305 files changed, 98174 insertions, 84406 deletions

diff --git a/AUTHORS b/AUTHORS
index 1120a91..dbd05d1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -85,7 +85,6 @@ Mike Sweet		<mike@easysw.com>
 	CUPS front end
 	Portability
 	Lots o'details
-	4.0 maintainer
 
 Peter Missel		<peter.missel@eplus-online.de>
 	Canon driver
@@ -118,5 +117,5 @@ Steve Miller		<smiller@rni.net>
 Thomas Tonino		<ttonino@bio.vu.nl>
 	Vastly improved dithering and color management
 
-Till Kamppeter		<till.kamppeter@gmx.net>
+Till Kamppeter		<till.kamppeter@gmail.com>
 	Foomatic interface
diff --git a/ChangeLog b/ChangeLog
index 0451aa6..a51e7c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,908 @@
+2007-06-17	<rlk@sourceforge.net>
+
+	Files:	doc/gutenprint.dox.in (1.4.18.1) (+263 -84)
+
+	Update doxygen input
+
+2007-06-17	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.305.6.8) (+1 -1)
+
+	Note that there "may be" issues with support for newer Canon
+	printers.
+
+2007-06-17	<faust3@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.4.4.3) (+0 -10)
+		src/main/canon-printers.h (1.13.4.3) (+6 -6)
+		src/main/printers.xml (1.157.4.6) (+9 -2)
+
+	fix printing of black ink for the iP4300
+
+2007-06-10	<rlk@sourceforge.net>
+
+	Files:	src/main/printers.xml (1.157.4.5) (+11 -11)
+
+	A number of Epson R-series printers do borderless better with the
+	RX400 settings than with the R300 settings.
+
+2007-06-04	<rlk@sourceforge.net>
+
+	Files:	src/main/print-util.c (1.109.4.3) (+2 -2)
+
+	Fix an overly enthusiastic conversion from ENABLE_NLS to HAVE_LOCALE_H
+
+2007-05-29	<rlk@sourceforge.net>
+
+	Files:	AUTHORS (1.21.10.2) (+0 -1)
+		NEWS (1.305.6.7) (+84 -22)
+		configure.ac (1.151.2.2) (+6 -5)
+		src/cups/Makefile.am (1.87.8.2) (+3 -3)
+		src/cups/cups-genppdconfig.in (1.13.8.1) (+2 -2)
+		src/cups/cups-genppdupdate.in (1.25.8.2) (+102 -48)
+		src/cups/genppd.c (1.119.2.3) (+6 -5)
+		src/escputil/escputil.c (1.87.8.1) (+2 -2)
+		src/foomatic/foomatic-generator.in (1.60.8.2) (+32 -28)
+		src/foomatic/foomatic-printermap (1.122.4.3) (+31 -1)
+		src/foomatic/printer_margins.c (1.17.8.2) (+9 -9)
+		src/foomatic/printer_options.c (1.50.8.2) (+135 -88)
+		src/gutenprintui2/panel.c (1.11.8.2) (+5 -4)
+		src/gutenprintui2/plist.c (1.6.10.3) (+41 -13)
+		src/main/escp2-channels.c (1.62.8.2) (+211 -1)
+		src/main/escp2-inks.c (1.46.10.2) (+87 -1)
+		src/main/escp2-papers.c (1.99.8.2) (+93 -1)
+		src/main/escp2-resolutions.c (1.33.8.2) (+85 -43)
+		src/main/print-canon.c (1.190.2.3) (+2 -2)
+		src/main/print-color.c (1.135.8.1) (+3 -1)
+		src/main/print-escp2-data.c (1.202.6.2) (+91 -4)
+		src/main/print-escp2.c (1.355.2.2) (+54 -23)
+		src/main/print-escp2.h (1.105.6.2) (+4 -2)
+		src/main/print-ps.c (1.87.8.1) (+136 -41)
+		src/main/print-util.c (1.109.4.2) (+12 -3)
+		src/main/print-vars.c (1.75.8.1) (+196 -119)
+		src/main/printers.c (1.79.2.1) (+46 -12)
+		src/main/printers.xml (1.157.4.4) (+44 -10)
+		src/main/xml.c (1.33.18.1) (+17 -10)
+		src/testpattern/testpatterny.y (1.26.18.2) (+2 -2)
+		test/parse-escp2 (1.11.8.2) (+22 -10)
+		test/pixma_parse.c (1.8.2.3) (+75 -8)
+		test/pixma_parse.h (1.3.2.3) (+9 -1)
+
+	Merge changes from 5.1.1 and 5.1.2
+
+2007-05-20	<rlk@sourceforge.net>
+
+	Files:	src/main/ppd.c (1.3) (+8 -8)
+
+	Fix handling of locale.
+
+	Remove unnecessary and inappropriate copyright notice from Postsript output.
+
+	Use stp_strdup consistently.
+
+2007-05-13	<rlk@sourceforge.net>
+
+	Files:	doc/gutenprint-users-manual.odt (1.1.6.2) (+284 -303)
+		doc/gutenprint-users-manual.pdf (1.1.6.1) (+5390 -7465)
+		po/cs.po (1.38.4.2) (+359 -371)
+		po/da.po (1.73.4.2) (+348 -362)
+		po/de.po (1.51.4.2) (+660 -674)
+		po/el.po (1.52.4.2) (+722 -733)
+		po/en_GB.po (1.144.4.2) (+348 -362)
+		po/es.po (1.50.4.2) (+761 -773)
+		po/fr.po (1.76.4.2) (+774 -788)
+		po/hu.po (1.9.4.2) (+349 -363)
+		po/ja.po (1.46.4.2) (+1108 -1120)
+		po/nb.po (1.13.4.2) (+392 -404)
+		po/nl.po (1.52.4.3) (+263 -277)
+		po/pl.po (1.56.4.2) (+415 -427)
+		po/pt.po (1.51.4.2) (+705 -717)
+		po/sk.po (1.55.4.2) (+1076 -1088)
+		po/sv.po (1.83.4.2) (+375 -389)
+		po/zh_TW.po (1.12.4.2) (+322 -337)
+
+	Merge from 5.1.1
+
+2007-05-12	<faust3@sourceforge.net>
+
+	Files:	NEWS (1.305.6.6) (+11 -0)
+
+	added Canon fixes
+
+2007-05-12	<faust3@sourceforge.net>
+
+	Files:	src/cups/canon.c (1.5.56.1) (+136 -19)
+		src/cups/epson.c (1.7.8.1) (+138 -21)
+
+	Make canon and epson backends work on newer kernels
+	(gutenprint-5.0.0-sysfs.patch from SUSE)
+
+2007-05-12	<faust3@sourceforge.net>
+
+	Files:	src/testpattern/testpatterny.y (1.26.18.1) (+6 -6)
+
+	add format arguments to fprintf()
+
+2007-05-12	<faust3@sourceforge.net>
+
+	Files:	src/gutenprintui2/plist.c (1.6.10.2) (+3 -3)
+
+	add format argument to g_message
+
+2007-05-12	<faust3@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.6.4.2) (+229 -116)
+		src/main/canon-media.h (1.4.4.2) (+3 -2)
+		src/main/canon-modes.h (1.8.4.2) (+63 -59)
+		src/main/canon-printers.h (1.13.4.2) (+22 -9)
+		src/main/print-canon.c (1.190.2.2) (+304 -305)
+		src/main/printers.xml (1.157.4.3) (+12 -12)
+
+	Backport Canon fixes from 5.1 to 5.0 branch:
+	- fixed CD printing for PIXMA class printers
+	- reenabled CD tray for PIXMA iP4200
+	- added CD fine adjustment controls
+	- fixed resolutions for S300 (https://bugs.launchpad.net/ubuntu/+source/gutenprint/+bug/110945)
+	- fixed printing with PIXMA printers connected to windows hosts (#1625202)
+	- renamed MULTIPASS printers to PIXMA
+
+2007-05-12	<faust3@sourceforge.net>
+
+	Files:	include/gutenprint/bit-ops.h (1.2.14.1) (+11 -2)
+		src/main/bit-ops.c (1.9.8.2) (+196 -1)
+
+	backport bit-ops changes (added 3 and 4 bit fold code) from 5.1 to 5.0 branch
+
+2007-03-20	<tillkamppeter@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.119.2.2) (+6 -2)
+
+	Added forgotten "#ifdef ENABLE_NLS ... #endif". This prevented from compiling with "--disable-nls".
+
+2007-03-04	<tillkamppeter@sourceforge.net>
+
+	Files:	AUTHORS (1.21.10.1) (+1 -1)
+		NEWS (1.305.6.5) (+2 -2)
+		README (1.165.6.2) (+1 -1)
+		doc/gutenprint-users-manual.odt (1.1.6.1) (+402 -360)
+		doc/users_guide/title.sgml (1.3.18.1) (+1 -1)
+		src/foomatic/gutenprint-version.c (1.2.18.1) (+2 -2)
+		src/foomatic/mk_printerlist.in (1.1.54.1) (+1 -1)
+		src/foomatic/paper_sizes.c (1.8.18.1) (+2 -2)
+		src/foomatic/printer_margins.c (1.17.8.1) (+3 -3)
+		src/foomatic/printer_options.c (1.50.8.1) (+2 -2)
+		src/foomatic/printers.c (1.10.18.1) (+2 -2)
+		src/testpattern/printer_options.c (1.2.8.2) (+2 -2)
+		src/testpattern/printers.c (1.6.18.1) (+2 -2)
+
+	Updated linuxprinting.org -> openprinting.org
+
+2007-03-03	<rlk@sourceforge.net>
+
+	Files:	po/cs.po (1.38.4.1) (+2083 -1921)
+		po/da.po (1.73.4.1) (+1986 -1792)
+		po/de.po (1.51.4.1) (+2006 -1844)
+		po/el.po (1.52.4.1) (+1995 -1868)
+		po/en_GB.po (1.144.4.1) (+1987 -1792)
+		po/es.po (1.50.4.1) (+2060 -1892)
+		po/fr.po (1.76.4.1) (+1990 -1795)
+		po/hu.po (1.9.4.1) (+1988 -1795)
+		po/ja.po (1.46.4.1) (+2055 -1892)
+		po/nb.po (1.13.4.1) (+1984 -1863)
+		po/nl.po (1.52.4.2) (+2354 -2040)
+		po/pl.po (1.56.4.1) (+1934 -1844)
+		po/pt.po (1.51.4.1) (+2003 -1839)
+		po/sk.po (1.55.4.1) (+2048 -1888)
+		po/sv.po (1.83.4.1) (+2030 -1835)
+		po/zh_TW.po (1.12.4.1) (+1952 -1793)
+
+	Gutenprint 5.0.0.99.1 release
+
+2007-03-03	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.305.6.4) (+7 -0)
+		src/foomatic/foomatic-printermap (1.122.4.2) (+4 -0)
+		src/main/printers.xml (1.157.4.2) (+5 -1)
+
+	Added support for some new Epson derivatives
+
+2007-03-03	<rlk@sourceforge.net>
+
+	Files:	po/nl.po (1.52.4.1) (+1963 -2874)
+
+	Updated Dutch translation
+
+2007-03-03	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.305.6.3) (+28 -29)
+
+	Minor release note updates
+
+2007-03-03	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.305.6.2) (+3 -3)
+
+	Satisfy make dist.
+
+2007-03-02	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.305.6.1) (+126 -411)
+		README (1.165.6.1) (+22 -22)
+		configure.ac (1.151.2.1) (+44 -23)
+		doc/README.maintaining (1.22.8.1) (+7 -7)
+		doc/developer/Makefile.am (1.19.6.1) (+2 -2)
+		doc/users_guide/Makefile.am (1.44.10.1) (+2 -2)
+		include/gutenprint/util.h (1.3.2.1) (+3 -2)
+		include/gutenprint/vars.h (1.3.8.1) (+4 -1)
+		scripts/autogen.sh (1.33.18.1) (+1 -1)
+		src/cups/Makefile.am (1.87.8.1) (+27 -7)
+		src/cups/cups-genppdupdate.in (1.25.8.1) (+82 -39)
+		src/cups/genppd.c (1.119.2.1) (+738 -453)
+		src/cups/rastertoprinter.c (1.105.2.1) (+99 -22)
+		src/foomatic/foomatic-generator.in (1.60.8.1) (+2 -2)
+		src/foomatic/foomatic-printermap (1.122.4.1) (+12 -1)
+		src/ghost/.cvsignore (1.12.10.1) (+0 -2)
+		src/gutenprintui/gutenprintui-internal.h (1.2.12.1) (+2 -2)
+		src/gutenprintui/panel.c (1.9.6.1) (+86 -13)
+		src/gutenprintui/plist.c (1.3.6.1) (+30 -19)
+		src/gutenprintui/printrcy.y (1.1.18.1) (+129 -80)
+		src/gutenprintui2/panel.c (1.11.8.1) (+86 -13)
+		src/gutenprintui2/plist.c (1.6.10.1) (+10 -3)
+		src/gutenprintui2/printrcy.y (1.1.18.1) (+129 -80)
+		src/main/Makefile.am (1.92.10.1) (+10 -2)
+		src/main/bit-ops.c (1.9.8.1) (+24 -21)
+		src/main/buffer-image.c (1.1.2.2) (+153 -0)
+		src/main/canon-inks.h (1.6.4.1) (+23 -0)
+		src/main/canon-media.h (1.4.4.1) (+55 -0)
+		src/main/canon-modes.h (1.8.4.1) (+91 -57)
+		src/main/canon-printers.h (1.13.4.1) (+62 -96)
+		src/main/escp2-channels.c (1.62.8.1) (+231 -7)
+		src/main/escp2-driver.c (1.30.6.1) (+16 -29)
+		src/main/escp2-inks.c (1.46.10.1) (+57 -17)
+		src/main/escp2-papers.c (1.99.8.1) (+480 -13)
+		src/main/escp2-resolutions.c (1.33.8.1) (+157 -84)
+		src/main/papers.xml (1.21.8.1) (+11 -4)
+		src/main/print-canon.c (1.190.2.1) (+364 -366)
+		src/main/print-canon.h (1.2.4.1) (+1 -1)
+		src/main/print-escp2-data.c (1.202.6.1) (+730 -1105)
+		src/main/print-escp2.c (1.355.2.1) (+271 -84)
+		src/main/print-escp2.h (1.105.6.1) (+54 -119)
+		src/main/print-olympus.c (1.61.2.1) (+1065 -839)
+		src/main/print-util.c (1.109.4.1) (+15 -1)
+		src/main/print-weave.c (1.65.8.1) (+3 -3)
+		src/main/printers.xml (1.157.4.1) (+23 -11)
+		src/main/util.h (1.33.10.1) (+5 -2)
+		src/testpattern/printer_options.c (1.2.8.1) (+16 -2)
+		src/testpattern/run-testpattern-2.in (1.2.4.1) (+75 -40)
+		test/.cvsignore (1.7.28.1) (+1 -0)
+		test/Makefile.am (1.46.8.1) (+4 -2)
+		test/parse-escp2 (1.11.8.1) (+261 -18)
+		test/pixma_parse.c (1.8.2.2) (+607 -0)
+		test/pixma_parse.h (1.3.2.2) (+256 -0)
+		test/unprint.c (1.37.8.1) (+5 -3)
+
+	Backport mainline 5.1.0 (release candidate) to 5.0 branch.  Omitted
+	changes to Postscript driver, and kept the name of the Olympus driver
+	the same (did not rename it to dyesub).
+
+2007-02-24	<rlk@sourceforge.net>
+
+	Files:	src/main/buffer-image.c (1.1.2.1) (removed)
+
+	file buffer-image.c was added on branch gutenprint-5_0-branch on 2007-03-02 12:01:21 +0000
+
+2007-02-24	<faust3@sourceforge.net>
+
+	Files:	src/main/buffer-image.c (1.1) (added)
+
+	add an internal function to buffer and rotate stp_images
+
+2007-02-24	<rlk@sourceforge.net>
+
+	Files:	test/pixma_parse.c (1.8.2.1) (removed)
+
+	file pixma_parse.c was added on branch gutenprint-5_0-branch on 2007-03-02 12:01:35 +0000
+
+2007-02-24	<faust3@sourceforge.net>
+
+	Files:	test/pixma_parse.c (1.8) (+3 -0)
+
+	ESC ($ enables duplex printing
+
+2007-02-24	<faust3@sourceforge.net>
+
+	Files:	test/pixma_parse.c (1.7) (+4 -0)
+
+	dump argument buffer for unknown bytes
+
+2007-02-23	<faust3@sourceforge.net>
+
+	Files:	test/pixma_parse.c (1.6) (+4 -1)
+
+	avoid endless loop
+
+2007-02-23	<faust3@sourceforge.net>
+
+	Files:	test/pixma_parse.c (1.5) (+17 -3)
+
+	add -y parameter to limit the height of the generated ppm
+
+2007-02-23	<rlk@sourceforge.net>
+
+	Files:	test/pixma_parse.h (1.3.2.1) (removed)
+
+	file pixma_parse.h was added on branch gutenprint-5_0-branch on 2007-03-02 12:01:36 +0000
+
+2007-02-23	<faust3@sourceforge.net>
+
+	Files:	test/pixma_parse.c (1.4) (+3 -1)
+		test/pixma_parse.h (1.3) (+2 -1)
+
+	print total number of dots
+
+2007-02-20	<faust3@sourceforge.net>
+
+	Files:	test/pixma_parse.c (1.3) (+1 -0)
+
+	fix handling of non extended ESC t) commands
+
+2006-11-01	<faust3@sourceforge.net>
+
+	Files:	test/pixma_parse.c (1.2) (+34 -8)
+		test/pixma_parse.h (1.2) (+5 -4)
+
+	Warning FIXES
+	support for the PIXMA iP6700:
+	ESC t) color order for this printer is CMYKcmk and not CMYKcmyk
+	a colorshift may happen when small and large dots of the same color get
+	printed to the same position => clip values for now
+	Thanks to Karl Günter Wünsch <kgw at mineralien-verkauf.de> for debugging
+	these issues
+
+2006-09-30	<faust3@sourceforge.net>
+
+	Files:	test/pixma_parse.c (1.1) (added)
+		test/pixma_parse.h (1.1) (added)
+
+	add pixma_parse a parser for canon bjl printjobs that can also generate ppm images from the raster data
+
+2006-09-18	<rlk@sourceforge.net>
+
+	Files:	m4/stp_option.m4 (1.7.2.1) (+3 -2)
+
+	Fix STP_ADD_COMPILER_ARG correctly.
+
+2006-09-18	<rlk@sourceforge.net>
+
+	Files:	src/main/mark.c (1.2) (+442 -0)
+		src/main/page.c (1.2) (+191 -0)
+		src/main/ppd.c (1.2) (+2644 -0)
+		src/main/ppd.h (1.2) (+345 -0)
+
+	First cut at new Postscript driver and changes to the UI code.
+
+	This code provided by David Suffield of HP.
+
+	This driver parses PPD files for options and dynamically creates
+	options based on the PPD files.
+
+2006-09-18	<rlk@sourceforge.net>
+
+	Files:	src/main/ppd.c (1.1) (added)
+
+	file ppd.c was initially added on branch new-ps-driver-branch.
+
+2006-09-14	<easysw@sourceforge.net>
+
+	Files:	Makefile.am (1.146) (+1 -26)
+
+	Remove EPM commands/targets from top-level makefile.
+
+2006-09-14	<easysw@sourceforge.net>
+
+	Files:	packaging/cups-gutenprint.gif (1.2) (removed)
+		packaging/cups-gutenprint.list.in (1.2) (removed)
+
+	Remove EPM packaging files.
+
+2006-09-14	<easysw@sourceforge.net>
+
+	Files:	configure.ac (1.151) (+2 -3)
+
+	Remove packaging/cups-gutenprint.list from the list of output files.
+
+2006-09-14	<easysw@sourceforge.net>
+
+	Files:	m4/stp_option.m4 (1.7) (+1 -1)
+
+	Fix duplicate optimizer option bug in STP_ADD_COMPILER_ARG - since
+	CFLAGS already contains the option, we don't need to add it a second
+	time.
+
+2006-09-14	<rlk@sourceforge.net>
+
+	Files:	src/main/printers.c (1.79) (+9 -4)
+
+	A few minor fixes.
+
+2006-09-13	<easysw@sourceforge.net>
+
+	Files:	Makefile.am (1.145) (+27 -1)
+		configure.ac (1.150) (+3 -3)
+		cups-gutenprint.list.in (1.2) (removed)
+		packaging/cups-gutenprint.gif (1.1) (added)
+		packaging/cups-gutenprint.list.in (1.1) (added)
+
+	Prepare CUPS driver packaging changes, and move all of the
+	packaging files under a subdirectory.
+
+	Add new logo image from Martin Owens.
+
+2006-09-13	<easysw@sourceforge.net>
+
+	Files:	configure.ac (1.149) (+9 -2)
+
+	Initialize common compiler options from the environment, otherwise
+	certain versions of autoconf will erroneously add "-g -O2" to the
+	compiler options.
+
+	Still need to figure out why we are getting double optimizer options
+	from the STP_FIRST_COMPILER_ARG macro...
+
+2006-09-12	<easysw@sourceforge.net>
+
+	Files:	configure.ac (1.148) (+6 -3)
+		src/cups/rastertoprinter.c (1.105) (+4 -4)
+		src/main/curve.c (1.52) (+6 -6)
+		src/main/print-canon.c (1.190) (+7 -3)
+		src/main/print-escp2.c (1.355) (+4 -2)
+		src/main/print-olympus.c (1.61) (+7 -3)
+		src/main/print-pcl.c (1.145) (+5 -2)
+		src/main/sequence.c (1.23) (+4 -4)
+
+	More portability fixes...
+
+	configure.ac:
+	    - Add explicit check for "finite" math function, and define
+	      isfinite to finite if it exists.
+	    - Define __attribute__ conditionally, since it may have already
+	      been defined in util.h...
+
+	src/cups/rastertoprinter.c:
+	    - Mark all static functions as static.
+
+	src/main/curve.c src/main/print-canon.c src/main/print-escp2.c
+	src/main/print-olympus.c src/main/print-pcl.c
+	src/main/sequence.c:
+	    - Use isfinite() instead of finite(), since isfinite() is part
+	      of the ISO C standard and finite() is not.
+
+2006-09-12	<easysw@sourceforge.net>
+
+	Files:	configure.ac (1.147) (+8 -3)
+		include/gutenprint/util.h (1.3) (+6 -2)
+		src/cups/genppd.c (1.119) (+6 -17)
+
+	Fix some non-portable stuff...
+
+	configure.ac:
+	    - If CC is GCC, we never set the optimization flags.
+	    - If CC is not GCC, we tried optimization flags that were not
+	      supported by commercial compilers (-O6 in particular) which
+	      produced warnings but not errors. Changed to only try -O...
+
+	include/gutenprint/util.h:
+	    - __attribute__ is primarily only available on GCC and with a
+	      few GCC-compatible commercial compilers.  Since the autoheader
+	      stuff isn't available here, and since util.h is a public header,
+	      added a GCC check and definition to allow it to be used with
+	      commercial compilers that don't implement __attribute__.
+
+	src/cups/genppd.c:
+	    - setenv() and unsetenv() are not portable.
+	    - Changed to just call setlocale() with the language that was
+	      passed.
+
+2006-09-10	<rlk@sourceforge.net>
+
+	Files:	include/gutenprint/ppd.h (1.1) (added)
+		src/main/ppd.h (1.1) (added)
+
+	file ppd.h was initially added on branch new-ps-driver-branch.
+
+2006-09-10	<rlk@sourceforge.net>
+
+	Files:	src/main/page.c (1.1) (added)
+
+	file page.c was initially added on branch new-ps-driver-branch.
+
+2006-09-10	<rlk@sourceforge.net>
+
+	Files:	src/main/mark.c (1.1) (added)
+
+	file mark.c was initially added on branch new-ps-driver-branch.
+
+2006-09-10	<m0m@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.122) (+1 -0)
+		src/main/print-olympus.c (1.60) (+84 -1)
+		src/main/printers.xml (1.157) (+2 -1)
+
+	add support for Olympus PS-100 (untested - see Feature Request 1527186)
+	https://sourceforge.net/tracker/?func=detail&aid=1527186&group_id=1537&atid=351537
+
+2006-09-10	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.189) (+3 -1)
+
+	don't send the A) command for empty lines, got broken when I commited the F) command support
+
+2006-09-10	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.188) (+18 -6)
+
+	fix K only printing when using the F) raster command
+
+2006-09-10	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.187) (+14 -7)
+
+	make number of rasterlines in every F) command #definable
+
+2006-09-09	<faust3@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.13) (+2 -2)
+		src/main/print-canon.c (1.186) (+93 -22)
+
+	Attempt to implement the F) raster command
+	probably the MP150 does not support the A) raster command
+
+	Not tested very well. I run out of ink ;(
+
+2006-09-09	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.185) (+47 -30)
+
+	get rid of static comp_buf size, prepare for I) J) L) F) raster sequence
+
+2006-09-09	<faust3@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.12) (+1 -1)
+
+	the MP150 needs the r) command, too
+
+2006-09-08	<faust3@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.4) (+1 -1)
+		src/main/print-canon.c (1.184) (+9 -16)
+
+	always use the first paper as default when the type is not set
+
+2006-09-08	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.183) (+1 -17)
+
+	remove unused lum adjustment curve
+
+2006-09-08	<faust3@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.121) (+1 -0)
+		src/main/canon-inks.h (1.6) (+12 -0)
+		src/main/canon-modes.h (1.8) (+6 -0)
+		src/main/canon-printers.h (1.11) (+12 -0)
+		src/main/printers.xml (1.156) (+2 -1)
+
+	add support for the Canon PIXMA iP2000 (untested)
+
+2006-09-08	<faust3@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.120) (+1 -0)
+		src/main/printers.xml (1.155) (+2 -1)
+
+	Add support for CANON MP500 which is according to
+	http://gentoo-wiki.com/Canon_pixma_series similar to the iP4200
+	(untested)
+
+2006-09-08	<faust3@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.119) (+6 -0)
+		src/main/printers.xml (1.154) (+7 -1)
+
+	add support for Canon PIXUS iP3100, i560/865, PIXMA ip3100 mp700/730
+	printers that are, according to http://gentoo-wiki.com/Canon_pixma_series,
+	compatible to the PIXMA iP3000
+	(all untested)
+
+2006-09-08	<faust3@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.118) (+9 -0)
+		src/main/printers.xml (1.153) (+10 -1)
+
+	add support for PIXUS iP4100, i860/865, PIXMA ip4100 mp750/760/770/780/790
+	printers that are, according to http://gentoo-wiki.com/Canon_pixma_series,
+	compatible to the PIXMA iP4000
+	(all untested)
+
+2006-09-08	<faust3@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.117) (+1 -0)
+		src/main/canon-modes.h (1.7) (+6 -0)
+		src/main/canon-printers.h (1.10) (+12 -0)
+		src/main/printers.xml (1.152) (+2 -1)
+
+	add support for MULITPASS MP830 (untested)
+
+2006-09-08	<faust3@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.9) (+7 -1)
+
+	the MP150 seems to require AckTime=Short, too
+
+2006-08-31	<faust3@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.8) (+28 -27)
+		src/main/print-canon.c (1.182) (+2 -3)
+
+	different printers require different args for the ESC r) command
+
+2006-08-31	<faust3@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.7) (+41 -26)
+		src/main/print-canon.c (1.181) (+8 -6)
+
+	per printer control command list
+
+2006-08-31	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.180) (+1 -28)
+
+	Remove workaround that I added to emulate the old modesetting code
+	The old set_ink_ranges returned when it did not find a matching ink
+	This was the case when printing Monochrome with DMT
+	The old code would then configure the printer to do DMT without feeding the correct dot_sizes to the dither engine
+
+2006-08-31	<faust3@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.3) (+1 -1)
+		src/main/canon-printers.h (1.6) (+168 -78)
+		src/main/print-canon.c (1.179) (+31 -98)
+		src/main/printers.xml (1.151) (+10 -7)
+
+	Attempt to improve the color correction for the PIXMA and MULTIPASS printers
+	a bit. Hopefully the colors are a bit better now (at least blue looks more
+	like blue ;)). The darker colors probably contain to much black.
+	The HSL adjustment curves were moved to canon-printers.h
+	The standard curves were removed from all other printers because the hsl
+	adjustment code seemed to be blindly copyed from the epson driver. It was never
+	used.
+
+2006-08-31	<faust3@sourceforge.net>
+
+	Files:	src/main/print-util.c (1.109) (+3 -2)
+
+	avoid crash when t2 is NULL
+
+2006-08-29	<faust3@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.6) (+3 -1)
+
+	Reenable 300x300dpi mode for PIXMA iP4000 add 600x600dpi draft mode
+
+2006-08-29	<faust3@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.116) (+2 -0)
+		src/main/canon-inks.h (1.5) (+13 -0)
+		src/main/canon-modes.h (1.5) (+6 -0)
+		src/main/canon-printers.h (1.5) (+12 -0)
+		src/main/printers.xml (1.150) (+3 -1)
+
+	basic support for PIXMA iP3000 and PIXMA iP5000 (untested)
+
+2006-08-29	<faust3@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.115) (+1 -0)
+		src/main/canon-inks.h (1.4) (+21 -0)
+		src/main/canon-modes.h (1.4) (+6 -0)
+		src/main/canon-printers.h (1.4) (+12 -0)
+		src/main/printers.xml (1.149) (+2 -1)
+
+	basic support for MULTIPASS MP150 (untested)
+
+2006-08-29	<faust3@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.114) (+2 -0)
+		src/main/canon-inks.h (1.3) (+26 -0)
+		src/main/canon-modes.h (1.3) (+5 -0)
+		src/main/canon-printers.h (1.3) (+12 -0)
+		src/main/printers.xml (1.148) (+3 -1)
+
+	basic PIXMA iP4200 and iP5200 support (untested), the iP4200 support is based on a patch by Michael Thayer
+
+2006-08-29	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.178) (+11 -13)
+
+	warning fixes
+
+2006-08-29	<faust3@sourceforge.net>
+
+	Files:	src/main/printers.xml (1.147) (+2 -2)
+
+	Rename Canon iP4000 to Canon PIXMA iP4000
+
+2006-08-29	<faust3@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.2) (+29 -16)
+
+	Add -m switch to print the md5sum for every generated printjob
+
+2006-08-29	<faust3@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.2) (+212 -0)
+		src/main/canon-media.h (1.2) (+31 -3)
+		src/main/canon-modes.h (1.2) (+216 -0)
+		src/main/canon-printers.h (1.2) (+368 -0)
+		src/main/print-canon.c (1.177) (+313 -1700)
+		src/main/print-canon.h (1.2) (+34 -25)
+
+	- new mode setting code
+	- remove EXPERIMENTAL_STUFF
+	- remove supported resolutions array - every printer can now support an  
+	unlimited amount of modes
+	- modedefintions can be found in canon-modes.h
+	- ink definitons can be found in canon-inks.h
+	- printer caps can be found in canon-printers.h
+	- the inklist can be used to generate the values for the extended ESC (t
+	command
+	- WEAVE and 5Pixelin1byte flags are now possible for every mode
+	- move paper definition from print-canon.h to canon-media.h
+
+	Although this looks like a complete rewrite all printers still support all
+	modes they supported before
+	The md5sums for every parameter combination testable with run-testpattern-2
+	are identical.
+	Exceptions:
+	bjc-6000,bjc-6100,bjc-6200,bjc-6500:
+	CMYK+BW+360x360dmt
+	bjc-7000:
+	CMYK+BW+300x300dpi
+	Reason:
+	Before the change the printer was configured to print CMYK when we only used
+	the K channel.
+	Now we configure the printer to print CcMmYK.
+
+	bjc-s200:
+	Gray+BW+360x360dpi
+	Reason:
+	Before the change BW+360x360dpi and Gray+BW+360x360dpi produced different
+	outputs.
+	Now they are the same.
+
+	bjc-PIXMA-iP4000:
+	BW+600x600dpi
+	Reason:
+	Before the change the driver has been using uninitialized memory in this mode.
+
+	Also fixes
+	http://sourceforge.net/tracker/index.php?func=detail&aid=1487718&group_id=1537&atid=101537
+
+2006-08-28	<faust3@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.1) (added)
+
+	file canon-modes.h was initially added on branch canon_experimental.
+
+2006-08-25	<faust3@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.1.4.1) (+29 -16)
+
+	add -m switch to print md5sum
+
+2006-08-24	<m0m@sourceforge.net>
+
+	Files:	src/main/print-olympus.c (1.59.2.1) (+76 -1)
+
+	changes:
+	- olympus_read_image now read whole image at once
+	- olympus_get_cached_output is no more used
+
+2006-08-09	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.175.2.3) (+3 -3)
+
+	rename papercount->count move media related structs to canon_media.h
+
+2006-08-07	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.175.2.2) (+2 -158)
+
+	move ink defintions to canon-inks.h
+
+2006-08-07	<faust3@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.1) (added)
+
+	file canon-inks.h was initially added on branch canon_experimental.
+
+2006-08-07	<faust3@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.113.4.1) (+1 -1)
+		src/main/printers.xml (1.146.4.1) (+2 -2)
+
+	rename iP4000 to PIXMA-iP4000 to avoid confusion with the japanese PIXUS models
+
+2006-08-07	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.176) (+1 -5)
+
+	Remove bogus default settings
+
+2006-08-07	<rleigh@sourceforge.net>
+
+	Files:	include/gutenprint/xml.h (1.2) (+6 -2)
+
+	Add missing closing brace for 'extern "C"' when using a C++ compiler.
+
+2006-08-07	<rleigh@sourceforge.net>
+
+	Files:	configure.ac (1.146) (+12 -2)
+
+	configure.ac: Teach PACKAGE_DATA_DIR about $datarootdir, used in new
+	versions of autoconf, so that it is correctly defined with all new and
+	old autoconf versions.
+
+2006-07-30	<rleigh@sourceforge.net>
+
+	Files:	doc/Makefile.am (1.49) (+4 -4)
+
+	doc/Makefile.am: Install documentation correctly when building in a VPATH.
+
+2006-07-30	<rlk@sourceforge.net>
+
+	Files:	po/cs.po (1.38) (+287 -285)
+		po/da.po (1.73) (+569 -468)
+		po/de.po (1.51) (+288 -287)
+		po/el.po (1.52) (+287 -282)
+		po/en_GB.po (1.144) (+307 -302)
+		po/es.po (1.50) (+287 -286)
+		po/fr.po (1.76) (+287 -282)
+		po/hu.po (1.9) (+550 -458)
+		po/ja.po (1.46) (+287 -285)
+		po/nb.po (1.13) (+287 -285)
+		po/nl.po (1.52) (+287 -282)
+		po/pl.po (1.56) (+287 -282)
+		po/pt.po (1.51) (+287 -285)
+		po/sk.po (1.55) (+287 -285)
+		po/sv.po (1.83) (+288 -286)
+		po/zh_TW.po (1.12) (+287 -282)
+
+	Gutenprint 5.0.0 release
+
+2006-07-23	<faust3@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.1) (added)
+
+	file canon-printers.h was initially added on branch canon_experimental.
+
+2006-07-23	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.175.2.1) (+2 -486)
+
+	Move printer capabilities to canon-printers.h
+
+2006-07-22	<faust3@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.1) (added)
+		src/main/print-canon.c (1.175) (+43 -121)
+		src/main/print-canon.h (1.1) (added)
+
+	Cleanup Step 1
+	create a header for the canon driver
+	move paper definitions to canon-media.h
+	make it possible to select different paper definitions for different papers
+	preparations for quality selection
+	remove a now obsolete hack for CD printing
+
 2006-07-22	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.305) (+3 -0)
@@ -1934,6 +2839,12 @@
 
 2005-10-01	<rlk@sourceforge.net>
 
+	Files:	test/unprint.c (1.35.8.1) (+7 -2)
+
+	Start work on the R2400
+
+2005-10-01	<rlk@sourceforge.net>
+
 	Files:	NEWS (1.241) (+7 -24)
 
 	Correct the list of printers for which four color mode is incompatible
@@ -2652,6 +3563,14 @@
 
 	Improve black generation on Ultrachrome printers, and green on 2200.
 
+2005-06-18	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.335.2.2) (+2 -2)
+
+	Add Stylus RX425.
+
+	Clean up a few minor glitches.
+
 2005-06-15	<rlk@sourceforge.net>
 
 	Files:	src/main/string-list.c (1.19) (+13 -5)
@@ -2690,6 +3609,12 @@
 
 	Fix unnecessary warnings.
 
+2005-06-13	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.335.2.1) (+254 -9)
+
+	Attempt to improve red and blue generation on the R800
+
 2005-06-07	<rlk@sourceforge.net>
 
 	Files:	src/main/escp2-channels.c (1.51) (+15 -4)
@@ -4841,6 +5766,13 @@
 
 	Support for Olympus P-200
 
+2004-07-22	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.322.2.1) (+3 -3)
+		src/main/print-olympus.c (1.50.2.1) (+3 -3)
+
+	Intermediate state
+
 2004-07-09	<m0m@sourceforge.net>
 
 	Files:	NEWS (1.175) (+4 -1)
@@ -5206,6 +6138,12 @@
 
 	file Makefile.am was initially added on branch gtk2-20040615-branch.
 
+2004-06-15	<rleigh@sourceforge.net>
+
+	Files:	configure.ac (1.106.2.1) (+7 -3)
+
+	Add initial GTK+ 2.0 work on a separate branch.
+
 2004-06-13	<rlk@sourceforge.net>
 
 	Files:	src/libgimpprintui/plist.c (1.39) (+3 -3)
@@ -6573,6 +7511,31 @@
 	Add support for generating API documentation with doxygen.
 	Document the sequence and array modules as examples.
 
+2004-03-28	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.89.2.2) (+15 -5)
+
+	Add KCMY, inverted grayscale, and CMY color spaces.
+
+	Improve wording in PPD files.
+
+2004-03-26	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.89.2.1) (+31 -16)
+
+	Intermediate state, lots of things compile, genppd works
+
+2004-03-24	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.95.2.1) (+9 -20)
+		m4/stp_option.m4 (1.3.2.1) (+42 -0)
+
+	Add autoconf macro to safely add compiler options to command line.
+
+	Ensure that aclocal.m4 is correctly rebuilt by autogen.sh.
+
+	Reviewed by Roger Leigh.
+
 2004-03-22	<rlk@sourceforge.net>
 
 	Files:	src/main/print-escp2-data.c (1.154) (+66 -66)
@@ -6746,6 +7709,12 @@
 	Per Mike Sweet, logged page numbers should be 1-based rather than
 	0-based.
 
+2004-03-01	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.140.2.3) (+23 -9)
+
+	Intermediate state
+
 2004-02-28	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.156) (+5 -5)
@@ -6859,6 +7828,22 @@
 
 	Increase size of band printed
 
+2004-02-22	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.140.2.2) (+26 -30)
+		src/main/print-escp2.c (1.308.2.2) (+40 -33)
+		src/main/printers.c (1.61.2.1) (+16 -8)
+
+	Intermediate state
+
+2004-02-16	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.79.2.1) (+10 -2)
+		src/main/print-canon.c (1.140.2.1) (+2 -4)
+		src/main/print-escp2.c (1.308.2.1) (+3 -3)
+
+	Branch for new API for color conversion
+
 2004-02-16	<rlk@sourceforge.net>
 
 	Files:	src/cups/Makefile.am (1.74) (+2 -2)
@@ -7403,6 +8388,12 @@
 
 	The CX-6300 and 6400 appear to actually be based on the C84, not the C64.
 
+2003-11-27	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.305.2.1) (+56 -66)
+
+	Eliminate the use of the term 'Microweave'
+
 2003-11-25	<rlk@sourceforge.net>
 
 	Files:	src/main/print-color.c (1.105) (+137 -98)
@@ -9215,6 +10206,13 @@
 
 2003-08-31	<rlk@sourceforge.net>
 
+	Files:	src/main/print-canon.c (1.129.2.2) (+6 -14)
+		src/main/print-escp2.c (1.285.2.2) (+8 -23)
+
+	Intermediate state
+
+2003-08-31	<rlk@sourceforge.net>
+
 	Files:	src/main/escp2-inks.c (1.20) (+2 -2)
 		src/main/print-escp2-data.c (1.124) (+3 -3)
 
@@ -9403,6 +10401,15 @@
 
 	code update
 
+2003-08-18	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.129.2.1) (+10 -8)
+		src/main/print-escp2.c (1.285.2.1) (+16 -11)
+		src/main/print-olympus.c (1.7.2.1) (+17 -20)
+		src/main/printers.c (1.59.2.1) (+3 -9)
+
+	Some new color stuff
+
 2003-08-08	<rlk@sourceforge.net>
 
 	Files:	po/cs.po (1.9) (+931 -928)
@@ -10090,6 +11097,12 @@
 
 2003-06-19	<rlk@sourceforge.net>
 
+	Files:	configure.ac (1.68.2.1) (+2 -8)
+
+	Eliminate the rest of libxml except for sequence.c so far
+
+2003-06-19	<rlk@sourceforge.net>
+
 	Files:	src/main/mxml.h (1.1) (added)
 
 	file mxml.h was initially added on branch mxml-branch.
@@ -10118,6 +11131,12 @@
 
 	file mxml-attr.c was initially added on branch mxml-branch.
 
+2003-06-19	<rlk@sourceforge.net>
+
+	Files:	src/main/printers.c (1.55.2.1) (+69 -64)
+
+	Use mxml rather than libxml2 for XML parser
+
 2003-06-17	<davehill@sourceforge.net>
 
 	Files:	src/main/print-pcl.c (1.113) (+8 -8)
@@ -10972,6 +11991,12 @@
 
 	Note order dependency on module loading for future fix.
 
+2003-05-25	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.120.2.3) (+12 -12)
+
+	Tested more things
+
 2003-05-23	<rlk@sourceforge.net>
 
 	Files:	po/cs.po (1.4) (+25 -66)
@@ -10998,6 +12023,14 @@
 
 	A few minor fixes for the Olympus driver
 
+2003-05-23	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.62.2.1) (+7 -6)
+		src/main/print-olympus.c (1.2.2.1) (+14 -13)
+		src/main/printers.xml (1.71.4.1) (+7 -1)
+
+	Merge changes in from mainline
+
 2003-05-22	<m0m@sourceforge.net>
 
 	Files:	NEWS (1.103) (+4 -0)
@@ -11009,12 +12042,25 @@
 
 	Merge with olympus driver
 
+2003-05-22	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.120.2.2) (+22 -81)
+		src/main/print-escp2.c (1.259.2.2) (+3 -6)
+
+	Compiles
+
 2003-05-21	<m0m@sourceforge.net>
 
 	Files:	src/main/print-olympus.c (1.1) (added)
 
 	file print-olympus.c was initially added on branch olympus-driver-branch.
 
+2003-05-21	<m0m@sourceforge.net>
+
+	Files:	src/main/print-olympus.c (1.1.2.1) (+546 -0)
+
+	Initial version of olympus driver added
+
 2003-05-20	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.135) (+2 -2)
@@ -11051,6 +12097,13 @@
 
 	Over-zealously changed HP LJII to a IIP.
 
+2003-05-12	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.120.2.1) (+4 -9)
+		src/main/print-escp2.c (1.259.2.1) (+6 -10)
+
+	Start work on new channel architecture
+
 2003-05-11	<rlk@sourceforge.net>
 
 	Files:	po/cs.po (1.3) (+3032 -1740)
@@ -11353,10 +12406,42 @@
 
 2003-05-04	<rlk@sourceforge.net>
 
+	Files:	po/cs.po (1.1.4.1) (+3348 -0)
+
+	Add Czech translation
+
+2003-05-04	<rlk@sourceforge.net>
+
 	Files:	po/cs.po (1.1) (added)
 
 	file cs.po was initially added on branch gimp-print-4_2_branch.
 
+2003-05-03	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.60.2.2) (+3 -3)
+
+	Bump the version number
+
+2003-05-01	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.60.2.1) (+2 -3)
+
+	Don't try to generate printdef Makefile
+
+2003-05-01	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.255.2.2) (+276 -250)
+
+	More code cleanup
+
+2003-04-28	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.66.2.1) (+11 -11)
+		src/main/print-escp2.c (1.255.2.1) (+356 -407)
+		src/main/printers.c (1.49.2.1) (+4 -4)
+
+	Start another thorny phase of cleanup
+
 2003-04-28	<rlk@sourceforge.net>
 
 	Files:	src/testpattern/run-testpattern (1.4) (+11 -8)
@@ -12680,10 +13765,34 @@
 
 2003-02-09	<rlk@sourceforge.net>
 
+	Files:	src/main/print-canon.c (1.107.2.2) (+5 -3)
+
+	Able to enable and disable individual options
+
+2003-02-09	<rlk@sourceforge.net>
+
 	Files:	src/libgimpprintui/printrc.h (1.1) (added)
 
 	file printrc.h was initially added on branch ui-20030201-branch.
 
+2003-02-09	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.229.2.2) (+3 -3)
+
+	UI stubs for optional parameters
+
+2003-02-08	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.107.2.1) (+4 -4)
+		src/main/print-escp2.c (1.229.2.1) (+24 -24)
+		src/main/printers.c (1.38.2.1) (+9 -5)
+
+	Allow UI to turn options on and off.
+
+	Fix a few bugs in the UI.
+
+	Valgrind the UI.
+
 2003-02-08	<rlk@sourceforge.net>
 
 	Files:	src/libgimpprintui/printrcy.y (1.1) (added)
@@ -13358,6 +14467,12 @@
 	(for shaping the GCR curve), and for individual CMYK densities.
 	This should simplify gray tuning.
 
+2003-01-18	<rlk@sourceforge.net>
+
+	Files:	src/main/print-util.c (1.85.4.1) (+52 -1)
+
+	New color code appears to work more or less correctly.
+
 2003-01-18	<mtomlinson@sourceforge.net>
 
 	Files:	src/main/print-dither.c (1.116) (+15 -3)
@@ -13370,6 +14485,13 @@
 
 	Make compute_a_curve work for steps != 256.
 
+2003-01-18	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.101.2.3) (+29 -35)
+		src/main/print-escp2.c (1.220.2.2) (+18 -34)
+
+	Compiles now
+
 2003-01-17	<davehill@sourceforge.net>
 
 	Files:	test/pcl-unprint.c (1.7) (+62 -19)
@@ -13377,12 +14499,25 @@
 	Added parsing of more parameters. Updated "PJL" parsing to handle (but not
 	act on) HPGL commands.
 
+2003-01-17	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.101.2.2) (+5 -8)
+		src/main/print-escp2.c (1.220.2.1) (+74 -75)
+
+	More work
+
 2003-01-15	<tillkamppeter@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-printermap (1.47) (+68 -5)
 
 	Added missing HP DeskJet and OfficeJet printers (DJ6xx, DJ8xx, and DJ9xx series).
 
+2003-01-15	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.101.2.1) (+20 -26)
+
+	Minor progress
+
 2003-01-14	<rlk@sourceforge.net>
 
 	Files:	include/gimp-print/gimp-print.h (1.15) (+5 -6)
@@ -13406,6 +14541,14 @@
 
 	Implemented new EvenTone raw CMYK (untested).
 
+2003-01-13	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.41.2.1) (+4 -3)
+		src/main/print-canon.c (1.100.2.1) (+7 -9)
+		src/main/print-escp2.c (1.219.2.1) (+3 -5)
+
+	Remove monochrome mode to simplify color modifications
+
 2003-01-12	<rlk@sourceforge.net>
 
 	Files:	include/gimp-print/gimp-print.h (1.14) (+3 -2)
@@ -13901,6 +15044,13 @@
 
 2003-01-05	<rlk@sourceforge.net>
 
+	Files:	src/main/print-canon.c (1.94.2.2) (+22 -20)
+		src/main/print-escp2.c (1.212.2.2) (+2 -2)
+
+	More code changes
+
+2003-01-05	<rlk@sourceforge.net>
+
 	Files:	po/da.po (1.25) (+1246 -1094)
 		po/de.po (1.10) (+1687 -1574)
 		po/el.po (1.12) (+1446 -1300)
@@ -13973,6 +15123,14 @@
 	Link instead_of_main.o with everything except print.o, libgimp.so and libgimpui.so
 	to create gimpprint-panel executable. dpace Jan 4, 2003.
 
+2003-01-04	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.94.2.1) (+64 -2)
+		src/main/print-escp2.c (1.212.2.1) (+126 -10)
+		src/main/printers.c (1.17.2.1) (+9 -1)
+
+	Work in progress
+
 2003-01-03	<rleigh@sourceforge.net>
 
 	Files:	src/escputil/escputil.c (1.49) (+26 -26)
@@ -14608,6 +15766,13 @@
 
 	Use curves for HSL mapping
 
+2002-12-21	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.84.2.1) (+67 -262)
+		src/main/print-escp2.c (1.197.2.1) (+22 -48)
+
+	Use curves for HSL transformations
+
 2002-12-18	<tillkamppeter@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-generator.in (1.28) (+6 -3)
@@ -15385,6 +16550,24 @@
 
 	Fix list function prototypes and header name
 
+2002-11-17	<rlk@sourceforge.net>
+
+	Files:	po/da.po (1.23.4.1) (+923 -1331)
+		po/de.po (1.8.4.1) (+942 -1165)
+		po/el.po (1.10.4.1) (+1077 -1362)
+		po/en_GB.po (1.90.4.1) (+969 -1125)
+		po/es.po (1.8.4.1) (+988 -1144)
+		po/fr.po (1.30.4.1) (+968 -1125)
+		po/ja.po (1.3.4.1) (+967 -1124)
+		po/nl.po (1.10.4.1) (+937 -1118)
+		po/pl.po (1.14.4.1) (+994 -1333)
+		po/pt.po (1.8.4.1) (+984 -1128)
+		po/sk.po (1.13.4.1) (+968 -1126)
+		po/sv.po (1.39.4.1) (+968 -1130)
+		src/main/printers.xml (1.56.4.1) (+9 -9)
+
+	Bring over some mimnor changes from the mainline
+
 2002-11-16	<rlk@sourceforge.net>
 
 	Files:	src/main/string-list.c (1.1) (added)
@@ -15393,6 +16576,19 @@
 
 2002-11-16	<rlk@sourceforge.net>
 
+	Files:	src/main/print-canon.c (1.83.2.3) (+2 -10)
+
+	Cleanup
+
+2002-11-16	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.29.2.1) (+71 -123)
+		src/main/print-canon.c (1.83.2.2) (+51 -132)
+
+	Revamp the API again, everything compiles, at least some things work
+
+2002-11-16	<rlk@sourceforge.net>
+
 	Files:	src/cups/gimp-print-cups.h (1.1) (added)
 
 	file gimp-print-cups.h was initially added on branch parameter-reorg-20021109-branch.
@@ -15403,6 +16599,12 @@
 
 	file gimp-print-cups.c was initially added on branch parameter-reorg-20021109-branch.
 
+2002-11-16	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.49.2.2) (+50 -138)
+
+	Revamp the API again, everything compiles, at least some things work
+
 2002-11-16	<davehill@sourceforge.net>
 
 	Files:	src/main/print-pcl.c (1.62) (+7 -1)
@@ -15417,6 +16619,12 @@
 
 	Document the new stp_list_t list type
 
+2002-11-15	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.193.2.2) (+2 -1)
+
+	Basic operation of the print plugin
+
 2002-11-14	<tillkamppeter@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-templates-ijs/Brightness.xml (1.3) (+2 -2)
@@ -15441,6 +16649,20 @@
 
 	Add SEE ALSO references to the libgimpprint man pages
 
+2002-11-10	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.49.2.1) (+3 -4)
+		src/main/print-canon.c (1.83.2.1) (+112 -98)
+		src/main/print-escp2.c (1.193.2.1) (+135 -113)
+
+	The core library now compiles
+
+2002-11-10	<rlk@sourceforge.net>
+
+	Files:	src/main/printers.c (1.7.2.1) (+31 -95)
+
+	Starting work on second phase of parameter reorganization
+
 2002-11-09	<rleigh@sourceforge.net>
 
 	Files:	man/gimpprint-imagetypes.7.in (1.2) (+2 -2)
@@ -15599,6 +16821,12 @@
 
 	file DitherAlgorithm.xml was initially added on branch parameter-reorg-20021102-branch.
 
+2002-11-03	<rlk@sourceforge.net>
+
+	Files:	src/main/print-util.c (1.75.4.1) (+8 -1)
+
+	Test patternn generator now works
+
 2002-11-02	<rlk@sourceforge.net>
 
 	Files:	src/gimp/gimp_main_window.c (1.80) (+3 -7)
@@ -16062,6 +17290,25 @@
 
 	Remove Ghostscript stp driver.
 
+2002-10-24	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.43.2.1) (+5 -5)
+
+	Fix up a lot of the width vs. height stuff
+
+2002-10-24	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.27.2.1) (+11 -20)
+
+	Remove the old-style Ghostscript stp driver
+
+2002-10-22	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.25.2.1) (+4 -57)
+		src/main/print-canon.c (1.77.2.3) (+12 -4)
+
+	Clean up the API, still need to fix the GIMP plugin
+
 2002-10-21	<rlk@sourceforge.net>
 
 	Files:	src/main/vars.h (1.1) (added)
@@ -16070,6 +17317,13 @@
 
 2002-10-21	<rlk@sourceforge.net>
 
+	Files:	src/main/print-canon.c (1.77.2.2) (+3 -3)
+		src/main/print-escp2.c (1.188.2.2) (+3 -3)
+
+	A bit more cleanup
+
+2002-10-21	<rlk@sourceforge.net>
+
 	Files:	src/main/printers.c (1.1) (added)
 
 	file printers.c was initially added on branch reorg-20021020-branch.
@@ -16092,6 +17346,14 @@
 
 	file print-papers.c was initially added on branch reorg-20021020-branch.
 
+2002-10-21	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.77.2.1) (+17 -39)
+		src/main/print-escp2.c (1.188.2.1) (+81 -68)
+		src/main/printers.c (1.1.2.1) (+142 -0)
+
+	Start working on some reorganization
+
 2002-10-19	<tillkamppeter@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-templates-gs/gimp-print.xml (1.3) (+1 -1)
@@ -16795,6 +18057,12 @@
 
 	Update en_GB translation (all fuzzy and unstranslated strings)
 
+2002-07-22	<rlk@sourceforge.net>
+
+	Files:	test/unprint.c (1.22.8.1) (+16 -5)
+
+	Merge mainline into 4.2 branch
+
 2002-07-21	<rlk@sourceforge.net>
 
 	Files:	src/main/print-color.c (1.28) (+3 -2)
@@ -16809,6 +18077,18 @@
 
 2002-07-21	<rlk@sourceforge.net>
 
+	Files:	src/main/print-escp2.c (1.180.2.2) (+56 -12)
+
+	Make raw mode work!
+
+2002-07-21	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.17.2.2) (+3 -3)
+
+	Don't use -ansi; it causes problems with getopt.
+
+2002-07-21	<rlk@sourceforge.net>
+
 	Files:	man/escputil.1.in (1.6) (+1 -2)
 		man/gimpprint-config.1.in (1.3) (+1 -2)
 
@@ -16822,6 +18102,14 @@
 
 2002-07-21	<rlk@sourceforge.net>
 
+	Files:	configure.ac (1.17.2.1) (+3 -3)
+		src/main/print-canon.c (1.75.2.1) (+5 -3)
+		src/main/print-escp2.c (1.180.2.1) (+10 -6)
+
+	Start working on n-color support
+
+2002-07-21	<rlk@sourceforge.net>
+
 	Files:	src/main/print-escp2.c (1.180) (+17 -18)
 
 	Minor cleanup
@@ -17361,6 +18649,12 @@
 
 	Small GPL amendments (year 2000 date fixes)
 
+2002-06-06	<sharkey@sourceforge.net>
+
+	Files:	po/es.po (1.1.4.2) (+19 -14)
+
+	Merge with 4.2.2-pre2.
+
 2002-06-05	<rlk@sourceforge.net>
 
 	Files:	src/testpattern/testpattern.c (1.7) (+64 -41)
@@ -17428,6 +18722,14 @@
 
 	Fix off-by-one error in VASPRINTF
 
+2002-05-25	<sharkey@sourceforge.net>
+
+	Files:	po/es.po (1.1.4.1) (+857 -647)
+		src/main/print-escp2-data.c (1.15.6.1) (+1 -1)
+		src/main/print-escp2.h (1.7.6.1) (+1 -1)
+
+	Sync debian-branch with 4.2.2-pre1.
+
 2002-05-19	<rleigh@sourceforge.net>
 
 	Files:	src/cups/Makefile.am (1.52) (+2 -2)
@@ -17442,6 +18744,12 @@
 
 2002-05-18	<rlk@sourceforge.net>
 
+	Files:	src/main/print-canon.c (1.71.2.3) (+2 -2)
+
+	media_sources should be const
+
+2002-05-18	<rlk@sourceforge.net>
+
 	Files:	src/main/print-util.c (1.65) (+32 -100)
 
 	Minor typo
@@ -17560,6 +18868,13 @@
 
 	Move config.h back to the root; it fixes a gettext bug
 
+2002-05-03	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.71.2.2) (+56 -62)
+
+	Merge libgimpprint from the mainline to bring in Even Tone dither
+	and better channel architecture.
+
 2002-05-02	<rleigh@sourceforge.net>
 
 	Files:	debian/changelog (1.45) (+6 -0)
@@ -17652,6 +18967,12 @@
 
 	Prep for 4.3.0
 
+2002-04-27	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.36.2.3) (+29 -48)
+
+	BSD portability issue.
+
 2002-04-26	<mtomlinson@sourceforge.net>
 
 	Files:	src/main/print-dither.c (1.83) (+4 -3)
@@ -17715,6 +19036,7 @@
 2002-04-14	<rlk@sourceforge.net>
 
 	Files:	lib/vasprintf.c (1.4) (+4 -4)
+		src/cups/genppd.c (1.36.2.2) (+4 -2)
 		src/cups/genppd.c (1.38) (+4 -2)
 		src/main/print-util.c (1.59) (+8 -17)
 
@@ -17850,6 +19172,12 @@
 
 	540307 Syntax error in CloseUI in PPD files
 
+2002-04-06	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.36.2.1) (+3 -3)
+
+	540307 Syntax error in CloseUI in PPD files
+
 2002-04-06	<tillkamppeter@sourceforge.net>
 
 	Files:	src/foomatic/Makefile.am (1.22) (+6 -6)
@@ -18588,6 +19916,12 @@
 
 2002-03-02	<rlk@sourceforge.net>
 
+	Files:	src/main/print-canon.c (1.71.2.1) (+33 -9)
+
+	Latest updates from Peter Missel, should fix a lot of the Canon problems
+
+2002-03-02	<rlk@sourceforge.net>
+
 	Files:	src/main/print-canon.c (1.75) (+33 -9)
 
 	Latest update from Peter Missel
@@ -18987,6 +20321,12 @@
 
 2002-01-23	<rlk@sourceforge.net>
 
+	Files:	src/main/print-escp2.c (1.147.2.2) (+6 -6)
+
+	Fix margins per manuals for old printers
+
+2002-01-23	<rlk@sourceforge.net>
+
 	Files:	src/main/print-escp2-data.c (1.8) (+6 -6)
 
 	Fix margins
@@ -19100,6 +20440,13 @@
 	499200 ESP 1280/1290 need special deinit code
 	499203 ESP 780/820 have different paper codes
 
+2002-01-04	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.147.2.1) (+173 -58)
+
+	499203 ESP 780/820 have different paper codes
+	499200 ESP 1280/1290 need special deinit code
+
 2002-01-03	<mtomlinson@sourceforge.net>
 
 	Files:	src/main/print-dither.c (1.53) (+304 -2)
@@ -20639,6 +21986,12 @@
 
 2001-10-17	<rlk@sourceforge.net>
 
+	Files:	src/main/print-escp2.c (1.129.2.1) (+35 -2824)
+
+	Split print-escp2.c into two.
+
+2001-10-17	<rlk@sourceforge.net>
+
 	Files:	po/en_GB.po (1.61) (+876 -3)
 		po/fr.po (1.4) (+1058 -156)
 		po/no.po (1.4) (+1054 -154)
@@ -21751,6 +23104,13 @@
 
 	Some reorg of Epson densities/drop sizes (mostly to make it easier to read)
 
+2001-09-14	<sharkey@sourceforge.net>
+
+	Files:	src/main/printers.xml (1.9.4.6) (+33 -5)
+
+	Merge in main trunk changes to bring the debian branch up to the beta1
+	release.
+
 2001-09-11	<rlk@sourceforge.net>
 
 	Files:	src/ghost/README (1.30) (+3 -4)
@@ -22985,6 +24345,12 @@
 	Stylus Photo 1270 (and very likely every printer using the 1999
 	command set) can print more than 44" long.
 
+2001-07-23	<sharkey@sourceforge.net>
+
+	Files:	src/main/printers.xml (1.9.4.5) (+56 -2)
+
+	Merge in alpha 2 from the mainline.
+
 2001-07-22	<rlk@sourceforge.net>
 
 	Files:	test/.cvsignore (1.3) (+1 -0)
@@ -23418,6 +24784,12 @@
 	made the source code being read), and second, the way how the lines were
 	evaluated didn't support option names with spaces.
 
+2001-07-10	<sharkey@sourceforge.net>
+
+	Files:	src/main/printers.xml (1.9.4.4) (+3 -3)
+
+	Merging 4.1.99-a1 into the debian branch.
+
 2001-07-10	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.29) (+27 -2)
@@ -23704,6 +25076,13 @@
 
 	No need for unistd.h here.
 
+2001-06-30	<sharkey@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.7.2.3) (+84 -97)
+		src/main/printers.xml (1.9.4.3) (+50 -0)
+
+	Merge in 4.1.10 for the 4.1.10-1 debian release.
+
 2001-06-24	<rleigh@sourceforge.net>
 
 	Files:	src/cups/Makefile.am (1.26) (+2 -8)
@@ -24298,6 +25677,19 @@
 
 	file print-dither-matrices.c was initially added on branch stylus-pro-branch.
 
+2001-05-28	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.43.2.2) (+7 -1)
+
+	Verify in the drivers that the parameters have been checked prior to
+	attempting to print.
+
+2001-05-27	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.43.2.1) (+2 -2)
+
+	Use stp_free rather than free everywhere.
+
 2001-05-27	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.98) (+5 -1)
@@ -24308,6 +25700,27 @@
 
 	Automatically generate debian/changelog during 'make dist'
 
+2001-05-27	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.14.2.1) (+83 -94)
+
+	Much better support for roll-feed paper.
+
+	The Gimp plugin now grays out page width & height boxes when they
+	can't be modified.
+
+2001-05-25	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.68.2.2) (+13 -7)
+
+	Some fixes
+
+2001-05-25	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.68.2.1) (+165 -58)
+
+	Stylus Pro mods
+
 2001-05-22	<rlk@sourceforge.net>
 
 	Files:	src/main/print-canon.c (1.43) (+19 -31)
@@ -24522,6 +25935,13 @@
 
 2001-05-09	<sharkey@sourceforge.net>
 
+	Files:	src/cups/genppd.c (1.7.2.2) (+49 -16)
+		src/main/print-util.c (1.8.4.3) (+207 -7)
+
+	Merge 4.1.7, prepare for 4.1.7-1 debs.
+
+2001-05-09	<sharkey@sourceforge.net>
+
 	Files:	debian/control.in (1.4) (+1 -1)
 
 	Add flex to build depends on the mainline too.
@@ -24727,6 +26147,15 @@
 	Changed PCL_STP_PRINTER_TIFF back to PCL_PRINTER_TIFF (over zealous
 	search and destroy!).
 
+2001-04-30	<sharkey@sourceforge.net>
+
+	Files:	po/en_GB.po (1.3.4.2) (+287 -262)
+		src/main/print-escp2.c (1.24.2.2) (+508 -492)
+		src/main/print-util.c (1.8.4.2) (+191 -157)
+		src/main/printers.xml (1.9.4.2) (+0 -10)
+
+	Finally get around to syncing debian-branch with 4.1.6.
+
 2001-04-29	<rlk@sourceforge.net>
 
 	Files:	src/main/print-dither.c (1.26) (+15 -26)
@@ -25180,6 +26609,20 @@
 	CMYK computation (black generation) out of the dither code, and
 	neither does it allow raw CMYK input.
 
+2001-03-31	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.29.2.2) (+6 -5)
+		src/main/print-escp2.c (1.42.2.2) (+6 -5)
+
+	Intermediate step
+
+2001-03-31	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.29.2.1) (+2 -1)
+		src/main/print-escp2.c (1.42.2.1) (+2 -1)
+
+	Let's try again with CMY(K)...
+
 2001-03-26	<rlk@sourceforge.net>
 
 	Files:	src/main/gimp-print-internal.h (1.24) (+14 -4)
@@ -25254,6 +26697,12 @@
 
 2001-03-24	<rlk@sourceforge.net>
 
+	Files:	src/main/print-canon.c (1.18.2.2) (+549 -78)
+
+	Merge up from mainline
+
+2001-03-24	<rlk@sourceforge.net>
+
 	Files:	src/ghost/README (1.11) (+6 -2)
 		src/gimp/gimp_main_window.c (1.11) (+7 -7)
 		src/main/print-color.c (1.9) (+19 -19)
@@ -25406,6 +26855,12 @@
 
 	Switch the color mode to monochrome when printing to a black & white printer.
 
+2001-03-10	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.18.2.1) (+348 -288)
+
+	Intermediate merge up with mainline
+
 2001-03-09	<rleigh@sourceforge.net>
 
 	Files:	acconfig.h (1.10) (+2 -1)
@@ -25464,6 +26919,18 @@
 	Added feature "CANON_CAP_ACKSHORT"
 	BJC8200: Uses new feature, try to use 3 bit for drop sizes instead of 2
 
+2001-03-06	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.37.2.2) (+107 -107)
+
+	More intermediate work on cmyk-ification.
+
+2001-03-05	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.37.2.1) (+240 -241)
+
+	Ongoing work on CMYK
+
 2001-03-05	<rleigh@sourceforge.net>
 
 	Files:	debian/control (1.10) (removed)
@@ -25482,6 +26949,17 @@
 
 	Removed dead code ("empty" variable).
 
+2001-03-05	<sharkey@sourceforge.net>
+
+	Files:	po/en_GB.po (1.3.4.1) (+274 -256)
+		src/cups/genppd.c (1.7.2.1) (+48 -37)
+		src/cups/rastertoprinter.c (1.8.2.1) (+50 -47)
+		src/main/print-escp2.c (1.24.2.1) (+548 -577)
+		src/main/print-util.c (1.8.4.1) (+456 -112)
+		src/main/printers.xml (1.9.4.1) (+1 -1)
+
+	Update the debian branch to the 4.1.5 release.
+
 2001-03-05	<gandy@sourceforge.net>
 
 	Files:	src/main/print-canon.c (1.18) (+5 -4)
@@ -25951,6 +27429,20 @@
 
 	Ignore a few new generated files.
 
+2001-02-21	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.10.2.3) (+16 -14)
+
+	Clean up paper sizes in the same way.
+
+2001-02-21	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.8.2.2) (+35 -32)
+		src/main/print-canon.c (1.10.2.2) (+12 -12)
+		src/main/print-escp2.c (1.25.2.2) (+48 -39)
+
+	Hide stp_printer_t in the same way we hid stp_vars_t.
+
 2001-02-21	<rleigh@sourceforge.net>
 
 	Files:	debian/changelog (1.7) (+6 -0)
@@ -25961,6 +27453,24 @@
 	Bump debian version
 	Make scripts/autogen.sh aclocal magic portable
 
+2001-02-20	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.8.2.1) (+23 -19)
+		src/cups/rastertoprinter.c (1.9.2.1) (+43 -44)
+
+	Bump binary version info.
+
+	Fix a few bugs.
+
+	Convert CUPS programs, run genppd to smoke test.
+
+2001-02-20	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.10.2.1) (+54 -52)
+		src/main/print-escp2.c (1.25.2.1) (+132 -133)
+
+	New print variable setup, on temporary branch
+
 2001-02-19	<rleigh@sourceforge.net>
 
 	Files:	configure.in.in (1.21) (+1 -4)
diff --git a/Makefile.am b/Makefile.am
index 72cd6c0..d359984 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.144 2005/11/21 11:16:22 rleigh Exp $
+## $Id: Makefile.am,v 1.146 2006/09/14 13:35:45 easysw Exp $
 ## Copyright (C) 2000-2004 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -199,3 +199,4 @@ MAINTAINERCLEANFILES = \
 EXTRA_DIST = autogen.sh ChangeLogStamp
 
 .PHONY: deb html install-cups install-gimp install-ghost snapshot ChangeLogPhony dist-time-check
+
diff --git a/Makefile.in b/Makefile.in
index 8ef3d29..d61b7fb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,27 +42,25 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/cups-gutenprint.list.in $(top_srcdir)/configure \
-	$(top_srcdir)/scripts/global.mk ABOUT-NLS AUTHORS COPYING \
-	ChangeLog INSTALL NEWS
+	$(top_srcdir)/configure $(top_srcdir)/scripts/global.mk \
+	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = cups-gutenprint.list
-depcomp =
-am__depfiles_maybe =
+CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -87,13 +85,18 @@ distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -119,6 +122,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -126,6 +131,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -138,12 +144,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -178,6 +186,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -273,14 +282,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -297,6 +309,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -314,17 +329,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -399,15 +418,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu  --ignore-deps'; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  --ignore-deps \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps Makefile
+	  $(AUTOMAKE) --gnu  Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -443,8 +462,6 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-cups-gutenprint.list: $(top_builddir)/config.status $(srcdir)/cups-gutenprint.list.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -597,7 +614,7 @@ distdir: $(DISTFILES)
 	esac
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/doc $(distdir)/include/gutenprint $(distdir)/m4 $(distdir)/man $(distdir)/po $(distdir)/scripts $(distdir)/src/cups $(distdir)/src/foomatic $(distdir)/src/gutenprintui $(distdir)/src/gutenprintui2 $(distdir)/src/main $(distdir)/src/testpattern
+	$(mkdir_p) $(distdir)/doc $(distdir)/include/gutenprint $(distdir)/m4 $(distdir)/man $(distdir)/po $(distdir)/scripts $(distdir)/src/cups $(distdir)/src/foomatic $(distdir)/src/gutenprintui $(distdir)/src/gutenprintui2 $(distdir)/src/main $(distdir)/src/testpattern
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/NEWS b/NEWS
index e4b7132..7c0942f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Welcome to Gutenprint 5.0.0!  Please read these release notes
+Welcome to Gutenprint 5.0.1!  Please read these release notes
 carefully.
 
 Gutenprint, formerly named Gimp-Print, is a suite of printer drivers
@@ -22,21 +22,16 @@ Gutenprint recognizes Johannes Gutenberg, the inventor of the movable
 type printing press.  Finally, the word "guten" means "good" in
 German.
 
-Gutenprint 5.0.0 is the first stable release of Gutenprint 5.0, and
-incorporates extensive feedback from the first release candidate.  It
-is based on the Gimp-Print 4.3 series that has been in development for
-over three years, and includes many improvements over the very popular
-4.2 series.
+Gutenprint 5.0.1 is a stable release of Gutenprint 5.0, with bug fixes
+and new features.
 
-Gutenprint currently supports over 700 printer models.
+Gutenprint currently supports over 800 printer models.
 
 These release notes contain the following sections:
 
 I)    General Requirements
 II)   Changes from Previous Releases
-	A) Changes from 5.0.0-rc3 to 5.0.0
-	B) Changes from 5.0.0-rc2 to 5.0.0-rc3
-	C) Changes from 5.0.0-rc1 to 5.0.0-rc2
+	A) Changes from 5.0.0 to 5.0.1
 III)  Overall changes from 4.2 to 5.0.
 	A) General user-visible changes
 	B) New Functionality
@@ -121,400 +116,211 @@ for building and installing Gutenprint.
 
 II) MAJOR CHANGES FROM PREVIOUS RELEASES
 
-A) MAJOR CHANGES BETWEEN GUTENPRINT 5.0.0 RELEASE CANDIDATE 3 AND
-   GUTENPRINT 5.0.0:
-
-  1) A serious problem with margins when printing from CUPS in some
-     cases was introduced in Gutenprint 5.0.0-rc3.  The symptoms are
-     that when printing certain kinds of material on certain printers,
-     the print is positioned incorrectly on the page (too far to the
-     right and too far down the page).  This problem has been fixed.
-
-  2) The Ghostscript driver used with Foomatic now prints all pages of
-     a document correctly.  Previously it did not print any page
-     except the first page of a document, or printed all other pages
-     with possibly incorrect settings (bug 1501816).
-
-  3) A new user's manual has been added in
-     doc/gutenprint-users-manual.odt (ODF format) and
-     doc/gutenprint-users-manual.pdf, replacing the old manual that
-     was based on Gimp-Print 4.2 (bug 1260142).
-
-  4) The Postscript driver now handles PPD files with non-integer
-     imageable areas correctly in all locales (the PPD files certain
-     HP inkjet printers using the HPIJS driver have non-integer
-     imageable areas for some paper sizes).  In 5.0.0-rc3, this was
-     handled incorrectly in locales that do not use the decimal point
-     (".") for separating fractions from integers.
-
-  5) The PPD file parameter is now always accessible when using the
-     Postscript driver in third party Gutenprint-enabled applications.
-     This was not an issue with the enhanced Print plugin for the
-     GIMP.
-
-  6) The Epson driver now chooses unidirectional vs. bidirectional
-     mode more intelligently on new printers that are capable of
-     producing excellent quality in bidirectional mode at high
-     resolutions.  This improves printing speed with the default
-     settings in certain cases and in some cases improves print
-     quality.
-
-  7) The Epson driver offers the same quality choices as 5.0.0-rc2 for
-     certain new printers such as the R800, R1800, and R2400.  Certain
-     quality choices (in particular Super Photo and Ultra Photo) were
-     not available in 5.0.0-rc3.
-
-  8) Various minor problems in the PPD files have been fixed.  The
-     most notable change is that the names of the option groups have
-     been shortened so that they are shorter than 40 characters in all
-     cases except for one case in French.
-
-  9) The French, Danish, Hungarian, and Swedish translations have been
-     updated.
-
-  10) In the GIMP 2.4 and above (forthcoming as of Gutenprint 5.0
-     release), the enhanced Print plugin will be named "Print with
-     Gutenprint" so as not to collide with the GtkPrint-based plugin
-     bundled with that version of the GIMP.  The Print plugin bundled
-     with GIMP 2.0 and 2.2 is based on Gimp-Print 4.2; the Print
-     plugin in this package simply replaces the Print plugin in those
-     versions of the GIMP (related to bug 1444700).
-
-  11) Crashes in the Ghostscript and IJS drivers on certain non-Linux
-     platforms have been fixed (bug 1518126).
-
-  12) A problem with margins with A4 paper on Kyocera printers has
-     been fixed (bug 1518131).
-
-  13) A problem with the preview in the GIMP 1.2 plugin (which also
-     affects Cinepaint) not being updated properly if orientation
-     changes has been fixed.
-
-  14) A problem with Foomatic data generation in certain locales has
-     been fixed (bug 1033007).
-
-  15) The Epson Stylus Photo R800 and R1800 now print closer to the
-     bottom edge of the page.
-
-The following bugs open in prereleases have been fixed in Gutenprint
-5.0.0:
-
-1033007 Foomatic XML data generation is locale-dependent
-1260142 User documentation needs updating for 5.0.0
-1444700 print menu item on wrong position
-1501816 ijsgutenprint/foomatic only prints first page
-1518126 rastertogutenprint core dumps on Solaris 10
-1518131 Kyocera KM-2530 CUPS+Gutenprint PPD - A4 paper
+A) NEW FEATURES AND FIXES IN GUTENPRINT 5.0.1:
+
+  1) New printers supported in this release:
+
+     * Dye sublimation printers using the Olympus driver:
+
+       Canon CP-10
+       Fujifilm FinePix NX-500
+       Kodak Easyshare Printer
+       Olympus P-S100
+       Sony DPP-EX5
+       Sony UP-DR100
+
+     * Canon inkjet printers:
+
+       The support for these printers is under development, and there
+       may be issues with these printers.  Please check with the
+       mailing list (gimp-print-devel@lists.sourceforge.net) if you
+       have any questions.
+
+       Canon PIXMA iP2000
+       Canon PIXMA iP3000
+       Canon PIXMA iP3100
+       Canon PIXMA iP4100
+       Canon PIXMA iP4200
+       Canon PIXMA iP4300
+       Canon PIXMA iP5000
+       Canon PIXMA iP5200
+       Canon PIXMA iP6700
+       Canon PIXMA MP150
+       Canon PIXMA MP500
+       Canon PIXMA MP700
+       Canon PIXMA MP730
+       Canon PIXMA MP750
+       Canon PIXMA MP760
+       Canon PIXMA MP770
+       Canon PIXMA MP780
+       Canon PIXMA MP790
+       Canon PIXMA MP830
+       Canon PIXUS iP3100
+       Canon PIXUS iP4100
+       Canon i560
+       Canon i850
+       Canon i860
+       Canon i865
+
+     * Epson inkjet printers:
+
+       Epson Picturemate Flash
+       Epson Picturemate Pal
+       Epson Picturemate Snap
+       Epson Picturemate PM-200
+       Epson Picturemate PM-210
+       Epson Picturemate PM-240
+       Epson Picturemate PM-250
+       Epson Picturemate PM-280
+       Epson Stylus C79+
+       Epson Stylus C87+
+       Epson Stylus Photo 1400
+       Epson Stylus Photo 1410
+       Epson Stylus Photo R230
+       Epson Stylus Photo R240 (preliminary)
+       Epson Stylus Photo R245 (preliminary)
+       Epson Stylus Photo R260
+       Epson Stylus Photo R265
+       Epson Stylus Photo R270
+       Epson Stylus Photo R350
+       Epson Stylus Photo R360
+       Epson Stylus Photo R380
+       Epson Stylus Photo R390
+       Epson Stylus Photo RX560
+       Epson Stylus Photo RX580
+       Epson Stylus Photo RX590
+       Epson Stylus Photo RX640
+       Epson PM A820
+       Epson PM D870
+       Epson PM G850
+       Epson PM G4500
+       Epson Stylus CX5000
+       Epson Stylus CX5000F
+       Epson Stylus CX6000
+       Epson Stylus CX7000F
+
+     The driver for the Stylus Photo 1400 has two separate quality
+     settings for 720x360 and 720 DPI.  The 720x360 DPI Enhanced and
+     720 DPI High Quality options offer improved quality at some cost
+     in printing speed.  The small format Claria-based printers (R260,
+     R390, RX580, and related printers) offer 720x360 and 720 DPI
+     modes approximately equal in quality to the Enhanced and High
+     Quality modes on the 1400 without a speed penalty.
+
+     * Lexmark inkjet and compatible printers:
+
+       Compaq IJ1200
+       Lexmark X73
+
+     * PCL laser printers (monochrome only):
+
+       Lexmark Optra E220
+       Xerox WorkCentre M118
+
+  2) CUPS 1.2 is now supported using on-the-fly PPD file generation.
+     In addition, the resolution names are all compliant with the PPD
+     specification.  cups-genppdupdate correctly updates on-the-fly
+     PPD files.  The PPD files now use the correct UTF-8 encoding.
+
+  3) The native CUPS driver offers a new Shrink Page If Necessary to
+     Fit Borders option, enabling the user to choose how to fit the
+     output to the imageable area of the page.  This is useful when a
+     printer offers a choice of imageable areas, typically normal
+     (which has margins) and full bleed (which allows printing to the
+     edge of the paper, or even beyond).  The following options are
+     available:
+
+     * Shrink (default): the output is shrunk if necessary to fit the
+       imageable area of the page.  If a printer is capable of
+       borderless operation but normal margins are selected, the
+       output will be shrunk.  This will print the entire page
+       (nothing will be lost), but will not preserve the dimensions of
+       the printout.  For example, a line intended to be 10 cm long
+       may print smaller than that.
+
+     * Crop: the output is cropped if necessary to fit the imageable
+       area of the page.  The dimensions of the page will be preserved
+       (a line intended to be 10 cm long will print out exactly 10
+       cm), but the edges of the output may be truncated (cropped).
+
+     * Expand: the output is expanded from the normal imageable area
+       to fit the maximum possible imageable area of the page.  When
+       selected on printers capable of full bleed output, in
+       conjunction with any other necessary options, the output will
+       be expanded to match the maximum page dimension.  The
+       dimensions of the page will be expanded if necessary beyond the
+       page size; a line intended to be 10 cm long may print longer
+       than that.
+
+     This option has no effect on printers not capable of full bleed
+     or other expanded margins.  It also has no effect when printing
+     to CD's or when printing to papers where the paper margin is
+     wider than the margin offered by the printer.
+
+     This behavior is different from Gutenprint 5.0.0; the behavior in
+     Gutenprint 5.0.0 was equivalent to the Crop option in Gutenprint
+     5.0.1.  The change has been made due to extensive user feedback
+     that cropping the output leads to unexpected results in normal
+     printing operation.  Users who need exact dimensional accuracy
+     should use the Crop option with borderless printing enabled.
+
+  4) Epson inkjet printers now correctly support borderless printing.
+     In addition, printing at the top and bottom of the page has been
+     improved on printers that support borderless printing, although
+     this is still not perfect in all cases.
+
+     Certain printers (in particular the C/D8x and C6x series) do not
+     print correctly to the bottom of the page with all colors.  This
+     problem is understood, but we do not know when a fix will be
+     available.
+
+  5) The list of resolutions supported on newer Epson printers has
+     been changed; resolutions of 2880x1440, 5760x1440, 2880x2880, and
+     5760x2880 (as appropriate) have been added, replacing various
+     1440x1440 and 1440x2880 enhanced resolutions.
+
+  6) The output for the Canon PIXMA printers has been improved.
+
+  7) The Canon driver now supports DuplexNoTumble for the PIXMA
+     iP4000.
+
+  8) Roll printing now works correctly on the Epson Stylus Photo
+     R800.
+
+  9) Printing with Canon PIXMA printers connected to windows hosts
+     (bug 1625202) has been fixed.
+
+  10) CD printing has been fixed for the Canon PIXMA iP4000 and iP4200.
+
+  11) The Canon driver now also supports the CD fine adjustment controls.
+
+  12) The Resolutions for the Canon S300 have been fixed.
+ 
+  13) Some Canon MULTIPASS printers have been renamed to PIXMA.
 
+  14) A minor border problem with the R800 and related printers has
+     been fixed.  The standard bottom border is now slightly wider to
+     eliminate the very bottom of the print from being chopped off.
 
-----------------
-
-B) MAJOR CHANGES BETWEEN GUTENPRINT 5.0.0 RELEASE CANDIDATE 2 AND
-   GUTENPRINT 5.0.0 RELEASE CANDIDATE 3:
-
-  1) The package now offers explicit support for many more printers.
-     All printers supported by Gutenprint are now listed explicitly
-     rather than via the compatibility list.  As a result, CUPS PPD
-     files and Foomatic are now generated for each supported printer.
-
-  2) CUPS and Foomatic/IJS now produce correctly dimensioned and
-     positioned output.  Previous pre-releases of Gutenprint 5.0
-     produced incorrectly dimensioned and/or positioned (offset from
-     the correct position) output in certain cases.  This happened in
-     the following circumstances:
-
-     a) When a printer capable of optional full-bleed or borderless
-	operation was used in full-bleed/borderless mode, the output
-	was stretched to fit the expanded dimensions.  The result was
-	that lines of specified lengths were printed slightly longer
-	than desired, and since the vertical and horizontal stretching
-	was normally not identical, the output was distorted slightly.
-
-     b) When printing directly to a CD, the output was shrunk
-	horizontally and/or positioned incorrectly by a small amount
-	(typically a few mm).
-
-     c) Depending upon the application doing the printing and the
-	printer selected, the output was shifted down and to the right
-	by several mm.
-
-     The PPD files and driver have been modified to specify zero
-     borders in all cases when a printer with borderless capability is
-     used.  If normal (non-borderless) mode is selected, the border is
-     simply not printed, leaving correct dimensions for everything
-     within the imageable area.  However, as a result of this, the
-     driver no longer prints true full bleed (overprinting the edge of
-     the page).  The margins are set to zero, and typically there will
-     be very narrow unprinted margins (less than 1 mm) on one or more
-     sides.
-
-     Printing to CD's works correctly whether or not full bleed mode
-     is selected.
-
-     This change has no effect in the enhanced GIMP plugin and in
-     other applications which directly use Gutenprint, as there was
-     never any problem in those contexts.
-
-  3) The IJS driver now correctly ejects the last page of a job.
-     Previously it did not always eject the last page with certain
-     Epson printers.
-
-  4) The Epson Stylus Photo R800, R1800, R2400, and related printers
-     should now print at full speed in all cases.  Previously these
-     printers were extremely slow (about 10 times slower than normal)
-     in many cases.
-
-     Related to this, the list of resolutions offered for these
-     printers are slightly different from before.  Resolutions above
-     2880x1440 DPI are no longer offered; instead, resolutions of
-     2880x1440 high quality and 2880x1440 highest quality are offered.
-     These resolutions use extra passes of the print head to reduce
-     banding.  In addition, these resolutions are actually 1440 DPI
-     horizontally and 2880 DPI vertically.
-
-  5) The HP DeskJet 690 and other supported PCL printers capable of
-     6-color photo printing (such as the Apollo P-2100 and Apple Color
-     StyleWriter 4500) no longer result in the driver crashing if
-     black and white output mode was selected.  Also, Canon printers
-     capable of 6 or 7 color photo printing no longer result in a
-     crash if black and white output mode is selected.
-
-  6) Canon and Lexmark inkjet printers now print if color output mode
-     is selected with a black and white cartridge installed.
-     Previously this was not possible in the GIMP plugin; the CUPS and
-     Foomatic drivers permitted this to be set, but gave a runtime
-     error when a job with these settings was printed.  These printers
-     now accept the job and simply print it in black and white.
-
-  7) The cleaning and nozzle check functions of escputil now work
-     properly on most printers, and escputil no longer crashes if you
-     type ctrl-D to a command prompt.  In addition, the status printed
-     via the status command is now much more readable.
-
-  8) The color quality for the Epson R300, R800, R2400, and related
-     printers has been improved.
-
-  9) Raw output now works correctly on the Epson R800 and R1800.
-
-  10) The Canon driver now handles color and grayscale, and also photo
-     ink cartridges (previously it sometimes handled these incorrectly
-     or even crashed).  However, many of these printers still do not
-     print correctly with a photo cartridge installed (the width of
-     the printout is incorrect).
-
-  11) The GIMP plugin now displays the thumbnail image correctly in CMY
-     mode (previously it displayed incorrect colors).
-
-  12) Experimental support for the Japan-market Epson printers PM-A900,
-     PM-D800, PM-G730, and PX-V630, and preliminary support for the
-     PM-A650, PM-A750, and PM-A890.
-
-  13) The definition of the Epson Stylus CX3500, CX3600, CX3650,
-     CX4100, CX4200, CX4500, CX4600, CX4700, CX4800, CX5700, CX5800,
-     CX7700, CX7800, DX4200, DX4250, DX4800, and PX-A650 have been
-     corrected.  The DX4800 now works correctly; the color output for
-     all of these printers has been corrected.  All of these printers
-     also now print at full speed; they previously printed extremely
-     slowly in many cases.
-
-     The list of resolutions is also slightly different from before;
-     the 2880x1440 DPI resolution is no longer offered; instead,
-     resolutions of 1440x1440 high quality and 1440x1440 highest
-     quality are offered.  These resolutions use extra passes of the
-     print head to reduce banding.
-
-  14) A new option for generating simplified PPD files for CUPS has
-     been added.  The --enable-simplified-cups-ppds=yes option to
-     configure allows generating PPD files with only basic options
-     (including only common paper sizes) in addition to the normal,
-     full-featured PPD files; --enable-simplified-cups-ppds=only
-     generates only the simplified PPD files.  The -a and -s options
-     to cups-genppd.5.0 may be used manually to do the same thing.
-     This is discussed in the README file.
-
-  15) cups-genppdupdate.5.0 has significant enhancements:
-
-     * A new option, -N, causes cups-genppdupdate.5.0 to not merge
-       options from the old PPD file into the new file.  This can be
-       used to reset a CUPS+Gutenprint PPD file to its original state.
-
-     * A new option, -o, causes cups-genppdupdate.5.0 to output the
-       PPD files into a different directory.
-
-     * It is now possible to specify individual PPD files or printer
-       queue names on the command line to only update/reset specific
-       PPD files.
-
-     * The program no longer tries and fails to update Foomatic-based
-       PPD files.
-
-  16) The Foomatic data generator now generates simplified data (using
-     a driver name of "gutenprint-ijs-simplified.5.0") in addition to
-     the standard, full-featured data (gutenprint-ijs.5.0).
-
-  17) The input slots (media sources) have been corrected for the
-     Epson Stylus Photo R1800, R2400, and RX700.
-
-  18) New options to escputil allow specifying the number of line pairs
-     and number of patterns for head alignment explicitly, if needed.
-     In addition, the number of line pairs for the Epson Stylus Photo
-     700 has been changed from 7 to 15.
-
-  19) A few build problems have been fixed.
-
-  20) A Hungarian translation has been added.
-
-  21) The configure script now prints out a summary of configuration
-     options selected at the end of the script run.  For developers,
-     "autogen.sh --help" now prints out the configure help if the
-     configure script exists.
-
-  22) The Lexmark driver should now print correctly (this is only
-     partially tested).
-
-  23) Chilean Office, Chilean Double Letter, and Chilean Double Office
-     paper sizes have been added.
-
-  24) An error in the Czech, Danish, and Portuguese translations that
-     caused the GIMP plugin to emit a warning at startup has been
-     fixed.
-
-  25) The package is now built with libtool 1.5.22.
-
-The following bugs have been fixed in Gutenprint 5.0.0-rc3:
-
-1318890 Borderless print scaled wrongly
-1379402 BJC-4400: SEGFAULT (photo-ink/color mode)
-1393755 [Feature Request] Chilean paper sizes.
-1417600 escputil clean and nozzle check don't work on new printers
-1417603 escputil seg faults if you type ctrl-D to prompt
-1421674 Gutenprint 5.0.0rc2 crashes in Mac OS X 10.2.8
-1422101 Raw output does not work on R800 and related printers
-1425951 Bug#351731: Fails in alignment with stylos photo 700
-1447115 Epson driver broken in RC2 (DX4850)
-1458059 Lexmark Z52 not working
-1458911 Very poor performance with Epson R2400, R800, and R1800
-1466678 Epson Stylus Photo R300 fails to eject last page
-1467956 Print to CD prints incorrectly with CUPS driver
-1478819 bad translation format
-1487715 HP DeskJet 690 and related crash in grayscale w/photo ink
-1487717 Canon/Lexmark printers fail in color mode w/BW inks
-1487720 Canon printers crash in grayscale with photo ink 
-
-----------------
-
-C) MAJOR CHANGES BETWEEN GUTENPRINT 5.0.0 RELEASE CANDIDATE 1 AND
-   GUTENPRINT 5.0.0 RELEASE CANDIDATE 2:
-
-  1) The Postscript driver now produces more accurate colors.
-     Previous releases produced overly pale colors with the default
-     settings.
-
-  2) The Postscript driver now accepts red, green, and blue rather
-     than cyan, magenta, and yellow options in the GIMP plugin.
-
-  3) The Postscript driver now prints correctly regardless of image
-     size.  Previously it corrupted the output if the width of the
-     image was not a multiple of 4 pixels.
-
-  4) The driver package now permits specifying all options regardless
-     of the setting of the Image Type and Quality options (previously
-     it disabled a lot of settings if Quality and/or Image Type were
-     not set to Manual Control).  The behavior is now that Quality and
-     Image Type provide defaults that may be overridden by the user.
-     For example, if the resolution is provided explicitly, it will
-     override the resolution implied by the Quality setting.
-
-     Related to this, the CUPS driver now handles Quality properly.
-
-  5) A description of all options supported by Gutenprint has been
-     added.
-
-  6) cups-genppdupdate now preserves the ownership and permissions of
-     the PPD files being updated, rather than forcibly setting the
-     owner to root and the permissions to root read/write and everyone
-     else read-only access.
-
-  7) The GIMP plugin now loads the printrc file correctly in all
-     locales.  Previously it did not load floating point numbers
-     correctly in locales that don't use the `.' character as the
-     decimal point.
-
-  8) The GIMP plugin now offers improved choices in the color
-     adjustment window for viewing individual channels of the output.
-     It now offers red/green/blue, cyan/magenta/yellow, or
-     cyan/magenta/yellow/black as appropriate.
-
-  9) The GIMP plugin is now considerably more responsive; many
-     unnecessary screen redraws have been removed.  In addition, a
-     display glitch wherein horizontal lines were sometimes drawn
-     through certain widgets has been fixed.
+  15) A build problem with the CUPS driver on some systems (in
+     particular, OS X and any system where --disable-nls is used) has
+     been fixed.
 
-  10) The Epson printer utility escputil now reports ink information
-     more consistently across a wider range of printers.  In
-     particular, the extended ink information command (escputil -e)
-     should now work correctly on all models from the Stylus Color 740
-     through the present.
+  16) The Postscript driver now handles CMYK input correctly, fixing a
+     problem with Cinepaint (bug 1701954).
 
-  11) Preliminary support for the Epson Stylus C68, C87, C88, CX3700,
-     CX3800, CX3805, CX3810, CX4100, CX4200, CX4500, CX4700, CX4800,
-     CX5700, CX5800, CX7700, CX7800, D68, D88, DX3800, DX3850, DX4200,
-     DX4250, DX4800, PX-A650, and Stylus Photo R220, R320, and R340.
-     These printers are expected to be fully functional (for the
-     multi-function devices, this package supports only the printer
-     function -- it does not support scanning or fax).
+  17) The Postscript driver and UI library now handle setting the
+     locale correctly.
 
-  12) Preliminary support for the Epson Stylus Photo R2400/PX-5500.
-     This printer has been partially tuned, but there will likely be
-     further changes to this driver.
-
-  13) Support for the Epson PictureMate/E-100.
-
-  14) Preliminary support for the Epson Stylus Photo RX700/PM-A900.
-     This printer has been partially tuned, but there will likely be
-     further changes to this driver.
-
-  15) Initial support for Canon S200, SELPHY CP-510 and SELPHY CP-710;
-     Sony UP-DR150, and Olympus P-11 has been added.
-
-  16) The Canon PIXMA iP4000 printers can now print to cds.  Duplex
-     printing with binding on the short side is now supported, too.
-
-  17) The Epson Stylus Photo R200 and related printers have been
-     retuned to give improved detail in the shadows, reduced ink
-     usage, more accurate grayscale, and more accurate colors.
-     Affected printers are presently the R200, R210, R220, R300, R310,
-     R320, R340, RX400, RX420, RX425, RX430, RX500, RX510, RX600,
-     RX620, RX630, PM-D750, PM-D770, PM-G700, and PM-G720.
-
-     Any profiles generated against these printers will have to be
-     re-created.
-
-  18) The Epson Stylus Photo R800 and R1800 have been retuned to give
-     improved detail in the shadows, reduced ink usage, more accurate
-     grayscale, and more accurate colors.
-
-     Any profiles generated against these printers will have to be
-     re-created.
-
-  19) New "transposed" resolutions (1440x720 and 2880x1440) have been
-     added for some Epson printers.  These resolutions are actually
-     equivalent to 720x1440 and 1440x2880 DPI respectively.  In some
-     cases these may yield better results (specifically, less
-     microbanding) than the normal 1440x720 and 2880x1440 DPI
-     resolutions.
-
-  20) Quadtone printing now works correctly regardless of whether
-     color or grayscale mode is selected.
-
-The following bugs have been fixed in Gutenprint 5.0.0-rc2:
-
-1389788 Poor discoverability of advanced options
-1389787 CUPS driver does not set Quality correctly
-1389785 cups-genppdupdate sets PPD file owners incorrectly
-1388615 escputil with Epson CX3700
-1304710 Postscript driver corrupts output if width not multiple of 4
-1251978 PPD for Stylus Color 600
+  18) The PPD file updater, cups-genppdupdate.5.1, now handles the -n
+     (don't do anything) correctly.  In addition, it handles --help
+     and --version.
+
+  19) The range of sizes for printing custom CD's has been extended
+     down to 65 mm in both the Epson and Canon drivers.
+
+  20) Printing to CD's on Epson printers now works correctly if the
+     image is not placed at the top of the page.
 
 
 ================================================================
@@ -1206,30 +1012,18 @@ IV) EXCEPTIONS AND WORKAROUNDS
 
 A) GENERAL ISSUES
 
-  1) Full bleed mode does not work completely correctly on most Epson
-     printers at present.  Typically there is a small margin at the
-     bottom of the page (1-2 mm) and possibly a very small margin at
-     the top.  However, it works correctly along the left and right
-     margins.  We do not have an estimated time for a fix.
-
-  2) The Canon, Hewlett-Packard, and Lexmark drivers do not offer all
+  1) The Canon, Hewlett-Packard, and Lexmark drivers do not offer all
      of the additional options and improvements that the Epson driver
      does.  We do not have an estimated time for fix.  Please contact
      us if you would like to assist with this.
 
-  3) Support for the Canon S200 has not yet been ported forward from
-     4.2.
-
-  4) This release is slower than 4.2 in many cases, particularly when
+  2) This release is slower than 4.2 in many cases, particularly when
      using High Accuracy (which is the default color correction in
      most cases) or Bright color correction.  It is possible that this
      release will not be able to drive some printers at full speed,
      particularly if your computer has a slow processor.  Performance
      has been only partially analyzed or tuned at present.
 
-  5) The user's manual and developer's guide have not been updated for
-     this release.
-
 
 ----------------
 
@@ -1493,8 +1287,8 @@ B) BUILD/INSTALLATION ISSUES
 	you install a new version of Gutenprint.
 
 	Please check the Foomatic site
-	(http://www.linuxprinting.org/foomatic.html) and the Gutenprint
-	site (http://gimp-print.sourceforge.net) for updated
+	(http://www.openprinting.org/foomatic.html) and the Gutenprint
+	site (http://gutenprint.sourceforge.net) for updated
 	instructions about this.
 
      ii) Unlike with the CUPS native driver, there is no simple way to
diff --git a/README b/README
index d0cf962..07d8087 100644
--- a/README
+++ b/README
@@ -1,21 +1,21 @@
-Welcome to Gutenprint 5.0.0!  Please read these notes carefully.
+Welcome to Gutenprint 5.0.1!  Please read these notes carefully.
 
 ================================================================
 
 I) INTRODUCTION
 
-    This is Gutenprint version 5.0.0, the first stable release of
-    Gutenprint 5.0.  Gutenprint, formerly named Gimp-Print, is a suite
-    of printer drivers that may be used with most common UNIX print
-    spooling systems, including CUPS, lpr, LPRng, or others.  These
-    drivers provide high quality printing for UNIX (including
-    Macintosh OS X 10.2 and newer) and Linux systems in many cases
-    equal to or better than proprietary vendor-supplied drivers.
-    Gutenprint also includes an enhanced print plug-in for the GIMP
-    image editor, replacing the Gimp-Print 4.2-based plugin supplied
-    with GIMP 1.2, 2.0, and 2.2, and offering an alternative with
-    additional capabilities to the GtkPrint-based plugin supplied with
-    GIMP 2.4 and beyond.
+    This is Gutenprint version 5.0.1, a stable release of Gutenprint
+    5.0.  Gutenprint, formerly named Gimp-Print, is a suite of printer
+    drivers that may be used with most common UNIX print spooling
+    systems, including CUPS, lpr, LPRng, or others.  These drivers
+    provide high quality printing for UNIX (including Macintosh OS X
+    10.2 and newer) and Linux systems in many cases equal to or better
+    than proprietary vendor-supplied drivers.  Gutenprint also
+    includes an enhanced print plug-in for the GIMP image editor,
+    replacing the Gimp-Print 4.2-based plugin supplied with GIMP 1.2,
+    2.0, and 2.2, and offering an alternative with additional
+    capabilities to the GtkPrint-based plugin supplied with GIMP 2.4
+    and beyond.
 
     Gutenprint has been renamed in order to clearly distinguish it
     from the GIMP.  While this package started out as the Print plugin
@@ -115,7 +115,7 @@ A) OVERVIEW
 	gimp-print-devel@lists.sourceforge.net
 
 	================================================================
-	  Release: gutenprint 5.0.0 generated on 22 Jul 2006
+	  Release: gutenprint 5.0.1 generated on 22 Jul 2006
 
 	  Features:
 	    Build CUPS:                                 yes, installing in /usr
@@ -141,8 +141,8 @@ A) OVERVIEW
 	    Installation prefix:                        /usr/local
 	    Data directory:                             /usr/local/share/gutenprint
 	    Library directory:                          /usr/local/lib/gutenprint
-	    XML data directory:                         /usr/local/share/gutenprint/5.0.0/xml
-	    Module directory:                           /usr/local/lib/gutenprint/5.0.0/modules
+	    XML data directory:                         /usr/local/share/gutenprint/5.0.1/xml
+	    Module directory:                           /usr/local/lib/gutenprint/5.0.1/modules
 	    Install sample images:                      yes
 
 	General configuration:
@@ -254,7 +254,7 @@ B) CUPS
       /usr/share/cups/model/gutenprint.  These PPD files can only be
       used by the precise version of Gutenprint that they were built
       with; for example, it is not possible to use PPD files from
-      Gutenprint 5.0.0 with Gutenprint 5.0.1.
+      Gutenprint 5.0.1 with Gutenprint 5.0.1.
 
     * A utility to update PPD files from an earlier release of
       Gutenprint, cups-genppdupdate.5.0.  This utility may be used to
@@ -442,7 +442,7 @@ C) FOOMATIC
     spooler (CUPS, lpd, LPRng, etc.) or even no spooler at all.  It
     uses XML data describing printer and driver capabilities in
     conjunction with Ghostscript to allow printing in any environment.
-    Please visit http://www.linuxprinting.org/foomatic.html for more
+    Please visit http://www.openprinting.org/foomatic.html for more
     information.
 
     We normally recommend using the native CUPS driver described above
@@ -629,8 +629,8 @@ A) PRINTER INSTALLATION
 
     Epson Stylus Photo R300 Foomatic/gutenprint-ijs.5.0
     Epson Stylus Photo R300 Foomatic/gutenprint-ijs-simplified.5.0
-    Epson Stylus Photo R300 - CUPS+Gutenprint v5.0.0
-    Epson Stylus Photo R300 - CUPS+Gutenprint v5.0.0 Simplified
+    Epson Stylus Photo R300 - CUPS+Gutenprint v5.0.1
+    Epson Stylus Photo R300 - CUPS+Gutenprint v5.0.1 Simplified
 
     The "simplified" PPD files offer a basic set of options only, for
     selecting printer options, standard paper sizes, and basic quality
@@ -660,12 +660,12 @@ A) PRINTER INSTALLATION
     of the driver that they were built against.  If you attempt to use
     a version of Gutenprint with PPD files not built for that precise
     version, the driver will fail with a diagnostic error message.
-    For example, PPD files built for Gutenprint 5.0.0-beta4 will not
-    work with driver version 5.0.0.  You can identify printers using
+    For example, PPD files built for Gutenprint 5.0.1-beta4 will not
+    work with driver version 5.0.1.  You can identify printers using
     Gutenprint PPD files by the name of the PPD file, which will be
     something like:
 
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.0(en)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.0.1(en)
 
     Linux users please note: If you are using CUPS 1.1.11 or higher,
     and you have a USB-connected printer, you must have a printer
diff --git a/aclocal.m4 b/aclocal.m4
index 4b1cfc4..fb9891f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6673,6 +6673,230 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 8
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+#serial 3
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # So let's grep whole file.
+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+    dirpart=`AS_DIRNAME("$mf")`
+  else
+    continue
+  fi
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n 's/^U = //p' < "$mf"`
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`AS_DIRNAME(["$file"])`
+    AS_MKDIR_P([$dirpart/$fdir])
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
 # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
 # Free Software Foundation, Inc.
 #
@@ -6884,6 +7108,58 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 
 AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 3
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
 # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
@@ -7211,6 +7487,7 @@ AC_SUBST([am__untar])
 m4_include([m4/gettext.m4])
 m4_include([m4/gimp.m4])
 m4_include([m4/iconv.m4])
+m4_include([m4/isc-posix.m4])
 m4_include([m4/lib-ld.m4])
 m4_include([m4/lib-link.m4])
 m4_include([m4/lib-prefix.m4])
diff --git a/config.h.in b/config.h.in
index d8572e2..d9c6ad2 100644
--- a/config.h.in
+++ b/config.h.in
@@ -32,7 +32,7 @@
 /* Define to 1 if GCC special attributes are supported */
 #undef HAVE_GCC_ATTRIBUTES
 
-#ifndef HAVE_GCC_ATTRIBUTES
+#if !defined(HAVE_GCC_ATTRIBUTES) && !defined(__attribute__)
 /* This should really be a C99 anonymous variadic macro. */
 #define __attribute__(attr)
 #endif
@@ -188,8 +188,8 @@
 #undef inline
 #endif
 
-/* Define to `long' if <sys/types.h> does not define. */
+/* Define to `long int' if <sys/types.h> does not define. */
 #undef off_t
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
diff --git a/configure b/configure
index 79a53a4..da75b1c 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,12 @@
 #! /bin/sh
-# From configure.ac Revision: 1.145 .
+# From configure.ac Revision: 1.151.2.2 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for gutenprint 5.0.0.
+# Generated by GNU Autoconf 2.60 for gutenprint 5.0.1.
 #
 # Report bugs to <gimp-print-devel@lists.sourceforge.net>.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
@@ -36,11 +37,35 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
@@ -49,8 +74,43 @@ else
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
 # Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -64,18 +124,19 @@ do
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    $as_unset $as_var
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
 done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -83,157 +144,386 @@ fi
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# CDPATH.
+$as_unset CDPATH
 
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
 fi
 
+  if test $as_have_required = yes && 	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
 
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
+  case $as_dir in
 	 /*)
-	   if ("$as_dir/$as_base" -c '
+	   for as_base in sh bash ksh sh5; do
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	   done;;
+       esac
+done
+IFS=$as_save_IFS
+
+
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+        done
+        export CONFIG_SHELL
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell autoconf@gnu.org about your system,
+  echo including any error possibly output before this
+  echo message
+}
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
     sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
       N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
+      s/-\n.*//
     ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
+  chmod +x "$as_me.lineno" ||
     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
 
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir
+fi
 echo >conf$$.file
 if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
 elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
@@ -242,7 +532,19 @@ else
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
+# systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  as_executable_p="test -x"
+else
+  as_executable_p=:
+fi
+rm -f conf$$.file
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -251,15 +553,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
 
 
 # Check that we are running under the correct shell.
@@ -415,34 +708,31 @@ tagnames=${tagnames+${tagnames},}CXX
 
 tagnames=${tagnames+${tagnames},}F77
 
+exec 7<&0 </dev/null 6>&1
+
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
-exec 6>&1
-
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_files=
 ac_config_libobj_dir=.
+LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
 # Identity of this package.
 PACKAGE_NAME='gutenprint'
 PACKAGE_TARNAME='gutenprint'
-PACKAGE_VERSION='5.0.0'
-PACKAGE_STRING='gutenprint 5.0.0'
+PACKAGE_VERSION='5.0.1'
+PACKAGE_STRING='gutenprint 5.0.1'
 PACKAGE_BUGREPORT='gimp-print-devel@lists.sourceforge.net'
 
 ac_unique_file="src/main/print-vars.c"
@@ -474,17 +764,301 @@ ac_includes_default="\
 #endif
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
+#endif
+#if HAVE_STDINT_H
+# include <stdint.h>
 #endif
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS GUTENPRINT_MAJOR_VERSION GUTENPRINT_MINOR_VERSION GUTENPRINT_MICRO_VERSION GUTENPRINT_CURRENT_INTERFACE GUTENPRINT_INTERFACE_AGE GUTENPRINT_BINARY_AGE GUTENPRINT_VERSION GUTENPRINTUI_CURRENT_INTERFACE GUTENPRINTUI_INTERFACE_AGE GUTENPRINTUI_BINARY_AGE GUTENPRINTUI2_CURRENT_INTERFACE GUTENPRINTUI2_INTERFACE_AGE GUTENPRINTUI2_BINARY_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ALL_LINGUAS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CUPS_CONFIG FOOMATIC_CONFIGURE FOOMATIC_PPDFILE IJS_CONFIG GIMPTOOL_CHECK GTK_CONFIG GTK_CFLAGS GTK_LIBS GIMPTOOL2_CHECK PKG_CONFIG ac_pt_PKG_CONFIG GTK2_CFLAGS GTK2_LIBS GIMP2_CFLAGS GIMP2_LIBS LEX LEXLIB LEX_OUTPUT_ROOT YACC FIND PERL GLIB_MKENUMS CONVERT TEXI2HTML DVIPS DB2PDF DVIPDF DB2PS DB2HTML DOXYGEN DIALOG FOOMATIC_KITLOAD MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GNUCFLAGS GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GIMPTOOL GIMP_CFLAGS GIMP_LIBS GIMP_CFLAGS_NOUI GIMP_LIBS_NOUI GIMP_DATA_DIR GIMP_PLUGIN_DIR BUILD_FOOMATIC_TRUE BUILD_FOOMATIC_FALSE BUILD_FOOMATIC_3_TRUE BUILD_FOOMATIC_3_FALSE BUILD_GHOSTSCRIPT_TRUE BUILD_GHOSTSCRIPT_FALSE BUILD_CUPS_TRUE BUILD_CUPS_FALSE BUILD_CUPS_PPDS_TRUE BUILD_CUPS_PPDS_FALSE CUPS_PPDS_AT_TOP_LEVEL_TRUE CUPS_PPDS_AT_TOP_LEVEL_FALSE BUILD_TRANSLATED_CUPS_PPDS_TRUE BUILD_TRANSLATED_CUPS_PPDS_FALSE USE_LEVEL3_PS_TRUE USE_LEVEL3_PS_FALSE BUILD_ESCPUTIL_TRUE BUILD_ESCPUTIL_FALSE BUILD_TEST_TRUE BUILD_TEST_FALSE BUILD_TESTPATTERN_TRUE BUILD_TESTPATTERN_FALSE BUILD_LIBGUTENPRINTUI_TRUE BUILD_LIBGUTENPRINTUI_FALSE BUILD_LIBGUTENPRINTUI2_TRUE BUILD_LIBGUTENPRINTUI2_FALSE BUILD_GIMP_TRUE BUILD_GIMP_FALSE BUILD_GIMP2_TRUE BUILD_GIMP2_FALSE BUILD_GIMP2_AS_GUTENPRINT_TRUE BUILD_GIMP2_AS_GUTENPRINT_FALSE INSTALL_SAMPLES_TRUE INSTALL_SAMPLES_FALSE INSTALL_USER_GUIDE_TRUE INSTALL_USER_GUIDE_FALSE USE_NLS_TRUE USE_NLS_FALSE BUILD_MODULES_TRUE BUILD_MODULES_FALSE BUILD_GENPPD_STATIC_TRUE BUILD_GENPPD_STATIC_FALSE RELEASE_DATE cups_prefix cups_exec_prefix cups_bindir cups_sbindir cups_conf_datadir cups_conf_serverbin cups_conf_serverroot CUPS_CFLAGS CUPS_LIBS CUPS_PPD_PS_LEVEL GENPPD_LIBS IJS_CFLAGS IJS_LIBS RM gimp_plug_indir gimp2_plug_indir GUTENPRINT_CFLAGS GUTENPRINT_LIBS GUTENPRINT_LIBDEPS GUTENPRINTUI_CFLAGS GUTENPRINTUI_LIBS GUTENPRINTUI_LIBDEPS GUTENPRINTUI_VERSION GUTENPRINTUI2_CFLAGS GUTENPRINTUI2_LIBS GUTENPRINTUI2_LIBDEPS GUTENPRINTUI2_VERSION gutenprint_cflags gutenprint_libs gutenprint_libdeps gutenprintui_cflags gutenprintui_libs gutenprintui_libdeps gutenprintui2_cflags gutenprintui2_libs gutenprintui2_libdeps LIBREADLINE_DEPS MAINTAINER_CFLAGS PLUG_IN_PATH WHICH_PPDS LIBOBJS LTLIBOBJS LTALLOCA'
+ac_subst_vars='SHELL
+PATH_SEPARATOR
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+GUTENPRINT_MAJOR_VERSION
+GUTENPRINT_MINOR_VERSION
+GUTENPRINT_MICRO_VERSION
+GUTENPRINT_CURRENT_INTERFACE
+GUTENPRINT_INTERFACE_AGE
+GUTENPRINT_BINARY_AGE
+GUTENPRINT_VERSION
+GUTENPRINTUI_CURRENT_INTERFACE
+GUTENPRINTUI_INTERFACE_AGE
+GUTENPRINTUI_BINARY_AGE
+GUTENPRINTUI2_CURRENT_INTERFACE
+GUTENPRINTUI2_INTERFACE_AGE
+GUTENPRINTUI2_BINARY_AGE
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+CYGPATH_W
+PACKAGE
+VERSION
+ACLOCAL
+AUTOCONF
+AUTOMAKE
+AUTOHEADER
+MAKEINFO
+install_sh
+STRIP
+INSTALL_STRIP_PROGRAM
+mkdir_p
+AWK
+SET_MAKE
+am__leading_dot
+AMTAR
+am__tar
+am__untar
+ALL_LINGUAS
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+EXEEXT
+OBJEXT
+DEPDIR
+am__include
+am__quote
+AMDEP_TRUE
+AMDEP_FALSE
+AMDEPBACKSLASH
+CCDEPMODE
+am__fastdepCC_TRUE
+am__fastdepCC_FALSE
+GREP
+EGREP
+LN_S
+ECHO
+AR
+RANLIB
+CPP
+CXX
+CXXFLAGS
+ac_ct_CXX
+CXXDEPMODE
+am__fastdepCXX_TRUE
+am__fastdepCXX_FALSE
+CXXCPP
+F77
+FFLAGS
+ac_ct_F77
+LIBTOOL
+LIBTOOL_DEPS
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
+CUPS_CONFIG
+FOOMATIC_CONFIGURE
+FOOMATIC_PPDFILE
+IJS_CONFIG
+GIMPTOOL_CHECK
+GTK_CONFIG
+GTK_CFLAGS
+GTK_LIBS
+GIMPTOOL2_CHECK
+PKG_CONFIG
+GTK2_CFLAGS
+GTK2_LIBS
+GIMP2_CFLAGS
+GIMP2_LIBS
+LEX
+LEXLIB
+LEX_OUTPUT_ROOT
+YACC
+YFLAGS
+FIND
+PERL
+GLIB_MKENUMS
+CONVERT
+TEXI2HTML
+DVIPS
+DB2PDF
+DVIPDF
+DB2PS
+DB2HTML
+DOXYGEN
+DIALOG
+FOOMATIC_KITLOAD
+MKINSTALLDIRS
+MSGFMT
+GMSGFMT
+XGETTEXT
+MSGMERGE
+USE_NLS
+LIBICONV
+LTLIBICONV
+INTLLIBS
+LIBINTL
+LTLIBINTL
+POSUB
+GNUCFLAGS
+GLIB_CONFIG
+GLIB_CFLAGS
+GLIB_LIBS
+GIMPTOOL
+GIMP_CFLAGS
+GIMP_LIBS
+GIMP_CFLAGS_NOUI
+GIMP_LIBS_NOUI
+GIMP_DATA_DIR
+GIMP_PLUGIN_DIR
+BUILD_FOOMATIC_TRUE
+BUILD_FOOMATIC_FALSE
+BUILD_FOOMATIC_3_TRUE
+BUILD_FOOMATIC_3_FALSE
+BUILD_GHOSTSCRIPT_TRUE
+BUILD_GHOSTSCRIPT_FALSE
+BUILD_CUPS_TRUE
+BUILD_CUPS_FALSE
+BUILD_CUPS_1_2_TRUE
+BUILD_CUPS_1_2_FALSE
+BUILD_CUPS_PPDS_TRUE
+BUILD_CUPS_PPDS_FALSE
+CUPS_PPDS_AT_TOP_LEVEL_TRUE
+CUPS_PPDS_AT_TOP_LEVEL_FALSE
+BUILD_TRANSLATED_CUPS_PPDS_TRUE
+BUILD_TRANSLATED_CUPS_PPDS_FALSE
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE
+USE_LEVEL3_PS_TRUE
+USE_LEVEL3_PS_FALSE
+BUILD_ESCPUTIL_TRUE
+BUILD_ESCPUTIL_FALSE
+BUILD_TEST_TRUE
+BUILD_TEST_FALSE
+BUILD_TESTPATTERN_TRUE
+BUILD_TESTPATTERN_FALSE
+BUILD_LIBGUTENPRINTUI_TRUE
+BUILD_LIBGUTENPRINTUI_FALSE
+BUILD_LIBGUTENPRINTUI2_TRUE
+BUILD_LIBGUTENPRINTUI2_FALSE
+BUILD_GIMP_TRUE
+BUILD_GIMP_FALSE
+BUILD_GIMP2_TRUE
+BUILD_GIMP2_FALSE
+BUILD_GIMP2_AS_GUTENPRINT_TRUE
+BUILD_GIMP2_AS_GUTENPRINT_FALSE
+INSTALL_SAMPLES_TRUE
+INSTALL_SAMPLES_FALSE
+INSTALL_USER_GUIDE_TRUE
+INSTALL_USER_GUIDE_FALSE
+USE_NLS_TRUE
+USE_NLS_FALSE
+BUILD_MODULES_TRUE
+BUILD_MODULES_FALSE
+BUILD_GENPPD_STATIC_TRUE
+BUILD_GENPPD_STATIC_FALSE
+RELEASE_DATE
+cups_prefix
+cups_exec_prefix
+cups_bindir
+cups_sbindir
+cups_conf_datadir
+cups_conf_serverbin
+cups_conf_serverroot
+CUPS_CFLAGS
+CUPS_LIBS
+CUPS_PPD_PS_LEVEL
+GENPPD_LIBS
+IJS_CFLAGS
+IJS_LIBS
+RM
+gimp_plug_indir
+gimp2_plug_indir
+GUTENPRINT_CFLAGS
+GUTENPRINT_LIBS
+GUTENPRINT_LIBDEPS
+GUTENPRINTUI_CFLAGS
+GUTENPRINTUI_LIBS
+GUTENPRINTUI_LIBDEPS
+GUTENPRINTUI_VERSION
+GUTENPRINTUI2_CFLAGS
+GUTENPRINTUI2_LIBS
+GUTENPRINTUI2_LIBDEPS
+GUTENPRINTUI2_VERSION
+gutenprint_cflags
+gutenprint_libs
+gutenprint_libdeps
+gutenprintui_cflags
+gutenprintui_libs
+gutenprintui_libdeps
+gutenprintui2_cflags
+gutenprintui2_libs
+gutenprintui2_libdeps
+LIBREADLINE_DEPS
+MAINTAINER_CFLAGS
+PLUG_IN_PATH
+WHICH_PPDS
+BUILD_CUPS_PPDS
+LIBOBJS
+LTLIBOBJS
+LTALLOCA'
 ac_subst_files=''
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+CPP
+CXX
+CXXFLAGS
+CCC
+CXXCPP
+F77
+FFLAGS
+PKG_CONFIG
+GTK2_CFLAGS
+GTK2_LIBS
+GIMP2_CFLAGS
+GIMP2_LIBS
+YACC
+YFLAGS'
+
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -511,34 +1085,48 @@ x_libraries=NONE
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
 
 ac_prev=
+ac_dashdash=
 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
+    eval $ac_prev=\$ac_option
     ac_prev=
     continue
   fi
 
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case $ac_option in
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
@@ -560,12 +1148,18 @@ do
   --config-cache | -C)
     cache_file=config.cache ;;
 
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+  -datadir | --datadir | --datadi | --datad)
     ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
     datadir=$ac_optarg ;;
 
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
@@ -573,7 +1167,17 @@ do
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
+    eval enable_$ac_feature=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
@@ -582,11 +1186,7 @@ do
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
+    eval enable_$ac_feature=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -613,6 +1213,12 @@ do
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
@@ -637,13 +1243,16 @@ do
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
   -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
+  | --localstate | --localstat | --localsta | --localst | --locals)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -708,6 +1317,16 @@ do
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
@@ -764,11 +1383,7 @@ do
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
+    eval with_$ac_package=\$ac_optarg ;;
 
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
@@ -777,7 +1392,7 @@ do
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
+    eval with_$ac_package=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -808,8 +1423,7 @@ Try \`$0 --help' for more information." >&2
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
+    eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
@@ -829,27 +1443,19 @@ if test -n "$ac_prev"; then
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
+# Be sure to have absolute directory names.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
 do
-  eval ac_val=$`echo $ac_var`
+  eval ac_val=\$$ac_var
   case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -876,114 +1482,76 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
 test "$silent" = yes && exec 6>/dev/null
 
 
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  { echo "$as_me: error: Working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  { echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
+
+
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$0" ||
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$0" : 'X\(//\)[^/]' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
   srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
+  if test ! -r "$srcdir/$ac_unique_file"; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
-  fi
 fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-ac_env_CXXCPP_set=${CXXCPP+set}
-ac_env_CXXCPP_value=$CXXCPP
-ac_cv_env_CXXCPP_set=${CXXCPP+set}
-ac_cv_env_CXXCPP_value=$CXXCPP
-ac_env_F77_set=${F77+set}
-ac_env_F77_value=$F77
-ac_cv_env_F77_set=${F77+set}
-ac_cv_env_F77_value=$F77
-ac_env_FFLAGS_set=${FFLAGS+set}
-ac_env_FFLAGS_value=$FFLAGS
-ac_cv_env_FFLAGS_set=${FFLAGS+set}
-ac_cv_env_FFLAGS_value=$FFLAGS
-ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_env_GTK2_CFLAGS_set=${GTK2_CFLAGS+set}
-ac_env_GTK2_CFLAGS_value=$GTK2_CFLAGS
-ac_cv_env_GTK2_CFLAGS_set=${GTK2_CFLAGS+set}
-ac_cv_env_GTK2_CFLAGS_value=$GTK2_CFLAGS
-ac_env_GTK2_LIBS_set=${GTK2_LIBS+set}
-ac_env_GTK2_LIBS_value=$GTK2_LIBS
-ac_cv_env_GTK2_LIBS_set=${GTK2_LIBS+set}
-ac_cv_env_GTK2_LIBS_value=$GTK2_LIBS
-ac_env_GIMP2_CFLAGS_set=${GIMP2_CFLAGS+set}
-ac_env_GIMP2_CFLAGS_value=$GIMP2_CFLAGS
-ac_cv_env_GIMP2_CFLAGS_set=${GIMP2_CFLAGS+set}
-ac_cv_env_GIMP2_CFLAGS_value=$GIMP2_CFLAGS
-ac_env_GIMP2_LIBS_set=${GIMP2_LIBS+set}
-ac_env_GIMP2_LIBS_value=$GIMP2_LIBS
-ac_cv_env_GIMP2_LIBS_set=${GIMP2_LIBS+set}
-ac_cv_env_GIMP2_LIBS_value=$GIMP2_LIBS
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
 
 #
 # Report the --help message.
@@ -992,7 +1560,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gutenprint 5.0.0 to adapt to many kinds of systems.
+\`configure' configures gutenprint 5.0.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1012,9 +1580,6 @@ Configuration:
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
-_ACEOF
-
-  cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
 			  [$ac_default_prefix]
@@ -1032,15 +1597,22 @@ Fine tuning of the installation directories:
   --bindir=DIR           user executables [EPREFIX/bin]
   --sbindir=DIR          system admin executables [EPREFIX/sbin]
   --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
   --libdir=DIR           object code libraries [EPREFIX/lib]
   --includedir=DIR       C header files [PREFIX/include]
   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR          info documentation [DATAROOTDIR/info]
+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR           man documentation [DATAROOTDIR/man]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/gutenprint]
+  --htmldir=DIR          html documentation [DOCDIR]
+  --dvidir=DIR           dvi documentation [DOCDIR]
+  --pdfdir=DIR           pdf documentation [DOCDIR]
+  --psdir=DIR            ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1058,23 +1630,25 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gutenprint 5.0.0:";;
+     short | recursive ) echo "Configuration of gutenprint 5.0.1:";;
    esac
   cat <<\_ACEOF
 
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-static[=PKGS]
-                          build static libraries [default=yes]
-  --enable-shared[=PKGS]
-                          build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=yes]
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
   --enable-cups-ppds      build CUPS PPD files [(automatic)]
+  --enable-cups-1_2-enhancements
+                          build CUPS 1.2 enhancements [(automatic)]
   --enable-translated-cups-ppds
                           build translated CUPS PPD files [yes]
   --enable-simplified-cups-ppds
@@ -1083,8 +1657,7 @@ Optional Features:
   --enable-cups-ppds-at-top-level
                           place CUPS PPD files at top level [no]
   --enable-cups-level3-ppds
-                          generate PostScript level 3 PPD files
-                          [(automatic)]
+                          generate PostScript level 3 PPD files [(automatic)]
   --enable-static-genppd  build a statically-linked cups-genppd and
                           rastertogutenprint. WARNING: Please read the README
                           and NEWS (release notes) CAREFULLY before disabling
@@ -1114,13 +1687,11 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
-  --with-tags[=TAGS]
-                          include additional configurations [automatic]
+  --with-tags[=TAGS]      include additional configurations [automatic]
   --with-cups=PREFIX      whether to build CUPS driver (default PREFIX=/usr)
                           [(automatic)]
   --with-foomatic         build foomatic data files [(automatic)]
-  --with-foomatic3        make use of foomatic 3 extra features
-                          [(automatic)]
+  --with-foomatic3        make use of foomatic 3 extra features [(automatic)]
   --with-ghostscript      build Ghostscript driver [(automatic)]
   --with-modules          enable loadable modules (options: ltdl, dlopen,
                           static) [(automatic)]
@@ -1129,7 +1700,7 @@ Optional Packages:
   --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)
   --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
   --with-gimp             build GIMP 1.2 Print plugin [(automatic)]
-  --with-gimp2            build GIMP 2.0 Print plugin [(automatic)]
+  --with-gimp2            build GIMP 2.x Print plugin [(automatic)]
   --with-gimp2-as-gutenprint
                           name GIMP 2.x Print plugin gutenprint (requires GIMP
                           2.2; normally used with GIMP 2.4 or above)
@@ -1149,8 +1720,8 @@ Some influential environment variables:
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
@@ -1163,110 +1734,81 @@ Some influential environment variables:
   GIMP2_CFLAGS
               C compiler flags for GIMP2, overriding pkg-config
   GIMP2_LIBS  linker flags for GIMP2, overriding pkg-config
+  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
+              the first program found out of: `bison -y', `byacc', `yacc'.
+  YFLAGS      The list of arguments that will be passed by default to $YACC.
+              This script will default YFLAGS to the empty string to avoid a
+              default value of `-d' given by some make applications.
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <gimp-print-devel@lists.sourceforge.net>.
 _ACEOF
+ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
+    test -d "$ac_dir" || continue
     ac_builddir=.
 
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
   done
 fi
 
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gutenprint configure 5.0.0
-generated by GNU Autoconf 2.59
+gutenprint configure 5.0.1
+generated by GNU Autoconf 2.60
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
@@ -1287,19 +1829,19 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 _ACEOF
-  exit 0
+  exit
 fi
-exec 5>config.log
-cat >&5 <<_ACEOF
+cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gutenprint $as_me 5.0.0, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+It was created by gutenprint $as_me 5.0.1, which was
+generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
+exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
@@ -1318,7 +1860,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown`
 /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
 /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
@@ -1332,6 +1874,7 @@ do
   test -z "$as_dir" && as_dir=.
   echo "PATH: $as_dir"
 done
+IFS=$as_save_IFS
 
 } >&5
 
@@ -1353,7 +1896,6 @@ _ACEOF
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
-ac_sep=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
@@ -1364,7 +1906,7 @@ do
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    *\'*)
       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
@@ -1386,9 +1928,7 @@ do
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
+      ac_configure_args="$ac_configure_args '$ac_arg'"
       ;;
     esac
   done
@@ -1399,8 +1939,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
@@ -1413,20 +1953,34 @@ trap 'exit_status=$?
 _ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
   (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
       sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
     *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-}
+    esac |
+    sort
+)
     echo
 
     cat <<\_ASBOX
@@ -1437,22 +1991,28 @@ _ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
       cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
 _ASBOX
       echo
       for ac_var in $ac_subst_files
       do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1464,26 +2024,24 @@ _ASBOX
 ## ----------- ##
 _ASBOX
       echo
-      sed "/^$/d" confdefs.h | sort
+      cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-     ' 0
+' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
 
 # Predefined preprocessor variables.
 
@@ -1514,14 +2072,17 @@ _ACEOF
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
+if test -n "$CONFIG_SITE"; then
+  set x "$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+else
+  set x "$ac_default_prefix/share/config.site" \
+	"$ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in $CONFIG_SITE; do
+shift
+for ac_site_file
+do
   if test -r "$ac_site_file"; then
     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
@@ -1537,8 +2098,8 @@ if test -r "$cache_file"; then
     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
     esac
   fi
 else
@@ -1550,12 +2111,11 @@ fi
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
@@ -1580,8 +2140,7 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1598,12 +2157,6 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov
    { (exit 1); exit 1; }; }
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
 
 
 
@@ -1628,47 +2181,58 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 
 
 ac_aux_dir=
-for ac_dir in scripts $srcdir/scripts; do
-  if test -f $ac_dir/install-sh; then
+for ac_dir in scripts "$srcdir"/scripts; do
+  if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break
-  elif test -f $ac_dir/install.sh; then
+  elif test -f "$ac_dir/install.sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
-  elif test -f $ac_dir/shtool; then
+  elif test -f "$ac_dir/shtool"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in scripts $srcdir/scripts" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in scripts $srcdir/scripts" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in scripts \"$srcdir\"/scripts" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in scripts \"$srcdir\"/scripts" >&2;}
    { (exit 1); exit 1; }; }
 fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
 
 
 
 
 GUTENPRINT_MAJOR_VERSION=5
 GUTENPRINT_MINOR_VERSION=0
-GUTENPRINT_MICRO_VERSION=0
+GUTENPRINT_MICRO_VERSION=1
 GUTENPRINT_EXTRA_VERSION=
 GUTENPRINT_CURRENT_INTERFACE=2
 GUTENPRINT_INTERFACE_AGE=0
 GUTENPRINT_BINARY_AGE=0
-GUTENPRINT_VERSION=5.0.0
+GUTENPRINT_VERSION=5.0.1
 GUTENPRINTUI_CURRENT_INTERFACE=1
 GUTENPRINTUI_INTERFACE_AGE=0
 GUTENPRINTUI_BINARY_AGE=0
@@ -1703,6 +2267,12 @@ GUTENPRINTUI2_BINARY_AGE=0
 
 
 
+CFLAGS="${CFLAGS:=}"
+CPPFLAGS="${CPPFLAGS:=}"
+CXXFLAGS="${CXXFLAGS:=}"
+LDFLAGS="${LDFLAGS:=}"
+LIBS="${LIBS:=}"
+
 am__api_version="1.9"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -1717,8 +2287,8 @@ am__api_version="1.9"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1740,7 +2310,7 @@ case $as_dir/ in
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -1759,21 +2329,22 @@ case $as_dir/ in
     ;;
 esac
 done
+IFS=$as_save_IFS
 
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
+    # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -1783,8 +2354,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -1826,20 +2397,20 @@ echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 test "$program_prefix" != NONE &&
-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
 # Double any \ or $.  echo might interpret backslashes.
 # By default was `s,x,x', remove it if useless.
 cat <<\_ACEOF >conftest.sed
 s/[\\$]/&&/g;s/;s,x,x,$//
 _ACEOF
 program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
+rm -f conftest.sed
 
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -1891,8 +2462,8 @@ for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1905,54 +2476,57 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
+  { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$AWK" && break
 done
 
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
 all:
-	@echo 'ac_maketemp="$(MAKE)"'
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
 rm -f conftest.make
 fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
   SET_MAKE=
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -1985,7 +2559,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gutenprint'
- VERSION='5.0.0'
+ VERSION='5.0.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2023,8 +2597,8 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2037,32 +2611,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
+  { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2075,27 +2651,41 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  STRIP=$ac_ct_STRIP
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
 else
   STRIP="$ac_cv_prog_STRIP"
 fi
@@ -2110,8 +2700,8 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 AMTAR=${AMTAR-"${am_missing_run}tar"}
 
 
-echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
-echo $ECHO_N "checking how to create a ustar tar archive... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
+echo $ECHO_N "checking how to create a ustar tar archive... $ECHO_C" >&6; }
 # Loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar plaintar pax cpio none'
 _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
@@ -2189,8 +2779,8 @@ else
   am_cv_prog_tar_ustar=$_am_tool
 fi
 
-echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5
-echo "${ECHO_T}$am_cv_prog_tar_ustar" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5
+echo "${ECHO_T}$am_cv_prog_tar_ustar" >&6; }
 
 
 
@@ -2211,7 +2801,7 @@ gutenprintui2_version=${GUTENPRINT_VERSION}
 GUTENPRINTUI_LIBDEPS="${GUTENPRINTUI_LIBDEPS} \$(GUTENPRINT_LIBS)"
 GUTENPRINTUI2_LIBDEPS="${GUTENPRINTUI2_LIBDEPS} \$(GUTENPRINT_LIBS)"
 
-          ac_config_headers="$ac_config_headers config.h"
+ac_config_headers="$ac_config_headers config.h"
 
 
 ALL_LINGUAS="cs da de el en_GB es fr hu ja nb nl pl pt sk sv zh_TW"
@@ -2221,10 +2811,9 @@ ALL_LINGUAS="cs da de el en_GB es fr hu ja nb nl pl pt sk sv zh_TW"
 
 # We need static libraries for CUPS genppd program for now, for bug 865265
 # --rlk 20031223
-# Check whether --enable-static or --disable-static was given.
+# Check whether --enable-static was given.
 if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
+  enableval=$enable_static; p=${PACKAGE-default}
     case $enableval in
     yes) enable_static=yes ;;
     no) enable_static=no ;;
@@ -2243,13 +2832,13 @@ if test "${enable_static+set}" = set; then
     esac
 else
   enable_static=yes
-fi;
+fi
+
 
 #AC_DISABLE_SHARED
-# Check whether --enable-shared or --disable-shared was given.
+# Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
+  enableval=$enable_shared; p=${PACKAGE-default}
     case $enableval in
     yes) enable_shared=yes ;;
     no) enable_shared=no ;;
@@ -2268,12 +2857,12 @@ if test "${enable_shared+set}" = set; then
     esac
 else
   enable_shared=yes
-fi;
+fi
+
 
-# Check whether --enable-fast-install or --disable-fast-install was given.
+# Check whether --enable-fast-install was given.
 if test "${enable_fast_install+set}" = set; then
-  enableval="$enable_fast_install"
-  p=${PACKAGE-default}
+  enableval=$enable_fast_install; p=${PACKAGE-default}
     case $enableval in
     yes) enable_fast_install=yes ;;
     no) enable_fast_install=no ;;
@@ -2292,60 +2881,155 @@ if test "${enable_fast_install+set}" = set; then
     esac
 else
   enable_fast_install=yes
-fi;
+fi
+
 
 # Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
 build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
+fi
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
 host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+
+
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+
+
+if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
 
 
 ac_ext=c
@@ -2356,8 +3040,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2370,32 +3054,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2408,36 +3094,51 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2450,74 +3151,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
 
+  fi
 fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2531,7 +3192,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -2542,6 +3203,7 @@ do
   fi
 done
 done
+IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
@@ -2559,22 +3221,23 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
+  for ac_prog in cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2587,36 +3250,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl
+  for ac_prog in cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2629,29 +3294,45 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$ac_ct_CC" && break
 done
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 fi
 
 fi
@@ -2664,21 +3345,35 @@ See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
+echo "$as_me:$LINENO: checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
@@ -2703,46 +3398,70 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
+#
+# List of possible output files, starting from the most likely.
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+# only as a last resort.  b.out is created by i960 compilers.
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+#
+# The IRIX 6 linker writes into existing files which may not be
+# executable, retaining their permissions.  Remove them first so a
+# subsequent execution test works.
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { (ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link_default") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
 	break;;
     * )
 	break;;
   esac
 done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -2755,19 +3474,23 @@ See \`config.log' for more details." >&2;}
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
 
-# Check the compiler produces executables we can run.  If not, either
+# Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -2786,22 +3509,27 @@ See \`config.log' for more details." >&2;}
     fi
   fi
 fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 rm -f a.out a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
+# Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
+
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -2812,9 +3540,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
 	  break;;
     * ) break;;
   esac
@@ -2828,14 +3555,14 @@ See \`config.log' for more details." >&2;}
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2855,14 +3582,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
@@ -2880,12 +3613,12 @@ fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2908,24 +3641,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -2934,24 +3679,28 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_compiler_gnu=no
+	ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2967,24 +3716,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -2993,12 +3754,131 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_cc_g=no
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3014,12 +3894,12 @@ else
     CFLAGS=
   fi
 fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_prog_cc_stdc=no
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3053,12 +3933,17 @@ static char *f (char * (*g) (char **, int), char **p, ...)
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
+   as 'x'.  The following induces an error, until -std is added to get
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
+   that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -3073,213 +3958,191 @@ return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   return 0;
 }
 _ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
+  ac_cv_prog_cc_c89=$ac_arg
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+  xno)
+    { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
   *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+    CC="$CC $ac_cv_prog_cc_c89"
+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CC"   am_compiler_list=
+
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
 
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
+
 fi
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
 
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
+if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
+
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
 if test "${lt_cv_path_SED+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3332,37 +4195,184 @@ done
 fi
 
 SED=$lt_cv_path_SED
-echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6
+{ echo "$as_me:$LINENO: result: $SED" >&5
+echo "${ECHO_T}$SED" >&6; }
 
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
+  # Extract the first word of "grep ggrep" to use in msg output
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
+if test "${ac_cv_path_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_path_GREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in grep ggrep; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
+    # Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+    $ac_path_GREP_found && break 3
+  done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     # Extract the first word of "egrep" to use in msg output
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_path_EGREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in egrep; do
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
+    # Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
     fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+
+    $ac_path_EGREP_found && break 3
+  done
+done
+
+done
+IFS=$as_save_IFS
+
+
+fi
+
+EGREP="$ac_cv_path_EGREP"
+if test -z "$EGREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+else
+  ac_cv_path_EGREP=$EGREP
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
 
 
+   fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
 
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+
+
+# Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi;
+fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -3391,11 +4401,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
 else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3428,17 +4438,17 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
+  { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3452,20 +4462,20 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
 if test "${lt_cv_ld_reload_flag+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -3482,8 +4492,8 @@ case $host_os in
     ;;
 esac
 
-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
 if test "${lt_cv_path_NM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3531,23 +4541,23 @@ else
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
 NM="$lt_cv_path_NM"
 
-echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6
+  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6; }
 fi
 
-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3722,8 +4732,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 esac
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -3741,11 +4751,11 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 compiler=$CC
 
 
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+# Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
+  enableval=$enable_libtool_lock;
+fi
 
-fi;
 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
@@ -3772,7 +4782,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3775 "configure"' > conftest.$ac_ext
+  echo '#line 4785 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -3857,8 +4867,8 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
 if test "${lt_cv_cc_needs_belf+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -3884,24 +4894,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -3910,9 +4932,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-lt_cv_cc_needs_belf=no
+	lt_cv_cc_needs_belf=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3921,8 +4944,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -3959,8 +4982,8 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -3994,8 +5017,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -4020,9 +5048,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4032,8 +5061,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -4060,6 +5094,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -4077,8 +5112,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -4101,8 +5136,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -4127,9 +5167,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4139,8 +5180,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -4167,6 +5213,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -4189,8 +5236,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4214,24 +5261,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -4240,9 +5299,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_header_stdc=no
+	ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -4298,6 +5358,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
+#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -4317,18 +5378,27 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return 2;
+  return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -4341,12 +5411,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -4369,9 +5441,9 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -4385,24 +5457,36 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -4411,12 +5495,14 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_Header=no"
+	eval "$as_ac_Header=no"
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -4431,18 +5517,19 @@ done
 for ac_header in dlfcn.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4453,24 +5540,36 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -4479,15 +5578,16 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4496,8 +5596,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -4521,9 +5626,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -4547,25 +5653,24 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
 ## ----------------------------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -4577,18 +5682,22 @@ fi
 
 done
 
-ac_ext=cc
+ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4601,36 +5710,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
+  { echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
     test -n "$CXX" && break
   done
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4643,55 +5754,85 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$ac_ct_CXX" && break
 done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 
-  CXX=$ac_ct_CXX
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
 fi
 
-
+  fi
+fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C++ compiler version" >&5
+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4714,24 +5855,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -4740,24 +5893,28 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_compiler_gnu=no
+	ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
 GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4773,24 +5930,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -4799,70 +5968,53 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_cxx_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
+	CXXFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
+
 int
 main ()
 {
-exit (42);
+
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -4871,79 +6023,218 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_declaration
+
 int
 main ()
 {
-exit (42);
+
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  break
+  ac_cv_prog_cxx_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-ac_ext=cc
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
+depcc="$CXX"  am_compiler_list=
+
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CXX_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CXX_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+
+
+if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+  am__fastdepCXX_TRUE=
+  am__fastdepCXX_FALSE='#'
+else
+  am__fastdepCXX_TRUE='#'
+  am__fastdepCXX_FALSE=
+fi
+
+
 
 
 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
     (test "X$CXX" != "Xg++"))) ; then
-  ac_ext=cc
+  ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4973,8 +6264,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -4999,9 +6295,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5011,8 +6308,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -5039,6 +6341,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -5056,8 +6359,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -5080,8 +6383,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -5106,9 +6414,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
   # Broken: fails on valid input.
 continue
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5118,8 +6427,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -5146,6 +6460,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ac_preproc_ok=:
 break
 fi
+
 rm -f conftest.err conftest.$ac_ext
 
 done
@@ -5161,7 +6476,7 @@ See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-ac_ext=cc
+ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -5175,12 +6490,12 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5193,36 +6508,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 F77=$ac_cv_prog_F77
 if test -n "$F77"; then
-  echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6
+  { echo "$as_me:$LINENO: result: $F77" >&5
+echo "${ECHO_T}$F77" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
     test -n "$F77" && break
   done
 fi
 if test -z "$F77"; then
   ac_ct_F77=$F77
-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5235,48 +6552,78 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_F77="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_F77=$ac_cv_prog_ac_ct_F77
 if test -n "$ac_ct_F77"; then
-  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+echo "${ECHO_T}$ac_ct_F77" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$ac_ct_F77" && break
 done
 
-  F77=$ac_ct_F77
+  if test "x$ac_ct_F77" = x; then
+    F77=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    F77=$ac_ct_F77
+  fi
 fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:5265:" \
-     "checking for Fortran 77 compiler version" >&5
+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
@@ -5286,8 +6633,8 @@ rm -f a.out
 # input file.  (Note that this only needs to work for GNU compilers.)
 ac_save_ext=$ac_ext
 ac_ext=F
-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
 if test "${ac_cv_f77_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5300,24 +6647,36 @@ else
       end
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -5326,20 +6685,21 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_compiler_gnu=no
+	ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_f77_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
 ac_ext=$ac_save_ext
 ac_test_FFLAGS=${FFLAGS+set}
 ac_save_FFLAGS=$FFLAGS
 FFLAGS=
-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_f77_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5350,24 +6710,36 @@ cat >conftest.$ac_ext <<_ACEOF
       end
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -5376,13 +6748,14 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_f77_g=no
+	ac_cv_prog_f77_g=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
 if test "$ac_test_FFLAGS" = set; then
   FFLAGS=$ac_save_FFLAGS
 elif test $ac_cv_prog_f77_g = yes; then
@@ -5411,8 +6784,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 
 # find the maximum length of command line arguments
-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
 if test "${lt_cv_sys_max_cmd_len+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5520,19 +6893,19 @@ else
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
+  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
 else
-  echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+  { echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6; }
 fi
 
 
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5736,15 +7109,15 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6
+  { echo "$as_me:$LINENO: result: failed" >&5
+echo "${ECHO_T}failed" >&6; }
 else
-  echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
+  { echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6; }
 fi
 
-echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for objdir" >&5
+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
 if test "${lt_cv_objdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5758,8 +7131,8 @@ else
 fi
 rmdir .libs 2>/dev/null
 fi
-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+echo "${ECHO_T}$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
@@ -5810,8 +7183,8 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5824,32 +7197,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
+  { echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5862,27 +7237,41 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="ar"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+echo "${ECHO_T}$ac_ct_AR" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  AR=$ac_ct_AR
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
 else
   AR="$ac_cv_prog_AR"
 fi
@@ -5890,8 +7279,8 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5904,32 +7293,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
+  { echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5942,27 +7333,41 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  RANLIB=$ac_ct_RANLIB
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
 else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
@@ -5970,8 +7375,8 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5984,32 +7389,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
+  { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6022,27 +7429,41 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  STRIP=$ac_ct_STRIP
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
 else
   STRIP="$ac_cv_prog_STRIP"
 fi
@@ -6101,8 +7522,8 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6154,17 +7575,17 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
+  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for file" >&5
+echo $ECHO_N "checking for file... $ECHO_C" >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6216,11 +7637,11 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
+  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
   else
@@ -6235,21 +7656,21 @@ esac
 enable_dlopen=yes
 enable_win32_dll=no
 
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+# Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
+  enableval=$enable_libtool_lock;
+fi
 
-fi;
 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 
-# Check whether --with-pic or --without-pic was given.
+# Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
+  withval=$with_pic; pic_mode="$withval"
 else
   pic_mode=default
-fi;
+fi
+
 test -z "$pic_mode" && pic_mode=default
 
 # Use C for the default configuration in the libtool script
@@ -6307,8 +7728,8 @@ if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
 
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6325,11 +7746,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6328: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7749: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6332: \$? = $ac_status" >&5
+   echo "$as_me:7753: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6342,8 +7763,8 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -6357,8 +7778,8 @@ lt_prog_compiler_wl=
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -6567,16 +7988,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     esac
   fi
 
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
 
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_pic_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6593,11 +8014,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6596: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8017: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6600: \$? = $ac_status" >&5
+   echo "$as_me:8021: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6610,8 +8031,8 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
@@ -6638,8 +8059,8 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_static_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6666,8 +8087,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
 
 if test x"$lt_prog_compiler_static_works" = xyes; then
     :
@@ -6676,8 +8097,8 @@ else
 fi
 
 
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_c_o+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -6697,11 +8118,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6700: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8121: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6704: \$? = $ac_status" >&5
+   echo "$as_me:8125: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -6723,23 +8144,23 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+  { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
   if test "$hard_links" = no; then
     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
@@ -6749,8 +8170,8 @@ else
   need_locks=no
 fi
 
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
 
   runpath_var=
   allow_undefined_flag=
@@ -7165,24 +8586,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7196,8 +8629,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -7226,24 +8661,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -7257,8 +8704,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -7707,8 +9156,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+echo "${ECHO_T}$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
 #
@@ -7728,8 +9177,8 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
@@ -7766,16 +9215,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6
+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -8362,8 +9811,8 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -8371,8 +9820,8 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var" || \
@@ -8396,8 +9845,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
@@ -8410,29 +9859,29 @@ fi
 
 striplib=
 old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+         { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
        else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
        ;;
    *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
     ;;
   esac
 fi
@@ -8464,8 +9913,8 @@ else
 
   darwin*)
   # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8478,40 +9927,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dlopen ();
 int
 main ()
 {
-dlopen ();
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8520,14 +9981,15 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dl_dlopen=no
+	ac_cv_lib_dl_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
@@ -8541,8 +10003,8 @@ fi
    ;;
 
   *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
 if test "${ac_cv_func_shl_load+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8569,53 +10031,59 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef shl_load
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char shl_load ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
+#if defined __stub_shl_load || defined __stub___shl_load
 choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != shl_load;
+return shl_load ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8624,18 +10092,19 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_shl_load=no
+	ac_cv_func_shl_load=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
 if test $ac_cv_func_shl_load = yes; then
   lt_cv_dlopen="shl_load"
 else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8648,40 +10117,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char shl_load ();
 int
 main ()
 {
-shl_load ();
+return shl_load ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8690,19 +10171,20 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dld_shl_load=no
+	ac_cv_lib_dld_shl_load=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
 if test $ac_cv_lib_dld_shl_load = yes; then
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
 else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
 if test "${ac_cv_func_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8729,53 +10211,59 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef dlopen
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dlopen ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
+#if defined __stub_dlopen || defined __stub___dlopen
 choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != dlopen;
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8784,18 +10272,19 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_func_dlopen=no
+	ac_cv_func_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
 if test $ac_cv_func_dlopen = yes; then
   lt_cv_dlopen="dlopen"
 else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8808,40 +10297,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dlopen ();
 int
 main ()
 {
-dlopen ();
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8850,19 +10351,20 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dl_dlopen=no
+	ac_cv_lib_dl_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8875,40 +10377,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dlopen ();
 int
 main ()
 {
-dlopen ();
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8917,19 +10431,20 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_svld_dlopen=no
+	ac_cv_lib_svld_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
 if test $ac_cv_lib_svld_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8942,40 +10457,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dld_link ();
 int
 main ()
 {
-dld_link ();
+return dld_link ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -8984,14 +10511,15 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dld_dld_link=no
+	ac_cv_lib_dld_dld_link=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
 if test $ac_cv_lib_dld_dld_link = yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 fi
@@ -9031,8 +10559,8 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
 if test "${lt_cv_dlopen_self+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9042,7 +10570,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9045 "configure"
+#line 10573 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9126,13 +10654,13 @@ rm -fr conftest*
 
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
 if test "${lt_cv_dlopen_self_static+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -9142,7 +10670,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9145 "configure"
+#line 10673 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9226,8 +10754,8 @@ rm -fr conftest*
 
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -9249,13 +10777,13 @@ fi
 
 
 # Report which library types will actually be built
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
 
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -9275,15 +10803,15 @@ aix4* | aix5*)
   fi
     ;;
 esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6; }
 
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
+{ echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6; }
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -9775,11 +11303,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 CC="$lt_save_CC"
 
 
-# Check whether --with-tags or --without-tags was given.
+# Check whether --with-tags was given.
 if test "${with_tags+set}" = set; then
-  withval="$with_tags"
-  tagnames="$withval"
-fi;
+  withval=$with_tags; tagnames="$withval"
+fi
+
 
 if test -f "$ltmain" && test -n "$tagnames"; then
   if test ! -f "${ofile}"; then
@@ -9833,7 +11361,7 @@ echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
 	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 	    (test "X$CXX" != "Xg++"))) ; then
-	  ac_ext=cc
+	  ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -9952,18 +11480,18 @@ if test "$GXX" = yes; then
   # Set up default GNU C++ configuration
 
 
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+# Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi;
+fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -9992,11 +11520,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
 else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10029,17 +11557,17 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
+  { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -10053,8 +11581,8 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -10104,8 +11632,8 @@ else
 fi
 
 # PORTME: fill in a description of your system's C++ link characteristics
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
 ld_shlibs_CXX=yes
 case $host_os in
   aix3*)
@@ -10217,24 +11745,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -10248,8 +11788,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -10279,24 +11821,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -10310,8 +11864,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -11042,8 +12598,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ld_shlibs_CXX=no
     ;;
 esac
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 GCC_CXX="$GXX"
@@ -11182,8 +12738,8 @@ lt_prog_compiler_wl_CXX=
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -11456,16 +13012,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     esac
   fi
 
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
 
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -11482,11 +13038,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11485: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13041: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11489: \$? = $ac_status" >&5
+   echo "$as_me:13045: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11499,8 +13055,8 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
 
 if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
@@ -11527,8 +13083,8 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -11555,8 +13111,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
 
 if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
     :
@@ -11565,8 +13121,8 @@ else
 fi
 
 
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -11586,11 +13142,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11589: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13145: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11593: \$? = $ac_status" >&5
+   echo "$as_me:13149: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11612,23 +13168,23 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+  { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
   if test "$hard_links" = no; then
     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
@@ -11638,8 +13194,8 @@ else
   need_locks=no
 fi
 
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
@@ -11663,8 +13219,8 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   ;;
   esac
 
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 #
@@ -11684,8 +13240,8 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
@@ -11722,16 +13278,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -12318,8 +13874,8 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -12327,8 +13883,8 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" || \
    test -n "$runpath_var_CXX" || \
@@ -12352,8 +13908,8 @@ else
   # directories.
   hardcode_action_CXX=unsupported
 fi
-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+echo "${ECHO_T}$hardcode_action_CXX" >&6; }
 
 if test "$hardcode_action_CXX" = relink; then
   # Fast installation is not supported
@@ -12878,13 +14434,13 @@ done
 cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
 
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -12903,15 +14459,15 @@ aix4* | aix5*)
   fi
   ;;
 esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6; }
 
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
+{ echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6; }
 
 GCC_F77="$G77"
 LD_F77="$LD"
@@ -12920,8 +14476,8 @@ lt_prog_compiler_wl_F77=
 lt_prog_compiler_pic_F77=
 lt_prog_compiler_static_F77=
 
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl_F77='-Wl,'
@@ -13130,16 +14686,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     esac
   fi
 
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_F77"; then
 
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -13156,11 +14712,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13159: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14715: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13163: \$? = $ac_status" >&5
+   echo "$as_me:14719: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13173,8 +14729,8 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
 
 if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
     case $lt_prog_compiler_pic_F77 in
@@ -13201,8 +14757,8 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_static_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -13229,8 +14785,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
 
 if test x"$lt_prog_compiler_static_works_F77" = xyes; then
     :
@@ -13239,8 +14795,8 @@ else
 fi
 
 
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -13260,11 +14816,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13263: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14819: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13267: \$? = $ac_status" >&5
+   echo "$as_me:14823: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13286,23 +14842,23 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+  { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
   if test "$hard_links" = no; then
     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
@@ -13312,8 +14868,8 @@ else
   need_locks=no
 fi
 
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
 
   runpath_var=
   allow_undefined_flag_F77=
@@ -13718,24 +15274,36 @@ _LT_EOF
       end
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -13749,8 +15317,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -13769,24 +15339,36 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       end
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -13800,8 +15382,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -14250,8 +15834,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+echo "${ECHO_T}$ld_shlibs_F77" >&6; }
 test "$ld_shlibs_F77" = no && can_build_shared=no
 
 #
@@ -14271,8 +15855,8 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
@@ -14309,16 +15893,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -14905,8 +16489,8 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -14914,8 +16498,8 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 hardcode_action_F77=
 if test -n "$hardcode_libdir_flag_spec_F77" || \
    test -n "$runpath_var_F77" || \
@@ -14939,8 +16523,8 @@ else
   # directories.
   hardcode_action_F77=unsupported
 fi
-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+echo "${ECHO_T}$hardcode_action_F77" >&6; }
 
 if test "$hardcode_action_F77" = relink; then
   # Fast installation is not supported
@@ -15377,7 +16961,6 @@ CC="$lt_save_CC"
 	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
 
 
-
 # Source file extension for Java test sources.
 ac_ext=java
 
@@ -15445,8 +17028,8 @@ if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
 
 
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -15463,11 +17046,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15466: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17049: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15470: \$? = $ac_status" >&5
+   echo "$as_me:17053: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15480,8 +17063,8 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
@@ -15495,8 +17078,8 @@ lt_prog_compiler_wl_GCJ=
 lt_prog_compiler_pic_GCJ=
 lt_prog_compiler_static_GCJ=
 
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl_GCJ='-Wl,'
@@ -15705,16 +17288,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     esac
   fi
 
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_GCJ"; then
 
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -15731,11 +17314,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15734: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17317: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15738: \$? = $ac_status" >&5
+   echo "$as_me:17321: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15748,8 +17331,8 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
 
 if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
     case $lt_prog_compiler_pic_GCJ in
@@ -15776,8 +17359,8 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -15804,8 +17387,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
 
 if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
     :
@@ -15814,8 +17397,8 @@ else
 fi
 
 
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -15835,11 +17418,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15838: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17421: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15842: \$? = $ac_status" >&5
+   echo "$as_me:17425: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15861,23 +17444,23 @@ else
    $rm conftest*
 
 fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
+  { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
   if test "$hard_links" = no; then
     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
@@ -15887,8 +17470,8 @@ else
   need_locks=no
 fi
 
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
 
   runpath_var=
   allow_undefined_flag_GCJ=
@@ -16303,24 +17886,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -16334,8 +17929,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -16364,24 +17961,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -16395,8 +18004,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -16845,8 +18456,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
 test "$ld_shlibs_GCJ" = no && can_build_shared=no
 
 #
@@ -16866,8 +18477,8 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
@@ -16904,16 +18515,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -17500,8 +19111,8 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -17509,8 +19120,8 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 hardcode_action_GCJ=
 if test -n "$hardcode_libdir_flag_spec_GCJ" || \
    test -n "$runpath_var_GCJ" || \
@@ -17534,8 +19145,8 @@ else
   # directories.
   hardcode_action_GCJ=unsupported
 fi
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6
+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
 
 if test "$hardcode_action_GCJ" = relink; then
   # Fast installation is not supported
@@ -17971,7 +19582,6 @@ CC="$lt_save_CC"
       RC)
 
 
-
 # Source file extension for RC test sources.
 ac_ext=rc
 
@@ -18511,17 +20121,17 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+    # Check whether --enable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
 else
   USE_MAINTAINER_MODE=no
-fi;
-  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
+fi
+
+  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
 
 
 if test $USE_MAINTAINER_MODE = yes; then
@@ -18563,8 +20173,8 @@ _ACEOF
 
 # Extract the first word of "cups-config", so it can be a program name with args.
 set dummy cups-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -18579,53 +20189,53 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
-
 if test -n "$CUPS_CONFIG"; then
-  echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5
-echo "${ECHO_T}$CUPS_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5
+echo "${ECHO_T}$CUPS_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 if test -z "${CUPS_CONFIG}" ; then
   BUILD_CUPS="no"
 else
   BUILD_CUPS="yes"
 fi
 # create custom command-line --with option
-echo "$as_me:$LINENO: checking whether to whether to build CUPS driver" >&5
-echo $ECHO_N "checking whether to whether to build CUPS driver... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to whether to build CUPS driver" >&5
+echo $ECHO_N "checking whether to whether to build CUPS driver... $ECHO_C" >&6; }
 
-# Check whether --with-cups or --without-cups was given.
+# Check whether --with-cups was given.
 if test "${with_cups+set}" = set; then
-  withval="$with_cups"
-  case "${withval}" in
+  withval=$with_cups; case "${withval}" in
 
-    yes) BUILD_CUPS="yes" ; echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6 ; cups_prefix="/usr" ;;
-    no) BUILD_CUPS="no" ; echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6 ; cups_prefix="/usr" ;;
+    yes) BUILD_CUPS="yes" ; { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; } ; cups_prefix="/usr" ;;
+    no) BUILD_CUPS="no" ; { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; } ; cups_prefix="/usr" ;;
     *) if test -d ${withval} ; then
          BUILD_CUPS="yes"
-	 echo "$as_me:$LINENO: result: yes (using specified prefix)" >&5
-echo "${ECHO_T}yes (using specified prefix)" >&6
+	 { echo "$as_me:$LINENO: result: yes (using specified prefix)" >&5
+echo "${ECHO_T}yes (using specified prefix)" >&6; }
          cups_prefix="${withval}"
        else
-         echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+         { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
          { { echo "$as_me:$LINENO: error: ${withval}: no such directory for --with-cups" >&5
 echo "$as_me: error: ${withval}: no such directory for --with-cups" >&2;}
    { (exit 1); exit 1; }; }
@@ -18636,33 +20246,48 @@ else
   if test -z "${BUILD_CUPS}" ; then
                BUILD_CUPS="(automatic)"
              fi
-             echo "$as_me:$LINENO: result: ${BUILD_CUPS}" >&5
-echo "${ECHO_T}${BUILD_CUPS}" >&6 ;
+             { echo "$as_me:$LINENO: result: ${BUILD_CUPS}" >&5
+echo "${ECHO_T}${BUILD_CUPS}" >&6; } ;
      cups_prefix="${prefix}"
 
-fi;
+fi
+
 if test -z "${BUILD_CUPS}" ; then
   BUILD_CUPS="(automatic)"
 fi
 
 
+USE_LEVEL3_PS=no
 BUILD_CUPS_PPDS="${BUILD_CUPS}"
 BUILD_TRANSLATED_CUPS_PPDS="${BUILD_CUPS}"
+BUILD_CUPS_1_2="no"
+if test -n "${CUPS_CONFIG}" -a "${BUILD_CUPS}" = "yes" ; then
+  cups_version=`${CUPS_CONFIG} --version`
+  cups_major=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\1/'`
+  cups_minor=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\2/'`
+  cups_point=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\3/'`
+  if test "$cups_major" -gt 1 -o "$cups_minor" -gt 1 -o "$cups_point" -gt 14 ; then
+    USE_LEVEL3_PS=yes
+  fi
+  if test "$cups_major" -gt 1 -o "$cups_minor" -gt 1 ; then
+    BUILD_CUPS_PPDS="no"
+    BUILD_CUPS_1_2="yes"
+  fi
+fi
 
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to build CUPS PPD files" >&5
-echo $ECHO_N "checking whether to build CUPS PPD files... $ECHO_C" >&6
-# Check whether --enable-cups-ppds or --disable-cups-ppds was given.
+{ echo "$as_me:$LINENO: checking whether to build CUPS PPD files" >&5
+echo $ECHO_N "checking whether to build CUPS PPD files... $ECHO_C" >&6; }
+# Check whether --enable-cups-ppds was given.
 if test "${enable_cups_ppds+set}" = set; then
-  enableval="$enable_cups_ppds"
-  case "${enableval}" in
-
-                yes) BUILD_CUPS_PPDS="yes" ; echo "$as_me:$LINENO: result: ${BUILD_CUPS_PPDS}" >&5
-echo "${ECHO_T}${BUILD_CUPS_PPDS}" >&6 ;;
-                no) BUILD_CUPS_PPDS="no" ; echo "$as_me:$LINENO: result: ${BUILD_CUPS_PPDS}" >&5
-echo "${ECHO_T}${BUILD_CUPS_PPDS}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  enableval=$enable_cups_ppds; case "${enableval}" in
+
+                yes) BUILD_CUPS_PPDS="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_CUPS_PPDS}" >&5
+echo "${ECHO_T}${BUILD_CUPS_PPDS}" >&6; } ;;
+                no) BUILD_CUPS_PPDS="no" ; { echo "$as_me:$LINENO: result: ${BUILD_CUPS_PPDS}" >&5
+echo "${ECHO_T}${BUILD_CUPS_PPDS}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-cups-ppds" >&5
 echo "$as_me: error: bad value ${enableval} for --enable-cups-ppds" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -18672,28 +20297,59 @@ else
   if test -z "${BUILD_CUPS_PPDS}" ; then
                BUILD_CUPS_PPDS="(automatic)"
              fi
-             echo "$as_me:$LINENO: result: ${BUILD_CUPS_PPDS}" >&5
-echo "${ECHO_T}${BUILD_CUPS_PPDS}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${BUILD_CUPS_PPDS}" >&5
+echo "${ECHO_T}${BUILD_CUPS_PPDS}" >&6; } ;
+fi
+
 if test -z "${BUILD_CUPS_PPDS}" ; then
   BUILD_CUPS_PPDS="(automatic)"
 fi
 
 
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to build translated CUPS PPD files" >&5
-echo $ECHO_N "checking whether to build translated CUPS PPD files... $ECHO_C" >&6
-# Check whether --enable-translated-cups-ppds or --disable-translated-cups-ppds was given.
+{ echo "$as_me:$LINENO: checking whether to build CUPS 1.2 enhancements" >&5
+echo $ECHO_N "checking whether to build CUPS 1.2 enhancements... $ECHO_C" >&6; }
+# Check whether --enable-cups-1_2-enhancements was given.
+if test "${enable_cups_1_2_enhancements+set}" = set; then
+  enableval=$enable_cups_1_2_enhancements; case "${enableval}" in
+
+                yes) BUILD_CUPS_1_2="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_CUPS_1_2}" >&5
+echo "${ECHO_T}${BUILD_CUPS_1_2}" >&6; } ;;
+                no) BUILD_CUPS_1_2="no" ; { echo "$as_me:$LINENO: result: ${BUILD_CUPS_1_2}" >&5
+echo "${ECHO_T}${BUILD_CUPS_1_2}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
+                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-cups-1_2-enhancements" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-cups-1_2-enhancements" >&2;}
+   { (exit 1); exit 1; }; } ;;
+
+	    esac
+else
+  if test -z "${BUILD_CUPS_1_2}" ; then
+               BUILD_CUPS_1_2="(automatic)"
+             fi
+             { echo "$as_me:$LINENO: result: ${BUILD_CUPS_1_2}" >&5
+echo "${ECHO_T}${BUILD_CUPS_1_2}" >&6; } ;
+fi
+
+if test -z "${BUILD_CUPS_1_2}" ; then
+  BUILD_CUPS_1_2="(automatic)"
+fi
+
+
+# create custom command-line --enable option
+{ echo "$as_me:$LINENO: checking whether to build translated CUPS PPD files" >&5
+echo $ECHO_N "checking whether to build translated CUPS PPD files... $ECHO_C" >&6; }
+# Check whether --enable-translated-cups-ppds was given.
 if test "${enable_translated_cups_ppds+set}" = set; then
-  enableval="$enable_translated_cups_ppds"
-  case "${enableval}" in
-
-                yes) BUILD_TRANSLATED_CUPS_PPDS="yes" ; echo "$as_me:$LINENO: result: ${BUILD_TRANSLATED_CUPS_PPDS}" >&5
-echo "${ECHO_T}${BUILD_TRANSLATED_CUPS_PPDS}" >&6 ;;
-                no) BUILD_TRANSLATED_CUPS_PPDS="no" ; echo "$as_me:$LINENO: result: ${BUILD_TRANSLATED_CUPS_PPDS}" >&5
-echo "${ECHO_T}${BUILD_TRANSLATED_CUPS_PPDS}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  enableval=$enable_translated_cups_ppds; case "${enableval}" in
+
+                yes) BUILD_TRANSLATED_CUPS_PPDS="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_TRANSLATED_CUPS_PPDS}" >&5
+echo "${ECHO_T}${BUILD_TRANSLATED_CUPS_PPDS}" >&6; } ;;
+                no) BUILD_TRANSLATED_CUPS_PPDS="no" ; { echo "$as_me:$LINENO: result: ${BUILD_TRANSLATED_CUPS_PPDS}" >&5
+echo "${ECHO_T}${BUILD_TRANSLATED_CUPS_PPDS}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-translated-cups-ppds" >&5
 echo "$as_me: error: bad value ${enableval} for --enable-translated-cups-ppds" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -18703,28 +20359,28 @@ else
   if test -z "${BUILD_TRANSLATED_CUPS_PPDS}" ; then
                BUILD_TRANSLATED_CUPS_PPDS="yes"
              fi
-             echo "$as_me:$LINENO: result: ${BUILD_TRANSLATED_CUPS_PPDS}" >&5
-echo "${ECHO_T}${BUILD_TRANSLATED_CUPS_PPDS}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${BUILD_TRANSLATED_CUPS_PPDS}" >&5
+echo "${ECHO_T}${BUILD_TRANSLATED_CUPS_PPDS}" >&6; } ;
+fi
+
 if test -z "${BUILD_TRANSLATED_CUPS_PPDS}" ; then
   BUILD_TRANSLATED_CUPS_PPDS="yes"
 fi
 
 
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to build simplified CUPS PPD files" >&5
-echo $ECHO_N "checking whether to build simplified CUPS PPD files... $ECHO_C" >&6
-# Check whether --enable-simplified-cups-ppds or --disable-simplified-cups-ppds was given.
+{ echo "$as_me:$LINENO: checking whether to build simplified CUPS PPD files" >&5
+echo $ECHO_N "checking whether to build simplified CUPS PPD files... $ECHO_C" >&6; }
+# Check whether --enable-simplified-cups-ppds was given.
 if test "${enable_simplified_cups_ppds+set}" = set; then
-  enableval="$enable_simplified_cups_ppds"
-  case "${enableval}" in
-
-    yes) WHICH_PPDS="-a"; BUILD_SIMPLIFIED_CUPS_PPDS=yes; echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6 ;;
-    no) WHICH_PPDS=""; BUILD_SIMPLIFIED_CUPS_PPDS=no; echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6 ;;
-    only) WHICH_PPDS="-s"; BUILD_SIMPLIFIED_CUPS_PPDS=only; echo "$as_me:$LINENO: result: only" >&5
-echo "${ECHO_T}only" >&6 ;;
+  enableval=$enable_simplified_cups_ppds; case "${enableval}" in
+
+    yes) WHICH_PPDS="-a"; BUILD_SIMPLIFIED_CUPS_PPDS=yes; { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; } ;;
+    no) WHICH_PPDS=""; BUILD_SIMPLIFIED_CUPS_PPDS=no; { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; } ;;
+    only) WHICH_PPDS="-s"; BUILD_SIMPLIFIED_CUPS_PPDS=only; { echo "$as_me:$LINENO: result: only" >&5
+echo "${ECHO_T}only" >&6; } ;;
     *) { { echo "$as_me:$LINENO: error: ${enableval}: not a valid option ('yes', 'no', or 'only')" >&5
 echo "$as_me: error: ${enableval}: not a valid option ('yes', 'no', or 'only')" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -18734,39 +20390,28 @@ else
   if test -z "${BUILD_SIMPLIFIED_CUPS_PPDS}" ; then
                BUILD_SIMPLIFIED_CUPS_PPDS="no"
              fi
-             echo "$as_me:$LINENO: result: ${BUILD_SIMPLIFIED_CUPS_PPDS}" >&5
-echo "${ECHO_T}${BUILD_SIMPLIFIED_CUPS_PPDS}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${BUILD_SIMPLIFIED_CUPS_PPDS}" >&5
+echo "${ECHO_T}${BUILD_SIMPLIFIED_CUPS_PPDS}" >&6; } ;
+fi
+
 if test -z "${BUILD_SIMPLIFIED_CUPS_PPDS}" ; then
   BUILD_SIMPLIFIED_CUPS_PPDS="no"
 fi
 
 
-USE_LEVEL3_PS=no
-if test -n "${CUPS_CONFIG}" -a "${BUILD_CUPS}" = "yes" ; then
-  cups_version=`${CUPS_CONFIG} --version`
-  cups_major=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\1/'`
-  cups_minor=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\2/'`
-  cups_point=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\3/'`
-  if test "$cups_major" -gt 1 -o "$cups_minor" -gt 1 -o "$cups_point" -gt 14 ; then
-    USE_LEVEL3_PS=yes
-  fi
-fi
-
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to place CUPS PPD files at top level" >&5
-echo $ECHO_N "checking whether to place CUPS PPD files at top level... $ECHO_C" >&6
-# Check whether --enable-cups-ppds-at-top-level or --disable-cups-ppds-at-top-level was given.
+{ echo "$as_me:$LINENO: checking whether to place CUPS PPD files at top level" >&5
+echo $ECHO_N "checking whether to place CUPS PPD files at top level... $ECHO_C" >&6; }
+# Check whether --enable-cups-ppds-at-top-level was given.
 if test "${enable_cups_ppds_at_top_level+set}" = set; then
-  enableval="$enable_cups_ppds_at_top_level"
-  case "${enableval}" in
-
-                yes) CUPS_PPDS_AT_TOP_LEVEL="yes" ; echo "$as_me:$LINENO: result: ${CUPS_PPDS_AT_TOP_LEVEL}" >&5
-echo "${ECHO_T}${CUPS_PPDS_AT_TOP_LEVEL}" >&6 ;;
-                no) CUPS_PPDS_AT_TOP_LEVEL="no" ; echo "$as_me:$LINENO: result: ${CUPS_PPDS_AT_TOP_LEVEL}" >&5
-echo "${ECHO_T}${CUPS_PPDS_AT_TOP_LEVEL}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  enableval=$enable_cups_ppds_at_top_level; case "${enableval}" in
+
+                yes) CUPS_PPDS_AT_TOP_LEVEL="yes" ; { echo "$as_me:$LINENO: result: ${CUPS_PPDS_AT_TOP_LEVEL}" >&5
+echo "${ECHO_T}${CUPS_PPDS_AT_TOP_LEVEL}" >&6; } ;;
+                no) CUPS_PPDS_AT_TOP_LEVEL="no" ; { echo "$as_me:$LINENO: result: ${CUPS_PPDS_AT_TOP_LEVEL}" >&5
+echo "${ECHO_T}${CUPS_PPDS_AT_TOP_LEVEL}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-cups-ppds-at-top-level" >&5
 echo "$as_me: error: bad value ${enableval} for --enable-cups-ppds-at-top-level" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -18776,28 +20421,28 @@ else
   if test -z "${CUPS_PPDS_AT_TOP_LEVEL}" ; then
                CUPS_PPDS_AT_TOP_LEVEL="no"
              fi
-             echo "$as_me:$LINENO: result: ${CUPS_PPDS_AT_TOP_LEVEL}" >&5
-echo "${ECHO_T}${CUPS_PPDS_AT_TOP_LEVEL}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${CUPS_PPDS_AT_TOP_LEVEL}" >&5
+echo "${ECHO_T}${CUPS_PPDS_AT_TOP_LEVEL}" >&6; } ;
+fi
+
 if test -z "${CUPS_PPDS_AT_TOP_LEVEL}" ; then
   CUPS_PPDS_AT_TOP_LEVEL="no"
 fi
 
 
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to generate PostScript level 3 PPD files" >&5
-echo $ECHO_N "checking whether to generate PostScript level 3 PPD files... $ECHO_C" >&6
-# Check whether --enable-cups-level3-ppds or --disable-cups-level3-ppds was given.
+{ echo "$as_me:$LINENO: checking whether to generate PostScript level 3 PPD files" >&5
+echo $ECHO_N "checking whether to generate PostScript level 3 PPD files... $ECHO_C" >&6; }
+# Check whether --enable-cups-level3-ppds was given.
 if test "${enable_cups_level3_ppds+set}" = set; then
-  enableval="$enable_cups_level3_ppds"
-  case "${enableval}" in
-
-                yes) USE_LEVEL3_PS="yes" ; echo "$as_me:$LINENO: result: ${USE_LEVEL3_PS}" >&5
-echo "${ECHO_T}${USE_LEVEL3_PS}" >&6 ;;
-                no) USE_LEVEL3_PS="no" ; echo "$as_me:$LINENO: result: ${USE_LEVEL3_PS}" >&5
-echo "${ECHO_T}${USE_LEVEL3_PS}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  enableval=$enable_cups_level3_ppds; case "${enableval}" in
+
+                yes) USE_LEVEL3_PS="yes" ; { echo "$as_me:$LINENO: result: ${USE_LEVEL3_PS}" >&5
+echo "${ECHO_T}${USE_LEVEL3_PS}" >&6; } ;;
+                no) USE_LEVEL3_PS="no" ; { echo "$as_me:$LINENO: result: ${USE_LEVEL3_PS}" >&5
+echo "${ECHO_T}${USE_LEVEL3_PS}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-cups-level3-ppds" >&5
 echo "$as_me: error: bad value ${enableval} for --enable-cups-level3-ppds" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -18807,9 +20452,10 @@ else
   if test -z "${USE_LEVEL3_PS}" ; then
                USE_LEVEL3_PS="(automatic)"
              fi
-             echo "$as_me:$LINENO: result: ${USE_LEVEL3_PS}" >&5
-echo "${ECHO_T}${USE_LEVEL3_PS}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${USE_LEVEL3_PS}" >&5
+echo "${ECHO_T}${USE_LEVEL3_PS}" >&6; } ;
+fi
+
 if test -z "${USE_LEVEL3_PS}" ; then
   USE_LEVEL3_PS="(automatic)"
 fi
@@ -18817,19 +20463,18 @@ fi
 
 STATIC_GENPPD="$enable_static"
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to build a statically-linked cups-genppd and rastertogutenprint.  WARNING: Please read the README and NEWS (release notes) CAREFULLY before disabling this!" >&5
-echo $ECHO_N "checking whether to build a statically-linked cups-genppd and rastertogutenprint.  WARNING: Please read the README and NEWS (release notes) CAREFULLY before disabling this!... $ECHO_C" >&6
-# Check whether --enable-static-genppd or --disable-static-genppd was given.
+{ echo "$as_me:$LINENO: checking whether to build a statically-linked cups-genppd and rastertogutenprint.  WARNING: Please read the README and NEWS (release notes) CAREFULLY before disabling this!" >&5
+echo $ECHO_N "checking whether to build a statically-linked cups-genppd and rastertogutenprint.  WARNING: Please read the README and NEWS (release notes) CAREFULLY before disabling this!... $ECHO_C" >&6; }
+# Check whether --enable-static-genppd was given.
 if test "${enable_static_genppd+set}" = set; then
-  enableval="$enable_static_genppd"
-  case "${enableval}" in
-
-                yes) STATIC_GENPPD="yes" ; echo "$as_me:$LINENO: result: ${STATIC_GENPPD}" >&5
-echo "${ECHO_T}${STATIC_GENPPD}" >&6 ;;
-                no) STATIC_GENPPD="no" ; echo "$as_me:$LINENO: result: ${STATIC_GENPPD}" >&5
-echo "${ECHO_T}${STATIC_GENPPD}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  enableval=$enable_static_genppd; case "${enableval}" in
+
+                yes) STATIC_GENPPD="yes" ; { echo "$as_me:$LINENO: result: ${STATIC_GENPPD}" >&5
+echo "${ECHO_T}${STATIC_GENPPD}" >&6; } ;;
+                no) STATIC_GENPPD="no" ; { echo "$as_me:$LINENO: result: ${STATIC_GENPPD}" >&5
+echo "${ECHO_T}${STATIC_GENPPD}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-static-genppd" >&5
 echo "$as_me: error: bad value ${enableval} for --enable-static-genppd" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -18839,9 +20484,10 @@ else
   if test -z "${STATIC_GENPPD}" ; then
                STATIC_GENPPD="(automatic)"
              fi
-             echo "$as_me:$LINENO: result: ${STATIC_GENPPD}" >&5
-echo "${ECHO_T}${STATIC_GENPPD}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${STATIC_GENPPD}" >&5
+echo "${ECHO_T}${STATIC_GENPPD}" >&6; } ;
+fi
+
 if test -z "${STATIC_GENPPD}" ; then
   STATIC_GENPPD="(automatic)"
 fi
@@ -18849,8 +20495,8 @@ fi
 
 # Extract the first word of "foomatic-configure", so it can be a program name with args.
 set dummy foomatic-configure; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_FOOMATIC_CONFIGURE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -18865,47 +20511,47 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_FOOMATIC_CONFIGURE="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 FOOMATIC_CONFIGURE=$ac_cv_path_FOOMATIC_CONFIGURE
-
 if test -n "$FOOMATIC_CONFIGURE"; then
-  echo "$as_me:$LINENO: result: $FOOMATIC_CONFIGURE" >&5
-echo "${ECHO_T}$FOOMATIC_CONFIGURE" >&6
+  { echo "$as_me:$LINENO: result: $FOOMATIC_CONFIGURE" >&5
+echo "${ECHO_T}$FOOMATIC_CONFIGURE" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 if test -z "${FOOMATIC_CONFIGURE}" ; then
   BUILD_FOOMATIC="no"
 else
   BUILD_FOOMATIC="yes"
 fi
 # create custom command-line --with option
-echo "$as_me:$LINENO: checking whether to build foomatic data files" >&5
-echo $ECHO_N "checking whether to build foomatic data files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build foomatic data files" >&5
+echo $ECHO_N "checking whether to build foomatic data files... $ECHO_C" >&6; }
 
-# Check whether --with-foomatic or --without-foomatic was given.
+# Check whether --with-foomatic was given.
 if test "${with_foomatic+set}" = set; then
-  withval="$with_foomatic"
-  case "${withval}" in
-
-                yes) BUILD_FOOMATIC="yes" ; echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC}" >&5
-echo "${ECHO_T}${BUILD_FOOMATIC}" >&6 ;;
-                no) BUILD_FOOMATIC="no" ; echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC}" >&5
-echo "${ECHO_T}${BUILD_FOOMATIC}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  withval=$with_foomatic; case "${withval}" in
+
+                yes) BUILD_FOOMATIC="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC}" >&5
+echo "${ECHO_T}${BUILD_FOOMATIC}" >&6; } ;;
+                no) BUILD_FOOMATIC="no" ; { echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC}" >&5
+echo "${ECHO_T}${BUILD_FOOMATIC}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-foomatic" >&5
 echo "$as_me: error: bad value ${withval} for --with-foomatic" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -18915,9 +20561,10 @@ else
   if test -z "${BUILD_FOOMATIC}" ; then
                BUILD_FOOMATIC="(automatic)"
              fi
-             echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC}" >&5
-echo "${ECHO_T}${BUILD_FOOMATIC}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC}" >&5
+echo "${ECHO_T}${BUILD_FOOMATIC}" >&6; } ;
+fi
+
 if test -z "${BUILD_FOOMATIC}" ; then
   BUILD_FOOMATIC="(automatic)"
 fi
@@ -18926,8 +20573,8 @@ fi
 
 # Extract the first word of "foomatic-ppdfile", so it can be a program name with args.
 set dummy foomatic-ppdfile; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_FOOMATIC_PPDFILE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -18942,47 +20589,47 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_FOOMATIC_PPDFILE="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 FOOMATIC_PPDFILE=$ac_cv_path_FOOMATIC_PPDFILE
-
 if test -n "$FOOMATIC_PPDFILE"; then
-  echo "$as_me:$LINENO: result: $FOOMATIC_PPDFILE" >&5
-echo "${ECHO_T}$FOOMATIC_PPDFILE" >&6
+  { echo "$as_me:$LINENO: result: $FOOMATIC_PPDFILE" >&5
+echo "${ECHO_T}$FOOMATIC_PPDFILE" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 if test -z "${FOOMATIC_PPDFILE}" ; then
   BUILD_FOOMATIC_3="no"
 else
   BUILD_FOOMATIC_3="yes"
 fi
 # create custom command-line --with option
-echo "$as_me:$LINENO: checking whether to make use of foomatic 3 extra features" >&5
-echo $ECHO_N "checking whether to make use of foomatic 3 extra features... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to make use of foomatic 3 extra features" >&5
+echo $ECHO_N "checking whether to make use of foomatic 3 extra features... $ECHO_C" >&6; }
 
-# Check whether --with-foomatic3 or --without-foomatic3 was given.
+# Check whether --with-foomatic3 was given.
 if test "${with_foomatic3+set}" = set; then
-  withval="$with_foomatic3"
-  case "${withval}" in
-
-                yes) BUILD_FOOMATIC_3="yes" ; echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC_3}" >&5
-echo "${ECHO_T}${BUILD_FOOMATIC_3}" >&6 ;;
-                no) BUILD_FOOMATIC_3="no" ; echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC_3}" >&5
-echo "${ECHO_T}${BUILD_FOOMATIC_3}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  withval=$with_foomatic3; case "${withval}" in
+
+                yes) BUILD_FOOMATIC_3="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC_3}" >&5
+echo "${ECHO_T}${BUILD_FOOMATIC_3}" >&6; } ;;
+                no) BUILD_FOOMATIC_3="no" ; { echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC_3}" >&5
+echo "${ECHO_T}${BUILD_FOOMATIC_3}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-foomatic3" >&5
 echo "$as_me: error: bad value ${withval} for --with-foomatic3" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -18992,9 +20639,10 @@ else
   if test -z "${BUILD_FOOMATIC_3}" ; then
                BUILD_FOOMATIC_3="(automatic)"
              fi
-             echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC_3}" >&5
-echo "${ECHO_T}${BUILD_FOOMATIC_3}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC_3}" >&5
+echo "${ECHO_T}${BUILD_FOOMATIC_3}" >&6; } ;
+fi
+
 if test -z "${BUILD_FOOMATIC_3}" ; then
   BUILD_FOOMATIC_3="(automatic)"
 fi
@@ -19002,8 +20650,8 @@ fi
 
 # Extract the first word of "ijs-config", so it can be a program name with args.
 set dummy ijs-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_IJS_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -19018,48 +20666,48 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_IJS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 IJS_CONFIG=$ac_cv_path_IJS_CONFIG
-
 if test -n "$IJS_CONFIG"; then
-  echo "$as_me:$LINENO: result: $IJS_CONFIG" >&5
-echo "${ECHO_T}$IJS_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $IJS_CONFIG" >&5
+echo "${ECHO_T}$IJS_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
+
 if test -z "${IJS_CONFIG}"  ; then
   BUILD_GHOSTSCRIPT="no"
 else
   BUILD_GHOSTSCRIPT="yes"
 fi
 # create custom command-line --with option
-echo "$as_me:$LINENO: checking whether to build Ghostscript driver" >&5
-echo $ECHO_N "checking whether to build Ghostscript driver... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build Ghostscript driver" >&5
+echo $ECHO_N "checking whether to build Ghostscript driver... $ECHO_C" >&6; }
 
-# Check whether --with-ghostscript or --without-ghostscript was given.
+# Check whether --with-ghostscript was given.
 if test "${with_ghostscript+set}" = set; then
-  withval="$with_ghostscript"
-  case "${withval}" in
-
-                yes) BUILD_GHOSTSCRIPT="yes" ; echo "$as_me:$LINENO: result: ${BUILD_GHOSTSCRIPT}" >&5
-echo "${ECHO_T}${BUILD_GHOSTSCRIPT}" >&6 ;;
-                no) BUILD_GHOSTSCRIPT="no" ; echo "$as_me:$LINENO: result: ${BUILD_GHOSTSCRIPT}" >&5
-echo "${ECHO_T}${BUILD_GHOSTSCRIPT}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  withval=$with_ghostscript; case "${withval}" in
+
+                yes) BUILD_GHOSTSCRIPT="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_GHOSTSCRIPT}" >&5
+echo "${ECHO_T}${BUILD_GHOSTSCRIPT}" >&6; } ;;
+                no) BUILD_GHOSTSCRIPT="no" ; { echo "$as_me:$LINENO: result: ${BUILD_GHOSTSCRIPT}" >&5
+echo "${ECHO_T}${BUILD_GHOSTSCRIPT}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-ghostscript" >&5
 echo "$as_me: error: bad value ${withval} for --with-ghostscript" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -19069,33 +20717,33 @@ else
   if test -z "${BUILD_GHOSTSCRIPT}" ; then
                BUILD_GHOSTSCRIPT="(automatic)"
              fi
-             echo "$as_me:$LINENO: result: ${BUILD_GHOSTSCRIPT}" >&5
-echo "${ECHO_T}${BUILD_GHOSTSCRIPT}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${BUILD_GHOSTSCRIPT}" >&5
+echo "${ECHO_T}${BUILD_GHOSTSCRIPT}" >&6; } ;
+fi
+
 if test -z "${BUILD_GHOSTSCRIPT}" ; then
   BUILD_GHOSTSCRIPT="(automatic)"
 fi
 
 
 # create custom command-line --with option
-echo "$as_me:$LINENO: checking whether to enable loadable modules" >&5
-echo $ECHO_N "checking whether to enable loadable modules... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to enable loadable modules" >&5
+echo $ECHO_N "checking whether to enable loadable modules... $ECHO_C" >&6; }
 
-# Check whether --with-modules or --without-modules was given.
+# Check whether --with-modules was given.
 if test "${with_modules+set}" = set; then
-  withval="$with_modules"
-  case "${withval}" in
-
-    yes) WITH_MODULES="yes";  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6 ;;
-    no) WITH_MODULES="no";  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6 ;;
-    ltdl) WITH_MODULES="ltdl";  echo "$as_me:$LINENO: result: ltdl" >&5
-echo "${ECHO_T}ltdl" >&6 ;;
-    dlopen) WITH_MODULES="dlopen";  echo "$as_me:$LINENO: result: dlopen" >&5
-echo "${ECHO_T}dlopen" >&6 ;;
-    static) WITH_MODULES="static";  echo "$as_me:$LINENO: result: static" >&5
-echo "${ECHO_T}static" >&6 ;;
+  withval=$with_modules; case "${withval}" in
+
+    yes) WITH_MODULES="yes";  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; } ;;
+    no) WITH_MODULES="no";  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; } ;;
+    ltdl) WITH_MODULES="ltdl";  { echo "$as_me:$LINENO: result: ltdl" >&5
+echo "${ECHO_T}ltdl" >&6; } ;;
+    dlopen) WITH_MODULES="dlopen";  { echo "$as_me:$LINENO: result: dlopen" >&5
+echo "${ECHO_T}dlopen" >&6; } ;;
+    static) WITH_MODULES="static";  { echo "$as_me:$LINENO: result: static" >&5
+echo "${ECHO_T}static" >&6; } ;;
     *) { { echo "$as_me:$LINENO: error: ${withval}: not a valid module loader" >&5
 echo "$as_me: error: ${withval}: not a valid module loader" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -19105,15 +20753,16 @@ else
   if test -z "${WITH_MODULES}" ; then
                WITH_MODULES="(automatic)"
              fi
-             echo "$as_me:$LINENO: result: ${WITH_MODULES}" >&5
-echo "${ECHO_T}${WITH_MODULES}" >&6 ;
+             { echo "$as_me:$LINENO: result: ${WITH_MODULES}" >&5
+echo "${ECHO_T}${WITH_MODULES}" >&6; } ;
     # if static libraries are enabled, modules must be static
     if test x$enable_static = xyes; then
       WITH_MODULES="static"
     else
       WITH_MODULES="yes"
     fi
-fi;
+fi
+
 if test -z "${WITH_MODULES}" ; then
   WITH_MODULES="(automatic)"
 fi
@@ -19133,19 +20782,18 @@ echo "$as_me: error: --disable-static must be used with --with-modules" >&2;}
 fi
 
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to turn on debugging in build" >&5
-echo $ECHO_N "checking whether to turn on debugging in build... $ECHO_C" >&6
-# Check whether --enable-debug or --disable-debug was given.
+{ echo "$as_me:$LINENO: checking whether to turn on debugging in build" >&5
+echo $ECHO_N "checking whether to turn on debugging in build... $ECHO_C" >&6; }
+# Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then
-  enableval="$enable_debug"
-  case "${enableval}" in
-
-                yes) ENABLE_DEBUG="yes" ; echo "$as_me:$LINENO: result: ${ENABLE_DEBUG}" >&5
-echo "${ECHO_T}${ENABLE_DEBUG}" >&6 ;;
-                no) ENABLE_DEBUG="no" ; echo "$as_me:$LINENO: result: ${ENABLE_DEBUG}" >&5
-echo "${ECHO_T}${ENABLE_DEBUG}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  enableval=$enable_debug; case "${enableval}" in
+
+                yes) ENABLE_DEBUG="yes" ; { echo "$as_me:$LINENO: result: ${ENABLE_DEBUG}" >&5
+echo "${ECHO_T}${ENABLE_DEBUG}" >&6; } ;;
+                no) ENABLE_DEBUG="no" ; { echo "$as_me:$LINENO: result: ${ENABLE_DEBUG}" >&5
+echo "${ECHO_T}${ENABLE_DEBUG}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-debug" >&5
 echo "$as_me: error: bad value ${enableval} for --enable-debug" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -19155,28 +20803,28 @@ else
   if test -z "${ENABLE_DEBUG}" ; then
                ENABLE_DEBUG="no"
              fi
-             echo "$as_me:$LINENO: result: ${ENABLE_DEBUG}" >&5
-echo "${ECHO_T}${ENABLE_DEBUG}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${ENABLE_DEBUG}" >&5
+echo "${ECHO_T}${ENABLE_DEBUG}" >&6; } ;
+fi
+
 if test -z "${ENABLE_DEBUG}" ; then
   ENABLE_DEBUG="no"
 fi
 
 
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to turn on profiling in build" >&5
-echo $ECHO_N "checking whether to turn on profiling in build... $ECHO_C" >&6
-# Check whether --enable-profile or --disable-profile was given.
+{ echo "$as_me:$LINENO: checking whether to turn on profiling in build" >&5
+echo $ECHO_N "checking whether to turn on profiling in build... $ECHO_C" >&6; }
+# Check whether --enable-profile was given.
 if test "${enable_profile+set}" = set; then
-  enableval="$enable_profile"
-  case "${enableval}" in
-
-                yes) ENABLE_PROFILE="yes" ; echo "$as_me:$LINENO: result: ${ENABLE_PROFILE}" >&5
-echo "${ECHO_T}${ENABLE_PROFILE}" >&6 ;;
-                no) ENABLE_PROFILE="no" ; echo "$as_me:$LINENO: result: ${ENABLE_PROFILE}" >&5
-echo "${ECHO_T}${ENABLE_PROFILE}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  enableval=$enable_profile; case "${enableval}" in
+
+                yes) ENABLE_PROFILE="yes" ; { echo "$as_me:$LINENO: result: ${ENABLE_PROFILE}" >&5
+echo "${ECHO_T}${ENABLE_PROFILE}" >&6; } ;;
+                no) ENABLE_PROFILE="no" ; { echo "$as_me:$LINENO: result: ${ENABLE_PROFILE}" >&5
+echo "${ECHO_T}${ENABLE_PROFILE}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-profile" >&5
 echo "$as_me: error: bad value ${enableval} for --enable-profile" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -19186,44 +20834,45 @@ else
   if test -z "${ENABLE_PROFILE}" ; then
                ENABLE_PROFILE="no"
              fi
-             echo "$as_me:$LINENO: result: ${ENABLE_PROFILE}" >&5
-echo "${ECHO_T}${ENABLE_PROFILE}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${ENABLE_PROFILE}" >&5
+echo "${ECHO_T}${ENABLE_PROFILE}" >&6; } ;
+fi
+
 if test -z "${ENABLE_PROFILE}" ; then
   ENABLE_PROFILE="no"
 fi
 
 
 # create custom command-line --with option
-echo "$as_me:$LINENO: checking whether to use readline" >&5
-echo $ECHO_N "checking whether to use readline... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to use readline" >&5
+echo $ECHO_N "checking whether to use readline... $ECHO_C" >&6; }
 
-# Check whether --with-readline or --without-readline was given.
+# Check whether --with-readline was given.
 if test "${with_readline+set}" = set; then
-  withval="$with_readline"
-  case "${withval}" in
+  withval=$with_readline; case "${withval}" in
 
-    yes) USE_READLINE="yes" ; echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6 ;;
-    no) USE_READLINE="no" ; echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6 ;;
+    yes) USE_READLINE="yes" ; { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; } ;;
+    no) USE_READLINE="no" ; { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; } ;;
     only) USE_READLINE="yes"
           EXTRA_LIBREADLINE_DEPS=" "
-          echo "$as_me:$LINENO: result: yes (using only readline)" >&5
-echo "${ECHO_T}yes (using only readline)" >&6 ;;
+          { echo "$as_me:$LINENO: result: yes (using only readline)" >&5
+echo "${ECHO_T}yes (using only readline)" >&6; } ;;
     *) USE_READLINE="yes"
        EXTRA_LIBREADLINE_DEPS="${withval}"
-       echo "$as_me:$LINENO: result: yes (using extra libraries ${withval})" >&5
-echo "${ECHO_T}yes (using extra libraries ${withval})" >&6 ;;
+       { echo "$as_me:$LINENO: result: yes (using extra libraries ${withval})" >&5
+echo "${ECHO_T}yes (using extra libraries ${withval})" >&6; } ;;
 
 	    esac
 else
   if test -z "${USE_READLINE}" ; then
                USE_READLINE="yes"
              fi
-             echo "$as_me:$LINENO: result: ${USE_READLINE}" >&5
-echo "${ECHO_T}${USE_READLINE}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${USE_READLINE}" >&5
+echo "${ECHO_T}${USE_READLINE}" >&6; } ;
+fi
+
 if test -z "${USE_READLINE}" ; then
   USE_READLINE="yes"
 fi
@@ -19233,8 +20882,8 @@ for ac_prog in gimptool-1.2 gimptool
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GIMPTOOL_CHECK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -19249,27 +20898,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GIMPTOOL_CHECK="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 GIMPTOOL_CHECK=$ac_cv_path_GIMPTOOL_CHECK
-
 if test -n "$GIMPTOOL_CHECK"; then
-  echo "$as_me:$LINENO: result: $GIMPTOOL_CHECK" >&5
-echo "${ECHO_T}$GIMPTOOL_CHECK" >&6
+  { echo "$as_me:$LINENO: result: $GIMPTOOL_CHECK" >&5
+echo "${ECHO_T}$GIMPTOOL_CHECK" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$GIMPTOOL_CHECK" && break
 done
 
@@ -19288,28 +20938,28 @@ else
 fi
 
 
-# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+# Check whether --with-gtk-prefix was given.
 if test "${with_gtk_prefix+set}" = set; then
-  withval="$with_gtk_prefix"
-  gtk_config_prefix="$withval"
+  withval=$with_gtk_prefix; gtk_config_prefix="$withval"
 else
   gtk_config_prefix=""
-fi;
+fi
+
 
-# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
+# Check whether --with-gtk-exec-prefix was given.
 if test "${with_gtk_exec_prefix+set}" = set; then
-  withval="$with_gtk_exec_prefix"
-  gtk_config_exec_prefix="$withval"
+  withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval"
 else
   gtk_config_exec_prefix=""
-fi;
-# Check whether --enable-gtktest or --disable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then
-  enableval="$enable_gtktest"
+fi
 
+# Check whether --enable-gtktest was given.
+if test "${enable_gtktest+set}" = set; then
+  enableval=$enable_gtktest;
 else
   enable_gtktest=yes
-fi;
+fi
+
 
   for module in .
   do
@@ -19335,8 +20985,8 @@ fi;
 
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -19351,31 +21001,32 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
   ;;
 esac
 fi
 GTK_CONFIG=$ac_cv_path_GTK_CONFIG
-
 if test -n "$GTK_CONFIG"; then
-  echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
-echo "${ECHO_T}$GTK_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
+echo "${ECHO_T}$GTK_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   min_gtk_version=1.2.0
-  echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
-echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
+echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; }
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -19480,13 +21131,22 @@ main ()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -19499,20 +21159,22 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 no_gtk=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then
-     echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+     { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
      BUILD_LIBGUTENPRINTUI="yes"
   GUTENPRINTUI_LIBDEPS="${GUTENPRINTUI_LIBDEPS} ${GTK_LIBS}"
   else
-     echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+     { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
      if test "$GTK_CONFIG" = "no" ; then
        echo "*** The gtk-config script installed by GTK could not be found"
        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
@@ -19544,24 +21206,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -19583,12 +21257,13 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- echo "*** The test program failed to compile or link. See the file config.log for the"
+	 echo "*** The test program failed to compile or link. See the file config.log for the"
           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
           echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
@@ -19604,20 +21279,19 @@ rm -f conftest.err conftest.$ac_objext \
 
 
 # create custom command-line --with option
-echo "$as_me:$LINENO: checking whether to build GIMP 1.2 Print plugin" >&5
-echo $ECHO_N "checking whether to build GIMP 1.2 Print plugin... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build GIMP 1.2 Print plugin" >&5
+echo $ECHO_N "checking whether to build GIMP 1.2 Print plugin... $ECHO_C" >&6; }
 
-# Check whether --with-gimp or --without-gimp was given.
+# Check whether --with-gimp was given.
 if test "${with_gimp+set}" = set; then
-  withval="$with_gimp"
-  case "${withval}" in
-
-                yes) BUILD_GIMP="yes" ; echo "$as_me:$LINENO: result: ${BUILD_GIMP}" >&5
-echo "${ECHO_T}${BUILD_GIMP}" >&6 ;;
-                no) BUILD_GIMP="no" ; echo "$as_me:$LINENO: result: ${BUILD_GIMP}" >&5
-echo "${ECHO_T}${BUILD_GIMP}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  withval=$with_gimp; case "${withval}" in
+
+                yes) BUILD_GIMP="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_GIMP}" >&5
+echo "${ECHO_T}${BUILD_GIMP}" >&6; } ;;
+                no) BUILD_GIMP="no" ; { echo "$as_me:$LINENO: result: ${BUILD_GIMP}" >&5
+echo "${ECHO_T}${BUILD_GIMP}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-gimp" >&5
 echo "$as_me: error: bad value ${withval} for --with-gimp" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -19627,28 +21301,28 @@ else
   if test -z "${BUILD_GIMP}" ; then
                BUILD_GIMP="(automatic)"
              fi
-             echo "$as_me:$LINENO: result: ${BUILD_GIMP}" >&5
-echo "${ECHO_T}${BUILD_GIMP}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${BUILD_GIMP}" >&5
+echo "${ECHO_T}${BUILD_GIMP}" >&6; } ;
+fi
+
 if test -z "${BUILD_GIMP}" ; then
   BUILD_GIMP="(automatic)"
 fi
 
 
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to build Gutenprint GTK+-1.2 user interface library" >&5
-echo $ECHO_N "checking whether to build Gutenprint GTK+-1.2 user interface library... $ECHO_C" >&6
-# Check whether --enable-libgutenprintui or --disable-libgutenprintui was given.
+{ echo "$as_me:$LINENO: checking whether to build Gutenprint GTK+-1.2 user interface library" >&5
+echo $ECHO_N "checking whether to build Gutenprint GTK+-1.2 user interface library... $ECHO_C" >&6; }
+# Check whether --enable-libgutenprintui was given.
 if test "${enable_libgutenprintui+set}" = set; then
-  enableval="$enable_libgutenprintui"
-  case "${enableval}" in
-
-                yes) BUILD_LIBGUTENPRINTUI="yes" ; echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI}" >&5
-echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI}" >&6 ;;
-                no) BUILD_LIBGUTENPRINTUI="no" ; echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI}" >&5
-echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  enableval=$enable_libgutenprintui; case "${enableval}" in
+
+                yes) BUILD_LIBGUTENPRINTUI="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI}" >&5
+echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI}" >&6; } ;;
+                no) BUILD_LIBGUTENPRINTUI="no" ; { echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI}" >&5
+echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-libgutenprintui" >&5
 echo "$as_me: error: bad value ${enableval} for --enable-libgutenprintui" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -19658,9 +21332,10 @@ else
   if test -z "${BUILD_LIBGUTENPRINTUI}" ; then
                BUILD_LIBGUTENPRINTUI="(automatic)"
              fi
-             echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI}" >&5
-echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI}" >&5
+echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI}" >&6; } ;
+fi
+
 if test -z "${BUILD_LIBGUTENPRINTUI}" ; then
   BUILD_LIBGUTENPRINTUI="(automatic)"
 fi
@@ -19670,8 +21345,8 @@ for ac_prog in gimptool-2.0 gimptool
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GIMPTOOL2_CHECK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -19686,27 +21361,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GIMPTOOL2_CHECK="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 GIMPTOOL2_CHECK=$ac_cv_path_GIMPTOOL2_CHECK
-
 if test -n "$GIMPTOOL2_CHECK"; then
-  echo "$as_me:$LINENO: result: $GIMPTOOL2_CHECK" >&5
-echo "${ECHO_T}$GIMPTOOL2_CHECK" >&6
+  { echo "$as_me:$LINENO: result: $GIMPTOOL2_CHECK" >&5
+echo "${ECHO_T}$GIMPTOOL2_CHECK" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$GIMPTOOL2_CHECK" && break
 done
 
@@ -19736,8 +21412,8 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -19752,34 +21428,35 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -19794,28 +21471,42 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  PKG_CONFIG=$ac_pt_PKG_CONFIG
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
 else
   PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
@@ -19823,22 +21514,22 @@ fi
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
+	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+		{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	else
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+		{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 		PKG_CONFIG=""
 	fi
 
 fi
 
 pkg_failed=no
-echo "$as_me:$LINENO: checking for GTK2" >&5
-echo $ECHO_N "checking for GTK2... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for GTK2" >&5
+echo $ECHO_N "checking for GTK2... $ECHO_C" >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$GTK2_CFLAGS"; then
@@ -19902,8 +21593,8 @@ elif test $pkg_failed = untried; then
 else
 	GTK2_CFLAGS=$pkg_cv_GTK2_CFLAGS
 	GTK2_LIBS=$pkg_cv_GTK2_LIBS
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	HAVE_GTK2=yes
                    BUILD_LIBGUTENPRINTUI2=yes
                    GUTENPRINTUI2_LIBDEPS="${GUTENPRINTUI2_LIBDEPS} ${GTK2_LIBS}"
@@ -19912,8 +21603,8 @@ fi
 if test x$BUILD_GIMP2 = xyes; then
 
 pkg_failed=no
-echo "$as_me:$LINENO: checking for GIMP2" >&5
-echo $ECHO_N "checking for GIMP2... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for GIMP2" >&5
+echo $ECHO_N "checking for GIMP2... $ECHO_C" >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$GIMP2_CFLAGS"; then
@@ -19975,27 +21666,26 @@ elif test $pkg_failed = untried; then
 else
 	GIMP2_CFLAGS=$pkg_cv_GIMP2_CFLAGS
 	GIMP2_LIBS=$pkg_cv_GIMP2_LIBS
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 	BUILD_GIMP2=yes
 fi
 fi
 
 # create custom command-line --with option
-echo "$as_me:$LINENO: checking whether to build GIMP 2.0 Print plugin" >&5
-echo $ECHO_N "checking whether to build GIMP 2.0 Print plugin... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to build GIMP 2.x Print plugin" >&5
+echo $ECHO_N "checking whether to build GIMP 2.x Print plugin... $ECHO_C" >&6; }
 
-# Check whether --with-gimp2 or --without-gimp2 was given.
+# Check whether --with-gimp2 was given.
 if test "${with_gimp2+set}" = set; then
-  withval="$with_gimp2"
-  case "${withval}" in
-
-                yes) BUILD_GIMP2="yes" ; echo "$as_me:$LINENO: result: ${BUILD_GIMP2}" >&5
-echo "${ECHO_T}${BUILD_GIMP2}" >&6 ;;
-                no) BUILD_GIMP2="no" ; echo "$as_me:$LINENO: result: ${BUILD_GIMP2}" >&5
-echo "${ECHO_T}${BUILD_GIMP2}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  withval=$with_gimp2; case "${withval}" in
+
+                yes) BUILD_GIMP2="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_GIMP2}" >&5
+echo "${ECHO_T}${BUILD_GIMP2}" >&6; } ;;
+                no) BUILD_GIMP2="no" ; { echo "$as_me:$LINENO: result: ${BUILD_GIMP2}" >&5
+echo "${ECHO_T}${BUILD_GIMP2}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-gimp2" >&5
 echo "$as_me: error: bad value ${withval} for --with-gimp2" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -20005,29 +21695,29 @@ else
   if test -z "${BUILD_GIMP2}" ; then
                BUILD_GIMP2="(automatic)"
              fi
-             echo "$as_me:$LINENO: result: ${BUILD_GIMP2}" >&5
-echo "${ECHO_T}${BUILD_GIMP2}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${BUILD_GIMP2}" >&5
+echo "${ECHO_T}${BUILD_GIMP2}" >&6; } ;
+fi
+
 if test -z "${BUILD_GIMP2}" ; then
   BUILD_GIMP2="(automatic)"
 fi
 
 
 # create custom command-line --with option
-echo "$as_me:$LINENO: checking whether to name GIMP 2.x Print plugin gutenprint (requires GIMP 2.2; normally used with GIMP 2.4 or above)" >&5
-echo $ECHO_N "checking whether to name GIMP 2.x Print plugin gutenprint (requires GIMP 2.2; normally used with GIMP 2.4 or above)... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether to name GIMP 2.x Print plugin gutenprint (requires GIMP 2.2; normally used with GIMP 2.4 or above)" >&5
+echo $ECHO_N "checking whether to name GIMP 2.x Print plugin gutenprint (requires GIMP 2.2; normally used with GIMP 2.4 or above)... $ECHO_C" >&6; }
 
-# Check whether --with-gimp2-as-gutenprint or --without-gimp2-as-gutenprint was given.
+# Check whether --with-gimp2-as-gutenprint was given.
 if test "${with_gimp2_as_gutenprint+set}" = set; then
-  withval="$with_gimp2_as_gutenprint"
-  case "${withval}" in
-
-                yes) BUILD_GIMP2_AS_GUTENPRINT="yes" ; echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
-echo "${ECHO_T}${BUILD_GIMP2_AS_GUTENPRINT}" >&6 ;;
-                no) BUILD_GIMP2_AS_GUTENPRINT="no" ; echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
-echo "${ECHO_T}${BUILD_GIMP2_AS_GUTENPRINT}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  withval=$with_gimp2_as_gutenprint; case "${withval}" in
+
+                yes) BUILD_GIMP2_AS_GUTENPRINT="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
+echo "${ECHO_T}${BUILD_GIMP2_AS_GUTENPRINT}" >&6; } ;;
+                no) BUILD_GIMP2_AS_GUTENPRINT="no" ; { echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
+echo "${ECHO_T}${BUILD_GIMP2_AS_GUTENPRINT}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-gimp2-as-gutenprint" >&5
 echo "$as_me: error: bad value ${withval} for --with-gimp2-as-gutenprint" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -20037,28 +21727,28 @@ else
   if test -z "${BUILD_GIMP2_AS_GUTENPRINT}" ; then
                BUILD_GIMP2_AS_GUTENPRINT="(automatic)"
              fi
-             echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
-echo "${ECHO_T}${BUILD_GIMP2_AS_GUTENPRINT}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
+echo "${ECHO_T}${BUILD_GIMP2_AS_GUTENPRINT}" >&6; } ;
+fi
+
 if test -z "${BUILD_GIMP2_AS_GUTENPRINT}" ; then
   BUILD_GIMP2_AS_GUTENPRINT="(automatic)"
 fi
 
 
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to build Gutenprint GTK+-2.0 user interface library" >&5
-echo $ECHO_N "checking whether to build Gutenprint GTK+-2.0 user interface library... $ECHO_C" >&6
-# Check whether --enable-libgutenprintui2 or --disable-libgutenprintui2 was given.
+{ echo "$as_me:$LINENO: checking whether to build Gutenprint GTK+-2.0 user interface library" >&5
+echo $ECHO_N "checking whether to build Gutenprint GTK+-2.0 user interface library... $ECHO_C" >&6; }
+# Check whether --enable-libgutenprintui2 was given.
 if test "${enable_libgutenprintui2+set}" = set; then
-  enableval="$enable_libgutenprintui2"
-  case "${enableval}" in
-
-                yes) BUILD_LIBGUTENPRINTUI2="yes" ; echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI2}" >&5
-echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI2}" >&6 ;;
-                no) BUILD_LIBGUTENPRINTUI2="no" ; echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI2}" >&5
-echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI2}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  enableval=$enable_libgutenprintui2; case "${enableval}" in
+
+                yes) BUILD_LIBGUTENPRINTUI2="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI2}" >&5
+echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI2}" >&6; } ;;
+                no) BUILD_LIBGUTENPRINTUI2="no" ; { echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI2}" >&5
+echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI2}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-libgutenprintui2" >&5
 echo "$as_me: error: bad value ${enableval} for --enable-libgutenprintui2" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -20068,28 +21758,28 @@ else
   if test -z "${BUILD_LIBGUTENPRINTUI2}" ; then
                BUILD_LIBGUTENPRINTUI2="(automatic)"
              fi
-             echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI2}" >&5
-echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI2}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI2}" >&5
+echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI2}" >&6; } ;
+fi
+
 if test -z "${BUILD_LIBGUTENPRINTUI2}" ; then
   BUILD_LIBGUTENPRINTUI2="(automatic)"
 fi
 
 
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to install sample images" >&5
-echo $ECHO_N "checking whether to install sample images... $ECHO_C" >&6
-# Check whether --enable-samples or --disable-samples was given.
+{ echo "$as_me:$LINENO: checking whether to install sample images" >&5
+echo $ECHO_N "checking whether to install sample images... $ECHO_C" >&6; }
+# Check whether --enable-samples was given.
 if test "${enable_samples+set}" = set; then
-  enableval="$enable_samples"
-  case "${enableval}" in
-
-                yes) INSTALL_SAMPLES="yes" ; echo "$as_me:$LINENO: result: ${INSTALL_SAMPLES}" >&5
-echo "${ECHO_T}${INSTALL_SAMPLES}" >&6 ;;
-                no) INSTALL_SAMPLES="no" ; echo "$as_me:$LINENO: result: ${INSTALL_SAMPLES}" >&5
-echo "${ECHO_T}${INSTALL_SAMPLES}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  enableval=$enable_samples; case "${enableval}" in
+
+                yes) INSTALL_SAMPLES="yes" ; { echo "$as_me:$LINENO: result: ${INSTALL_SAMPLES}" >&5
+echo "${ECHO_T}${INSTALL_SAMPLES}" >&6; } ;;
+                no) INSTALL_SAMPLES="no" ; { echo "$as_me:$LINENO: result: ${INSTALL_SAMPLES}" >&5
+echo "${ECHO_T}${INSTALL_SAMPLES}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-samples" >&5
 echo "$as_me: error: bad value ${enableval} for --enable-samples" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -20099,28 +21789,28 @@ else
   if test -z "${INSTALL_SAMPLES}" ; then
                INSTALL_SAMPLES="yes"
              fi
-             echo "$as_me:$LINENO: result: ${INSTALL_SAMPLES}" >&5
-echo "${ECHO_T}${INSTALL_SAMPLES}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${INSTALL_SAMPLES}" >&5
+echo "${ECHO_T}${INSTALL_SAMPLES}" >&6; } ;
+fi
+
 if test -z "${INSTALL_SAMPLES}" ; then
   INSTALL_SAMPLES="yes"
 fi
 
 
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to build escputil" >&5
-echo $ECHO_N "checking whether to build escputil... $ECHO_C" >&6
-# Check whether --enable-escputil or --disable-escputil was given.
+{ echo "$as_me:$LINENO: checking whether to build escputil" >&5
+echo $ECHO_N "checking whether to build escputil... $ECHO_C" >&6; }
+# Check whether --enable-escputil was given.
 if test "${enable_escputil+set}" = set; then
-  enableval="$enable_escputil"
-  case "${enableval}" in
-
-                yes) BUILD_ESCPUTIL="yes" ; echo "$as_me:$LINENO: result: ${BUILD_ESCPUTIL}" >&5
-echo "${ECHO_T}${BUILD_ESCPUTIL}" >&6 ;;
-                no) BUILD_ESCPUTIL="no" ; echo "$as_me:$LINENO: result: ${BUILD_ESCPUTIL}" >&5
-echo "${ECHO_T}${BUILD_ESCPUTIL}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  enableval=$enable_escputil; case "${enableval}" in
+
+                yes) BUILD_ESCPUTIL="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_ESCPUTIL}" >&5
+echo "${ECHO_T}${BUILD_ESCPUTIL}" >&6; } ;;
+                no) BUILD_ESCPUTIL="no" ; { echo "$as_me:$LINENO: result: ${BUILD_ESCPUTIL}" >&5
+echo "${ECHO_T}${BUILD_ESCPUTIL}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-escputil" >&5
 echo "$as_me: error: bad value ${enableval} for --enable-escputil" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -20130,28 +21820,28 @@ else
   if test -z "${BUILD_ESCPUTIL}" ; then
                BUILD_ESCPUTIL="yes"
              fi
-             echo "$as_me:$LINENO: result: ${BUILD_ESCPUTIL}" >&5
-echo "${ECHO_T}${BUILD_ESCPUTIL}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${BUILD_ESCPUTIL}" >&5
+echo "${ECHO_T}${BUILD_ESCPUTIL}" >&6; } ;
+fi
+
 if test -z "${BUILD_ESCPUTIL}" ; then
   BUILD_ESCPUTIL="yes"
 fi
 
 
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to build test programs" >&5
-echo $ECHO_N "checking whether to build test programs... $ECHO_C" >&6
-# Check whether --enable-test or --disable-test was given.
+{ echo "$as_me:$LINENO: checking whether to build test programs" >&5
+echo $ECHO_N "checking whether to build test programs... $ECHO_C" >&6; }
+# Check whether --enable-test was given.
 if test "${enable_test+set}" = set; then
-  enableval="$enable_test"
-  case "${enableval}" in
-
-                yes) BUILD_TEST="yes" ; echo "$as_me:$LINENO: result: ${BUILD_TEST}" >&5
-echo "${ECHO_T}${BUILD_TEST}" >&6 ;;
-                no) BUILD_TEST="no" ; echo "$as_me:$LINENO: result: ${BUILD_TEST}" >&5
-echo "${ECHO_T}${BUILD_TEST}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  enableval=$enable_test; case "${enableval}" in
+
+                yes) BUILD_TEST="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_TEST}" >&5
+echo "${ECHO_T}${BUILD_TEST}" >&6; } ;;
+                no) BUILD_TEST="no" ; { echo "$as_me:$LINENO: result: ${BUILD_TEST}" >&5
+echo "${ECHO_T}${BUILD_TEST}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-test" >&5
 echo "$as_me: error: bad value ${enableval} for --enable-test" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -20161,9 +21851,10 @@ else
   if test -z "${BUILD_TEST}" ; then
                BUILD_TEST="yes"
              fi
-             echo "$as_me:$LINENO: result: ${BUILD_TEST}" >&5
-echo "${ECHO_T}${BUILD_TEST}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${BUILD_TEST}" >&5
+echo "${ECHO_T}${BUILD_TEST}" >&6; } ;
+fi
+
 if test -z "${BUILD_TEST}" ; then
   BUILD_TEST="yes"
 fi
@@ -20176,19 +21867,18 @@ else
 fi
 
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to build testpattern generator" >&5
-echo $ECHO_N "checking whether to build testpattern generator... $ECHO_C" >&6
-# Check whether --enable-testpattern or --disable-testpattern was given.
+{ echo "$as_me:$LINENO: checking whether to build testpattern generator" >&5
+echo $ECHO_N "checking whether to build testpattern generator... $ECHO_C" >&6; }
+# Check whether --enable-testpattern was given.
 if test "${enable_testpattern+set}" = set; then
-  enableval="$enable_testpattern"
-  case "${enableval}" in
-
-                yes) BUILD_TESTPATTERN="yes" ; echo "$as_me:$LINENO: result: ${BUILD_TESTPATTERN}" >&5
-echo "${ECHO_T}${BUILD_TESTPATTERN}" >&6 ;;
-                no) BUILD_TESTPATTERN="no" ; echo "$as_me:$LINENO: result: ${BUILD_TESTPATTERN}" >&5
-echo "${ECHO_T}${BUILD_TESTPATTERN}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  enableval=$enable_testpattern; case "${enableval}" in
+
+                yes) BUILD_TESTPATTERN="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_TESTPATTERN}" >&5
+echo "${ECHO_T}${BUILD_TESTPATTERN}" >&6; } ;;
+                no) BUILD_TESTPATTERN="no" ; { echo "$as_me:$LINENO: result: ${BUILD_TESTPATTERN}" >&5
+echo "${ECHO_T}${BUILD_TESTPATTERN}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-testpattern" >&5
 echo "$as_me: error: bad value ${enableval} for --enable-testpattern" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -20198,28 +21888,28 @@ else
   if test -z "${BUILD_TESTPATTERN}" ; then
                BUILD_TESTPATTERN="(automatic)"
              fi
-             echo "$as_me:$LINENO: result: ${BUILD_TESTPATTERN}" >&5
-echo "${ECHO_T}${BUILD_TESTPATTERN}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${BUILD_TESTPATTERN}" >&5
+echo "${ECHO_T}${BUILD_TESTPATTERN}" >&6; } ;
+fi
+
 if test -z "${BUILD_TESTPATTERN}" ; then
   BUILD_TESTPATTERN="(automatic)"
 fi
 
 
 # create custom command-line --enable option
-echo "$as_me:$LINENO: checking whether to install GIMP plugin in home directory" >&5
-echo $ECHO_N "checking whether to install GIMP plugin in home directory... $ECHO_C" >&6
-# Check whether --enable-user-install or --disable-user-install was given.
+{ echo "$as_me:$LINENO: checking whether to install GIMP plugin in home directory" >&5
+echo $ECHO_N "checking whether to install GIMP plugin in home directory... $ECHO_C" >&6; }
+# Check whether --enable-user-install was given.
 if test "${enable_user_install+set}" = set; then
-  enableval="$enable_user_install"
-  case "${enableval}" in
-
-                yes) USER_INSTALL="yes" ; echo "$as_me:$LINENO: result: ${USER_INSTALL}" >&5
-echo "${ECHO_T}${USER_INSTALL}" >&6 ;;
-                no) USER_INSTALL="no" ; echo "$as_me:$LINENO: result: ${USER_INSTALL}" >&5
-echo "${ECHO_T}${USER_INSTALL}" >&6 ;;
-                *) echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6
+  enableval=$enable_user_install; case "${enableval}" in
+
+                yes) USER_INSTALL="yes" ; { echo "$as_me:$LINENO: result: ${USER_INSTALL}" >&5
+echo "${ECHO_T}${USER_INSTALL}" >&6; } ;;
+                no) USER_INSTALL="no" ; { echo "$as_me:$LINENO: result: ${USER_INSTALL}" >&5
+echo "${ECHO_T}${USER_INSTALL}" >&6; } ;;
+                *) { echo "$as_me:$LINENO: result: unknown" >&5
+echo "${ECHO_T}unknown" >&6; }
                    { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-user-install" >&5
 echo "$as_me: error: bad value ${enableval} for --enable-user-install" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -20229,9 +21919,10 @@ else
   if test -z "${USER_INSTALL}" ; then
                USER_INSTALL="no"
              fi
-             echo "$as_me:$LINENO: result: ${USER_INSTALL}" >&5
-echo "${ECHO_T}${USER_INSTALL}" >&6 ;
-fi;
+             { echo "$as_me:$LINENO: result: ${USER_INSTALL}" >&5
+echo "${ECHO_T}${USER_INSTALL}" >&6; } ;
+fi
+
 if test -z "${USER_INSTALL}" ; then
   USER_INSTALL="no"
 fi
@@ -20243,13 +21934,14 @@ else
 fi
 
 
-echo "$as_me:$LINENO: checking for library containing strerror" >&5
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
-if test "${ac_cv_search_strerror+set}" = set; then
+
+        { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
+echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; }
+if test "${ac_cv_lib_cposix_strerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_strerror=no
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -20257,124 +21949,81 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-char strerror ();
-int
-main ()
-{
-strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_strerror="none required"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_strerror" = no; then
-  for ac_lib in cposix; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char strerror ();
 int
 main ()
 {
-strerror ();
+return strerror ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_search_strerror="-l$ac_lib"
-break
+  ac_cv_lib_cposix_strerror=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_cv_lib_cposix_strerror=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-  done
+LIBS=$ac_check_lib_save_LIBS
 fi
-LIBS=$ac_func_search_save_LIBS
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
+echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6; }
+if test $ac_cv_lib_cposix_strerror = yes; then
+  LIBS="$LIBS -lcposix"
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-echo "${ECHO_T}$ac_cv_search_strerror" >&6
-if test "$ac_cv_search_strerror" != no; then
-  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
 
-fi
+
 
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20387,25 +22036,27 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
+  { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$AWK" && break
 done
 
@@ -20417,8 +22068,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20431,32 +22082,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20469,36 +22122,51 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20511,74 +22179,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
 
+  fi
 fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20592,7 +22220,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -20603,6 +22231,7 @@ do
   fi
 done
 done
+IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
@@ -20620,22 +22249,23 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
+  for ac_prog in cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20648,36 +22278,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl
+  for ac_prog in cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20690,29 +22322,45 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$ac_ct_CC" && break
 done
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 fi
 
 fi
@@ -20725,27 +22373,41 @@ See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
+echo "$as_me:$LINENO: checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -20768,24 +22430,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -20794,24 +22468,28 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_compiler_gnu=no
+	ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20827,24 +22505,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -20853,12 +22543,131 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_cc_g=no
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -20874,12 +22683,12 @@ else
     CFLAGS=
   fi
 fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_prog_cc_stdc=no
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -20913,12 +22722,17 @@ static char *f (char * (*g) (char **, int), char **p, ...)
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
+   as 'x'.  The following induces an error, until -std is added to get
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
+   that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -20933,210 +22747,188 @@ return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   return 0;
 }
 _ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
+  ac_cv_prog_cc_c89=$ac_arg
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+  xno)
+    { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
   *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+    CC="$CC $ac_cv_prog_cc_c89"
+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CC"   am_compiler_list=
+
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
 
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
+
 fi
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
 
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
+if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -21146,8 +22938,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -21160,32 +22952,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -21198,36 +22992,51 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -21240,74 +23049,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
 
+  fi
 fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -21321,7 +23090,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -21332,6 +23101,7 @@ do
   fi
 done
 done
+IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
@@ -21349,22 +23119,23 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
+  for ac_prog in cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -21377,36 +23148,38 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl
+  for ac_prog in cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -21419,29 +23192,45 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$ac_ct_CC" && break
 done
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 fi
 
 fi
@@ -21454,27 +23243,41 @@ See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
+echo "$as_me:$LINENO: checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -21497,24 +23300,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -21523,24 +23338,28 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_compiler_gnu=no
+	ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21556,24 +23375,147 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -21582,12 +23524,20 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_cc_g=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -21603,12 +23553,12 @@ else
     CFLAGS=
   fi
 fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_prog_cc_stdc=no
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -21642,12 +23592,17 @@ static char *f (char * (*g) (char **, int), char **p, ...)
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
+   as 'x'.  The following induces an error, until -std is added to get
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
+   that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -21662,210 +23617,188 @@ return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   return 0;
 }
 _ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
+  ac_cv_prog_cc_c89=$ac_arg
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+  xno)
+    { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
   *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+    CC="$CC $ac_cv_prog_cc_c89"
+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CC"   am_compiler_list=
+
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
 
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
+
 fi
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
 
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
+if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 
 
 am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
@@ -21883,8 +23816,8 @@ am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21906,7 +23839,7 @@ case $as_dir/ in
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -21925,21 +23858,22 @@ case $as_dir/ in
     ;;
 esac
 done
+IFS=$as_save_IFS
 
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
+    # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -21949,23 +23883,23 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6
+  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6; }
 fi
 
 for ac_prog in flex lex
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_LEX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -21978,33 +23912,35 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LEX="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
-  echo "$as_me:$LINENO: result: $LEX" >&5
-echo "${ECHO_T}$LEX" >&6
+  { echo "$as_me:$LINENO: result: $LEX" >&5
+echo "${ECHO_T}$LEX" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$LEX" && break
 done
 test -n "$LEX" || LEX=":"
 
 if test -z "$LEXLIB"
 then
-  echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
-echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
+echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_fl_yywrap+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22017,40 +23953,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char yywrap ();
 int
 main ()
 {
-yywrap ();
+return yywrap ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -22059,19 +24007,20 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_fl_yywrap=no
+	ac_cv_lib_fl_yywrap=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
-echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
+echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6; }
 if test $ac_cv_lib_fl_yywrap = yes; then
   LEXLIB="-lfl"
 else
-  echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
-echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
+echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6; }
 if test "${ac_cv_lib_l_yywrap+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22084,40 +24033,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char yywrap ();
 int
 main ()
 {
-yywrap ();
+return yywrap ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -22126,14 +24087,15 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_l_yywrap=no
+	ac_cv_lib_l_yywrap=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
-echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
+echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6; }
 if test $ac_cv_lib_l_yywrap = yes; then
   LEXLIB="-ll"
 fi
@@ -22143,8 +24105,8 @@ fi
 fi
 
 if test "x$LEX" != "x:"; then
-  echo "$as_me:$LINENO: checking lex output file root" >&5
-echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking lex output file root" >&5
+echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
 if test "${ac_cv_prog_lex_root+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22154,8 +24116,13 @@ cat >conftest.l <<_ACEOF
 %%
 %%
 _ACEOF
-{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5
-  (eval $LEX conftest.l) 2>&5
+{ (ac_try="$LEX conftest.l"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$LEX conftest.l") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
@@ -22169,13 +24136,13 @@ echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
    { (exit 1); exit 1; }; }
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
-echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
+echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
 rm -f conftest.l
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
-echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
-echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
+echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
 if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22190,24 +24157,36 @@ cat >conftest.$ac_ext <<_ACEOF
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -22216,15 +24195,17 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_save_LIBS
 rm -f "${LEX_OUTPUT_ROOT}.c"
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
-echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
+echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; }
 if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -22241,8 +24222,8 @@ for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_YACC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22255,33 +24236,35 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_YACC="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:$LINENO: result: $YACC" >&5
-echo "${ECHO_T}$YACC" >&6
+  { echo "$as_me:$LINENO: result: $YACC" >&5
+echo "${ECHO_T}$YACC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$YACC" && break
 done
 test -n "$YACC" || YACC="yacc"
 
 # Extract the first word of "find", so it can be a program name with args.
 set dummy find; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_FIND+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22296,31 +24279,32 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 FIND=$ac_cv_path_FIND
-
 if test -n "$FIND"; then
-  echo "$as_me:$LINENO: result: $FIND" >&5
-echo "${ECHO_T}$FIND" >&6
+  { echo "$as_me:$LINENO: result: $FIND" >&5
+echo "${ECHO_T}$FIND" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_PERL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22335,31 +24319,32 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 PERL=$ac_cv_path_PERL
-
 if test -n "$PERL"; then
-  echo "$as_me:$LINENO: result: $PERL" >&5
-echo "${ECHO_T}$PERL" >&6
+  { echo "$as_me:$LINENO: result: $PERL" >&5
+echo "${ECHO_T}$PERL" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 # Extract the first word of "glib-mkenums", so it can be a program name with args.
 set dummy glib-mkenums; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GLIB_MKENUMS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22374,31 +24359,32 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
-
 if test -n "$GLIB_MKENUMS"; then
-  echo "$as_me:$LINENO: result: $GLIB_MKENUMS" >&5
-echo "${ECHO_T}$GLIB_MKENUMS" >&6
+  { echo "$as_me:$LINENO: result: $GLIB_MKENUMS" >&5
+echo "${ECHO_T}$GLIB_MKENUMS" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 # Extract the first word of "convert", so it can be a program name with args.
 set dummy convert; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_CONVERT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22413,27 +24399,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CONVERT="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 CONVERT=$ac_cv_path_CONVERT
-
 if test -n "$CONVERT"; then
-  echo "$as_me:$LINENO: result: $CONVERT" >&5
-echo "${ECHO_T}$CONVERT" >&6
+  { echo "$as_me:$LINENO: result: $CONVERT" >&5
+echo "${ECHO_T}$CONVERT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${CONVERT} = x ; then
     { echo "$as_me:$LINENO: WARNING: PostScript developer's guide cannot be regenerated!" >&5
@@ -22442,8 +24429,8 @@ echo "$as_me: WARNING: PostScript developer's guide cannot be regenerated!" >&2;
 fi
 # Extract the first word of "texi2html", so it can be a program name with args.
 set dummy texi2html; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_TEXI2HTML+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22458,27 +24445,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_TEXI2HTML="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 TEXI2HTML=$ac_cv_path_TEXI2HTML
-
 if test -n "$TEXI2HTML"; then
-  echo "$as_me:$LINENO: result: $TEXI2HTML" >&5
-echo "${ECHO_T}$TEXI2HTML" >&6
+  { echo "$as_me:$LINENO: result: $TEXI2HTML" >&5
+echo "${ECHO_T}$TEXI2HTML" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${TEXI2HTML} = x ; then
     { echo "$as_me:$LINENO: WARNING: HTML documentation cannot be regenerated!" >&5
@@ -22487,8 +24475,8 @@ echo "$as_me: WARNING: HTML documentation cannot be regenerated!" >&2;}
 fi
 # Extract the first word of "dvips", so it can be a program name with args.
 set dummy dvips; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_DVIPS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22503,27 +24491,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DVIPS="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 DVIPS=$ac_cv_path_DVIPS
-
 if test -n "$DVIPS"; then
-  echo "$as_me:$LINENO: result: $DVIPS" >&5
-echo "${ECHO_T}$DVIPS" >&6
+  { echo "$as_me:$LINENO: result: $DVIPS" >&5
+echo "${ECHO_T}$DVIPS" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${DVIPS} = x ; then
     { echo "$as_me:$LINENO: WARNING: PostScript documentation cannot be regenerated!" >&5
@@ -22532,8 +24521,8 @@ echo "$as_me: WARNING: PostScript documentation cannot be regenerated!" >&2;}
 fi
 # Extract the first word of "db2pdf", so it can be a program name with args.
 set dummy db2pdf; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_DB2PDF+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22548,27 +24537,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DB2PDF="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 DB2PDF=$ac_cv_path_DB2PDF
-
 if test -n "$DB2PDF"; then
-  echo "$as_me:$LINENO: result: $DB2PDF" >&5
-echo "${ECHO_T}$DB2PDF" >&6
+  { echo "$as_me:$LINENO: result: $DB2PDF" >&5
+echo "${ECHO_T}$DB2PDF" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${DB2PDF} = x ; then
     { echo "$as_me:$LINENO: WARNING: PDF developer's guide cannot be regenerated!" >&5
@@ -22579,8 +24569,8 @@ for ac_prog in dvipdf dvipdfm
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_DVIPDF+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22595,27 +24585,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DVIPDF="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 DVIPDF=$ac_cv_path_DVIPDF
-
 if test -n "$DVIPDF"; then
-  echo "$as_me:$LINENO: result: $DVIPDF" >&5
-echo "${ECHO_T}$DVIPDF" >&6
+  { echo "$as_me:$LINENO: result: $DVIPDF" >&5
+echo "${ECHO_T}$DVIPDF" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$DVIPDF" && break
 done
 
@@ -22627,8 +24618,8 @@ echo "$as_me: WARNING: PDF documentation cannot be regenerated!" >&2;}
 fi
 # Extract the first word of "db2ps", so it can be a program name with args.
 set dummy db2ps; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_DB2PS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22643,27 +24634,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DB2PS="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 DB2PS=$ac_cv_path_DB2PS
-
 if test -n "$DB2PS"; then
-  echo "$as_me:$LINENO: result: $DB2PS" >&5
-echo "${ECHO_T}$DB2PS" >&6
+  { echo "$as_me:$LINENO: result: $DB2PS" >&5
+echo "${ECHO_T}$DB2PS" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${DB2PS} = x ; then
     { echo "$as_me:$LINENO: WARNING: PostScript developer's guide cannot be regenerated!" >&5
@@ -22672,8 +24664,8 @@ echo "$as_me: WARNING: PostScript developer's guide cannot be regenerated!" >&2;
 fi
 # Extract the first word of "db2html", so it can be a program name with args.
 set dummy db2html; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_DB2HTML+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22688,27 +24680,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DB2HTML="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 DB2HTML=$ac_cv_path_DB2HTML
-
 if test -n "$DB2HTML"; then
-  echo "$as_me:$LINENO: result: $DB2HTML" >&5
-echo "${ECHO_T}$DB2HTML" >&6
+  { echo "$as_me:$LINENO: result: $DB2HTML" >&5
+echo "${ECHO_T}$DB2HTML" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${DB2HTML} = x ; then
     { echo "$as_me:$LINENO: WARNING: HTML developer's guide cannot be regenerated!" >&5
@@ -22717,8 +24710,8 @@ echo "$as_me: WARNING: HTML developer's guide cannot be regenerated!" >&2;}
 fi
 # Extract the first word of "doxygen", so it can be a program name with args.
 set dummy doxygen; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_DOXYGEN+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22733,27 +24726,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 DOXYGEN=$ac_cv_path_DOXYGEN
-
 if test -n "$DOXYGEN"; then
-  echo "$as_me:$LINENO: result: $DOXYGEN" >&5
-echo "${ECHO_T}$DOXYGEN" >&6
+  { echo "$as_me:$LINENO: result: $DOXYGEN" >&5
+echo "${ECHO_T}$DOXYGEN" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${DOXYGEN} = x ; then
     { echo "$as_me:$LINENO: WARNING: HTML developer's guide cannot be regenerated!" >&5
@@ -22764,8 +24758,8 @@ fi
 if test x${BUILD_CUPS} = xyes; then
   # Extract the first word of "dialog", so it can be a program name with args.
 set dummy dialog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_DIALOG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22780,27 +24774,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DIALOG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 DIALOG=$ac_cv_path_DIALOG
-
 if test -n "$DIALOG"; then
-  echo "$as_me:$LINENO: result: $DIALOG" >&5
-echo "${ECHO_T}$DIALOG" >&6
+  { echo "$as_me:$LINENO: result: $DIALOG" >&5
+echo "${ECHO_T}$DIALOG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 
 
@@ -22808,8 +24803,8 @@ if test x${BUILD_FOOMATIC} = xyes ; then
   PATH_SBIN=$PATH:/usr/sbin:/usr/local/sbin
   # Extract the first word of "foomatic-kitload", so it can be a program name with args.
 set dummy foomatic-kitload; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_FOOMATIC_KITLOAD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22824,27 +24819,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_FOOMATIC_KITLOAD="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 FOOMATIC_KITLOAD=$ac_cv_path_FOOMATIC_KITLOAD
-
 if test -n "$FOOMATIC_KITLOAD"; then
-  echo "$as_me:$LINENO: result: $FOOMATIC_KITLOAD" >&5
-echo "${ECHO_T}$FOOMATIC_KITLOAD" >&6
+  { echo "$as_me:$LINENO: result: $FOOMATIC_KITLOAD" >&5
+echo "${ECHO_T}$FOOMATIC_KITLOAD" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   if test -z "$FOOMATIC_KITLOAD" ; then
     { echo "$as_me:$LINENO: WARNING: Cannot find foomatic-kitload; attempt to install foomatic will fail" >&5
 echo "$as_me: WARNING: Cannot find foomatic-kitload; attempt to install foomatic will fail" >&2;}
@@ -22877,8 +24873,8 @@ fi
 
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22905,17 +24901,17 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
+  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
+echo "${ECHO_T}$MSGFMT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
   # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22930,33 +24926,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
   ;;
 esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
-
 if test -n "$GMSGFMT"; then
-  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
+  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+echo "${ECHO_T}$GMSGFMT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
+
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -22983,19 +24980,19 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
+  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+echo "${ECHO_T}$XGETTEXT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
     rm -f messages.po
 
     # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_MSGMERGE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -23021,11 +25018,11 @@ esac
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-echo "${ECHO_T}$MSGMERGE" >&6
+  { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+echo "${ECHO_T}$MSGMERGE" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -23035,8 +25032,8 @@ fi
       : ;
     else
       GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
-echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
+      { echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
+echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
       GMSGFMT=":"
     fi
   fi
@@ -23046,14 +25043,14 @@ echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
        (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
       : ;
     else
-      echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
+      { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
       XGETTEXT=":"
     fi
         rm -f messages.po
   fi
 
-            ac_config_commands="$ac_config_commands default-1"
+  ac_config_commands="$ac_config_commands default-1"
 
 
 
@@ -23073,18 +25070,18 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
   prefix="$acl_save_prefix"
 
 
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+# Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi;
+fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -23113,11 +25110,11 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
 else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
 fi
 if test "${acl_cv_path_LD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23146,17 +25143,17 @@ fi
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
+  { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
 if test "${acl_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -23167,14 +25164,14 @@ else
   acl_cv_prog_gnu_ld=no
 fi
 fi
-echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
+{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
-                                                echo "$as_me:$LINENO: checking for shared library run path origin" >&5
-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
+                                                { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
 if test "${acl_cv_rpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -23186,8 +25183,8 @@ else
     acl_cv_rpath=done
 
 fi
-echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
-echo "${ECHO_T}$acl_cv_rpath" >&6
+{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+echo "${ECHO_T}$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
   libext="$acl_cv_libext"
   shlibext="$acl_cv_shlibext"
@@ -23197,13 +25194,13 @@ echo "${ECHO_T}$acl_cv_rpath" >&6
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
-    # Check whether --enable-rpath or --disable-rpath was given.
+    # Check whether --enable-rpath was given.
 if test "${enable_rpath+set}" = set; then
-  enableval="$enable_rpath"
-  :
+  enableval=$enable_rpath; :
 else
   enable_rpath=yes
-fi;
+fi
+
 
 
 
@@ -23225,10 +25222,9 @@ fi;
   prefix="$acl_save_prefix"
 
 
-# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
+# Check whether --with-libiconv-prefix was given.
 if test "${with_libiconv_prefix+set}" = set; then
-  withval="$with_libiconv_prefix"
-
+  withval=$with_libiconv_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
@@ -23251,7 +25247,8 @@ if test "${with_libiconv_prefix+set}" = set; then
       fi
     fi
 
-fi;
+fi
+
       LIBICONV=
   LTLIBICONV=
   INCICONV=
@@ -23603,17 +25600,17 @@ fi;
 
 
 
-  echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
-    # Check whether --enable-nls or --disable-nls was given.
+  { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
+    # Check whether --enable-nls was given.
 if test "${enable_nls+set}" = set; then
-  enableval="$enable_nls"
-  USE_NLS=$enableval
+  enableval=$enable_nls; USE_NLS=$enableval
 else
   USE_NLS=yes
-fi;
-  echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6
+fi
+
+  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
+echo "${ECHO_T}$USE_NLS" >&6; }
 
 
 
@@ -23629,8 +25626,8 @@ echo "${ECHO_T}$USE_NLS" >&6
 
 
 
-        echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
-echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
+        { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
+echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
 if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -23653,24 +25650,36 @@ return (long) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -23679,13 +25688,14 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-gt_cv_func_gnugettext1_libc=no
+	gt_cv_func_gnugettext1_libc=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
+{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
+echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; }
 
         if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
 
@@ -23718,8 +25728,8 @@ echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
   done
 
 
-  echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for iconv" >&5
+echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
 if test "${am_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -23745,24 +25755,36 @@ iconv_t cd = iconv_open("","");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -23771,8 +25793,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
@@ -23796,24 +25820,36 @@ iconv_t cd = iconv_open("","");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -23823,15 +25859,17 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi
-echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6
+{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+echo "${ECHO_T}$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -23840,10 +25878,10 @@ _ACEOF
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    echo "$as_me:$LINENO: checking how to link with libiconv" >&5
-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
-    echo "$as_me:$LINENO: result: $LIBICONV" >&5
-echo "${ECHO_T}$LIBICONV" >&6
+    { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
+    { echo "$as_me:$LINENO: result: $LIBICONV" >&5
+echo "${ECHO_T}$LIBICONV" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
     LIBICONV=
@@ -23869,10 +25907,9 @@ echo "${ECHO_T}$LIBICONV" >&6
   prefix="$acl_save_prefix"
 
 
-# Check whether --with-libintl-prefix or --without-libintl-prefix was given.
+# Check whether --with-libintl-prefix was given.
 if test "${with_libintl_prefix+set}" = set; then
-  withval="$with_libintl_prefix"
-
+  withval=$with_libintl_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
@@ -23895,7 +25932,8 @@ if test "${with_libintl_prefix+set}" = set; then
       fi
     fi
 
-fi;
+fi
+
       LIBINTL=
   LTLIBINTL=
   INCINTL=
@@ -24231,8 +26269,8 @@ fi;
     done
   fi
 
-          echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
-echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
+          { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
+echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
 if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -24263,24 +26301,36 @@ return (long) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -24289,9 +26339,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-gt_cv_func_gnugettext1_libintl=no
+	gt_cv_func_gnugettext1_libintl=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
                         if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
@@ -24318,24 +26369,36 @@ return (long) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -24347,15 +26410,17 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"
 fi
-echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6
+{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
+echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; }
         fi
 
                                         if test "$gt_cv_func_gnugettext1_libc" = "yes" \
@@ -24386,10 +26451,10 @@ _ACEOF
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
-        echo "$as_me:$LINENO: checking how to link with libintl" >&5
-echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6
-        echo "$as_me:$LINENO: result: $LIBINTL" >&5
-echo "${ECHO_T}$LIBINTL" >&6
+        { echo "$as_me:$LINENO: checking how to link with libintl" >&5
+echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; }
+        { echo "$as_me:$LINENO: result: $LIBINTL" >&5
+echo "${ECHO_T}$LIBINTL" >&6; }
 
   for element in $INCINTL; do
     haveit=
@@ -24470,6 +26535,16 @@ if test "x${datadir}" = 'x${prefix}/share'; then
   else
     PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
   fi
+elif test "x${datadir}" = 'x${datarootdir}'; then
+  if test "x${datarootdir}" = 'x${prefix}/share'; then
+    if test "x${prefix}" = "xNONE"; then
+      PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
+    else
+      PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
+    fi
+  else
+    PACKAGE_DATA_DIR="${datarootdir}/${PACKAGE}"
+  fi
 else
   PACKAGE_DATA_DIR="${datadir}/${PACKAGE}"
 fi
@@ -24518,10 +26593,10 @@ _ACEOF
 
 if test x$ac_compiler_gnu = "xyes"; then
 
-  for stp_ac_arg in -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -finline-limit=1048576 ; do
+  for stp_ac_arg in -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=1048576 ; do
 
-  echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
-echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6; }
   stp_acOLDCFLAGS="${CFLAGS}"
   CFLAGS="${GNUCFLAGS} ${stp_ac_arg}"
   cat >conftest.$ac_ext <<_ACEOF
@@ -24540,38 +26615,52 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6;
-        stp_newCFLAGS="${GNUCFLAGS} ${stp_ac_arg}"
+   { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; };
+        stp_newCFLAGS="$CFLAGS"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6;
+	 { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; };
+	stp_newCFLAGS="$stp_acOLDCFLAGS"
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$stp_acOLDCFLAGS"
   GNUCFLAGS="${stp_newCFLAGS}"
 
@@ -24581,8 +26670,8 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
   for stp_ac_arg in -pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls ; do
 
-  echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
-echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6; }
   stp_acOLDCFLAGS="${CFLAGS}"
   CFLAGS="${GNUCFLAGS} ${stp_ac_arg}"
   cat >conftest.$ac_ext <<_ACEOF
@@ -24601,49 +26690,62 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6;
-        stp_newCFLAGS="${GNUCFLAGS} ${stp_ac_arg}"
+   { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; };
+        stp_newCFLAGS="$CFLAGS"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6;
+	 { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; };
+	stp_newCFLAGS="$stp_acOLDCFLAGS"
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$stp_acOLDCFLAGS"
   GNUCFLAGS="${stp_newCFLAGS}"
 
   done
 
   fi
-else
   if test x$ENABLE_DEBUG = xyes ; then
 
-  echo "$as_me:$LINENO: checking if ${CC} supports -g" >&5
-echo $ECHO_N "checking if ${CC} supports -g... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking if ${CC} supports -g" >&5
+echo $ECHO_N "checking if ${CC} supports -g... $ECHO_C" >&6; }
   stp_acOLDCFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} -g"
   cat >conftest.$ac_ext <<_ACEOF
@@ -24662,38 +26764,52 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6;
-        stp_newCFLAGS="${CFLAGS} -g"
+   { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; };
+        stp_newCFLAGS="$CFLAGS"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6;
+	 { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; };
+	stp_newCFLAGS="$stp_acOLDCFLAGS"
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$stp_acOLDCFLAGS"
   CFLAGS="${stp_newCFLAGS}"
 
@@ -24702,8 +26818,8 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   for stp_ac_arg in -O6 -O3 -O2 -O1 -O ; do
     stp_ac_save_CFLAGS="${CFLAGS}"
 
-  echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
-echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6; }
   stp_acOLDCFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${stp_ac_arg}"
   cat >conftest.$ac_ext <<_ACEOF
@@ -24722,38 +26838,202 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+   { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; };
+        stp_newCFLAGS="$CFLAGS"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	 { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; };
+	stp_newCFLAGS="$stp_acOLDCFLAGS"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS="$stp_acOLDCFLAGS"
+  CFLAGS="${stp_newCFLAGS}"
+
+    test "${stp_ac_save_CFLAGS}" != "${CFLAGS}" && break
+  done
+
+  fi
+else
+  if test x$ENABLE_DEBUG = xyes ; then
+
+  { echo "$as_me:$LINENO: checking if ${CC} supports -g" >&5
+echo $ECHO_N "checking if ${CC} supports -g... $ECHO_C" >&6; }
+  stp_acOLDCFLAGS="${CFLAGS}"
+  CFLAGS="${CFLAGS} -g"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+   { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; };
+        stp_newCFLAGS="$CFLAGS"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	 { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; };
+	stp_newCFLAGS="$stp_acOLDCFLAGS"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS="$stp_acOLDCFLAGS"
+  CFLAGS="${stp_newCFLAGS}"
+
+  else
+
+  for stp_ac_arg in -O ; do
+    stp_ac_save_CFLAGS="${CFLAGS}"
+
+  { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6; }
+  stp_acOLDCFLAGS="${CFLAGS}"
+  CFLAGS="${CFLAGS} ${stp_ac_arg}"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6;
-        stp_newCFLAGS="${CFLAGS} ${stp_ac_arg}"
+   { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; };
+        stp_newCFLAGS="$CFLAGS"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6;
+	 { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; };
+	stp_newCFLAGS="$stp_acOLDCFLAGS"
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$stp_acOLDCFLAGS"
   CFLAGS="${stp_newCFLAGS}"
 
@@ -24764,8 +27044,8 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 if test x$ENABLE_PROFILE = xyes ; then
 
-  echo "$as_me:$LINENO: checking if ${CC} supports -pg" >&5
-echo $ECHO_N "checking if ${CC} supports -pg... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking if ${CC} supports -pg" >&5
+echo $ECHO_N "checking if ${CC} supports -pg... $ECHO_C" >&6; }
   stp_acOLDCFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} -pg"
   cat >conftest.$ac_ext <<_ACEOF
@@ -24784,38 +27064,52 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6;
-        stp_newCFLAGS="${CFLAGS} -pg"
+   { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; };
+        stp_newCFLAGS="$CFLAGS"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6;
+	 { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; };
+	stp_newCFLAGS="$stp_acOLDCFLAGS"
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$stp_acOLDCFLAGS"
   CFLAGS="${stp_newCFLAGS}"
 
@@ -24824,8 +27118,8 @@ fi
 
 
 
-echo "$as_me:$LINENO: checking if $CC supports __attribute__ syntax" >&5
-echo $ECHO_N "checking if $CC supports __attribute__ syntax... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if $CC supports __attribute__ syntax" >&5
+echo $ECHO_N "checking if $CC supports __attribute__ syntax... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -24846,29 +27140,41 @@ test_struct_t mystruct;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
                    cat >>confdefs.h <<\_ACEOF
 #define HAVE_GCC_ATTRIBUTES 1
 _ACEOF
@@ -24877,10 +27183,11 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
@@ -24890,8 +27197,8 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 if test "$USE_READLINE" = yes ; then
   if test "$EXTRA_LIBREADLINE_DEPS" = "" ; then
     unset ac_cv_lib_readline_readline
-    echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
+echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; }
 if test "${ac_cv_lib_readline_readline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -24904,40 +27211,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char readline ();
 int
 main ()
 {
-readline ();
+return readline ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -24946,14 +27265,15 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_readline_readline=no
+	ac_cv_lib_readline_readline=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
+echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; }
 if test $ac_cv_lib_readline_readline = yes; then
   HAVE_LIBREADLINE=true
 else
@@ -24969,8 +27289,8 @@ _ACEOF
 
     else
       unset ac_cv_lib_readline_readline
-      echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6
+      { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
+echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; }
 if test "${ac_cv_lib_readline_readline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -24983,40 +27303,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char readline ();
 int
 main ()
 {
-readline ();
+return readline ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -25025,14 +27357,15 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_readline_readline=no
+	ac_cv_lib_readline_readline=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
+echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; }
 if test $ac_cv_lib_readline_readline = yes; then
   HAVE_LIBREADLINE=true
 else
@@ -25048,8 +27381,8 @@ _ACEOF
 
       else
 	unset ac_cv_lib_readline_readline
-	echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6
+	{ echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
+echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; }
 if test "${ac_cv_lib_readline_readline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -25062,40 +27395,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char readline ();
 int
 main ()
 {
-readline ();
+return readline ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -25104,14 +27449,15 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_readline_readline=no
+	ac_cv_lib_readline_readline=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
+echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; }
 if test $ac_cv_lib_readline_readline = yes; then
   HAVE_LIBREADLINE=true
 else
@@ -25127,8 +27473,8 @@ _ACEOF
 
 	else
 	  unset ac_cv_lib_readline_readline
-	  echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6
+	  { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
+echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; }
 if test "${ac_cv_lib_readline_readline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -25141,40 +27487,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char readline ();
 int
 main ()
 {
-readline ();
+return readline ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -25183,14 +27541,15 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_readline_readline=no
+	ac_cv_lib_readline_readline=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
+echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; }
 if test $ac_cv_lib_readline_readline = yes; then
   HAVE_LIBREADLINE=true
 else
@@ -25213,8 +27572,8 @@ _ACEOF
     fi
   else
     unset ac_cv_lib_readline_readline
-    echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
+echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; }
 if test "${ac_cv_lib_readline_readline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -25227,40 +27586,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char readline ();
 int
 main ()
 {
-readline ();
+return readline ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -25269,14 +27640,15 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_readline_readline=no
+	ac_cv_lib_readline_readline=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
+echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; }
 if test $ac_cv_lib_readline_readline = yes; then
   HAVE_LIBREADLINE=true
 else
@@ -25304,8 +27676,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for lt_dlopen in -lltdl" >&5
-echo $ECHO_N "checking for lt_dlopen in -lltdl... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for lt_dlopen in -lltdl" >&5
+echo $ECHO_N "checking for lt_dlopen in -lltdl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_ltdl_lt_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -25318,40 +27690,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char lt_dlopen ();
 int
 main ()
 {
-lt_dlopen ();
+return lt_dlopen ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -25360,21 +27744,22 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_ltdl_lt_dlopen=no
+	ac_cv_lib_ltdl_lt_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlopen" >&6; }
 if test $ac_cv_lib_ltdl_lt_dlopen = yes; then
   LTDL_LIBS="-lltdl"
 fi
 
 
-echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -25387,40 +27772,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dlopen ();
 int
 main ()
 {
-dlopen ();
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -25429,21 +27826,22 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_dl_dlopen=no
+	ac_cv_lib_dl_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
   DLOPEN_LIBS="-ldl"
 fi
 
 
-echo "$as_me:$LINENO: checking for pow in -lm" >&5
-echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for pow in -lm" >&5
+echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6; }
 if test "${ac_cv_lib_m_pow+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -25456,40 +27854,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char pow ();
 int
 main ()
 {
-pow ();
+return pow ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -25498,22 +27908,23 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_m_pow=no
+	ac_cv_lib_m_pow=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
-echo "${ECHO_T}$ac_cv_lib_m_pow" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
+echo "${ECHO_T}$ac_cv_lib_m_pow" >&6; }
 if test $ac_cv_lib_m_pow = yes; then
   GUTENPRINT_LIBDEPS="${GUTENPRINT_LIBDEPS} -lm"
              gutenprint_libdeps="${gutenprint_libdeps} -lm"
 fi
 
 
-echo "$as_me:$LINENO: checking for pow in -lm" >&5
-echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for pow in -lm" >&5
+echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6; }
 if test "${ac_cv_lib_m_pow+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -25526,40 +27937,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char pow ();
 int
 main ()
 {
-pow ();
+return pow ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -25568,21 +27991,22 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_m_pow=no
+	ac_cv_lib_m_pow=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
-echo "${ECHO_T}$ac_cv_lib_m_pow" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
+echo "${ECHO_T}$ac_cv_lib_m_pow" >&6; }
 if test $ac_cv_lib_m_pow = yes; then
   CUPS_LIBS="${CUPS_LIBS} -lm"
 fi
 
 if test x${BUILD_CUPS} = xyes ; then
-  echo "$as_me:$LINENO: checking for gzgets in -lz" >&5
-echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for gzgets in -lz" >&5
+echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6; }
 if test "${ac_cv_lib_z_gzgets+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -25595,40 +28019,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char gzgets ();
 int
 main ()
 {
-gzgets ();
+return gzgets ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -25637,14 +28073,15 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_z_gzgets=no
+	ac_cv_lib_z_gzgets=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5
-echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5
+echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6; }
 if test $ac_cv_lib_z_gzgets = yes; then
   HAVE_LIBZ=true
 else
@@ -25661,8 +28098,8 @@ _ACEOF
   fi
   # Extract the first word of "cups-config", so it can be a program name with args.
 set dummy cups-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -25677,35 +28114,36 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
-
 if test -n "$CUPS_CONFIG"; then
-  echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5
-echo "${ECHO_T}$CUPS_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5
+echo "${ECHO_T}$CUPS_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   if test "x$CUPS_CONFIG" != x; then
         CUPS_LIBS="`$CUPS_CONFIG --ldflags` `$CUPS_CONFIG --image --libs`"
     CUPS_CFLAGS="`$CUPS_CONFIG --cflags`"
   else
         SAVELIBS="$LIBS"
     LIBS="$LIBS ${CUPS_LIBS}"
-    echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
-echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
+echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; }
 if test "${ac_cv_lib_socket_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -25718,40 +28156,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char socket ();
 int
 main ()
 {
-socket ();
+return socket ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -25760,14 +28210,15 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_socket_socket=no
+	ac_cv_lib_socket_socket=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; }
 if test $ac_cv_lib_socket_socket = yes; then
   if test x${OSTYPE} != xirix ; then
       CUPS_LIBS="${CUPS_LIBS} -lsocket"
@@ -25775,8 +28226,8 @@ if test $ac_cv_lib_socket_socket = yes; then
     fi
 fi
 
-    echo "$as_me:$LINENO: checking for gethostbyaddr in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyaddr in -lnsl... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for gethostbyaddr in -lnsl" >&5
+echo $ECHO_N "checking for gethostbyaddr in -lnsl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_nsl_gethostbyaddr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -25789,40 +28240,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char gethostbyaddr ();
 int
 main ()
 {
-gethostbyaddr ();
+return gethostbyaddr ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -25831,14 +28294,15 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_nsl_gethostbyaddr=no
+	ac_cv_lib_nsl_gethostbyaddr=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyaddr" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyaddr" >&6; }
 if test $ac_cv_lib_nsl_gethostbyaddr = yes; then
   if test x${OSTYPE} != xirix ; then
       CUPS_LIBS="${CUPS_LIBS} -lnsl"
@@ -25848,17 +28312,17 @@ fi
 
 
             if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
-echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
+echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
-echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
+echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking openssl/ssl.h usability" >&5
-echo $ECHO_N "checking openssl/ssl.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking openssl/ssl.h usability" >&5
+echo $ECHO_N "checking openssl/ssl.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25869,24 +28333,36 @@ $ac_includes_default
 #include <openssl/ssl.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -25895,15 +28371,16 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking openssl/ssl.h presence" >&5
-echo $ECHO_N "checking openssl/ssl.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking openssl/ssl.h presence" >&5
+echo $ECHO_N "checking openssl/ssl.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25912,8 +28389,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <openssl/ssl.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -25937,9 +28419,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -25963,25 +28446,23 @@ echo "$as_me: WARNING: openssl/ssl.h:     section \"Present But Cannot Be Compil
 echo "$as_me: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
 ## ----------------------------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
-echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
+echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_openssl_ssl_h=$ac_header_preproc
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
-echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
+echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; }
 
 fi
 if test $ac_cv_header_openssl_ssl_h = yes; then
@@ -25993,8 +28474,8 @@ if test $ac_cv_header_openssl_ssl_h = yes; then
 	  "-lcrypto -lrsaref" \
 	  "-lcrypto -lRSAglue -lrsaref"
       do
-	  echo "$as_me:$LINENO: checking for SSL_new in -lssl" >&5
-echo $ECHO_N "checking for SSL_new in -lssl... $ECHO_C" >&6
+	  { echo "$as_me:$LINENO: checking for SSL_new in -lssl" >&5
+echo $ECHO_N "checking for SSL_new in -lssl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -26007,40 +28488,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char SSL_new ();
 int
 main ()
 {
-SSL_new ();
+return SSL_new ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -26049,14 +28542,15 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_ssl_SSL_new=no
+	ac_cv_lib_ssl_SSL_new=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_new" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_new" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_new" >&5
+echo "${ECHO_T}$ac_cv_lib_ssl_SSL_new" >&6; }
 if test $ac_cv_lib_ssl_SSL_new = yes; then
   CUPS_LIBS="${CUPS_LIBS} -lssl $libcrypto"
 	       SSL="yes"
@@ -26071,8 +28565,8 @@ fi
 
 
 
-        echo "$as_me:$LINENO: checking for cupsPrintFiles in -lcups" >&5
-echo $ECHO_N "checking for cupsPrintFiles in -lcups... $ECHO_C" >&6
+        { echo "$as_me:$LINENO: checking for cupsPrintFiles in -lcups" >&5
+echo $ECHO_N "checking for cupsPrintFiles in -lcups... $ECHO_C" >&6; }
 if test "${ac_cv_lib_cups_cupsPrintFiles+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -26085,40 +28579,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char cupsPrintFiles ();
 int
 main ()
 {
-cupsPrintFiles ();
+return cupsPrintFiles ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -26127,14 +28633,15 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_cups_cupsPrintFiles=no
+	ac_cv_lib_cups_cupsPrintFiles=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_cups_cupsPrintFiles" >&5
-echo "${ECHO_T}$ac_cv_lib_cups_cupsPrintFiles" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_cups_cupsPrintFiles" >&5
+echo "${ECHO_T}$ac_cv_lib_cups_cupsPrintFiles" >&6; }
 if test $ac_cv_lib_cups_cupsPrintFiles = yes; then
   CUPS_LIBS="${CUPS_LIBS} -lcups"
 else
@@ -26144,8 +28651,8 @@ echo "$as_me: error: Cannot find CUPS libraries (libcups)" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-    echo "$as_me:$LINENO: checking for cupsRasterOpen in -lcupsimage" >&5
-echo $ECHO_N "checking for cupsRasterOpen in -lcupsimage... $ECHO_C" >&6
+    { echo "$as_me:$LINENO: checking for cupsRasterOpen in -lcupsimage" >&5
+echo $ECHO_N "checking for cupsRasterOpen in -lcupsimage... $ECHO_C" >&6; }
 if test "${ac_cv_lib_cupsimage_cupsRasterOpen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -26158,40 +28665,52 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char cupsRasterOpen ();
 int
 main ()
 {
-cupsRasterOpen ();
+return cupsRasterOpen ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -26200,14 +28719,15 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_cupsimage_cupsRasterOpen=no
+	ac_cv_lib_cupsimage_cupsRasterOpen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_cupsimage_cupsRasterOpen" >&5
-echo "${ECHO_T}$ac_cv_lib_cupsimage_cupsRasterOpen" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_cupsimage_cupsRasterOpen" >&5
+echo "${ECHO_T}$ac_cv_lib_cupsimage_cupsRasterOpen" >&6; }
 if test $ac_cv_lib_cupsimage_cupsRasterOpen = yes; then
   CUPS_LIBS="${CUPS_LIBS} -lcupsimage"
 else
@@ -26229,28 +28749,28 @@ fi
 
 if test x$BUILD_LEXMARKUTIL = xyes -o x$BUILD_GUTENPRINTUI = xyes ; then
 
-# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+# Check whether --with-gtk-prefix was given.
 if test "${with_gtk_prefix+set}" = set; then
-  withval="$with_gtk_prefix"
-  gtk_config_prefix="$withval"
+  withval=$with_gtk_prefix; gtk_config_prefix="$withval"
 else
   gtk_config_prefix=""
-fi;
+fi
+
 
-# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
+# Check whether --with-gtk-exec-prefix was given.
 if test "${with_gtk_exec_prefix+set}" = set; then
-  withval="$with_gtk_exec_prefix"
-  gtk_config_exec_prefix="$withval"
+  withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval"
 else
   gtk_config_exec_prefix=""
-fi;
-# Check whether --enable-gtktest or --disable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then
-  enableval="$enable_gtktest"
+fi
 
+# Check whether --enable-gtktest was given.
+if test "${enable_gtktest+set}" = set; then
+  enableval=$enable_gtktest;
 else
   enable_gtktest=yes
-fi;
+fi
+
 
   for module in .
   do
@@ -26276,8 +28796,8 @@ fi;
 
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -26292,31 +28812,32 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
   ;;
 esac
 fi
 GTK_CONFIG=$ac_cv_path_GTK_CONFIG
-
 if test -n "$GTK_CONFIG"; then
-  echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
-echo "${ECHO_T}$GTK_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
+echo "${ECHO_T}$GTK_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   min_gtk_version=1.2.0
-  echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
-echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
+echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; }
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -26421,13 +28942,22 @@ main ()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -26440,19 +28970,21 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 no_gtk=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then
-     echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+     { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
      :
   else
-     echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+     { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
      if test "$GTK_CONFIG" = "no" ; then
        echo "*** The gtk-config script installed by GTK could not be found"
        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
@@ -26484,24 +29016,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -26523,12 +29067,13 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- echo "*** The test program failed to compile or link. See the file config.log for the"
+	 echo "*** The test program failed to compile or link. See the file config.log for the"
           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
           echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
@@ -26549,28 +29094,28 @@ fi
 if test x${BUILD_GIMP} = xyes ; then
   if test x$GIMP_SOURCE_TREE_SUBDIR = xyes ; then
 
-# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+# Check whether --with-gtk-prefix was given.
 if test "${with_gtk_prefix+set}" = set; then
-  withval="$with_gtk_prefix"
-  gtk_config_prefix="$withval"
+  withval=$with_gtk_prefix; gtk_config_prefix="$withval"
 else
   gtk_config_prefix=""
-fi;
+fi
+
 
-# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
+# Check whether --with-gtk-exec-prefix was given.
 if test "${with_gtk_exec_prefix+set}" = set; then
-  withval="$with_gtk_exec_prefix"
-  gtk_config_exec_prefix="$withval"
+  withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval"
 else
   gtk_config_exec_prefix=""
-fi;
-# Check whether --enable-gtktest or --disable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then
-  enableval="$enable_gtktest"
+fi
 
+# Check whether --enable-gtktest was given.
+if test "${enable_gtktest+set}" = set; then
+  enableval=$enable_gtktest;
 else
   enable_gtktest=yes
-fi;
+fi
+
 
   for module in .
   do
@@ -26596,8 +29141,8 @@ fi;
 
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -26612,31 +29157,32 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
   ;;
 esac
 fi
 GTK_CONFIG=$ac_cv_path_GTK_CONFIG
-
 if test -n "$GTK_CONFIG"; then
-  echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
-echo "${ECHO_T}$GTK_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
+echo "${ECHO_T}$GTK_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   min_gtk_version=0.99.7
-  echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
-echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
+echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; }
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -26741,13 +29287,22 @@ main ()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -26760,19 +29315,21 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 no_gtk=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then
-     echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+     { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
      :
   else
-     echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+     { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
      if test "$GTK_CONFIG" = "no" ; then
        echo "*** The gtk-config script installed by GTK could not be found"
        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
@@ -26804,24 +29361,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -26843,12 +29412,13 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- echo "*** The test program failed to compile or link. See the file config.log for the"
+	 echo "*** The test program failed to compile or link. See the file config.log for the"
           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
           echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
@@ -26863,28 +29433,28 @@ rm -f conftest.err conftest.$ac_objext \
   rm -f conf.gtktest
 
 
-# Check whether --with-glib-prefix or --without-glib-prefix was given.
+# Check whether --with-glib-prefix was given.
 if test "${with_glib_prefix+set}" = set; then
-  withval="$with_glib_prefix"
-  glib_config_prefix="$withval"
+  withval=$with_glib_prefix; glib_config_prefix="$withval"
 else
   glib_config_prefix=""
-fi;
+fi
 
-# Check whether --with-glib-exec-prefix or --without-glib-exec-prefix was given.
+
+# Check whether --with-glib-exec-prefix was given.
 if test "${with_glib_exec_prefix+set}" = set; then
-  withval="$with_glib_exec_prefix"
-  glib_config_exec_prefix="$withval"
+  withval=$with_glib_exec_prefix; glib_config_exec_prefix="$withval"
 else
   glib_config_exec_prefix=""
-fi;
-# Check whether --enable-glibtest or --disable-glibtest was given.
-if test "${enable_glibtest+set}" = set; then
-  enableval="$enable_glibtest"
+fi
 
+# Check whether --enable-glibtest was given.
+if test "${enable_glibtest+set}" = set; then
+  enableval=$enable_glibtest;
 else
   enable_glibtest=yes
-fi;
+fi
+
 
   if test x$glib_config_exec_prefix != x ; then
      glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
@@ -26913,8 +29483,8 @@ fi;
 
   # Extract the first word of "glib-config", so it can be a program name with args.
 set dummy glib-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GLIB_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -26929,31 +29499,32 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GLIB_CONFIG" && ac_cv_path_GLIB_CONFIG="no"
   ;;
 esac
 fi
 GLIB_CONFIG=$ac_cv_path_GLIB_CONFIG
-
 if test -n "$GLIB_CONFIG"; then
-  echo "$as_me:$LINENO: result: $GLIB_CONFIG" >&5
-echo "${ECHO_T}$GLIB_CONFIG" >&6
+  { echo "$as_me:$LINENO: result: $GLIB_CONFIG" >&5
+echo "${ECHO_T}$GLIB_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   min_glib_version=0.99.7
-  echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
-echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
+echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; }
   no_glib=""
   if test "$GLIB_CONFIG" = "no" ; then
     no_glib=yes
@@ -27056,13 +29627,22 @@ main ()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -27075,19 +29655,21 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 no_glib=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_glib" = x ; then
-     echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+     { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
      :
   else
-     echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+     { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
      if test "$GLIB_CONFIG" = "no" ; then
        echo "*** The glib-config script installed by GLIB could not be found"
        echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
@@ -27119,24 +29701,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -27158,12 +29752,13 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- echo "*** The test program failed to compile or link. See the file config.log for the"
+	 echo "*** The test program failed to compile or link. See the file config.log for the"
           echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
           echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
           echo "*** may want to edit the glib-config script: $GLIB_CONFIG"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
@@ -27181,28 +29776,28 @@ rm -f conftest.err conftest.$ac_objext \
     GIMP_LIBS="\$(GTK_LIBS) \$(GLIB_LIBS) \$(top_builddir)/../../libgimp/libgimp.la  \$(top_builddir)/../../libgimp/libgimpui.la"
   else
 
-# Check whether --with-gimp-prefix or --without-gimp-prefix was given.
+# Check whether --with-gimp-prefix was given.
 if test "${with_gimp_prefix+set}" = set; then
-  withval="$with_gimp_prefix"
-  gimptool_prefix="$withval"
+  withval=$with_gimp_prefix; gimptool_prefix="$withval"
 else
   gimptool_prefix=""
-fi;
+fi
+
 
-# Check whether --with-gimp-exec-prefix or --without-gimp-exec-prefix was given.
+# Check whether --with-gimp-exec-prefix was given.
 if test "${with_gimp_exec_prefix+set}" = set; then
-  withval="$with_gimp_exec_prefix"
-  gimptool_exec_prefix="$withval"
+  withval=$with_gimp_exec_prefix; gimptool_exec_prefix="$withval"
 else
   gimptool_exec_prefix=""
-fi;
-# Check whether --enable-gimptest or --disable-gimptest was given.
-if test "${enable_gimptest+set}" = set; then
-  enableval="$enable_gimptest"
+fi
 
+# Check whether --enable-gimptest was given.
+if test "${enable_gimptest+set}" = set; then
+  enableval=$enable_gimptest;
 else
   enable_gimptest=yes
-fi;
+fi
+
 
   if test x$gimptool_exec_prefix != x ; then
      gimptool_args="$gimptool_args --exec-prefix=$gimptool_exec_prefix"
@@ -27221,8 +29816,8 @@ fi;
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GIMPTOOL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -27237,34 +29832,35 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GIMPTOOL="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 GIMPTOOL=$ac_cv_path_GIMPTOOL
-
 if test -n "$GIMPTOOL"; then
-  echo "$as_me:$LINENO: result: $GIMPTOOL" >&5
-echo "${ECHO_T}$GIMPTOOL" >&6
+  { echo "$as_me:$LINENO: result: $GIMPTOOL" >&5
+echo "${ECHO_T}$GIMPTOOL" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$GIMPTOOL" && break
 done
 test -n "$GIMPTOOL" || GIMPTOOL="no"
 
   min_gimp_version=1.2.0
-  echo "$as_me:$LINENO: checking for GIMP 1.2 - version >= $min_gimp_version" >&5
-echo $ECHO_N "checking for GIMP 1.2 - version >= $min_gimp_version... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for GIMP 1.2 - version >= $min_gimp_version" >&5
+echo $ECHO_N "checking for GIMP 1.2 - version >= $min_gimp_version... $ECHO_C" >&6; }
   no_gimp=""
   if test "$GIMPTOOL" = "no" ; then
     no_gimp=yes
@@ -27371,13 +29967,22 @@ int main ()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -27390,20 +29995,22 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 no_gimp=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gimp" = x ; then
-     echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+     { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
      SAVE_GTK_LIBS="$GIMP_LIBS"
                    SAVE_GTK_CFLAGS="$GIMP_CFLAGS"
   else
-     echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+     { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
      if test "$GIMPTOOL" = "no" ; then
        echo "*** The gimptool script installed by GIMP 1.2 could not be"
        echo "*** found.  If GIMP 1.2 was installed in PREFIX, make sure"
@@ -27455,24 +30062,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -27490,13 +30109,14 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- echo "*** The test program failed to compile or link.  See the file config.log"
+	 echo "*** The test program failed to compile or link.  See the file config.log"
           echo "*** for the exact error that occured.  This usually means GIMP 1.2 was"
           echo "*** incorrectly installed or that you have moved GIMP 1.2 since it was"
           echo "*** installed.  In the latter case, you may want to edit the gimptool"
           echo "*** gimptool script: $GIMPTOOL"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
@@ -27524,16 +30144,16 @@ fi
 
 
 if test x${BUILD_GIMP} = xyes ; then
-  echo "$as_me:$LINENO: checking for GIMP 1.2 plug-in directory" >&5
-echo $ECHO_N "checking for GIMP 1.2 plug-in directory... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for GIMP 1.2 plug-in directory" >&5
+echo $ECHO_N "checking for GIMP 1.2 plug-in directory... $ECHO_C" >&6; }
 # create temporary "plug-in" to install
   touch print
   chmod 755 print
   GIMPTOOL_OUTPUT=`$GIMPTOOL --dry-run --install-${PLUG_IN_PATH} print`
   rm print
   gimp_plug_indir=`echo "$GIMPTOOL_OUTPUT" | sed -e 's/.* \(.*\)\/print/\1/'`
-  echo "$as_me:$LINENO: result: $gimp_plug_indir" >&5
-echo "${ECHO_T}$gimp_plug_indir" >&6
+  { echo "$as_me:$LINENO: result: $gimp_plug_indir" >&5
+echo "${ECHO_T}$gimp_plug_indir" >&6; }
 else
   gimp_plug_indir="$libdir/gimp/1.2/plug-ins"
 fi
@@ -27545,8 +30165,8 @@ if test x${BUILD_GIMP2} = xyes ; then
 fi
 
 
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -27570,24 +30190,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -27596,9 +30228,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_header_stdc=no
+	ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -27654,6 +30287,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
+#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -27673,18 +30307,27 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return 2;
+  return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -27697,12 +30340,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+
+
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -27715,18 +30360,19 @@ fi
 for ac_header in getopt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27737,24 +30383,36 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -27763,15 +30421,16 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27780,8 +30439,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -27805,9 +30469,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -27831,25 +30496,24 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
 ## ----------------------------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -27862,17 +30526,17 @@ fi
 done
 
 if test "${ac_cv_header_readline_readline_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for readline/readline.h" >&5
-echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6
+  { echo "$as_me:$LINENO: checking for readline/readline.h" >&5
+echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_readline_readline_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5
-echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5
+echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking readline/readline.h usability" >&5
-echo $ECHO_N "checking readline/readline.h usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking readline/readline.h usability" >&5
+echo $ECHO_N "checking readline/readline.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27883,24 +30547,36 @@ $ac_includes_default
 #include <readline/readline.h>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -27909,15 +30585,16 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking readline/readline.h presence" >&5
-echo $ECHO_N "checking readline/readline.h presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking readline/readline.h presence" >&5
+echo $ECHO_N "checking readline/readline.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27926,8 +30603,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <readline/readline.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -27951,9 +30633,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -27977,25 +30660,23 @@ echo "$as_me: WARNING: readline/readline.h:     section \"Present But Cannot Be
 echo "$as_me: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
 ## ----------------------------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for readline/readline.h" >&5
-echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for readline/readline.h" >&5
+echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_readline_readline_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_readline_readline_h=$ac_header_preproc
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5
-echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5
+echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6; }
 
 fi
 if test $ac_cv_header_readline_readline_h = yes; then
@@ -28019,18 +30700,19 @@ fi
 for ac_header in dlfcn.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28041,24 +30723,36 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -28067,15 +30761,16 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28084,8 +30779,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -28109,9 +30809,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -28135,25 +30836,24 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
 ## ----------------------------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -28169,18 +30869,19 @@ done
 for ac_header in fcntl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28191,24 +30892,36 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -28217,15 +30930,16 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28234,8 +30948,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -28259,9 +30978,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -28285,25 +31005,24 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
 ## ----------------------------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -28319,18 +31038,19 @@ done
 for ac_header in limits.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28341,24 +31061,36 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -28367,15 +31099,16 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28384,8 +31117,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -28409,9 +31147,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -28435,25 +31174,24 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
 ## ----------------------------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -28469,18 +31207,19 @@ done
 for ac_header in locale.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28491,24 +31230,36 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -28517,15 +31268,16 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28534,8 +31286,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -28559,9 +31316,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -28585,25 +31343,24 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
 ## ----------------------------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -28619,18 +31376,19 @@ done
 for ac_header in ltdl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28641,24 +31399,36 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -28667,15 +31437,16 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28684,8 +31455,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -28709,9 +31485,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -28735,25 +31512,24 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
 ## ----------------------------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -28771,18 +31547,19 @@ done
 for ac_header in stdarg.h stdlib.h string.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28793,24 +31570,36 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -28819,15 +31608,16 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28836,8 +31626,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -28861,9 +31656,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -28887,25 +31683,24 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
 ## ----------------------------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -28922,18 +31717,19 @@ done
 for ac_header in sys/time.h sys/types.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28944,24 +31740,36 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -28970,15 +31778,16 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28987,8 +31796,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -29012,9 +31826,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -29038,25 +31853,24 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
 ## ----------------------------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -29072,18 +31886,19 @@ done
 for ac_header in time.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29094,24 +31909,36 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -29120,15 +31947,16 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29137,8 +31965,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -29162,9 +31995,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -29188,25 +32022,24 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
 ## ----------------------------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -29222,18 +32055,19 @@ done
 for ac_header in unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29244,24 +32078,36 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -29270,15 +32116,16 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+	ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29287,8 +32134,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -29312,9 +32164,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
+
 rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -29338,25 +32191,24 @@ echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
+    ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
 ## ----------------------------------------------------- ##
 _ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -29369,8 +32221,8 @@ fi
 done
 
 
-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -29410,6 +32262,7 @@ main ()
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
+    if (s) return 0;
   }
   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
     int x[] = {25, 17};
@@ -29428,7 +32281,9 @@ main ()
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
+    if (!foo) return 0;
   }
+  return !x[0] && !zero.x;
 #endif
 
   ;
@@ -29436,24 +32291,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -29462,12 +32329,13 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_c_const=no
+	ac_cv_c_const=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+echo "${ECHO_T}$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -29476,8 +32344,8 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for inline" >&5
+echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -29497,39 +32365,54 @@ $ac_kw foo_t foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_c_inline=$ac_kw; break
+  ac_cv_c_inline=$ac_kw
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
 done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+echo "${ECHO_T}$ac_cv_c_inline" >&6; }
 
 
 case $ac_cv_c_inline in
@@ -29547,8 +32430,8 @@ _ACEOF
     ;;
 esac
 
-echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for off_t" >&5
+echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -29559,36 +32442,49 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef off_t ac__type_new_;
 int
 main ()
 {
-if ((off_t *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (off_t))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -29597,24 +32493,25 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_off_t=no
+	ac_cv_type_off_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
 if test $ac_cv_type_off_t = yes; then
   :
 else
 
 cat >>confdefs.h <<_ACEOF
-#define off_t long
+#define off_t long int
 _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for size_t" >&5
+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -29625,36 +32522,49 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef size_t ac__type_new_;
 int
 main ()
 {
-if ((size_t *) 0)
+if ((ac__type_new_ *) 0)
   return 0;
-if (sizeof (size_t))
+if (sizeof (ac__type_new_))
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -29663,24 +32573,25 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_size_t=no
+	ac_cv_type_size_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
 if test $ac_cv_type_size_t = yes; then
   :
 else
 
 cat >>confdefs.h <<_ACEOF
-#define size_t unsigned
+#define size_t unsigned int
 _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -29692,56 +32603,61 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <signal.h>
-#ifdef signal
-# undef signal
-#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
-#endif
 
 int
 main ()
 {
-int i;
+return *(signal (0, 0)) (0) == 1;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_type_signal=void
+  ac_cv_type_signal=int
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_signal=int
+	ac_cv_type_signal=void
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+echo "${ECHO_T}$ac_cv_type_signal" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define RETSIGTYPE $ac_cv_type_signal
@@ -29755,9 +32671,9 @@ _ACEOF
 for ac_func in nanosleep poll usleep
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -29783,53 +32699,59 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -29838,13 +32760,15 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -29857,9 +32781,9 @@ done
 for ac_func in getopt_long
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -29885,53 +32809,59 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
-{
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
 #endif
 
 int
 main ()
 {
-return f != $ac_func;
+return $ac_func ();
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -29940,13 +32870,15 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
+	eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
@@ -29956,6 +32888,105 @@ fi
 done
 
 
+{ echo "$as_me:$LINENO: checking for library containing finite" >&5
+echo $ECHO_N "checking for library containing finite... $ECHO_C" >&6; }
+if test "${ac_cv_search_finite+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char finite ();
+int
+main ()
+{
+return finite ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' m; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_search_finite=$ac_res
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext \
+      conftest$ac_exeext
+  if test "${ac_cv_search_finite+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_finite+set}" = set; then
+  :
+else
+  ac_cv_search_finite=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_search_finite" >&5
+echo "${ECHO_T}$ac_cv_search_finite" >&6; }
+ac_res=$ac_cv_search_finite
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  CFLAGS="-Disfinite=finite $CFLAGS"
+fi
+
 
 
 
@@ -30003,6 +33034,17 @@ fi
 
 
 
+if test x${BUILD_CUPS_1_2} = xyes; then
+  BUILD_CUPS_1_2_TRUE=
+  BUILD_CUPS_1_2_FALSE='#'
+else
+  BUILD_CUPS_1_2_TRUE='#'
+  BUILD_CUPS_1_2_FALSE=
+fi
+
+
+
+
 if test x${BUILD_CUPS_PPDS} = xyes; then
   BUILD_CUPS_PPDS_TRUE=
   BUILD_CUPS_PPDS_FALSE='#'
@@ -30034,6 +33076,17 @@ else
 fi
 
 
+
+
+if test x${BUILD_SIMPLIFIED_CUPS_PPDS} = xyes; then
+  BUILD_SIMPLIFIED_CUPS_PPDS_TRUE=
+  BUILD_SIMPLIFIED_CUPS_PPDS_FALSE='#'
+else
+  BUILD_SIMPLIFIED_CUPS_PPDS_TRUE='#'
+  BUILD_SIMPLIFIED_CUPS_PPDS_FALSE=
+fi
+
+
 if test x${USE_LEVEL3_PS} = xno ; then
   CUPS_PPD_PS_LEVEL=2
 else
@@ -30255,8 +33308,8 @@ elif test x$WITH_MODULES = xdlopen; then
   fi
 fi
 # define what module system is to be used
-echo "$as_me:$LINENO: checking which module system will be used" >&5
-echo $ECHO_N "checking which module system will be used... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking which module system will be used" >&5
+echo $ECHO_N "checking which module system will be used... $ECHO_C" >&6; }
 if test x$USE_LTDL = xtrue; then
   MODULE="true"
 
@@ -30271,8 +33324,8 @@ _ACEOF
 
   GUTENPRINT_LIBDEPS="${GUTENPRINT_LIBDEPS} ${LTDL_LIBS}"
   gutenprint_libdeps="${gutenprint_libdeps} ${LTDL_LIBS}"
-  echo "$as_me:$LINENO: result: ltdl" >&5
-echo "${ECHO_T}ltdl" >&6
+  { echo "$as_me:$LINENO: result: ltdl" >&5
+echo "${ECHO_T}ltdl" >&6; }
 elif test x$USE_DLOPEN = xtrue; then
   MODULE="true"
 
@@ -30287,12 +33340,12 @@ _ACEOF
 
   GUTENPRINT_LIBDEPS="${GUTENPRINT_LIBDEPS} ${DLOPEN_LIBS}"
   gutenprint_libdeps="${gutenprint_libdeps} ${DLOPEN_LIBS}"
-  echo "$as_me:$LINENO: result: dlopen" >&5
-echo "${ECHO_T}dlopen" >&6
+  { echo "$as_me:$LINENO: result: dlopen" >&5
+echo "${ECHO_T}dlopen" >&6; }
 else
   MODULE="false"
-  echo "$as_me:$LINENO: result: static" >&5
-echo "${ECHO_T}static" >&6
+  { echo "$as_me:$LINENO: result: static" >&5
+echo "${ECHO_T}static" >&6; }
 fi
 
 
@@ -30351,7 +33404,7 @@ cat >>confdefs.h <<_ACEOF
 #define CUPS_PPD_PS_LEVEL ${CUPS_PPD_PS_LEVEL}
 _ACEOF
 
-RELEASE_DATE="22 Jul 2006"
+RELEASE_DATE="17 Jun 2007"
 
 cat >>confdefs.h <<_ACEOF
 #define RELEASE_DATE "${RELEASE_DATE}"
@@ -30412,89 +33465,88 @@ gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}"
 
 
 
-          ac_config_files="$ac_config_files Makefile"
 
-          ac_config_files="$ac_config_files doc/Makefile"
+ac_config_files="$ac_config_files Makefile"
 
-          ac_config_files="$ac_config_files doc/gutenprint.dox"
+ac_config_files="$ac_config_files doc/Makefile"
 
-          ac_config_files="$ac_config_files doc/gutenprintui2.dox"
+ac_config_files="$ac_config_files doc/gutenprint.dox"
 
-          ac_config_files="$ac_config_files doc/developer/Makefile"
+ac_config_files="$ac_config_files doc/gutenprintui2.dox"
 
-          ac_config_files="$ac_config_files include/Makefile"
+ac_config_files="$ac_config_files doc/developer/Makefile"
 
-          ac_config_files="$ac_config_files include/gutenprint/Makefile"
+ac_config_files="$ac_config_files include/Makefile"
 
-          ac_config_files="$ac_config_files include/gutenprintui/Makefile"
+ac_config_files="$ac_config_files include/gutenprint/Makefile"
 
-          ac_config_files="$ac_config_files include/gutenprintui2/Makefile"
+ac_config_files="$ac_config_files include/gutenprintui/Makefile"
 
-          ac_config_files="$ac_config_files include/gutenprint/gutenprint-version.h"
+ac_config_files="$ac_config_files include/gutenprintui2/Makefile"
 
-          ac_config_files="$ac_config_files man/Makefile"
+ac_config_files="$ac_config_files include/gutenprint/gutenprint-version.h"
 
-          ac_config_files="$ac_config_files man/cups-calibrate.8"
+ac_config_files="$ac_config_files man/Makefile"
 
-          ac_config_files="$ac_config_files man/cups-genppd.8"
+ac_config_files="$ac_config_files man/cups-calibrate.8"
 
-          ac_config_files="$ac_config_files man/cups-genppdconfig.8"
+ac_config_files="$ac_config_files man/cups-genppd.8"
 
-          ac_config_files="$ac_config_files man/cups-genppdupdate.8"
+ac_config_files="$ac_config_files man/cups-genppdconfig.8"
 
-          ac_config_files="$ac_config_files man/escputil.1"
+ac_config_files="$ac_config_files man/cups-genppdupdate.8"
 
-          ac_config_files="$ac_config_files man/ijsgutenprint.1"
+ac_config_files="$ac_config_files man/escputil.1"
 
-          ac_config_files="$ac_config_files po/Makefile.in"
+ac_config_files="$ac_config_files man/ijsgutenprint.1"
 
-          ac_config_files="$ac_config_files samples/Makefile"
+ac_config_files="$ac_config_files po/Makefile.in"
 
-          ac_config_files="$ac_config_files src/Makefile"
+ac_config_files="$ac_config_files samples/Makefile"
 
-          ac_config_files="$ac_config_files src/cups/Makefile"
+ac_config_files="$ac_config_files src/Makefile"
 
-          ac_config_files="$ac_config_files src/cups/cups-genppdconfig"
+ac_config_files="$ac_config_files src/cups/Makefile"
 
-          ac_config_files="$ac_config_files src/cups/cups-genppdupdate"
+ac_config_files="$ac_config_files src/cups/cups-genppdconfig"
 
-          ac_config_files="$ac_config_files src/escputil/Makefile"
+ac_config_files="$ac_config_files src/cups/cups-genppdupdate"
 
-          ac_config_files="$ac_config_files src/foomatic/Makefile"
+ac_config_files="$ac_config_files src/escputil/Makefile"
 
-          ac_config_files="$ac_config_files src/foomatic/foomatic-generator"
+ac_config_files="$ac_config_files src/foomatic/Makefile"
 
-          ac_config_files="$ac_config_files src/foomatic/mk_printerlist"
+ac_config_files="$ac_config_files src/foomatic/foomatic-generator"
 
-          ac_config_files="$ac_config_files src/testpattern/run-testpattern-2"
+ac_config_files="$ac_config_files src/foomatic/mk_printerlist"
 
-          ac_config_files="$ac_config_files src/ghost/Makefile"
+ac_config_files="$ac_config_files src/testpattern/run-testpattern-2"
 
-          ac_config_files="$ac_config_files src/testpattern/Makefile"
+ac_config_files="$ac_config_files src/ghost/Makefile"
 
-          ac_config_files="$ac_config_files src/gimp/Makefile"
+ac_config_files="$ac_config_files src/testpattern/Makefile"
 
-          ac_config_files="$ac_config_files src/gimp2/Makefile"
+ac_config_files="$ac_config_files src/gimp/Makefile"
 
-          ac_config_files="$ac_config_files src/main/Makefile"
+ac_config_files="$ac_config_files src/gimp2/Makefile"
 
-          ac_config_files="$ac_config_files src/main/gutenprint.pc"
+ac_config_files="$ac_config_files src/main/Makefile"
 
-          ac_config_files="$ac_config_files src/gutenprintui/Makefile"
+ac_config_files="$ac_config_files src/main/gutenprint.pc"
 
-          ac_config_files="$ac_config_files src/gutenprintui/gutenprintui.pc"
+ac_config_files="$ac_config_files src/gutenprintui/Makefile"
 
-          ac_config_files="$ac_config_files src/gutenprintui2/Makefile"
+ac_config_files="$ac_config_files src/gutenprintui/gutenprintui.pc"
 
-          ac_config_files="$ac_config_files src/gutenprintui2/gutenprintui2.pc"
+ac_config_files="$ac_config_files src/gutenprintui2/Makefile"
 
-          ac_config_files="$ac_config_files cups-gutenprint.list"
+ac_config_files="$ac_config_files src/gutenprintui2/gutenprintui2.pc"
 
-          ac_config_files="$ac_config_files test/Makefile"
+ac_config_files="$ac_config_files test/Makefile"
 
-          ac_config_files="$ac_config_files scripts/Makefile"
+ac_config_files="$ac_config_files scripts/Makefile"
 
-          ac_config_commands="$ac_config_commands default"
+ac_config_commands="$ac_config_commands default"
 
 
 cat >confcache <<\_ACEOF
@@ -30515,39 +33567,58 @@ _ACEOF
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
+# So, we kill variables containing newlines.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+
   (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
       # `set' does not quote correctly, so add quotes (double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
+      ;; #(
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-} |
+    esac |
+    sort
+) |
   sed '
+     /^ac_cv_env_/b end
      t clear
-     : clear
+     :clear
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    echo "not updating unwritable cache $cache_file"
+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -30556,38 +33627,45 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
 DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
 LTLIBOBJS=$ac_ltlibobjs
 
 
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -30595,6 +33673,20 @@ echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${BUILD_FOOMATIC_TRUE}" && test -z "${BUILD_FOOMATIC_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"BUILD_FOOMATIC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -30623,6 +33715,13 @@ echo "$as_me: error: conditional \"BUILD_CUPS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${BUILD_CUPS_1_2_TRUE}" && test -z "${BUILD_CUPS_1_2_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_CUPS_1_2\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_CUPS_1_2\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${BUILD_CUPS_PPDS_TRUE}" && test -z "${BUILD_CUPS_PPDS_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"BUILD_CUPS_PPDS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -30644,6 +33743,13 @@ echo "$as_me: error: conditional \"BUILD_TRANSLATED_CUPS_PPDS\" was never define
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${BUILD_SIMPLIFIED_CUPS_PPDS_TRUE}" && test -z "${BUILD_SIMPLIFIED_CUPS_PPDS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"BUILD_SIMPLIFIED_CUPS_PPDS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_SIMPLIFIED_CUPS_PPDS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${USE_LEVEL3_PS_TRUE}" && test -z "${USE_LEVEL3_PS_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"USE_LEVEL3_PS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -30777,11 +33883,35 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
@@ -30790,8 +33920,43 @@ else
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
 # Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -30805,18 +33970,19 @@ do
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    $as_unset $as_var
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
 done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -30824,159 +33990,120 @@ fi
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
+# CDPATH.
+$as_unset CDPATH
 
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
 
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
     sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
       N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
+      s/-\n.*//
     ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+  chmod +x "$as_me.lineno" ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
 
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir
+fi
 echo >conf$$.file
 if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
 elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
@@ -30985,7 +34112,19 @@ else
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
+# systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  as_executable_p="test -x"
+else
+  as_executable_p=:
+fi
+rm -f conf$$.file
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -30994,31 +34133,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
 exec 6>&1
 
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# Save the log message, to keep $[0] and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by gutenprint $as_me 5.0.0, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+# values after options handling.
+ac_log="
+This file was extended by gutenprint $as_me 5.0.1, which was
+generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -31026,30 +34148,20 @@ generated by GNU Autoconf 2.59.  Invocation command line was
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
 _ACEOF
 
+cat >>$CONFIG_STATUS <<_ACEOF
 # Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
 
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
+_ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
-
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -31076,19 +34188,21 @@ Configuration commands:
 $config_commands
 
 Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
 
+_ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-gutenprint config.status 5.0.0
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+gutenprint config.status 5.0.1
+configured by $0, generated by GNU Autoconf 2.60,
+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -31099,39 +34213,24 @@ while test $# != 0
 do
   case $1 in
   --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  -*)
+  *)
     ac_option=$1
     ac_optarg=$2
     ac_shift=shift
     ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
   esac
 
   case $ac_option in
   # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
@@ -31141,18 +34240,24 @@ Try \`$0 --help' for more information." >&2;}
     $ac_shift
     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
     ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    { echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
+  -*) { echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
-  *) ac_config_targets="$ac_config_targets $1" ;;
+  *) ac_config_targets="$ac_config_targets $1"
+     ac_need_defaults=false ;;
 
   esac
   shift
@@ -31168,17 +34273,29 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  CONFIG_SHELL=$SHELL
+  export CONFIG_SHELL
+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 fi
 
 _ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  echo "$ac_log"
+} >&5
 
+_ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 #
-# INIT-COMMANDS section.
+# INIT-COMMANDS
 #
-
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 # Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
     # from automake.
@@ -31191,63 +34308,64 @@ GUTENPRINT_RELEASE_VERSION=${GUTENPRINT_RELEASE_VERSION}
 
 _ACEOF
 
-
-
 cat >>$CONFIG_STATUS <<\_ACEOF
+
+# Handling of arguments.
 for ac_config_target in $ac_config_targets
 do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-  "doc/gutenprint.dox" ) CONFIG_FILES="$CONFIG_FILES doc/gutenprint.dox" ;;
-  "doc/gutenprintui2.dox" ) CONFIG_FILES="$CONFIG_FILES doc/gutenprintui2.dox" ;;
-  "doc/developer/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/developer/Makefile" ;;
-  "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-  "include/gutenprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/gutenprint/Makefile" ;;
-  "include/gutenprintui/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/gutenprintui/Makefile" ;;
-  "include/gutenprintui2/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/gutenprintui2/Makefile" ;;
-  "include/gutenprint/gutenprint-version.h" ) CONFIG_FILES="$CONFIG_FILES include/gutenprint/gutenprint-version.h" ;;
-  "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-  "man/cups-calibrate.8" ) CONFIG_FILES="$CONFIG_FILES man/cups-calibrate.8" ;;
-  "man/cups-genppd.8" ) CONFIG_FILES="$CONFIG_FILES man/cups-genppd.8" ;;
-  "man/cups-genppdconfig.8" ) CONFIG_FILES="$CONFIG_FILES man/cups-genppdconfig.8" ;;
-  "man/cups-genppdupdate.8" ) CONFIG_FILES="$CONFIG_FILES man/cups-genppdupdate.8" ;;
-  "man/escputil.1" ) CONFIG_FILES="$CONFIG_FILES man/escputil.1" ;;
-  "man/ijsgutenprint.1" ) CONFIG_FILES="$CONFIG_FILES man/ijsgutenprint.1" ;;
-  "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-  "samples/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
-  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-  "src/cups/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/cups/Makefile" ;;
-  "src/cups/cups-genppdconfig" ) CONFIG_FILES="$CONFIG_FILES src/cups/cups-genppdconfig" ;;
-  "src/cups/cups-genppdupdate" ) CONFIG_FILES="$CONFIG_FILES src/cups/cups-genppdupdate" ;;
-  "src/escputil/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/escputil/Makefile" ;;
-  "src/foomatic/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/foomatic/Makefile" ;;
-  "src/foomatic/foomatic-generator" ) CONFIG_FILES="$CONFIG_FILES src/foomatic/foomatic-generator" ;;
-  "src/foomatic/mk_printerlist" ) CONFIG_FILES="$CONFIG_FILES src/foomatic/mk_printerlist" ;;
-  "src/testpattern/run-testpattern-2" ) CONFIG_FILES="$CONFIG_FILES src/testpattern/run-testpattern-2" ;;
-  "src/ghost/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/ghost/Makefile" ;;
-  "src/testpattern/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/testpattern/Makefile" ;;
-  "src/gimp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gimp/Makefile" ;;
-  "src/gimp2/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gimp2/Makefile" ;;
-  "src/main/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/main/Makefile" ;;
-  "src/main/gutenprint.pc" ) CONFIG_FILES="$CONFIG_FILES src/main/gutenprint.pc" ;;
-  "src/gutenprintui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gutenprintui/Makefile" ;;
-  "src/gutenprintui/gutenprintui.pc" ) CONFIG_FILES="$CONFIG_FILES src/gutenprintui/gutenprintui.pc" ;;
-  "src/gutenprintui2/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gutenprintui2/Makefile" ;;
-  "src/gutenprintui2/gutenprintui2.pc" ) CONFIG_FILES="$CONFIG_FILES src/gutenprintui2/gutenprintui2.pc" ;;
-  "cups-gutenprint.list" ) CONFIG_FILES="$CONFIG_FILES cups-gutenprint.list" ;;
-  "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
-  "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
-  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-  "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "doc/gutenprint.dox") CONFIG_FILES="$CONFIG_FILES doc/gutenprint.dox" ;;
+    "doc/gutenprintui2.dox") CONFIG_FILES="$CONFIG_FILES doc/gutenprintui2.dox" ;;
+    "doc/developer/Makefile") CONFIG_FILES="$CONFIG_FILES doc/developer/Makefile" ;;
+    "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
+    "include/gutenprint/Makefile") CONFIG_FILES="$CONFIG_FILES include/gutenprint/Makefile" ;;
+    "include/gutenprintui/Makefile") CONFIG_FILES="$CONFIG_FILES include/gutenprintui/Makefile" ;;
+    "include/gutenprintui2/Makefile") CONFIG_FILES="$CONFIG_FILES include/gutenprintui2/Makefile" ;;
+    "include/gutenprint/gutenprint-version.h") CONFIG_FILES="$CONFIG_FILES include/gutenprint/gutenprint-version.h" ;;
+    "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
+    "man/cups-calibrate.8") CONFIG_FILES="$CONFIG_FILES man/cups-calibrate.8" ;;
+    "man/cups-genppd.8") CONFIG_FILES="$CONFIG_FILES man/cups-genppd.8" ;;
+    "man/cups-genppdconfig.8") CONFIG_FILES="$CONFIG_FILES man/cups-genppdconfig.8" ;;
+    "man/cups-genppdupdate.8") CONFIG_FILES="$CONFIG_FILES man/cups-genppdupdate.8" ;;
+    "man/escputil.1") CONFIG_FILES="$CONFIG_FILES man/escputil.1" ;;
+    "man/ijsgutenprint.1") CONFIG_FILES="$CONFIG_FILES man/ijsgutenprint.1" ;;
+    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+    "samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "src/cups/Makefile") CONFIG_FILES="$CONFIG_FILES src/cups/Makefile" ;;
+    "src/cups/cups-genppdconfig") CONFIG_FILES="$CONFIG_FILES src/cups/cups-genppdconfig" ;;
+    "src/cups/cups-genppdupdate") CONFIG_FILES="$CONFIG_FILES src/cups/cups-genppdupdate" ;;
+    "src/escputil/Makefile") CONFIG_FILES="$CONFIG_FILES src/escputil/Makefile" ;;
+    "src/foomatic/Makefile") CONFIG_FILES="$CONFIG_FILES src/foomatic/Makefile" ;;
+    "src/foomatic/foomatic-generator") CONFIG_FILES="$CONFIG_FILES src/foomatic/foomatic-generator" ;;
+    "src/foomatic/mk_printerlist") CONFIG_FILES="$CONFIG_FILES src/foomatic/mk_printerlist" ;;
+    "src/testpattern/run-testpattern-2") CONFIG_FILES="$CONFIG_FILES src/testpattern/run-testpattern-2" ;;
+    "src/ghost/Makefile") CONFIG_FILES="$CONFIG_FILES src/ghost/Makefile" ;;
+    "src/testpattern/Makefile") CONFIG_FILES="$CONFIG_FILES src/testpattern/Makefile" ;;
+    "src/gimp/Makefile") CONFIG_FILES="$CONFIG_FILES src/gimp/Makefile" ;;
+    "src/gimp2/Makefile") CONFIG_FILES="$CONFIG_FILES src/gimp2/Makefile" ;;
+    "src/main/Makefile") CONFIG_FILES="$CONFIG_FILES src/main/Makefile" ;;
+    "src/main/gutenprint.pc") CONFIG_FILES="$CONFIG_FILES src/main/gutenprint.pc" ;;
+    "src/gutenprintui/Makefile") CONFIG_FILES="$CONFIG_FILES src/gutenprintui/Makefile" ;;
+    "src/gutenprintui/gutenprintui.pc") CONFIG_FILES="$CONFIG_FILES src/gutenprintui/gutenprintui.pc" ;;
+    "src/gutenprintui2/Makefile") CONFIG_FILES="$CONFIG_FILES src/gutenprintui2/Makefile" ;;
+    "src/gutenprintui2/gutenprintui2.pc") CONFIG_FILES="$CONFIG_FILES src/gutenprintui2/gutenprintui2.pc" ;;
+    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
+    "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
+    "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
 
+
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
@@ -31259,496 +34377,660 @@ if $ac_need_defaults; then
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
+# simply because there is no reason against having it here, and in addition,
 # creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
   trap '{ (exit 1); exit 1; }' 1 2 13 15
 }
-
 # Create a (secure) tmp directory for tmp files.
 
 {
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
 } ||
 {
    echo "$me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
 #
-# CONFIG_FILES section.
+# Set up the sed scripts for CONFIG_FILES section.
 #
 
 # No need to generate the scripts if there are no CONFIG_FILES.
 # This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@GUTENPRINT_MAJOR_VERSION@,$GUTENPRINT_MAJOR_VERSION,;t t
-s,@GUTENPRINT_MINOR_VERSION@,$GUTENPRINT_MINOR_VERSION,;t t
-s,@GUTENPRINT_MICRO_VERSION@,$GUTENPRINT_MICRO_VERSION,;t t
-s,@GUTENPRINT_CURRENT_INTERFACE@,$GUTENPRINT_CURRENT_INTERFACE,;t t
-s,@GUTENPRINT_INTERFACE_AGE@,$GUTENPRINT_INTERFACE_AGE,;t t
-s,@GUTENPRINT_BINARY_AGE@,$GUTENPRINT_BINARY_AGE,;t t
-s,@GUTENPRINT_VERSION@,$GUTENPRINT_VERSION,;t t
-s,@GUTENPRINTUI_CURRENT_INTERFACE@,$GUTENPRINTUI_CURRENT_INTERFACE,;t t
-s,@GUTENPRINTUI_INTERFACE_AGE@,$GUTENPRINTUI_INTERFACE_AGE,;t t
-s,@GUTENPRINTUI_BINARY_AGE@,$GUTENPRINTUI_BINARY_AGE,;t t
-s,@GUTENPRINTUI2_CURRENT_INTERFACE@,$GUTENPRINTUI2_CURRENT_INTERFACE,;t t
-s,@GUTENPRINTUI2_INTERFACE_AGE@,$GUTENPRINTUI2_INTERFACE_AGE,;t t
-s,@GUTENPRINTUI2_BINARY_AGE@,$GUTENPRINTUI2_BINARY_AGE,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CYGPATH_W@,$CYGPATH_W,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
-s,@ACLOCAL@,$ACLOCAL,;t t
-s,@AUTOCONF@,$AUTOCONF,;t t
-s,@AUTOMAKE@,$AUTOMAKE,;t t
-s,@AUTOHEADER@,$AUTOHEADER,;t t
-s,@MAKEINFO@,$MAKEINFO,;t t
-s,@install_sh@,$install_sh,;t t
-s,@STRIP@,$STRIP,;t t
-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s,@mkdir_p@,$mkdir_p,;t t
-s,@AWK@,$AWK,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@am__leading_dot@,$am__leading_dot,;t t
-s,@AMTAR@,$AMTAR,;t t
-s,@am__tar@,$am__tar,;t t
-s,@am__untar@,$am__untar,;t t
-s,@ALL_LINGUAS@,$ALL_LINGUAS,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@EGREP@,$EGREP,;t t
-s,@LN_S@,$LN_S,;t t
-s,@ECHO@,$ECHO,;t t
-s,@AR@,$AR,;t t
-s,@ac_ct_AR@,$ac_ct_AR,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@CPP@,$CPP,;t t
-s,@CXX@,$CXX,;t t
-s,@CXXFLAGS@,$CXXFLAGS,;t t
-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-s,@CXXCPP@,$CXXCPP,;t t
-s,@F77@,$F77,;t t
-s,@FFLAGS@,$FFLAGS,;t t
-s,@ac_ct_F77@,$ac_ct_F77,;t t
-s,@LIBTOOL@,$LIBTOOL,;t t
-s,@LIBTOOL_DEPS@,$LIBTOOL_DEPS,;t t
-s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s,@MAINT@,$MAINT,;t t
-s,@CUPS_CONFIG@,$CUPS_CONFIG,;t t
-s,@FOOMATIC_CONFIGURE@,$FOOMATIC_CONFIGURE,;t t
-s,@FOOMATIC_PPDFILE@,$FOOMATIC_PPDFILE,;t t
-s,@IJS_CONFIG@,$IJS_CONFIG,;t t
-s,@GIMPTOOL_CHECK@,$GIMPTOOL_CHECK,;t t
-s,@GTK_CONFIG@,$GTK_CONFIG,;t t
-s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
-s,@GTK_LIBS@,$GTK_LIBS,;t t
-s,@GIMPTOOL2_CHECK@,$GIMPTOOL2_CHECK,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
-s,@GTK2_CFLAGS@,$GTK2_CFLAGS,;t t
-s,@GTK2_LIBS@,$GTK2_LIBS,;t t
-s,@GIMP2_CFLAGS@,$GIMP2_CFLAGS,;t t
-s,@GIMP2_LIBS@,$GIMP2_LIBS,;t t
-s,@LEX@,$LEX,;t t
-s,@LEXLIB@,$LEXLIB,;t t
-s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
-s,@YACC@,$YACC,;t t
-s,@FIND@,$FIND,;t t
-s,@PERL@,$PERL,;t t
-s,@GLIB_MKENUMS@,$GLIB_MKENUMS,;t t
-s,@CONVERT@,$CONVERT,;t t
-s,@TEXI2HTML@,$TEXI2HTML,;t t
-s,@DVIPS@,$DVIPS,;t t
-s,@DB2PDF@,$DB2PDF,;t t
-s,@DVIPDF@,$DVIPDF,;t t
-s,@DB2PS@,$DB2PS,;t t
-s,@DB2HTML@,$DB2HTML,;t t
-s,@DOXYGEN@,$DOXYGEN,;t t
-s,@DIALOG@,$DIALOG,;t t
-s,@FOOMATIC_KITLOAD@,$FOOMATIC_KITLOAD,;t t
-s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
-s,@MSGFMT@,$MSGFMT,;t t
-s,@GMSGFMT@,$GMSGFMT,;t t
-s,@XGETTEXT@,$XGETTEXT,;t t
-s,@MSGMERGE@,$MSGMERGE,;t t
-s,@USE_NLS@,$USE_NLS,;t t
-s,@LIBICONV@,$LIBICONV,;t t
-s,@LTLIBICONV@,$LTLIBICONV,;t t
-s,@INTLLIBS@,$INTLLIBS,;t t
-s,@LIBINTL@,$LIBINTL,;t t
-s,@LTLIBINTL@,$LTLIBINTL,;t t
-s,@POSUB@,$POSUB,;t t
-s,@GNUCFLAGS@,$GNUCFLAGS,;t t
-s,@GLIB_CONFIG@,$GLIB_CONFIG,;t t
-s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
-s,@GLIB_LIBS@,$GLIB_LIBS,;t t
-s,@GIMPTOOL@,$GIMPTOOL,;t t
-s,@GIMP_CFLAGS@,$GIMP_CFLAGS,;t t
-s,@GIMP_LIBS@,$GIMP_LIBS,;t t
-s,@GIMP_CFLAGS_NOUI@,$GIMP_CFLAGS_NOUI,;t t
-s,@GIMP_LIBS_NOUI@,$GIMP_LIBS_NOUI,;t t
-s,@GIMP_DATA_DIR@,$GIMP_DATA_DIR,;t t
-s,@GIMP_PLUGIN_DIR@,$GIMP_PLUGIN_DIR,;t t
-s,@BUILD_FOOMATIC_TRUE@,$BUILD_FOOMATIC_TRUE,;t t
-s,@BUILD_FOOMATIC_FALSE@,$BUILD_FOOMATIC_FALSE,;t t
-s,@BUILD_FOOMATIC_3_TRUE@,$BUILD_FOOMATIC_3_TRUE,;t t
-s,@BUILD_FOOMATIC_3_FALSE@,$BUILD_FOOMATIC_3_FALSE,;t t
-s,@BUILD_GHOSTSCRIPT_TRUE@,$BUILD_GHOSTSCRIPT_TRUE,;t t
-s,@BUILD_GHOSTSCRIPT_FALSE@,$BUILD_GHOSTSCRIPT_FALSE,;t t
-s,@BUILD_CUPS_TRUE@,$BUILD_CUPS_TRUE,;t t
-s,@BUILD_CUPS_FALSE@,$BUILD_CUPS_FALSE,;t t
-s,@BUILD_CUPS_PPDS_TRUE@,$BUILD_CUPS_PPDS_TRUE,;t t
-s,@BUILD_CUPS_PPDS_FALSE@,$BUILD_CUPS_PPDS_FALSE,;t t
-s,@CUPS_PPDS_AT_TOP_LEVEL_TRUE@,$CUPS_PPDS_AT_TOP_LEVEL_TRUE,;t t
-s,@CUPS_PPDS_AT_TOP_LEVEL_FALSE@,$CUPS_PPDS_AT_TOP_LEVEL_FALSE,;t t
-s,@BUILD_TRANSLATED_CUPS_PPDS_TRUE@,$BUILD_TRANSLATED_CUPS_PPDS_TRUE,;t t
-s,@BUILD_TRANSLATED_CUPS_PPDS_FALSE@,$BUILD_TRANSLATED_CUPS_PPDS_FALSE,;t t
-s,@USE_LEVEL3_PS_TRUE@,$USE_LEVEL3_PS_TRUE,;t t
-s,@USE_LEVEL3_PS_FALSE@,$USE_LEVEL3_PS_FALSE,;t t
-s,@BUILD_ESCPUTIL_TRUE@,$BUILD_ESCPUTIL_TRUE,;t t
-s,@BUILD_ESCPUTIL_FALSE@,$BUILD_ESCPUTIL_FALSE,;t t
-s,@BUILD_TEST_TRUE@,$BUILD_TEST_TRUE,;t t
-s,@BUILD_TEST_FALSE@,$BUILD_TEST_FALSE,;t t
-s,@BUILD_TESTPATTERN_TRUE@,$BUILD_TESTPATTERN_TRUE,;t t
-s,@BUILD_TESTPATTERN_FALSE@,$BUILD_TESTPATTERN_FALSE,;t t
-s,@BUILD_LIBGUTENPRINTUI_TRUE@,$BUILD_LIBGUTENPRINTUI_TRUE,;t t
-s,@BUILD_LIBGUTENPRINTUI_FALSE@,$BUILD_LIBGUTENPRINTUI_FALSE,;t t
-s,@BUILD_LIBGUTENPRINTUI2_TRUE@,$BUILD_LIBGUTENPRINTUI2_TRUE,;t t
-s,@BUILD_LIBGUTENPRINTUI2_FALSE@,$BUILD_LIBGUTENPRINTUI2_FALSE,;t t
-s,@BUILD_GIMP_TRUE@,$BUILD_GIMP_TRUE,;t t
-s,@BUILD_GIMP_FALSE@,$BUILD_GIMP_FALSE,;t t
-s,@BUILD_GIMP2_TRUE@,$BUILD_GIMP2_TRUE,;t t
-s,@BUILD_GIMP2_FALSE@,$BUILD_GIMP2_FALSE,;t t
-s,@BUILD_GIMP2_AS_GUTENPRINT_TRUE@,$BUILD_GIMP2_AS_GUTENPRINT_TRUE,;t t
-s,@BUILD_GIMP2_AS_GUTENPRINT_FALSE@,$BUILD_GIMP2_AS_GUTENPRINT_FALSE,;t t
-s,@INSTALL_SAMPLES_TRUE@,$INSTALL_SAMPLES_TRUE,;t t
-s,@INSTALL_SAMPLES_FALSE@,$INSTALL_SAMPLES_FALSE,;t t
-s,@INSTALL_USER_GUIDE_TRUE@,$INSTALL_USER_GUIDE_TRUE,;t t
-s,@INSTALL_USER_GUIDE_FALSE@,$INSTALL_USER_GUIDE_FALSE,;t t
-s,@USE_NLS_TRUE@,$USE_NLS_TRUE,;t t
-s,@USE_NLS_FALSE@,$USE_NLS_FALSE,;t t
-s,@BUILD_MODULES_TRUE@,$BUILD_MODULES_TRUE,;t t
-s,@BUILD_MODULES_FALSE@,$BUILD_MODULES_FALSE,;t t
-s,@BUILD_GENPPD_STATIC_TRUE@,$BUILD_GENPPD_STATIC_TRUE,;t t
-s,@BUILD_GENPPD_STATIC_FALSE@,$BUILD_GENPPD_STATIC_FALSE,;t t
-s,@RELEASE_DATE@,$RELEASE_DATE,;t t
-s,@cups_prefix@,$cups_prefix,;t t
-s,@cups_exec_prefix@,$cups_exec_prefix,;t t
-s,@cups_bindir@,$cups_bindir,;t t
-s,@cups_sbindir@,$cups_sbindir,;t t
-s,@cups_conf_datadir@,$cups_conf_datadir,;t t
-s,@cups_conf_serverbin@,$cups_conf_serverbin,;t t
-s,@cups_conf_serverroot@,$cups_conf_serverroot,;t t
-s,@CUPS_CFLAGS@,$CUPS_CFLAGS,;t t
-s,@CUPS_LIBS@,$CUPS_LIBS,;t t
-s,@CUPS_PPD_PS_LEVEL@,$CUPS_PPD_PS_LEVEL,;t t
-s,@GENPPD_LIBS@,$GENPPD_LIBS,;t t
-s,@IJS_CFLAGS@,$IJS_CFLAGS,;t t
-s,@IJS_LIBS@,$IJS_LIBS,;t t
-s,@RM@,$RM,;t t
-s,@gimp_plug_indir@,$gimp_plug_indir,;t t
-s,@gimp2_plug_indir@,$gimp2_plug_indir,;t t
-s,@GUTENPRINT_CFLAGS@,$GUTENPRINT_CFLAGS,;t t
-s,@GUTENPRINT_LIBS@,$GUTENPRINT_LIBS,;t t
-s,@GUTENPRINT_LIBDEPS@,$GUTENPRINT_LIBDEPS,;t t
-s,@GUTENPRINTUI_CFLAGS@,$GUTENPRINTUI_CFLAGS,;t t
-s,@GUTENPRINTUI_LIBS@,$GUTENPRINTUI_LIBS,;t t
-s,@GUTENPRINTUI_LIBDEPS@,$GUTENPRINTUI_LIBDEPS,;t t
-s,@GUTENPRINTUI_VERSION@,$GUTENPRINTUI_VERSION,;t t
-s,@GUTENPRINTUI2_CFLAGS@,$GUTENPRINTUI2_CFLAGS,;t t
-s,@GUTENPRINTUI2_LIBS@,$GUTENPRINTUI2_LIBS,;t t
-s,@GUTENPRINTUI2_LIBDEPS@,$GUTENPRINTUI2_LIBDEPS,;t t
-s,@GUTENPRINTUI2_VERSION@,$GUTENPRINTUI2_VERSION,;t t
-s,@gutenprint_cflags@,$gutenprint_cflags,;t t
-s,@gutenprint_libs@,$gutenprint_libs,;t t
-s,@gutenprint_libdeps@,$gutenprint_libdeps,;t t
-s,@gutenprintui_cflags@,$gutenprintui_cflags,;t t
-s,@gutenprintui_libs@,$gutenprintui_libs,;t t
-s,@gutenprintui_libdeps@,$gutenprintui_libdeps,;t t
-s,@gutenprintui2_cflags@,$gutenprintui2_cflags,;t t
-s,@gutenprintui2_libs@,$gutenprintui2_libs,;t t
-s,@gutenprintui2_libdeps@,$gutenprintui2_libdeps,;t t
-s,@LIBREADLINE_DEPS@,$LIBREADLINE_DEPS,;t t
-s,@MAINTAINER_CFLAGS@,$MAINTAINER_CFLAGS,;t t
-s,@PLUG_IN_PATH@,$PLUG_IN_PATH,;t t
-s,@WHICH_PPDS@,$WHICH_PPDS,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-s,@LTALLOCA@,$LTALLOCA,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
+if test -n "$CONFIG_FILES"; then
+
+_ACEOF
+
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+GUTENPRINT_MAJOR_VERSION!$GUTENPRINT_MAJOR_VERSION$ac_delim
+GUTENPRINT_MINOR_VERSION!$GUTENPRINT_MINOR_VERSION$ac_delim
+GUTENPRINT_MICRO_VERSION!$GUTENPRINT_MICRO_VERSION$ac_delim
+GUTENPRINT_CURRENT_INTERFACE!$GUTENPRINT_CURRENT_INTERFACE$ac_delim
+GUTENPRINT_INTERFACE_AGE!$GUTENPRINT_INTERFACE_AGE$ac_delim
+GUTENPRINT_BINARY_AGE!$GUTENPRINT_BINARY_AGE$ac_delim
+GUTENPRINT_VERSION!$GUTENPRINT_VERSION$ac_delim
+GUTENPRINTUI_CURRENT_INTERFACE!$GUTENPRINTUI_CURRENT_INTERFACE$ac_delim
+GUTENPRINTUI_INTERFACE_AGE!$GUTENPRINTUI_INTERFACE_AGE$ac_delim
+GUTENPRINTUI_BINARY_AGE!$GUTENPRINTUI_BINARY_AGE$ac_delim
+GUTENPRINTUI2_CURRENT_INTERFACE!$GUTENPRINTUI2_CURRENT_INTERFACE$ac_delim
+GUTENPRINTUI2_INTERFACE_AGE!$GUTENPRINTUI2_INTERFACE_AGE$ac_delim
+GUTENPRINTUI2_BINARY_AGE!$GUTENPRINTUI2_BINARY_AGE$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+CYGPATH_W!$CYGPATH_W$ac_delim
+PACKAGE!$PACKAGE$ac_delim
+VERSION!$VERSION$ac_delim
+ACLOCAL!$ACLOCAL$ac_delim
+AUTOCONF!$AUTOCONF$ac_delim
+AUTOMAKE!$AUTOMAKE$ac_delim
+AUTOHEADER!$AUTOHEADER$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
+install_sh!$install_sh$ac_delim
+STRIP!$STRIP$ac_delim
+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
+AWK!$AWK$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
+ALL_LINGUAS!$ALL_LINGUAS$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
+DEPDIR!$DEPDIR$ac_delim
+am__include!$am__include$ac_delim
+am__quote!$am__quote$ac_delim
+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+CCDEPMODE!$CCDEPMODE$ac_delim
+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+GREP!$GREP$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
-fi # test -n "$CONFIG_FILES"
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+EGREP!$EGREP$ac_delim
+LN_S!$LN_S$ac_delim
+ECHO!$ECHO$ac_delim
+AR!$AR$ac_delim
+RANLIB!$RANLIB$ac_delim
+CPP!$CPP$ac_delim
+CXX!$CXX$ac_delim
+CXXFLAGS!$CXXFLAGS$ac_delim
+ac_ct_CXX!$ac_ct_CXX$ac_delim
+CXXDEPMODE!$CXXDEPMODE$ac_delim
+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+CXXCPP!$CXXCPP$ac_delim
+F77!$F77$ac_delim
+FFLAGS!$FFLAGS$ac_delim
+ac_ct_F77!$ac_ct_F77$ac_delim
+LIBTOOL!$LIBTOOL$ac_delim
+LIBTOOL_DEPS!$LIBTOOL_DEPS$ac_delim
+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+MAINT!$MAINT$ac_delim
+CUPS_CONFIG!$CUPS_CONFIG$ac_delim
+FOOMATIC_CONFIGURE!$FOOMATIC_CONFIGURE$ac_delim
+FOOMATIC_PPDFILE!$FOOMATIC_PPDFILE$ac_delim
+IJS_CONFIG!$IJS_CONFIG$ac_delim
+GIMPTOOL_CHECK!$GIMPTOOL_CHECK$ac_delim
+GTK_CONFIG!$GTK_CONFIG$ac_delim
+GTK_CFLAGS!$GTK_CFLAGS$ac_delim
+GTK_LIBS!$GTK_LIBS$ac_delim
+GIMPTOOL2_CHECK!$GIMPTOOL2_CHECK$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+GTK2_CFLAGS!$GTK2_CFLAGS$ac_delim
+GTK2_LIBS!$GTK2_LIBS$ac_delim
+GIMP2_CFLAGS!$GIMP2_CFLAGS$ac_delim
+GIMP2_LIBS!$GIMP2_LIBS$ac_delim
+LEX!$LEX$ac_delim
+LEXLIB!$LEXLIB$ac_delim
+LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
+YACC!$YACC$ac_delim
+YFLAGS!$YFLAGS$ac_delim
+FIND!$FIND$ac_delim
+PERL!$PERL$ac_delim
+GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim
+CONVERT!$CONVERT$ac_delim
+TEXI2HTML!$TEXI2HTML$ac_delim
+DVIPS!$DVIPS$ac_delim
+DB2PDF!$DB2PDF$ac_delim
+DVIPDF!$DVIPDF$ac_delim
+DB2PS!$DB2PS$ac_delim
+DB2HTML!$DB2HTML$ac_delim
+DOXYGEN!$DOXYGEN$ac_delim
+DIALOG!$DIALOG$ac_delim
+FOOMATIC_KITLOAD!$FOOMATIC_KITLOAD$ac_delim
+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
+MSGFMT!$MSGFMT$ac_delim
+GMSGFMT!$GMSGFMT$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+MSGMERGE!$MSGMERGE$ac_delim
+USE_NLS!$USE_NLS$ac_delim
+LIBICONV!$LIBICONV$ac_delim
+LTLIBICONV!$LTLIBICONV$ac_delim
+INTLLIBS!$INTLLIBS$ac_delim
+LIBINTL!$LIBINTL$ac_delim
+LTLIBINTL!$LTLIBINTL$ac_delim
+POSUB!$POSUB$ac_delim
+GNUCFLAGS!$GNUCFLAGS$ac_delim
+GLIB_CONFIG!$GLIB_CONFIG$ac_delim
+GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
+GLIB_LIBS!$GLIB_LIBS$ac_delim
+GIMPTOOL!$GIMPTOOL$ac_delim
+GIMP_CFLAGS!$GIMP_CFLAGS$ac_delim
+GIMP_LIBS!$GIMP_LIBS$ac_delim
+GIMP_CFLAGS_NOUI!$GIMP_CFLAGS_NOUI$ac_delim
+GIMP_LIBS_NOUI!$GIMP_LIBS_NOUI$ac_delim
+GIMP_DATA_DIR!$GIMP_DATA_DIR$ac_delim
+GIMP_PLUGIN_DIR!$GIMP_PLUGIN_DIR$ac_delim
+BUILD_FOOMATIC_TRUE!$BUILD_FOOMATIC_TRUE$ac_delim
+BUILD_FOOMATIC_FALSE!$BUILD_FOOMATIC_FALSE$ac_delim
+BUILD_FOOMATIC_3_TRUE!$BUILD_FOOMATIC_3_TRUE$ac_delim
+BUILD_FOOMATIC_3_FALSE!$BUILD_FOOMATIC_3_FALSE$ac_delim
+BUILD_GHOSTSCRIPT_TRUE!$BUILD_GHOSTSCRIPT_TRUE$ac_delim
+BUILD_GHOSTSCRIPT_FALSE!$BUILD_GHOSTSCRIPT_FALSE$ac_delim
+BUILD_CUPS_TRUE!$BUILD_CUPS_TRUE$ac_delim
+BUILD_CUPS_FALSE!$BUILD_CUPS_FALSE$ac_delim
+BUILD_CUPS_1_2_TRUE!$BUILD_CUPS_1_2_TRUE$ac_delim
+BUILD_CUPS_1_2_FALSE!$BUILD_CUPS_1_2_FALSE$ac_delim
+BUILD_CUPS_PPDS_TRUE!$BUILD_CUPS_PPDS_TRUE$ac_delim
+BUILD_CUPS_PPDS_FALSE!$BUILD_CUPS_PPDS_FALSE$ac_delim
+CUPS_PPDS_AT_TOP_LEVEL_TRUE!$CUPS_PPDS_AT_TOP_LEVEL_TRUE$ac_delim
+CUPS_PPDS_AT_TOP_LEVEL_FALSE!$CUPS_PPDS_AT_TOP_LEVEL_FALSE$ac_delim
+BUILD_TRANSLATED_CUPS_PPDS_TRUE!$BUILD_TRANSLATED_CUPS_PPDS_TRUE$ac_delim
+BUILD_TRANSLATED_CUPS_PPDS_FALSE!$BUILD_TRANSLATED_CUPS_PPDS_FALSE$ac_delim
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE!$BUILD_SIMPLIFIED_CUPS_PPDS_TRUE$ac_delim
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE!$BUILD_SIMPLIFIED_CUPS_PPDS_FALSE$ac_delim
+USE_LEVEL3_PS_TRUE!$USE_LEVEL3_PS_TRUE$ac_delim
+USE_LEVEL3_PS_FALSE!$USE_LEVEL3_PS_FALSE$ac_delim
+BUILD_ESCPUTIL_TRUE!$BUILD_ESCPUTIL_TRUE$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
 
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 _ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+BUILD_ESCPUTIL_FALSE!$BUILD_ESCPUTIL_FALSE$ac_delim
+BUILD_TEST_TRUE!$BUILD_TEST_TRUE$ac_delim
+BUILD_TEST_FALSE!$BUILD_TEST_FALSE$ac_delim
+BUILD_TESTPATTERN_TRUE!$BUILD_TESTPATTERN_TRUE$ac_delim
+BUILD_TESTPATTERN_FALSE!$BUILD_TESTPATTERN_FALSE$ac_delim
+BUILD_LIBGUTENPRINTUI_TRUE!$BUILD_LIBGUTENPRINTUI_TRUE$ac_delim
+BUILD_LIBGUTENPRINTUI_FALSE!$BUILD_LIBGUTENPRINTUI_FALSE$ac_delim
+BUILD_LIBGUTENPRINTUI2_TRUE!$BUILD_LIBGUTENPRINTUI2_TRUE$ac_delim
+BUILD_LIBGUTENPRINTUI2_FALSE!$BUILD_LIBGUTENPRINTUI2_FALSE$ac_delim
+BUILD_GIMP_TRUE!$BUILD_GIMP_TRUE$ac_delim
+BUILD_GIMP_FALSE!$BUILD_GIMP_FALSE$ac_delim
+BUILD_GIMP2_TRUE!$BUILD_GIMP2_TRUE$ac_delim
+BUILD_GIMP2_FALSE!$BUILD_GIMP2_FALSE$ac_delim
+BUILD_GIMP2_AS_GUTENPRINT_TRUE!$BUILD_GIMP2_AS_GUTENPRINT_TRUE$ac_delim
+BUILD_GIMP2_AS_GUTENPRINT_FALSE!$BUILD_GIMP2_AS_GUTENPRINT_FALSE$ac_delim
+INSTALL_SAMPLES_TRUE!$INSTALL_SAMPLES_TRUE$ac_delim
+INSTALL_SAMPLES_FALSE!$INSTALL_SAMPLES_FALSE$ac_delim
+INSTALL_USER_GUIDE_TRUE!$INSTALL_USER_GUIDE_TRUE$ac_delim
+INSTALL_USER_GUIDE_FALSE!$INSTALL_USER_GUIDE_FALSE$ac_delim
+USE_NLS_TRUE!$USE_NLS_TRUE$ac_delim
+USE_NLS_FALSE!$USE_NLS_FALSE$ac_delim
+BUILD_MODULES_TRUE!$BUILD_MODULES_TRUE$ac_delim
+BUILD_MODULES_FALSE!$BUILD_MODULES_FALSE$ac_delim
+BUILD_GENPPD_STATIC_TRUE!$BUILD_GENPPD_STATIC_TRUE$ac_delim
+BUILD_GENPPD_STATIC_FALSE!$BUILD_GENPPD_STATIC_FALSE$ac_delim
+RELEASE_DATE!$RELEASE_DATE$ac_delim
+cups_prefix!$cups_prefix$ac_delim
+cups_exec_prefix!$cups_exec_prefix$ac_delim
+cups_bindir!$cups_bindir$ac_delim
+cups_sbindir!$cups_sbindir$ac_delim
+cups_conf_datadir!$cups_conf_datadir$ac_delim
+cups_conf_serverbin!$cups_conf_serverbin$ac_delim
+cups_conf_serverroot!$cups_conf_serverroot$ac_delim
+CUPS_CFLAGS!$CUPS_CFLAGS$ac_delim
+CUPS_LIBS!$CUPS_LIBS$ac_delim
+CUPS_PPD_PS_LEVEL!$CUPS_PPD_PS_LEVEL$ac_delim
+GENPPD_LIBS!$GENPPD_LIBS$ac_delim
+IJS_CFLAGS!$IJS_CFLAGS$ac_delim
+IJS_LIBS!$IJS_LIBS$ac_delim
+RM!$RM$ac_delim
+gimp_plug_indir!$gimp_plug_indir$ac_delim
+gimp2_plug_indir!$gimp2_plug_indir$ac_delim
+GUTENPRINT_CFLAGS!$GUTENPRINT_CFLAGS$ac_delim
+GUTENPRINT_LIBS!$GUTENPRINT_LIBS$ac_delim
+GUTENPRINT_LIBDEPS!$GUTENPRINT_LIBDEPS$ac_delim
+GUTENPRINTUI_CFLAGS!$GUTENPRINTUI_CFLAGS$ac_delim
+GUTENPRINTUI_LIBS!$GUTENPRINTUI_LIBS$ac_delim
+GUTENPRINTUI_LIBDEPS!$GUTENPRINTUI_LIBDEPS$ac_delim
+GUTENPRINTUI_VERSION!$GUTENPRINTUI_VERSION$ac_delim
+GUTENPRINTUI2_CFLAGS!$GUTENPRINTUI2_CFLAGS$ac_delim
+GUTENPRINTUI2_LIBS!$GUTENPRINTUI2_LIBS$ac_delim
+GUTENPRINTUI2_LIBDEPS!$GUTENPRINTUI2_LIBDEPS$ac_delim
+GUTENPRINTUI2_VERSION!$GUTENPRINTUI2_VERSION$ac_delim
+gutenprint_cflags!$gutenprint_cflags$ac_delim
+gutenprint_libs!$gutenprint_libs$ac_delim
+gutenprint_libdeps!$gutenprint_libdeps$ac_delim
+gutenprintui_cflags!$gutenprintui_cflags$ac_delim
+gutenprintui_libs!$gutenprintui_libs$ac_delim
+gutenprintui_libdeps!$gutenprintui_libdeps$ac_delim
+gutenprintui2_cflags!$gutenprintui2_cflags$ac_delim
+gutenprintui2_libs!$gutenprintui2_libs$ac_delim
+gutenprintui2_libdeps!$gutenprintui2_libdeps$ac_delim
+LIBREADLINE_DEPS!$LIBREADLINE_DEPS$ac_delim
+MAINTAINER_CFLAGS!$MAINTAINER_CFLAGS$ac_delim
+PLUG_IN_PATH!$PLUG_IN_PATH$ac_delim
+WHICH_PPDS!$WHICH_PPDS$ac_delim
+BUILD_CUPS_PPDS!$BUILD_CUPS_PPDS$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+LTALLOCA!$LTALLOCA$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
+_ACEOF
+
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
 cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
+fi # test -n "$CONFIG_FILES"
+
+
+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+   { (exit 1); exit 1; }; };;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
 
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
+      esac
+      ac_file_inputs="$ac_file_inputs $ac_f"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input="Generated from "`IFS=:
+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    fi
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin";;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
     as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
     done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
-
   ac_builddir=.
 
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
 
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
 
   case $INSTALL in
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+_ACEOF
 
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+
+case `sed -n '/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+' $ac_file_inputs` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+    s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
 _ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
 $extrasub
@@ -31756,260 +35038,130 @@ _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-  # Run the commands associated with the file.
+s&@configure_input@&$configure_input&;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+$ac_datarootdir_hack
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
+
+  rm -f "$tmp/stdin"
   case $ac_file in
-    src/cups/cups-genppdconfig ) chmod +x src/cups/cups-genppdconfig;
-		 rm -f src/cups/cups-genppdconfig.${GUTENPRINT_RELEASE_VERSION};
-		 mv src/cups/cups-genppdconfig src/cups/cups-genppdconfig.${GUTENPRINT_RELEASE_VERSION} ;;
-    src/cups/cups-genppdupdate ) chmod +x src/cups/cups-genppdupdate;
-		 rm -f src/cups/cups-genppdupdate.${GUTENPRINT_RELEASE_VERSION};
-		 mv src/cups/cups-genppdupdate src/cups/cups-genppdupdate.${GUTENPRINT_RELEASE_VERSION} ;;
-    src/foomatic/foomatic-generator ) chmod +x src/foomatic/foomatic-generator ;;
-    src/foomatic/mk_printerlist ) chmod +x src/foomatic/mk_printerlist ;;
-    src/testpattern/run-testpattern-2 ) chmod +x src/testpattern/run-testpattern-2 ;;
+  -) cat "$tmp/out"; rm -f "$tmp/out";;
+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
   esac
-done
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
 
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status.  If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless.  But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
+ac_dB='\\)[	 (].*,\\1define\\2'
 ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status.  Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments.  This is necessary, for
+ac_dD=' ,'
+
+uniq confdefs.h |
+  sed -n '
+	t rset
+	:rset
+	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
+	t ok
+	d
+	:ok
+	s/[\\&,]/\\&/g
+	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+  ' >>conftest.defines
+
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments.  This is necessary, for
 # example, in the case of _POSIX_SOURCE, which is predefined and required
 # on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[	 #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
 do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+  # Write a here document:
+    cat >>$CONFIG_STATUS <<_ACEOF
+    # First, check the format of the line:
+    cat >"\$tmp/defines.sed" <<\\CEOF
+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
+b
+:def
+_ACEOF
+  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
   echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+  grep . conftest.tail >/dev/null || break
   rm -f conftest.defines
   mv conftest.tail conftest.defines
 done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
+rm -f conftest.defines conftest.tail
 
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
 cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
   if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+    echo "/* $configure_input  */" >"$tmp/config.h"
+    cat "$ac_result" >>"$tmp/config.h"
+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
       rm -f $ac_file
-      mv $tmp/config.h $ac_file
+      mv "$tmp/config.h" $ac_file
     fi
   else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
+    echo "/* $configure_input  */"
+    cat "$ac_result"
   fi
+  rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
 _am_stamp_count=1
 for _am_header in $config_headers :; do
@@ -32020,135 +35172,162 @@ for _am_header in $config_headers :; do
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
 $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X$ac_file : 'X\(//\)[^/]' \| \
 	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
 echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
 
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # So let's grep whole file.
+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+    dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
   else
-    as_dir="$ac_dir"
+    continue
+  fi
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n 's/^U = //p' < "$mf"`
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    { as_dir=$dirpart/$fdir
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
     as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
     done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    default-1 )
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+ ;;
+    "default-1":C)
     for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"
       case "$ac_file" in
@@ -32244,14 +35423,22 @@ echo "$as_me: executing $ac_dest commands" >&6;}
         ;;
       esac
     done ;;
-    default )
+    "src/cups/cups-genppdconfig":F) chmod +x src/cups/cups-genppdconfig;
+		 rm -f src/cups/cups-genppdconfig.${GUTENPRINT_RELEASE_VERSION};
+		 mv src/cups/cups-genppdconfig src/cups/cups-genppdconfig.${GUTENPRINT_RELEASE_VERSION} ;;
+    "src/cups/cups-genppdupdate":F) chmod +x src/cups/cups-genppdupdate;
+		 rm -f src/cups/cups-genppdupdate.${GUTENPRINT_RELEASE_VERSION};
+		 mv src/cups/cups-genppdupdate src/cups/cups-genppdupdate.${GUTENPRINT_RELEASE_VERSION} ;;
+    "src/foomatic/foomatic-generator":F) chmod +x src/foomatic/foomatic-generator ;;
+    "src/foomatic/mk_printerlist":F) chmod +x src/foomatic/mk_printerlist ;;
+    "src/testpattern/run-testpattern-2":F) chmod +x src/testpattern/run-testpattern-2 ;;
+    "default":C)
 echo
  ;;
+
   esac
-done
-_ACEOF
+done # for ac_tag
 
-cat >>$CONFIG_STATUS <<\_ACEOF
 
 { (exit 0); exit 0; }
 _ACEOF
@@ -32293,13 +35480,18 @@ echo "================================================================"
 echo "  Release: $PACKAGE_STRING generated on $RELEASE_DATE"
 echo
 echo "  Features:"
-echo "    Build CUPS:                                 $BUILD_CUPS, installing in $cups_prefix"
 if test "$BUILD_CUPS" != "no" ; then
+    echo "    Build CUPS:                                 $BUILD_CUPS, installing in $cups_prefix"
+    echo "        Build CUPS 1.2 enhancements:            $BUILD_CUPS_1_2"
     echo "        Build CUPS PPD files:                   $BUILD_CUPS_PPDS"
-    echo "            Build translated CUPS PPD files:    $BUILD_TRANSLATED_CUPS_PPDS"
-    echo "            Build simplified CUPS PPD files:    $BUILD_SIMPLIFIED_CUPS_PPDS"
-    echo "            Generate PS level 3 CUPS PPD files: $USE_LEVEL3_PS"
-    echo "        Install CUPS PPD files at top level:    $CUPS_PPDS_AT_TOP_LEVEL"
+    if test "$BUILD_CUPS_PPDS" != "no" ; then
+	echo "            Build translated CUPS PPD files:    $BUILD_TRANSLATED_CUPS_PPDS"
+	echo "            Build simplified CUPS PPD files:    $BUILD_SIMPLIFIED_CUPS_PPDS"
+	echo "            Install CUPS PPDs at top level:     $CUPS_PPDS_AT_TOP_LEVEL"
+    fi
+    if test "$BUILD_CUPS_PPDS" != "no" -o "$BUILD_CUPS_1_2" != "no" ; then
+        echo "        Generate PS level 3 CUPS PPD files:     $USE_LEVEL3_PS"
+    fi
     echo "        Build genppd statically:                $STATIC_GENPPD"
 
     if test "$STATIC_GENPPD" = "no" ; then
@@ -32310,6 +35502,8 @@ if test "$BUILD_CUPS" != "no" ; then
 	echo "                        Please review the README and release notes carefully!"
 	warnings_emitted=1
     fi
+else
+    echo "    Build CUPS:                                 $BUILD_CUPS"
 fi
 echo "    Build Ghostscript IJS driver:               $BUILD_GHOSTSCRIPT"
 echo "    Build Foomatic data:                        $BUILD_FOOMATIC"
@@ -32352,6 +35546,7 @@ fi
 echo "    Build static libraries:                     $enable_static"
 echo "    Build shared libraries:                     $enable_shared"
 echo "    Maintainer mode:                            $USE_MAINTAINER_MODE"
+echo "    Use i18n:                                   $USE_NLS"
 echo "    Generate profiling information:             $ENABLE_PROFILE"
 echo "    Generate debugging symbols:                 $ENABLE_DEBUG"
 echo "    Use modules:                                $WITH_MODULES"
diff --git a/configure.ac b/configure.ac
index c66f379..576a171 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 1.145 2006/07/16 22:59:20 rlk Exp $
+dnl $Id: configure.ac,v 1.151.2.2 2007/05/29 01:47:26 rlk Exp $
 dnl Copyright (C) 2001-2004 Roger Leigh
 dnl 
 dnl This program is free software; you can redistribute it and/or modify
@@ -37,7 +37,7 @@ dnl
 pushdef([GUTENPRINT_NAME],              [gutenprint])
 pushdef([GUTENPRINT_MAJOR_VERSION],     [5])
 pushdef([GUTENPRINT_MINOR_VERSION],     [0])
-pushdef([GUTENPRINT_MICRO_VERSION],     [0])
+pushdef([GUTENPRINT_MICRO_VERSION],     [1])
 pushdef([GUTENPRINT_EXTRA_VERSION],     [])
 pushdef([GUTENPRINT_CURRENT_INTERFACE], [2])
 pushdef([GUTENPRINT_INTERFACE_AGE],     [0])
@@ -52,7 +52,7 @@ pushdef([GUTENPRINT_VERSION], GUTENPRINT_MAJOR_VERSION.GUTENPRINT_MINOR_VERSION.
 
 AC_INIT(GUTENPRINT_NAME, GUTENPRINT_VERSION, [gimp-print-devel@lists.sourceforge.net])
 AC_PREREQ(2.53)
-AC_REVISION($Revision: 1.145 $)
+AC_REVISION($Revision: 1.151.2.2 $)
 AC_CONFIG_SRCDIR(src/main/print-vars.c)
 AC_CONFIG_AUX_DIR(scripts)
 STP_INIT
@@ -116,8 +116,15 @@ AC_SUBST([GUTENPRINTUI2_CURRENT_INTERFACE])
 AC_SUBST([GUTENPRINTUI2_INTERFACE_AGE])
 AC_SUBST([GUTENPRINTUI2_BINARY_AGE])
 
+dnl Make sure we inherit common compiler options from the environment...
+CFLAGS="${CFLAGS:=}"
+CPPFLAGS="${CPPFLAGS:=}"
+CXXFLAGS="${CXXFLAGS:=}"
+LDFLAGS="${LDFLAGS:=}"
+LIBS="${LIBS:=}"
+
 dnl Initialize automake stuff.
-AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-dist-gzip tar-ustar check-news gnu no-dependencies)
+AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-dist-gzip tar-ustar check-news gnu)
 popdef([GUTENPRINT_NAME])
 popdef([GUTENPRINT_VERSION])
 
@@ -214,14 +221,36 @@ STP_ARG_WITH_DETAILED(
      cups_prefix="${prefix}"
   ])
 
+USE_LEVEL3_PS=no
 BUILD_CUPS_PPDS="${BUILD_CUPS}"
 BUILD_TRANSLATED_CUPS_PPDS="${BUILD_CUPS}"
+BUILD_CUPS_1_2="no"
+if test -n "${CUPS_CONFIG}" -a "${BUILD_CUPS}" = "yes" ; then
+  cups_version=`${CUPS_CONFIG} --version`
+dnl Quote to protect sed regexes
+  [cups_major=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\1/'`]
+  [cups_minor=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\2/'`]
+  [cups_point=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\3/'`]
+dnl There was no CUPS 1.0.15 or the like
+  if test "$cups_major" -gt 1 -o "$cups_minor" -gt 1 -o "$cups_point" -gt 14 ; then
+    USE_LEVEL3_PS=yes
+  fi
+  if test "$cups_major" -gt 1 -o "$cups_minor" -gt 1 ; then
+    BUILD_CUPS_PPDS="no"
+    BUILD_CUPS_1_2="yes"
+  fi
+fi
 
 STP_ARG_ENABLE([cups-ppds],
                [build CUPS PPD files],
                [BUILD_CUPS_PPDS],
                [(automatic)])
 
+STP_ARG_ENABLE([cups-1_2-enhancements],
+               [build CUPS 1.2 enhancements],
+               [BUILD_CUPS_1_2],
+               [(automatic)])
+
 STP_ARG_ENABLE([translated-cups-ppds],
                [build translated CUPS PPD files],
                [BUILD_TRANSLATED_CUPS_PPDS],
@@ -240,19 +269,6 @@ STP_ARG_ENABLE_DETAILED([simplified-cups-ppds],
     *) AC_MSG_ERROR([${enableval}: not a valid option ('yes', 'no', or 'only')]) ;;
 				   ])
 
-USE_LEVEL3_PS=no
-if test -n "${CUPS_CONFIG}" -a "${BUILD_CUPS}" = "yes" ; then
-  cups_version=`${CUPS_CONFIG} --version`
-dnl Quote to protect sed regexes
-  [cups_major=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\1/'`]
-  [cups_minor=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\2/'`]
-  [cups_point=`echo $cups_version | sed -e 's/\([0-9][0-9]*\).\([0-9][0-9]*\).\([0-9][0-9]*\).*/\3/'`]
-dnl There was no CUPS 1.0.15 or the like
-  if test "$cups_major" -gt 1 -o "$cups_minor" -gt 1 -o "$cups_point" -gt 14 ; then
-    USE_LEVEL3_PS=yes
-  fi
-fi
-
 STP_ARG_ENABLE([cups-ppds-at-top-level],
 	       [place CUPS PPD files at top level],
 	       [CUPS_PPDS_AT_TOP_LEVEL],
@@ -428,7 +444,7 @@ if test x$BUILD_GIMP2 = xyes; then
 fi
 
 STP_ARG_WITH([gimp2],
-             [build GIMP 2.0 Print plugin],
+             [build GIMP 2.x Print plugin],
              [BUILD_GIMP2],
              [(automatic)])
 
@@ -587,6 +603,16 @@ if test "x${datadir}" = 'x${prefix}/share'; then
   else
     PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
   fi
+elif test "x${datadir}" = 'x${datarootdir}'; then
+  if test "x${datarootdir}" = 'x${prefix}/share'; then
+    if test "x${prefix}" = "xNONE"; then
+      PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
+    else
+      PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
+    fi
+  else
+    PACKAGE_DATA_DIR="${datarootdir}/${PACKAGE}"
+  fi
 else
   PACKAGE_DATA_DIR="${datadir}/${PACKAGE}"
 fi
@@ -621,16 +647,21 @@ AC_DEFINE_UNQUOTED(PKGMODULEDIR, ["$PKGMODULEDIR"])
 
 dnl Compiler flags
 if test x$ac_compiler_gnu = "xyes"; then
-  STP_ADD_COMPILER_ARGS([-Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -finline-limit=1048576],, [GNUCFLAGS])
+  STP_ADD_COMPILER_ARGS([-Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=1048576],, [GNUCFLAGS])
   if test x${USE_MAINTAINER_MODE} = xyes ; then
     STP_ADD_COMPILER_ARGS([-pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls],, [GNUCFLAGS])
   fi
-else
   if test x$ENABLE_DEBUG = xyes ; then
     STP_ADD_COMPILER_ARG([-g])
   else
     STP_ADD_FIRST_COMPILER_ARG([-O6 -O3 -O2 -O1 -O])
   fi
+else
+  if test x$ENABLE_DEBUG = xyes ; then
+    STP_ADD_COMPILER_ARG([-g])
+  else
+    STP_ADD_FIRST_COMPILER_ARG([-O])
+  fi
 fi
 if test x$ENABLE_PROFILE = xyes ; then
   STP_ADD_COMPILER_ARG([-pg])
@@ -651,7 +682,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([typedef struct __attribute__((__packed__)) {
                   [AC_MSG_RESULT([no])])
 
 AH_VERBATIM([HAVE_GCC_ATTRIBUTES_BOILERPLATE],
-[#ifndef HAVE_GCC_ATTRIBUTES
+[#if !defined(HAVE_GCC_ATTRIBUTES) && !defined(__attribute__)
 /* This should really be a C99 anonymous variadic macro. */
 #define __attribute__(attr)
 #endif])
@@ -768,6 +799,9 @@ dnl Checks for library functions.
 AC_CHECK_FUNCS([nanosleep poll usleep])
 AC_CHECK_FUNCS([getopt_long])
 
+dnl finite() is non-standard, isfinite() is ISO-standard, figure out
+dnl which to use...
+AC_SEARCH_LIBS(finite, m, CFLAGS="-Disfinite=finite $CFLAGS")
 
 dnl Define what has to be built
 AM_CONDITIONAL(BUILD_FOOMATIC, test x${BUILD_FOOMATIC} = xyes)
@@ -778,12 +812,16 @@ AM_CONDITIONAL(BUILD_GHOSTSCRIPT, test x${BUILD_GHOSTSCRIPT} = xyes)
 
 AM_CONDITIONAL(BUILD_CUPS, test x${BUILD_CUPS} = xyes)
 
+AM_CONDITIONAL(BUILD_CUPS_1_2, test x${BUILD_CUPS_1_2} = xyes)
+
 AM_CONDITIONAL(BUILD_CUPS_PPDS, test x${BUILD_CUPS_PPDS} = xyes)
 
 AM_CONDITIONAL(CUPS_PPDS_AT_TOP_LEVEL, test x${CUPS_PPDS_AT_TOP_LEVEL} = xyes)
 
 AM_CONDITIONAL(BUILD_TRANSLATED_CUPS_PPDS, test x${BUILD_TRANSLATED_CUPS_PPDS} = xyes)
 
+AM_CONDITIONAL(BUILD_SIMPLIFIED_CUPS_PPDS, test x${BUILD_SIMPLIFIED_CUPS_PPDS} = xyes)
+
 if test x${USE_LEVEL3_PS} = xno ; then
   CUPS_PPD_PS_LEVEL=2
 else
@@ -946,6 +984,7 @@ AC_SUBST(LIBREADLINE_DEPS)
 AC_SUBST(MAINTAINER_CFLAGS)
 AC_SUBST(PLUG_IN_PATH)
 AC_SUBST(WHICH_PPDS)
+AC_SUBST(BUILD_CUPS_PPDS)
 
 dnl Output files
 
@@ -996,7 +1035,6 @@ AC_CONFIG_FILES([src/gutenprintui/Makefile])
 AC_CONFIG_FILES([src/gutenprintui/gutenprintui.pc])
 AC_CONFIG_FILES([src/gutenprintui2/Makefile])
 AC_CONFIG_FILES([src/gutenprintui2/gutenprintui2.pc])
-AC_CONFIG_FILES([cups-gutenprint.list])
 AC_CONFIG_FILES([test/Makefile])
 AC_CONFIG_FILES([scripts/Makefile])
 AC_CONFIG_COMMANDS([default], [
@@ -1019,13 +1057,18 @@ echo "================================================================"
 echo "  Release: $PACKAGE_STRING generated on $RELEASE_DATE"
 echo
 echo "  Features:"
-echo "    Build CUPS:                                 $BUILD_CUPS, installing in $cups_prefix"
 if test "$BUILD_CUPS" != "no" ; then
+    echo "    Build CUPS:                                 $BUILD_CUPS, installing in $cups_prefix"
+    echo "        Build CUPS 1.2 enhancements:            $BUILD_CUPS_1_2"
     echo "        Build CUPS PPD files:                   $BUILD_CUPS_PPDS"
-    echo "            Build translated CUPS PPD files:    $BUILD_TRANSLATED_CUPS_PPDS"
-    echo "            Build simplified CUPS PPD files:    $BUILD_SIMPLIFIED_CUPS_PPDS"
-    echo "            Generate PS level 3 CUPS PPD files: $USE_LEVEL3_PS"
-    echo "        Install CUPS PPD files at top level:    $CUPS_PPDS_AT_TOP_LEVEL"
+    if test "$BUILD_CUPS_PPDS" != "no" ; then
+	echo "            Build translated CUPS PPD files:    $BUILD_TRANSLATED_CUPS_PPDS"
+	echo "            Build simplified CUPS PPD files:    $BUILD_SIMPLIFIED_CUPS_PPDS"
+	echo "            Install CUPS PPDs at top level:     $CUPS_PPDS_AT_TOP_LEVEL"
+    fi
+    if test "$BUILD_CUPS_PPDS" != "no" -o "$BUILD_CUPS_1_2" != "no" ; then
+        echo "        Generate PS level 3 CUPS PPD files:     $USE_LEVEL3_PS"
+    fi
     echo "        Build genppd statically:                $STATIC_GENPPD"
 
     if test "$STATIC_GENPPD" = "no" ; then
@@ -1036,6 +1079,8 @@ if test "$BUILD_CUPS" != "no" ; then
 	echo "                        Please review the README and release notes carefully!"
 	warnings_emitted=1
     fi
+else
+    echo "    Build CUPS:                                 $BUILD_CUPS"
 fi
 echo "    Build Ghostscript IJS driver:               $BUILD_GHOSTSCRIPT"
 echo "    Build Foomatic data:                        $BUILD_FOOMATIC"
@@ -1078,6 +1123,7 @@ fi
 echo "    Build static libraries:                     $enable_static"
 echo "    Build shared libraries:                     $enable_shared"
 echo "    Maintainer mode:                            $USE_MAINTAINER_MODE"
+echo "    Use i18n:                                   $USE_NLS"
 echo "    Generate profiling information:             $ENABLE_PROFILE"
 echo "    Generate debugging symbols:                 $ENABLE_DEBUG"
 echo "    Use modules:                                $WITH_MODULES"
diff --git a/cups-gutenprint.list.in b/cups-gutenprint.list.in
deleted file mode 100644
index 64e0705..0000000
--- a/cups-gutenprint.list.in
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# "$Id: cups-gutenprint.list.in,v 1.1 2004/09/17 18:37:41 rleigh Exp $"
-#
-# EPM list file for CUPS drivers; EPM is available at:
-#
-#     http://www.easysw.com/epm/
-#
-# YOU MUST CONFIGURE GUTENPRINT WITH --disable-shared!
-#
-# Copyright 2001 by Michael Sweet
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-
-# Basic product info...
-%product Gutenprint drivers for CUPS
-%copyright 1997-2001 by Michael Sweet and Robert Krawitz
-%vendor Michael Sweet and Robert Krawitz
-%version @GUTENPRINT_VERSION@
-%readme README
-%license COPYING
-%requires cups
-
-# Directories
-$prefix=@cups_prefix@
-$sbindir=@cups_sbindir@
-$bindir=@cups_bindir@
-$datadir=@cups_datadir@
-$libdir=@cups_libdir@
-$sysconfdir=@cups_sysconfdir@
-
-# MIME type file for printer command files...
-f 0444 root sys $sysconfdir/cups/command.types src/cups/command.types
-
-# PPD files for printer drivers...
-f 0444 root sys $datadir/cups/model/en src/cups/ppd/C/*.ppd
-f 0444 root sys $datadir/cups/model/en src/cups/ppd/C/*.ppd.gz
-
-# Data file for calibration
-f 0444 root sys $datadir/cups/data/calibrate.ppm src/cups/calibrate.ppm
-
-# User commands...
-f 0555 root sys $bindir/cups-calibrate src/cups/cups-calibrate
-f 0555 root sys $sbindir/cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ src/cups/cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
-f 0555 root sys $sbindir/cups-genppdupdate.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ src/cups/cups-genppdupdate.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
-f 0555 root sys $bindir/cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ src/cups/cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
-
-# Backends for printer drivers...
-f 0555 root sys $libdir/cups/backend/canon src/cups/canon
-f 0555 root sys $libdir/cups/backend/epson src/cups/epson
-
-# Filters for printer drivers...
-f 0555 root sys $libdir/cups/filter/commandtocanon src/cups/commandtocanon
-f 0555 root sys $libdir/cups/filter/commandtoepson src/cups/commandtoepson
-f 0555 root sys $libdir/cups/filter/rastertogutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ src/cups/rastertogutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
-
-# Reload PPD database after installation...
-%postinstall /etc/software/init.d/cups restart
-
-#
-# End of "$Id: cups-gutenprint.list.in,v 1.1 2004/09/17 18:37:41 rleigh Exp $"
-#
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9920c97..1449665 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.48 2006/07/16 22:59:53 rlk Exp $
+## $Id: Makefile.am,v 1.49 2006/07/30 23:24:38 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -63,9 +63,9 @@ html:
 
 install-data-local: FAQ.html gutenprint-users-manual.odt gutenprint-users-manual.pdf
 	$(mkdir_p) $(DESTDIR)$(docdir)
-	$(INSTALL_DATA) FAQ.html $(DESTDIR)$(docdir)
-	$(INSTALL_DATA) gutenprint-users-manual.odt $(DESTDIR)$(docdir)
-	$(INSTALL_DATA) gutenprint-users-manual.pdf $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/FAQ.html $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/gutenprint-users-manual.odt $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/gutenprint-users-manual.pdf $(DESTDIR)$(docdir)
 
 
 ## Clean
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 53016ab..b73fbf6 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -47,18 +47,17 @@ subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = gutenprint.dox gutenprintui2.dox
-depcomp =
-am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -73,13 +72,18 @@ DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -105,6 +109,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -112,6 +118,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -124,12 +131,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -164,6 +173,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -259,14 +269,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -283,6 +296,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = $(datadir)/$(PACKAGE)/doc
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -300,24 +316,27 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 SUBDIRS = developer
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
-docdir = $(datadir)/$(PACKAGE)/doc
 MAINTAINERCLEANFILES = \
 	Makefile.in \
 	gutenprint-stamp
@@ -346,9 +365,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps doc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps doc/Makefile
+	  $(AUTOMAKE) --gnu  doc/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -691,9 +710,9 @@ html:
 
 install-data-local: FAQ.html gutenprint-users-manual.odt gutenprint-users-manual.pdf
 	$(mkdir_p) $(DESTDIR)$(docdir)
-	$(INSTALL_DATA) FAQ.html $(DESTDIR)$(docdir)
-	$(INSTALL_DATA) gutenprint-users-manual.odt $(DESTDIR)$(docdir)
-	$(INSTALL_DATA) gutenprint-users-manual.pdf $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/FAQ.html $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/gutenprint-users-manual.odt $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/gutenprint-users-manual.pdf $(DESTDIR)$(docdir)
 
 maintainer-clean-local:
 	$(RM) -r gutenprint
diff --git a/doc/README.maintaining b/doc/README.maintaining
index 14aa51c..2ae7782 100644
--- a/doc/README.maintaining
+++ b/doc/README.maintaining
@@ -49,7 +49,7 @@ something that you would like covering, please let me know!
 
  -- Roger Leigh <rleigh@debian.org>
 
- $Id: README.maintaining,v 1.22 2006/05/14 20:02:18 rleigh Exp $
+ $Id: README.maintaining,v 1.22.8.1 2007/03/02 12:01:12 rlk Exp $
 
 
 1. Setting up the autotools
@@ -226,12 +226,12 @@ is enabled, and should be present in the release tarball.
 Other packages (including the extra development packages on some
 systems) must be installed on your system to build correctly.  These
 include: autoconf, automake, libtool, gtk, gdk, gimp 1.2, gimp 2.0,
-cups, foomatic, makeinfo, jade/jadetex, readline, SGML tools,
-texi2html.  Not all these need to be installed, depending on the
-configure options used.  It might be necessary to get the latest
-releases of some of these packages, as critical bugs present in
-earlier releases have been fixed.  The latest gettext and texi2html
-are strongly suggested.
+cups, foomatic, readline, and a DocBook processor (db2html, db2pdf,
+db2html).  Not all these need to be installed, depending on the
+configure options used (GIMP, CUPS, Foomatic and readline are
+optional).  It might be necessary to get the latest releases of some
+of these packages, as critical bugs present in earlier releases have
+been fixed.  The latest gettext is strongly suggested.
 
 3.4 Extra make targets
 ----------------------
diff --git a/doc/developer/Makefile.am b/doc/developer/Makefile.am
index e93267c..ec1232f 100644
--- a/doc/developer/Makefile.am
+++ b/doc/developer/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.19 2006/07/16 22:57:23 rlk Exp $
+## $Id: Makefile.am,v 1.19.6.1 2007/03/02 12:01:12 rlk Exp $
 ## Copyright (C) 2001 Andy Stewart and Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -163,7 +163,7 @@ clean-local:
 	  $(RM) -f $(MANUAL_SRC_FILES) ; \
 	fi
 	-$(RM) -rf *.tex *.log *.aux *.dvi *.gz *.out *.junk *.out *.fot
-	-$(RM) -rf db2html* DB2HTML*
+	-$(RM) -rf db2html* DB2HTML* CATALOG.local
 
 veryclean:
 	$(MAKE) MAINT_MODE=true clean
diff --git a/doc/developer/Makefile.in b/doc/developer/Makefile.in
index a86a76e..bc8612f 100644
--- a/doc/developer/Makefile.in
+++ b/doc/developer/Makefile.in
@@ -46,30 +46,34 @@ subdir = doc/developer
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-depcomp =
-am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -95,6 +99,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -102,6 +108,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -114,12 +121,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -154,6 +163,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -249,14 +259,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -273,6 +286,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -290,17 +306,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -347,9 +367,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps doc/developer/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/developer/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps doc/developer/Makefile
+	  $(AUTOMAKE) --gnu  doc/developer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -617,7 +637,7 @@ clean-local:
 	  $(RM) -f $(MANUAL_SRC_FILES) ; \
 	fi
 	-$(RM) -rf *.tex *.log *.aux *.dvi *.gz *.out *.junk *.out *.fot
-	-$(RM) -rf db2html* DB2HTML*
+	-$(RM) -rf db2html* DB2HTML* CATALOG.local
 
 veryclean:
 	$(MAKE) MAINT_MODE=true clean
diff --git a/doc/developer/gutenprint.pdf b/doc/developer/gutenprint.pdf
index 66a6479..e46f495 100644
--- a/doc/developer/gutenprint.pdf
+++ b/doc/developer/gutenprint.pdf
diff --git a/doc/developer/reference-html/book1.html b/doc/developer/reference-html/book1.html
index 8c8b39c..22d3b84 100644
--- a/doc/developer/reference-html/book1.html
+++ b/doc/developer/reference-html/book1.html
@@ -10,7 +10,7 @@ REL="NEXT"
 TITLE="Preface"
 HREF="f14.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="book"
 ><DIV
diff --git a/doc/developer/reference-html/c1717.html b/doc/developer/reference-html/c1717.html
index 3a40313..8d788c0 100644
--- a/doc/developer/reference-html/c1717.html
+++ b/doc/developer/reference-html/c1717.html
@@ -16,7 +16,7 @@ REL="NEXT"
 TITLE="Weaving algorithms"
 HREF="x1734.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="chapter"
 ><DIV
diff --git a/doc/developer/reference-html/c194.html b/doc/developer/reference-html/c194.html
index 40d250a..9b10465 100644
--- a/doc/developer/reference-html/c194.html
+++ b/doc/developer/reference-html/c194.html
@@ -16,7 +16,7 @@ REL="NEXT"
 TITLE="Adding a new printer"
 HREF="c200.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="chapter"
 ><DIV
diff --git a/doc/developer/reference-html/c1968.html b/doc/developer/reference-html/c1968.html
index 6604cc4..2f76563 100644
--- a/doc/developer/reference-html/c1968.html
+++ b/doc/developer/reference-html/c1968.html
@@ -16,7 +16,7 @@ REL="NEXT"
 TITLE="GNU General Public License"
 HREF="gpl.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="chapter"
 ><DIV
diff --git a/doc/developer/reference-html/c200.html b/doc/developer/reference-html/c200.html
index a995e70..113c95f 100644
--- a/doc/developer/reference-html/c200.html
+++ b/doc/developer/reference-html/c200.html
@@ -16,7 +16,7 @@ REL="NEXT"
 TITLE="The driver file"
 HREF="x271.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="chapter"
 ><DIV
diff --git a/doc/developer/reference-html/c39.html b/doc/developer/reference-html/c39.html
index 1b6ce3e..ddadc9f 100644
--- a/doc/developer/reference-html/c39.html
+++ b/doc/developer/reference-html/c39.html
@@ -16,7 +16,7 @@ REL="NEXT"
 TITLE="Using libgutenprint"
 HREF="c48.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="chapter"
 ><DIV
diff --git a/doc/developer/reference-html/c464.html b/doc/developer/reference-html/c464.html
index 059dc9a..6dfb8d3 100644
--- a/doc/developer/reference-html/c464.html
+++ b/doc/developer/reference-html/c464.html
@@ -16,7 +16,7 @@ REL="NEXT"
 TITLE="Remote Mode Commands"
 HREF="x955.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="chapter"
 ><DIV
diff --git a/doc/developer/reference-html/c48.html b/doc/developer/reference-html/c48.html
index 907e61a..71e4a89 100644
--- a/doc/developer/reference-html/c48.html
+++ b/doc/developer/reference-html/c48.html
@@ -16,7 +16,7 @@ REL="NEXT"
 TITLE="Linking with libgutenprint"
 HREF="x67.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="chapter"
 ><DIV
diff --git a/doc/developer/reference-html/f14.html b/doc/developer/reference-html/f14.html
index b9e5ab2..48eaa51 100644
--- a/doc/developer/reference-html/f14.html
+++ b/doc/developer/reference-html/f14.html
@@ -16,7 +16,7 @@ REL="NEXT"
 TITLE="Copying, modification and redistribution"
 HREF="c39.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="preface"
 ><DIV
diff --git a/doc/developer/reference-html/gpl-terms.html b/doc/developer/reference-html/gpl-terms.html
index a457062..16c410f 100644
--- a/doc/developer/reference-html/gpl-terms.html
+++ b/doc/developer/reference-html/gpl-terms.html
@@ -16,7 +16,7 @@ REL="PREVIOUS"
 TITLE="GNU General Public License"
 HREF="gpl.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="sect1"
 ><DIV
diff --git a/doc/developer/reference-html/gpl.html b/doc/developer/reference-html/gpl.html
index ccdc927..3a7280e 100644
--- a/doc/developer/reference-html/gpl.html
+++ b/doc/developer/reference-html/gpl.html
@@ -16,7 +16,7 @@ REL="NEXT"
 TITLE="TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
 HREF="gpl-terms.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="appendix"
 ><DIV
diff --git a/doc/developer/reference-html/ln10.html b/doc/developer/reference-html/ln10.html
index cf959ef..87e4a78 100644
--- a/doc/developer/reference-html/ln10.html
+++ b/doc/developer/reference-html/ln10.html
@@ -11,7 +11,7 @@ REL="NEXT"
 TITLE="Preface"
 HREF="f14.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 ><DIV
 CLASS="NAVHEADER"
diff --git a/doc/developer/reference-html/x1669.html b/doc/developer/reference-html/x1669.html
index 9f290fe..4785a2f 100644
--- a/doc/developer/reference-html/x1669.html
+++ b/doc/developer/reference-html/x1669.html
@@ -19,7 +19,7 @@ REL="NEXT"
 TITLE="Weaving for inkjet printers"
 HREF="c1717.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="sect1"
 ><DIV
diff --git a/doc/developer/reference-html/x1734.html b/doc/developer/reference-html/x1734.html
index 1a3623a..9004db7 100644
--- a/doc/developer/reference-html/x1734.html
+++ b/doc/developer/reference-html/x1734.html
@@ -19,7 +19,7 @@ REL="NEXT"
 TITLE="Dithering"
 HREF="c1968.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="sect1"
 ><DIV
diff --git a/doc/developer/reference-html/x271.html b/doc/developer/reference-html/x271.html
index 6be31a9..288dbfa 100644
--- a/doc/developer/reference-html/x271.html
+++ b/doc/developer/reference-html/x271.html
@@ -19,7 +19,7 @@ REL="NEXT"
 TITLE="ESC/P2"
 HREF="c464.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="sect1"
 ><DIV
diff --git a/doc/developer/reference-html/x67.html b/doc/developer/reference-html/x67.html
index 9130f98..c402044 100644
--- a/doc/developer/reference-html/x67.html
+++ b/doc/developer/reference-html/x67.html
@@ -19,7 +19,7 @@ REL="NEXT"
 TITLE="Integrating libgutenprint"
 HREF="x79.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="sect1"
 ><DIV
diff --git a/doc/developer/reference-html/x79.html b/doc/developer/reference-html/x79.html
index 05f0608..4b4d156 100644
--- a/doc/developer/reference-html/x79.html
+++ b/doc/developer/reference-html/x79.html
@@ -19,7 +19,7 @@ REL="NEXT"
 TITLE="Reporting Bugs"
 HREF="c194.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="sect1"
 ><DIV
diff --git a/doc/developer/reference-html/x955.html b/doc/developer/reference-html/x955.html
index cd11971..5570b9f 100644
--- a/doc/developer/reference-html/x955.html
+++ b/doc/developer/reference-html/x955.html
@@ -19,7 +19,7 @@ REL="NEXT"
 TITLE="Appropriate Remote Commands"
 HREF="x1669.html"><META
 http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+content="text/html; charset=@encoding@"></HEAD
 ><BODY
 CLASS="sect1"
 ><DIV
diff --git a/doc/gutenprint-users-manual.odt b/doc/gutenprint-users-manual.odt
index 618f1ba..c828b3a 100644
--- a/doc/gutenprint-users-manual.odt
+++ b/doc/gutenprint-users-manual.odt
diff --git a/doc/gutenprint-users-manual.pdf b/doc/gutenprint-users-manual.pdf
index 7751497..a6f6365 100644
--- a/doc/gutenprint-users-manual.pdf
+++ b/doc/gutenprint-users-manual.pdf
diff --git a/doc/gutenprint.dox.in b/doc/gutenprint.dox.in
index c75434f..ece7460 100644
--- a/doc/gutenprint.dox.in
+++ b/doc/gutenprint.dox.in
@@ -1,4 +1,4 @@
-# Doxyfile 1.3.4
+# Doxyfile 1.5.2
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -14,6 +14,14 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 
+# This tag specifies the encoding used for all characters in the config file that 
+# follow. The default is UTF-8 which is also the encoding used for all text before 
+# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into 
+# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of 
+# possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
@@ -32,27 +40,27 @@ PROJECT_NUMBER         = @VERSION@
 
 OUTPUT_DIRECTORY       = ./gutenprint
 
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all 
 # documentation generated by doxygen is written. Doxygen will use this 
 # information to generate all constant output in the proper language. 
 # The default language is English, other supported languages are: 
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 
-# (Japanese with English messages), Korean, Norwegian, Polish, Portuguese, 
-# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, 
+# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, 
+# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, 
+# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
 
 OUTPUT_LANGUAGE        = English
 
-# This tag can be used to specify the encoding used in the generated output. 
-# The encoding is not always determined by the language that is chosen, 
-# but also whether or not the output is meant for Windows or non-Windows users. 
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
-# forces the Windows encoding (this is the default for the Windows binary), 
-# whereas setting the tag to NO uses a Unix-style encoding (the default for 
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   = NO
-
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
 # include brief member descriptions after the members that are listed in 
 # the file and class documentation (similar to JavaDoc). 
@@ -67,16 +75,28 @@ BRIEF_MEMBER_DESC      = YES
 
 REPEAT_BRIEF           = YES
 
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = 
+
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
 # Doxygen will generate a detailed section even if there is only a brief 
 # description.
 
 ALWAYS_DETAILED_SEC    = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
-# members of a class in the documentation of that class as if those members were 
-# ordinary class members. Constructors, destructors and assignment operators of 
-# the base classes will not be shown.
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
 
 INLINE_INHERITED_MEMB  = NO
 
@@ -89,10 +109,21 @@ FULL_PATH_NAMES        = YES
 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
 # can be used to strip a user-defined part of the path. Stripping is 
 # only done if one of the specified strings matches the left-hand part of 
-# the path. It is allowed to use relative paths in the argument list.
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
 
 STRIP_FROM_PATH        = ../
 
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
 # (but less readable) file names. This can be useful is your file systems 
 # doesn't support long names like on DOS, Mac, or CD-ROM.
@@ -103,7 +134,7 @@ SHORT_NAMES            = NO
 # will interpret the first line (until the first dot) of a JavaDoc-style 
 # comment as the brief description. If set to NO, the JavaDoc 
 # comments will behave just like the Qt-style comments (thus requiring an 
-# explict @brief command for a brief description.
+# explicit @brief command for a brief description.
 
 JAVADOC_AUTOBRIEF      = YES
 
@@ -124,16 +155,15 @@ DETAILS_AT_TOP         = NO
 
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
 # member inherits the documentation from any documented member that it 
-# reimplements.
+# re-implements.
 
 INHERIT_DOCS           = YES
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
 
-DISTRIBUTE_GROUP_DOC   = NO
+SEPARATE_MEMBER_PAGES  = NO
 
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
 # Doxygen uses this value to replace tabs by spaces in code fragments.
@@ -149,20 +179,41 @@ TAB_SIZE               = 8
 
 ALIASES                = 
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
-# only. Doxygen will then generate output that is more tailored for C. 
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
 # For instance, some of the names that are used will be different. The list 
 # of all members will be omitted, etc.
 
 OPTIMIZE_OUTPUT_FOR_C  = YES
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
-# only. Doxygen will then generate output that is more tailored for Java. 
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for Java. 
 # For instance, namespaces will be presented as packages, qualified scopes 
 # will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to 
+# include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
 # Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
 # the same type (for instance a group of public functions) to be put as a 
 # subgroup of that type (e.g. under the Public Functions section). Set it to 
@@ -198,6 +249,13 @@ EXTRACT_STATIC         = YES
 
 EXTRACT_LOCAL_CLASSES  = YES
 
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
 # undocumented members of documented classes, files or namespaces. 
 # If set to NO (the default) these members will be included in the 
@@ -238,7 +296,7 @@ INTERNAL_DOCS          = NO
 # file names in lower-case letters. If set to YES upper-case letters are also 
 # allowed. This is useful if you have classes or files whose names only differ 
 # in case and if your file system supports case sensitive file names. Windows 
-# users are advised to set this option to NO.
+# and Mac users are advised to set this option to NO.
 
 CASE_SENSE_NAMES       = YES
 
@@ -266,6 +324,23 @@ INLINE_INFO            = YES
 
 SORT_MEMBER_DOCS       = YES
 
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
 # The GENERATE_TODOLIST tag can be used to enable (YES) or 
 # disable (NO) the todo list. This list is created by putting \todo 
 # commands in the documentation.
@@ -311,6 +386,22 @@ MAX_INITIALIZER_LINES  = 30
 
 SHOW_USED_FILES        = YES
 
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from the 
+# version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -339,10 +430,20 @@ WARN_IF_UNDOCUMENTED   = YES
 
 WARN_IF_DOC_ERROR      = YES
 
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
 # The WARN_FORMAT tag determines the format of the warning messages that 
 # doxygen can produce. The string should contain the $file, $line, and $text 
 # tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text.
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
 
 WARN_FORMAT            = "$file:$line: $text"
 
@@ -363,12 +464,19 @@ WARN_LOGFILE           =
 
 INPUT                  = @top_srcdir@/include/gutenprint
 
+# This tag can be used to specify the character encoding of the source files that 
+# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
+# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. 
+# See http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
 # and *.h) to filter out the source-files in the directories. If left 
 # blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
 
 FILE_PATTERNS          = 
 
@@ -384,17 +492,27 @@ RECURSIVE              = NO
 
 EXCLUDE                = @top_srcdir@/src/main/xmli18n-tmp.h
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
 
 EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the 
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories.
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
 
 EXCLUDE_PATTERNS       = 
 
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the output. 
+# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, 
+# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
+
 # The EXAMPLE_PATH tag can be used to specify one or more files or 
 # directories that contain example code fragments that are included (see 
 # the \include command).
@@ -426,10 +544,20 @@ IMAGE_PATH             =
 # by executing (via popen()) the command <filter> <input-file>, where <filter> 
 # is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
 # input file. Doxygen will then use the output that the filter program writes 
-# to standard output.
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
 
 INPUT_FILTER           = 
 
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
 # INPUT_FILTER) will be used to filter the input files when producing source 
 # files to browse (i.e. when SOURCE_BROWSER is set to YES).
@@ -441,7 +569,9 @@ FILTER_SOURCE_FILES    = NO
 #---------------------------------------------------------------------------
 
 # If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources.
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
 
 SOURCE_BROWSER         = NO
 
@@ -468,6 +598,21 @@ REFERENCED_BY_RELATION = YES
 
 REFERENCES_RELATION    = YES
 
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.  Otherwise they will link to the documentstion.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
 # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
 # will generate a verbatim copy of the header file for each class for 
 # which an include is specified. Set to NO to disable this.
@@ -533,7 +678,9 @@ HTML_FOOTER            =
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
 # fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
 
 HTML_STYLESHEET        = 
 
@@ -553,7 +700,7 @@ GENERATE_HTMLHELP      = NO
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
 # be used to specify the file name of the resulting .chm file. You 
 # can add a path in front of the file if the result should not be 
-# written to the html output dir.
+# written to the html output directory.
 
 CHM_FILE               = 
 
@@ -688,7 +835,7 @@ LATEX_HIDE_INDICES     = NO
 #---------------------------------------------------------------------------
 
 # If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimised for Word 97 and may not look very pretty with 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
 # other RTF readers or editors.
 
 GENERATE_RTF           = NO
@@ -715,7 +862,7 @@ COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
 
 # Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assigments. You only have to provide 
+# config file, i.e. a series of assignments. You only have to provide 
 # replacements, missing definitions are set to their default value.
 
 RTF_STYLESHEET_FILE    = 
@@ -759,9 +906,7 @@ MAN_LINKS              = NO
 
 # If the GENERATE_XML tag is set to YES Doxygen will 
 # generate an XML file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
+# the code including all documentation.
 
 GENERATE_XML           = NO
 
@@ -783,6 +928,13 @@ XML_SCHEMA             =
 
 XML_DTD                = 
 
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -847,7 +999,7 @@ MACRO_EXPANSION        = NO
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
 # then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+# PREDEFINED and EXPAND_AS_DEFINED tags.
 
 EXPAND_ONLY_PREDEF     = NO
 
@@ -873,7 +1025,9 @@ INCLUDE_FILE_PATTERNS  =
 # are defined before the preprocessor is started (similar to the -D option of 
 # gcc). The argument of the tag is a list of macros of the form: name 
 # or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed.
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
 
 PREDEFINED             = 
 
@@ -887,13 +1041,13 @@ EXPAND_AS_DEFINED      =
 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
 # doxygen's preprocessor will remove all function-like macros that are alone 
 # on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse the 
-# parser if not removed.
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
+# Configuration::additions related to external references   
 #---------------------------------------------------------------------------
 
 # The TAGFILES option can be used to specify one or more tagfiles. 
@@ -940,13 +1094,22 @@ PERL_PATH              = @PERL@
 #---------------------------------------------------------------------------
 
 # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or 
-# super classes. Setting the tag to NO turns the diagrams off. Note that this 
-# option is superceded by the HAVE_DOT option below. This is only a fallback. It is 
-# recommended to install and use dot, since it yields more powerful graphs.
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
 
 CLASS_DIAGRAMS         = NO
 
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to 
+# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to 
+# specify the directory where the mscgen tool resides. If left empty the tool is assumed to 
+# be found in the default search path.
+
+MSCGEN_PATH            = 
+
 # If set to YES, the inheritance and collaboration graphs will hide 
 # inheritance and usage relations if the target is undocumented 
 # or is not a class.
@@ -974,8 +1137,13 @@ CLASS_GRAPH            = NO
 
 COLLABORATION_GRAPH    = NO
 
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similiar to the OMG's Unified Modeling 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
 # Language.
 
 UML_LOOK               = NO
@@ -1007,11 +1175,26 @@ INCLUDED_BY_GRAPH      = NO
 
 CALL_GRAPH             = NO
 
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# generate a caller dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable caller graphs for selected 
+# functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
 # will graphical hierarchy of all classes instead of a textual one.
 
 GRAPHICAL_HIERARCHY    = NO
 
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
 # generated by dot. Possible values are png, jpg, or gif
 # If left blank png will be used.
@@ -1019,7 +1202,7 @@ GRAPHICAL_HIERARCHY    = NO
 DOT_IMAGE_FORMAT       = png
 
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found on the path.
+# found. If left blank, it is assumed the dot tool can be found in the path.
 
 DOT_PATH               = 
 
@@ -1029,32 +1212,28 @@ DOT_PATH               =
 
 DOTFILE_DIRS           = 
 
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
+# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen will always 
+# show the root nodes and its direct children regardless of this setting.
 
-MAX_DOT_GRAPH_WIDTH    = 1024
+DOT_GRAPH_MAX_NODES    = 50
 
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, which results in a white background. 
+# Warning: Depending on the platform used, enabling this option may lead to 
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
+# read).
 
-MAX_DOT_GRAPH_HEIGHT   = 1024
+DOT_TRANSPARENT        = NO
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes that 
-# lay further from the root node will be omitted. Note that setting this option to 
-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also 
-# note that a graph may be further truncated if the graph's image dimensions are 
-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). 
-# If 0 is used for the depth value (the default), the graph is not depth-constrained.
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
 
-MAX_DOT_GRAPH_DEPTH    = 0
+DOT_MULTI_TARGETS      = NO
 
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
 # generate a legend page explaining the meaning of the various boxes and 
@@ -1069,7 +1248,7 @@ GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
 
 #---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine   
+# Configuration::additions related to the search engine   
 #---------------------------------------------------------------------------
 
 # The SEARCHENGINE tag specifies whether or not a search engine should be 
diff --git a/doc/gutenprint/gutenprint.tag b/doc/gutenprint/gutenprint.tag
index e06ea8e..d55549e 100644
--- a/doc/gutenprint/gutenprint.tag
+++ b/doc/gutenprint/gutenprint.tag
@@ -2,324 +2,345 @@
 <tagfile>
   <compound kind="file">
     <name>array.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>array_8h</filename>
     <includes id="sequence_8h" name="sequence.h" local="no" imported="no">gutenprint/sequence.h</includes>
     <member kind="typedef">
       <type>stp_array</type>
       <name>stp_array_t</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g26a474575a39c1c36ad520b95aa813b0</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_array_t *</type>
       <name>stp_array_create</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>ga3d385d3e2f248b1c1ac88d5f103e9a2</anchor>
       <arglist>(int x_size, int y_size)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_destroy</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>gafb2573df35220ef9be3f6ba4b8c871b</anchor>
       <arglist>(stp_array_t *array)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_copy</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gaa9bf798890e01b4bbce8cda45615021</anchor>
       <arglist>(stp_array_t *dest, const stp_array_t *source)</arglist>
     </member>
     <member kind="function">
       <type>stp_array_t *</type>
       <name>stp_array_create_copy</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gd0b50228ca40df79196197f9c21f4b56</anchor>
       <arglist>(const stp_array_t *array)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_set_size</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>ge6fb91b246ef5abd388927cb9674503e</anchor>
       <arglist>(stp_array_t *array, int x_size, int y_size)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_get_size</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>gfe61db801ab3b0326646178e536dd161</anchor>
       <arglist>(const stp_array_t *array, int *x_size, int *y_size)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_set_data</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gea0493f5bec9c5c185679adfde3edc9a</anchor>
       <arglist>(stp_array_t *array, const double *data)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_get_data</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>ge0d44ee80048189d244b16f231c54b80</anchor>
       <arglist>(const stp_array_t *array, size_t *size, const double **data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_array_set_point</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>gd6b95b2efd500007b098594826f4467f</anchor>
       <arglist>(stp_array_t *array, int x, int y, double data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_array_get_point</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g9078af984a5e1ec80a6068bdb51c9a6d</anchor>
       <arglist>(const stp_array_t *array, int x, int y, double *data)</arglist>
     </member>
     <member kind="function">
       <type>const stp_sequence_t *</type>
       <name>stp_array_get_sequence</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>ge05ba5cfe8c03e2435348d6c5488d87e</anchor>
       <arglist>(const stp_array_t *array)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>bit-ops.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>bit-ops_8h</filename>
     <member kind="function">
       <type>void</type>
       <name>stp_fold</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
-      <anchor>a0</anchor>
-      <arglist>(const unsigned char *line, int single_height, unsigned char *outbuf)</arglist>
+      <anchor>1a36a9f23f967528df8fffbd71b5e96c</anchor>
+      <arglist>(const unsigned char *line, int single_length, unsigned char *outbuf)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
+      <name>stp_fold_3bit</name>
+      <anchorfile>bit-ops_8h.html</anchorfile>
+      <anchor>0ee5e547d025f7113f275dbb4614230c</anchor>
+      <arglist>(const unsigned char *line, int single_length, unsigned char *outbuf)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
+      <name>stp_fold_3bit_323</name>
+      <anchorfile>bit-ops_8h.html</anchorfile>
+      <anchor>fe47834318158a214ca693f1433996f1</anchor>
+      <arglist>(const unsigned char *line, int single_length, unsigned char *outbuf)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
+      <name>stp_fold_4bit</name>
+      <anchorfile>bit-ops_8h.html</anchorfile>
+      <anchor>62ac3ec2651afff5fbe6c63544a13c66</anchor>
+      <arglist>(const unsigned char *line, int single_length, unsigned char *outbuf)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_split_2</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>260a00a6551c9e27e56ea1fab9444d80</anchor>
       <arglist>(int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_split_4</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>6d93a70fcc820df08fcf8d380b9743f5</anchor>
       <arglist>(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_unpack_2</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>e04e96586931b37257f4547eca77b116</anchor>
       <arglist>(int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_unpack_4</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>c5bb5a178b5c6275e7e7c2f6b5064342</anchor>
       <arglist>(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_unpack_8</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>958196e6b7349e883a450e52cae83d93</anchor>
       <arglist>(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_unpack_16</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>8ddfbe4f60566d4111b4c4d88a956d1b</anchor>
       <arglist>(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7, unsigned char *out8, unsigned char *out9, unsigned char *out10, unsigned char *out11, unsigned char *out12, unsigned char *out13, unsigned char *out14, unsigned char *out15)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>channel.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>channel_8h</filename>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_reset</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>90026b1db4586b08df148db41a676b50</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_reset_channel</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>b4b4591b1709146874c0218bc0591255</anchor>
       <arglist>(stp_vars_t *v, int channel)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_add</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>f03151796a167ec708b5412a31ddced5</anchor>
       <arglist>(stp_vars_t *v, unsigned channel, unsigned subchannel, double value)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_channel_get_value</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>748f1fc90c60e70016998953b1adcde2</anchor>
       <arglist>(stp_vars_t *v, unsigned channel, unsigned subchannel)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_set_density_adjustment</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>e7bd4572fb2ac86694555d0b827a2db9</anchor>
       <arglist>(stp_vars_t *v, int color, int subchannel, double adjustment)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_channel_get_density_adjustment</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>43188fd2c70d894e1e050277c1e4da35</anchor>
       <arglist>(stp_vars_t *v, int color, int subchannel)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_set_ink_limit</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>68afca52a3f3c0c72c1ff0329ef245c7</anchor>
       <arglist>(stp_vars_t *v, double limit)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_channel_get_ink_limit</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>fe8ad41148d568cb1d662064ec721ac1</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_set_cutoff_adjustment</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>59a4810ca297444fb16a5a1a1db319ed</anchor>
       <arglist>(stp_vars_t *v, int color, int subchannel, double adjustment)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_channel_get_cutoff_adjustment</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>f903f5318c045567f6aa3b6f1496b5ba</anchor>
       <arglist>(stp_vars_t *v, int color, int subchannel)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_set_black_channel</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>1c1101b3f21368b26241a0db2877364e</anchor>
       <arglist>(stp_vars_t *v, int channel)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_channel_get_black_channel</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a11</anchor>
+      <anchor>8a3cf94dfe1461bd0c8fb7464d5c99a6</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_set_gloss_channel</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a12</anchor>
+      <anchor>b09858181233a7777b2d49ca50a327c6</anchor>
       <arglist>(stp_vars_t *v, int channel)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_channel_get_gloss_channel</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a13</anchor>
+      <anchor>7771fa6878d414b4cd3b08743aadc3fc</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_set_gloss_limit</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a14</anchor>
+      <anchor>774df9fbabb8fcd9241976cc50c9501d</anchor>
       <arglist>(stp_vars_t *v, double limit)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_channel_get_gloss_limit</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a15</anchor>
+      <anchor>9231b8d3be7ec55dc657da2e6a5c406e</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_set_curve</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a16</anchor>
+      <anchor>9e2107aa3cc118db2b6540f939064fed</anchor>
       <arglist>(stp_vars_t *v, int channel, const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>const stp_curve_t *</type>
       <name>stp_channel_get_curve</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a17</anchor>
+      <anchor>36feed643e8768ff93308980203a92be</anchor>
       <arglist>(stp_vars_t *v, int channel)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_set_gcr_curve</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a18</anchor>
+      <anchor>4f0863196d55416aa58ea9815eb33312</anchor>
       <arglist>(stp_vars_t *v, const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>const stp_curve_t *</type>
       <name>stp_channel_get_gcr_curve</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a19</anchor>
+      <anchor>c5c6578307d574f53c8f9110053fe9c5</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_initialize</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a20</anchor>
+      <anchor>35b64c052b8dcfd4f1576b10d999e022</anchor>
       <arglist>(stp_vars_t *v, stp_image_t *image, int input_channel_count)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_convert</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a21</anchor>
+      <anchor>4559ad54f7de2403438baab1c97789f7</anchor>
       <arglist>(const stp_vars_t *v, unsigned *zero_mask)</arglist>
     </member>
     <member kind="function">
       <type>unsigned short *</type>
       <name>stp_channel_get_input</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a22</anchor>
+      <anchor>c73acbaeb300c75912529c5064ea507a</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>unsigned short *</type>
       <name>stp_channel_get_output</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a23</anchor>
+      <anchor>3ad58abee1208b328da69e49d230a54f</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>color.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>color_8h</filename>
     <class kind="struct">stp_colorfuncs_t</class>
     <class kind="struct">stp_color</class>
@@ -327,97 +348,97 @@
       <type>stp_color</type>
       <name>stp_color_t</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>gd1408f9835b72f266ec7c7e1e1202a74</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_init</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g23392fc53078d51fcd14d6d565d56423</anchor>
       <arglist>(stp_vars_t *v, stp_image_t *image, size_t steps)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_get_row</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g0cf28c3c9638987df4b1740deadba0cb</anchor>
       <arglist>(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_color_list_parameters</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>ga282220724877a57738b047140835141</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_color_describe_parameter</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g83bc80c9fd84d741099bc20285a1b655</anchor>
       <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_register</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g47d6a8163ef21a6e700b1371228b851d</anchor>
       <arglist>(const stp_color_t *color)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_unregister</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g2b62ec8e0afe1b6297bc71466f8a334c</anchor>
       <arglist>(const stp_color_t *color)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_count</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g68c13c36d723e5604507bf33fe629f8b</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const stp_color_t *</type>
       <name>stp_get_color_by_name</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g3b8f62108f3604480e7b89b253527f4a</anchor>
       <arglist>(const char *name)</arglist>
     </member>
     <member kind="function">
       <type>const stp_color_t *</type>
       <name>stp_get_color_by_index</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g68ba525119da39ae854645ae649557d3</anchor>
       <arglist>(int idx)</arglist>
     </member>
     <member kind="function">
       <type>const stp_color_t *</type>
       <name>stp_get_color_by_colorfuncs</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g578f80b2bc3937df38ce7e803f5f472c</anchor>
       <arglist>(stp_colorfuncs_t *colorfuncs)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_color_get_name</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g5a4a4da67cb5c3f1c0a2a9618e46ed50</anchor>
       <arglist>(const stp_color_t *c)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_color_get_long_name</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g612389b45f09358f6bad0e376c91b057</anchor>
       <arglist>(const stp_color_t *c)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>curve-cache.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>curve-cache_8h</filename>
     <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprint/curve.h</includes>
     <class kind="struct">stp_cached_curve_t</class>
@@ -425,97 +446,97 @@
       <type>#define</type>
       <name>CURVE_CACHE_FAST_USHORT</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>4b278e86a2f914893307fb20cf218e7c</anchor>
       <arglist>(cache)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>CURVE_CACHE_FAST_DOUBLE</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>f79c26492d6e6fd726498df18cae11fe</anchor>
       <arglist>(cache)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>CURVE_CACHE_FAST_COUNT</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>70b70d0328c61f17925402a4b1bb9a90</anchor>
       <arglist>(cache)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_free_curve_cache</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>80cb29d2d12707901ca9261df5f3cd1c</anchor>
       <arglist>(stp_cached_curve_t *cache)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_cache_curve_data</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>f3e398d179e00c2e7d8b7c2e5dcbfd5c</anchor>
       <arglist>(stp_cached_curve_t *cache)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_cache_get_curve</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>26161d0b2b6c8b97e0de2dc12619cc6c</anchor>
       <arglist>(stp_cached_curve_t *cache)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_cache_curve_invalidate</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>8d9c7b9a9aca371b6d2e72dcfc367f88</anchor>
       <arglist>(stp_cached_curve_t *cache)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_cache_set_curve</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>8469e7bd7d80cfb01fc470a42e6ac805</anchor>
       <arglist>(stp_cached_curve_t *cache, stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_cache_set_curve_copy</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>cd8bbfbdb0b60d079b6615cc4a19ee56</anchor>
       <arglist>(stp_cached_curve_t *cache, const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_curve_cache_get_count</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>aefb6ef535ba108e0fdba1db4b58bd34</anchor>
       <arglist>(stp_cached_curve_t *cache)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned short *</type>
       <name>stp_curve_cache_get_ushort_data</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>204df5bd2ecc318cccf6e2541d8b4830</anchor>
       <arglist>(stp_cached_curve_t *cache)</arglist>
     </member>
     <member kind="function">
       <type>const double *</type>
       <name>stp_curve_cache_get_double_data</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a11</anchor>
+      <anchor>45415b5aa0600b60b65880803aea84b4</anchor>
       <arglist>(stp_cached_curve_t *cache)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_cache_copy</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a12</anchor>
+      <anchor>f5642e9d4e265b8d16db6075e1309a20</anchor>
       <arglist>(stp_cached_curve_t *dest, const stp_cached_curve_t *src)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>curve.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>curve_8h</filename>
     <includes id="sequence_8h" name="sequence.h" local="no" imported="no">gutenprint/sequence.h</includes>
     <class kind="struct">stp_curve_point_t</class>
@@ -523,405 +544,405 @@
       <type>stp_curve</type>
       <name>stp_curve_t</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g375a2b23705fb0698ae1d823243c8524</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_type_t</name>
-      <anchor>ga47</anchor>
+      <anchor>g982f8191c84b049cc3ad3cee1558fc23</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_TYPE_LINEAR</name>
-      <anchor>gga47a1</anchor>
+      <anchor>gg982f8191c84b049cc3ad3cee1558fc2346228ddaa2d52a85ccd79c4dc0f76ad3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_TYPE_SPLINE</name>
-      <anchor>gga47a2</anchor>
+      <anchor>gg982f8191c84b049cc3ad3cee1558fc23fb1ffdc3754f428d8e3a2124e014ff77</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_wrap_mode_t</name>
-      <anchor>ga48</anchor>
+      <anchor>g3ae3af552b490b0ca8b02e442ac9547a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_WRAP_NONE</name>
-      <anchor>gga48a3</anchor>
+      <anchor>gg3ae3af552b490b0ca8b02e442ac9547ad840485ad7df768a06ee4be02d93b97a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_WRAP_AROUND</name>
-      <anchor>gga48a4</anchor>
+      <anchor>gg3ae3af552b490b0ca8b02e442ac9547ac0361aebddfabfb263dc0205a61f6fbd</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_compose_t</name>
-      <anchor>ga49</anchor>
+      <anchor>g7eddbee28cb1f3c76a19408b86ea142e</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_ADD</name>
-      <anchor>gga49a5</anchor>
+      <anchor>gg7eddbee28cb1f3c76a19408b86ea142ec38b0bf09e93edb67c3e5c53035295f3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_MULTIPLY</name>
-      <anchor>gga49a6</anchor>
+      <anchor>gg7eddbee28cb1f3c76a19408b86ea142ed3bd2cdb63498d5d22686e79e2c0ed95</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_EXPONENTIATE</name>
-      <anchor>gga49a7</anchor>
+      <anchor>gg7eddbee28cb1f3c76a19408b86ea142e8de151149fdfd4fcca78826e6352246a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_bounds_t</name>
-      <anchor>ga50</anchor>
+      <anchor>g86d146e483ca1902f973d574f542b85f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_RESCALE</name>
-      <anchor>gga50a8</anchor>
+      <anchor>gg86d146e483ca1902f973d574f542b85f118d303bf7bdf4f00bda71cc6eac49c3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_CLIP</name>
-      <anchor>gga50a9</anchor>
+      <anchor>gg86d146e483ca1902f973d574f542b85fec9e6673edac9d34e3aad376fa711aa5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_ERROR</name>
-      <anchor>gga50a10</anchor>
+      <anchor>gg86d146e483ca1902f973d574f542b85fd699d675d5df223055388cd83d0b362b</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g6b3640f0e25bd9d38e46bdc1b2ee58a4</anchor>
       <arglist>(stp_curve_wrap_mode_t wrap)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_copy</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g972ed591394396e0c66e928a0695b3bf</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_copy</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gcd7861bf1c9d61ac4ec87844a15ab9d3</anchor>
       <arglist>(stp_curve_t *dest, const stp_curve_t *source)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_destroy</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g4294b85e848fe421496469e2406ef380</anchor>
       <arglist>(stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_bounds</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>ge32fb850963b8694d3739c0ed8475f75</anchor>
       <arglist>(stp_curve_t *curve, double low, double high)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_get_bounds</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g63c3386fbfd75da9fe985673bf7b1ca3</anchor>
       <arglist>(const stp_curve_t *curve, double *low, double *high)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_wrap_mode_t</type>
       <name>stp_curve_get_wrap</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g859020827897bac0f4671322ec027dc4</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_is_piecewise</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g29b022a3055afe0b48d1f2736ff2f4da</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_get_range</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>gcb8e51731b9385556747744a0d4f43fb</anchor>
       <arglist>(const stp_curve_t *curve, double *low, double *high)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_curve_count_points</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g766ff02b29b976372779f719076ad017</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_interpolation_type</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g82890cef78f5861a88c5789c33693423</anchor>
       <arglist>(stp_curve_t *curve, stp_curve_type_t itype)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_type_t</type>
       <name>stp_curve_get_interpolation_type</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g42c98a6a6d2512516738b6df9367510e</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g81bceb4cb991cef1cda2298cf7bb9f15</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const double *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_data_points</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>gce09cab4e6ae3d55f75aacae3689e8e6</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const stp_curve_point_t *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_float_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>gbd7a39289471607311141c7fc3bbb415</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const float *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_long_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>ge6a435a21a5c4b5e582d42095a7b06fc</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const long *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_ulong_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g723173297f5b67af937205c7d74ac353</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const unsigned long *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_int_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>g31e76843f4d2f207701755b58766a670</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const int *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_uint_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g3ee80f8e4f33691a78b3ad8c3fd7c34f</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const unsigned int *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_short_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g2fa5222aab07e85f215e389734b6dbea</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const short *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_ushort_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g0af395eefa7bfe0d19acc1acbaeefe48</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const unsigned short *data)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_get_subrange</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>g5cbf7c4b6ad96ecb35fc06f46c0319f0</anchor>
       <arglist>(const stp_curve_t *curve, size_t start, size_t count)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_subrange</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>g73dfcc4c95734449965227e21deb3037</anchor>
       <arglist>(stp_curve_t *curve, const stp_curve_t *range, size_t start)</arglist>
     </member>
     <member kind="function">
       <type>const double *</type>
       <name>stp_curve_get_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>gb2208f56694e47e4300d10e057f59ee8</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const stp_curve_point_t *</type>
       <name>stp_curve_get_data_points</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>g79e0d6afa3573917c756af64b56a0d82</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const float *</type>
       <name>stp_curve_get_float_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>g251f105cb5f2b126ea02b7908f717c18</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const long *</type>
       <name>stp_curve_get_long_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>gf59bd38c9dfc7beb08a283dc9e400bf2</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned long *</type>
       <name>stp_curve_get_ulong_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>g24a862eda4cdbb626f51aeb7d8ae9a50</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const int *</type>
       <name>stp_curve_get_int_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga29</anchor>
+      <anchor>g6de80e81b64262e0051441f697ae4de4</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned int *</type>
       <name>stp_curve_get_uint_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga30</anchor>
+      <anchor>g19b3160a57dc6959fe08c631c7206a8a</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const short *</type>
       <name>stp_curve_get_short_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga31</anchor>
+      <anchor>g87c5d1904efa58be8a21ab6b2c41d0b9</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned short *</type>
       <name>stp_curve_get_ushort_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga32</anchor>
+      <anchor>ga02125af6b9c192e34985851370391b8</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const stp_sequence_t *</type>
       <name>stp_curve_get_sequence</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga33</anchor>
+      <anchor>gde323594e84d4380c88ecf122a5a4da8</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_gamma</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga34</anchor>
+      <anchor>gcb8a2b9b21f97f32faacb99a6125e152</anchor>
       <arglist>(stp_curve_t *curve, double f_gamma)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_curve_get_gamma</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga35</anchor>
+      <anchor>g0420a6cfa87aa96e5c9a56142aa0178d</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_point</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga36</anchor>
+      <anchor>g2d3b8372bde3fce699a3b7bb3c9d8582</anchor>
       <arglist>(stp_curve_t *curve, size_t where, double data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_get_point</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga37</anchor>
+      <anchor>g569aae57147ed7681f23e0e60bd8af35</anchor>
       <arglist>(const stp_curve_t *curve, size_t where, double *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_interpolate_value</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga38</anchor>
+      <anchor>gb33642ee6c49334f379a4dc185ecd355</anchor>
       <arglist>(const stp_curve_t *curve, double where, double *result)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_resample</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga39</anchor>
+      <anchor>g87298cf562468cbcf2c1f76a0ab80b62</anchor>
       <arglist>(stp_curve_t *curve, size_t points)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_rescale</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga40</anchor>
+      <anchor>gad611b3ddbd667ec204fa7b42f8d7546</anchor>
       <arglist>(stp_curve_t *curve, double scale, stp_curve_compose_t mode, stp_curve_bounds_t bounds_mode)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_write</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga41</anchor>
+      <anchor>gc12af55cf0eb2f76db967886f8996313</anchor>
       <arglist>(FILE *file, const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stp_curve_write_string</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga42</anchor>
+      <anchor>gf2f0da590278ff74af1eccb0aa0c7169</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_from_stream</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga43</anchor>
+      <anchor>g478a24e44a3ce345f7207cf7ded12e37</anchor>
       <arglist>(FILE *fp)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_from_file</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga44</anchor>
+      <anchor>gd96d7d1cda5f037f7d6a9b651ebbbb46</anchor>
       <arglist>(const char *file)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_from_string</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga45</anchor>
+      <anchor>gb8c0df217306a6e0597f058efbfaca82</anchor>
       <arglist>(const char *string)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_compose</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga46</anchor>
+      <anchor>g55c83a9139fc1b06b90e983d7c1ceff7</anchor>
       <arglist>(stp_curve_t **retval, stp_curve_t *a, stp_curve_t *b, stp_curve_compose_t mode, int points)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>dither.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>dither_8h</filename>
     <class kind="struct">stp_dither_matrix_short</class>
     <class kind="struct">stp_dither_matrix_normal</class>
@@ -933,408 +954,408 @@
       <type>#define</type>
       <name>STP_ECOLOR_K</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>9da4fbd724d498250c7129ccbb88c9a3</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_ECOLOR_C</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>fb855574a9dd1ce3c0ac8e353917cf40</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_ECOLOR_M</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>42c70bd6031d27d8ce2ab23133f7ed71</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_ECOLOR_Y</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>ac7bfac809059b8c99338dfa9347cf85</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_NCOLORS</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>bda31f8e7a9e473057644a5fe4a2339b</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_dither_matrix_short</type>
       <name>stp_dither_matrix_short_t</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>9a2c54a4730e2c9bb25cf95f6cd3e597</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_dither_matrix_normal</type>
       <name>stp_dither_matrix_normal_t</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>febf0484e151cf3cce4ef0b9911d0022</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_dither_matrix_generic</type>
       <name>stp_dither_matrix_generic_t</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>9f5f63d4f792df1d7becccf3fb5c8fdd</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>dither_matrix_impl</type>
       <name>stp_dither_matrix_impl_t</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>f823fed10cb9591c0e659033ec49f55f</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_dotsize</type>
       <name>stp_dotsize_t</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>7a74b9371fd47b48d961d2316e2126e4</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_shade</type>
       <name>stp_shade_t</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>5baefb325bf92b7ca10c2d057c04b835</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_iterated_init</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a11</anchor>
+      <anchor>36691189c1f859d82675f32f5046e674</anchor>
       <arglist>(stp_dither_matrix_impl_t *mat, size_t size, size_t exponent, const unsigned *array)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_shear</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a12</anchor>
+      <anchor>df8bb5a54d552846dcf4d1534d612b65</anchor>
       <arglist>(stp_dither_matrix_impl_t *mat, int x_shear, int y_shear)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_init</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a13</anchor>
+      <anchor>2c42ec7156263c024ea6f51ab3b17530</anchor>
       <arglist>(stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_init_short</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a14</anchor>
+      <anchor>588103d2a828a6c5f51577a917b09cdf</anchor>
       <arglist>(stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_dither_matrix_validate_array</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a15</anchor>
+      <anchor>ad322d923e2d9c3141cc50863d627b25</anchor>
       <arglist>(const stp_array_t *array)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_init_from_dither_array</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a16</anchor>
+      <anchor>53b7ba7fd141db6ef43c68a6f500bda2</anchor>
       <arglist>(stp_dither_matrix_impl_t *mat, const stp_array_t *array, int transpose)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_destroy</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a17</anchor>
+      <anchor>49ff7bd6b10cd34f9164b4414adbb87c</anchor>
       <arglist>(stp_dither_matrix_impl_t *mat)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_clone</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a18</anchor>
+      <anchor>d0dfe2800ed318431a0a54c1ed7d383b</anchor>
       <arglist>(const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest, int x_offset, int y_offset)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_copy</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a19</anchor>
+      <anchor>3ea3c72ff26afef246873edc0bc542d3</anchor>
       <arglist>(const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_scale_exponentially</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a20</anchor>
+      <anchor>a62e8e672a125150074ea9bddb474423</anchor>
       <arglist>(stp_dither_matrix_impl_t *mat, double exponent)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_set_row</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a21</anchor>
+      <anchor>a6ca0a88b0bef517cc1909fb7074e8ac</anchor>
       <arglist>(stp_dither_matrix_impl_t *mat, int y)</arglist>
     </member>
     <member kind="function">
       <type>stp_array_t *</type>
       <name>stp_find_standard_dither_array</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a22</anchor>
+      <anchor>c523d1ba539398308a7ea83f4188d6ae</anchor>
       <arglist>(int x_aspect, int y_aspect)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_dither_list_parameters</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a23</anchor>
+      <anchor>27fa3e870e438b0c399472a908555630</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_describe_parameter</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a24</anchor>
+      <anchor>f1c4669d2bed56e2e1403a7d0f36f6ba</anchor>
       <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_init</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a25</anchor>
+      <anchor>9835738585d6a9053eaeacdca25d0fe6</anchor>
       <arglist>(stp_vars_t *v, stp_image_t *image, int out_width, int xdpi, int ydpi)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_iterated_matrix</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a26</anchor>
+      <anchor>57aecb702251a2e18848b02109521aed</anchor>
       <arglist>(stp_vars_t *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_matrix</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a27</anchor>
+      <anchor>a973f651768626a6eb7ab9ad4ce09b2c</anchor>
       <arglist>(stp_vars_t *v, const stp_dither_matrix_generic_t *mat, int transpose, int x_shear, int y_shear)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_matrix_from_dither_array</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a28</anchor>
+      <anchor>3155913bdc63c0545786fc427ca2396a</anchor>
       <arglist>(stp_vars_t *v, const stp_array_t *array, int transpose)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_transition</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a29</anchor>
+      <anchor>6f4efd170562a43139f7d6a4b41ecaf3</anchor>
       <arglist>(stp_vars_t *v, double)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_randomizer</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a30</anchor>
+      <anchor>560bcf46dfa233a01bdf6042e4680f54</anchor>
       <arglist>(stp_vars_t *v, int color, double)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_ink_spread</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a31</anchor>
+      <anchor>b47439fc32e7f669f8cd6c41acdcf398</anchor>
       <arglist>(stp_vars_t *v, int spread)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_adaptive_limit</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a32</anchor>
+      <anchor>c6a4aa7bda3af1ae03d87f243311ebba</anchor>
       <arglist>(stp_vars_t *v, double limit)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_dither_get_first_position</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a33</anchor>
+      <anchor>fe180672fad52d306e737a333ea113fb</anchor>
       <arglist>(stp_vars_t *v, int color, int subchan)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_dither_get_last_position</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a34</anchor>
+      <anchor>ddc996112f61432ff66a10eb502d9a4d</anchor>
       <arglist>(stp_vars_t *v, int color, int subchan)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_inks_simple</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a35</anchor>
+      <anchor>4dd13ea23fe601571d864eabae4b0c40</anchor>
       <arglist>(stp_vars_t *v, int color, int nlevels, const double *levels, double density, double darkness)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_inks_full</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a36</anchor>
+      <anchor>f5822743e380d0d51a397dcb3eb6247c</anchor>
       <arglist>(stp_vars_t *v, int color, int nshades, const stp_shade_t *shades, double density, double darkness)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_inks</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a37</anchor>
+      <anchor>5b8786ffa17dcc1604521b1d1cc5a3a5</anchor>
       <arglist>(stp_vars_t *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_add_channel</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a38</anchor>
+      <anchor>d70196f1a4510c43f3651bf1450be5fa</anchor>
       <arglist>(stp_vars_t *v, unsigned char *data, unsigned channel, unsigned subchannel)</arglist>
     </member>
     <member kind="function">
       <type>unsigned char *</type>
       <name>stp_dither_get_channel</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a39</anchor>
+      <anchor>8866521ed5c139e2048e5548cc4fb43f</anchor>
       <arglist>(stp_vars_t *v, unsigned channel, unsigned subchannel)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a40</anchor>
+      <anchor>0a470a9c9daef26e90bdb890479a7f87</anchor>
       <arglist>(stp_vars_t *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_internal</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a41</anchor>
+      <anchor>70a6b29366005ba76ee77e9f1aaae105</anchor>
       <arglist>(stp_vars_t *v, int row, const unsigned short *input, int duplicate_line, int zero_mask, const unsigned char *mask)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprint-intl-internal.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>gutenprint-intl-internal_8h</filename>
     <member kind="define">
       <type>#define</type>
       <name>textdomain</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g5f80e8482ab93869489531a8c7ce7006</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>gettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g83b8be0887dede025766d25e2bb884c6</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dgettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>gd24abc7110e1bdf384dc2ef2b63e5d07</anchor>
       <arglist>(Domain, Message)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dcgettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g115dd6a6dd9d7a249f6374a7c06deef5</anchor>
       <arglist>(Domain, Message, Type)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>bindtextdomain</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gdd6dfc1077058ff26d79cdb18099d58a</anchor>
       <arglist>(Domain, Directory)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>_</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g32a3cf3d9dd914f5aeeca5423c157934</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>N_</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g75278405e7f034d2b1af80bfd94675fe</anchor>
       <arglist>(String)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprint-intl.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>gutenprint-intl_8h</filename>
     <member kind="define">
       <type>#define</type>
       <name>textdomain</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g5f80e8482ab93869489531a8c7ce7006</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>gettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g83b8be0887dede025766d25e2bb884c6</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dgettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>gd24abc7110e1bdf384dc2ef2b63e5d07</anchor>
       <arglist>(Domain, Message)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dcgettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g115dd6a6dd9d7a249f6374a7c06deef5</anchor>
       <arglist>(Domain, Message, Type)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>bindtextdomain</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gdd6dfc1077058ff26d79cdb18099d58a</anchor>
       <arglist>(Domain, Directory)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>_</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g32a3cf3d9dd914f5aeeca5423c157934</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>N_</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g75278405e7f034d2b1af80bfd94675fe</anchor>
       <arglist>(String)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprint-module.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>gutenprint-module_8h</filename>
     <includes id="gutenprint_8h" name="gutenprint.h" local="no" imported="no">gutenprint/gutenprint.h</includes>
     <includes id="bit-ops_8h" name="bit-ops.h" local="no" imported="no">gutenprint/bit-ops.h</includes>
@@ -1350,116 +1371,116 @@
       <type>#define</type>
       <name>STP_MODULE</name>
       <anchorfile>gutenprint-module_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>38fcab54351f45a3968822e2747aff6b</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprint-version.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>gutenprint-version_8h</filename>
     <member kind="define">
       <type>#define</type>
       <name>STP_MAJOR_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gdd0b07630653da8e46b91c2c1bafc2b9</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MINOR_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g87507431ad6b7504b129eafad863cb1f</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MICRO_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>gb860ee8cb0b05ea1385e01d130d7358e</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_CURRENT_INTERFACE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g1969d8a5a74a5c70a978f99aa68d9f4b</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_BINARY_AGE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g509ecd9be5329eef0f8d49e0b25f63da</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_INTERFACE_AGE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g6485cd073e75e01f9df68ecd67b14372</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_CHECK_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>gf20320940416f43ed7735137296fa12b</anchor>
       <arglist>(major, minor, micro)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_check_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g05a93cb4ac52cc50875b5839c59bcafc</anchor>
       <arglist>(unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_major_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g4d72666d9093df7a31e7cd448b7cfd1d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_minor_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g5efc986430f0d27f5d11236c4bc48079</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_micro_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g2c7e65e276ce5af050b3ea9f859f1f89</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_current_interface</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gfc84e89ce8d6d3302270c56ebe01d5ef</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_binary_age</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g44593f7714544c5886ab34521e05d0bd</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_interface_age</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g1284e8ef76a4c864e85b7b698b91bf0c</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprint.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>gutenprint_8h</filename>
     <includes id="array_8h" name="array.h" local="no" imported="no">gutenprint/array.h</includes>
     <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprint/curve.h</includes>
@@ -1474,320 +1495,320 @@
   </compound>
   <compound kind="file">
     <name>image.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>image_8h</filename>
     <class kind="struct">stp_image</class>
     <member kind="define">
       <type>#define</type>
       <name>STP_CHANNEL_LIMIT</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g0b7daa7e9e9b26fea847d71ca9de7c02</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_image</type>
       <name>stp_image_t</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>gae0b5ef92b619849a51cb75d376a90fb</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_image_status_t</name>
-      <anchor>ga9</anchor>
+      <anchor>g58672e1989d582c14328048b207657c8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_IMAGE_STATUS_OK</name>
-      <anchor>gga9a2</anchor>
+      <anchor>gg58672e1989d582c14328048b207657c8b5574da151b93391a337f29b2a7c96cf</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_IMAGE_STATUS_ABORT</name>
-      <anchor>gga9a3</anchor>
+      <anchor>gg58672e1989d582c14328048b207657c8224b8ac15cf785b24b2f3f53b4fdc274</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_image_init</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>gd257f72ac5272e94ff9314f8ecd24f1e</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_image_reset</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>gf2fc433dba580b9ec8e69aebc2e65338</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_image_width</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gbe86b2ff9a3a0c0e98248990f9be5652</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_image_height</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gf9dcdf718ad99df9eb71fc542d5b47e1</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>stp_image_status_t</type>
       <name>stp_image_get_row</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g01d72a16de9e98722859ca651561e8f5</anchor>
       <arglist>(stp_image_t *image, unsigned char *data, size_t limit, int row)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_image_get_appname</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g1643f6b9eb180e98f3c1c267950f18d2</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_image_conclude</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g7598151354fbeb5f6a8b3f92d1e40ad7</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>list.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>list_8h</filename>
     <member kind="typedef">
       <type>stp_list_item</type>
       <name>stp_list_item_t</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g67b4fafe1ab6ead5be7500f88874bdb0</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_list</type>
       <name>stp_list_t</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g53cf4f01ab7d712f771cb5fb479d2ba7</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
-      <type>void(*</type>
+      <type>void(*)</type>
       <name>stp_node_freefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga2</anchor>
-      <arglist>)(void *)</arglist>
+      <anchor>g4102fc776ec5bbd84eb589cfba97dfc2</anchor>
+      <arglist>(void *)</arglist>
     </member>
     <member kind="typedef">
-      <type>void *(*</type>
+      <type>void *(*)</type>
       <name>stp_node_copyfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga3</anchor>
-      <arglist>)(const void *)</arglist>
+      <anchor>g846d759413f07e91bed397f1fe3224d1</anchor>
+      <arglist>(const void *)</arglist>
     </member>
     <member kind="typedef">
-      <type>const char *(*</type>
+      <type>const char *(*)</type>
       <name>stp_node_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga4</anchor>
-      <arglist>)(const void *)</arglist>
+      <anchor>g7ecf51e54538837d4e0804da3ce58f12</anchor>
+      <arglist>(const void *)</arglist>
     </member>
     <member kind="typedef">
-      <type>int(*</type>
+      <type>int(*)</type>
       <name>stp_node_sortfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga5</anchor>
-      <arglist>)(const void *, const void *)</arglist>
+      <anchor>gd12571e44981e7acd62137c83652121a</anchor>
+      <arglist>(const void *, const void *)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_node_free_data</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g55fbb8f7a3920b783b02183c5ea57624</anchor>
       <arglist>(void *item)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_t *</type>
       <name>stp_list_create</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g3cfea94cd07f50d7d9b4ce384d349fca</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_t *</type>
       <name>stp_list_copy</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g0ba249dd06efbf5c0af8511ceab671e8</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_destroy</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>ge23ef06175b27dd6772d4d4c098999b1</anchor>
       <arglist>(stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_start</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>gd185100e8d7969a473e9d42bc8084572</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_end</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>ge939f15ee1a6e4c0aaad7a7be7f40b74</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_item_by_index</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>gd377973e8b13d02c9c111d970f491993</anchor>
       <arglist>(const stp_list_t *list, int idx)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_item_by_name</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g729867c847dd8282f74806968c708f28</anchor>
       <arglist>(const stp_list_t *list, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_item_by_long_name</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>gcc9140df3f4311cd750ba10a1cbf37d1</anchor>
       <arglist>(const stp_list_t *list, const char *long_name)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_get_length</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>ge22741060734c9cbc47656c5ea35c3f3</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_freefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>ge3300d7971c393d119d6fd62e2b578ec</anchor>
       <arglist>(stp_list_t *list, stp_node_freefunc freefunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_freefunc</type>
       <name>stp_list_get_freefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>gbfc1ef258084a3e1ad959aa3d2f053f4</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_copyfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>g7e002ed25bbfbad236c1c619841f1ac6</anchor>
       <arglist>(stp_list_t *list, stp_node_copyfunc copyfunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_copyfunc</type>
       <name>stp_list_get_copyfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g686e92ee802147171e5fc723d0079b8d</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g889af512d87a00d696acc0b6b3fafe78</anchor>
       <arglist>(stp_list_t *list, stp_node_namefunc namefunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_namefunc</type>
       <name>stp_list_get_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g50b1ab3c3b6b0ba7c0cf2128e2024369</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_long_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>g5be91978431b0ed48ea7919807bdcb73</anchor>
       <arglist>(stp_list_t *list, stp_node_namefunc long_namefunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_namefunc</type>
       <name>stp_list_get_long_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>gb99b3ed6da1ea739eed3f2c04fbb7fa7</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_sortfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>gb1d2486542b858b44b299cfcdf7d8784</anchor>
       <arglist>(stp_list_t *list, stp_node_sortfunc sortfunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_sortfunc</type>
       <name>stp_list_get_sortfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>g4b32e315d3fd23eabeffcc8d931ea454</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_item_create</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>ge726297a82e140672a018e135ffc6a0e</anchor>
       <arglist>(stp_list_t *list, stp_list_item_t *next, const void *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_item_destroy</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>g5e36d4f61e00cb3e4c4a759f5e7e9f4b</anchor>
       <arglist>(stp_list_t *list, stp_list_item_t *item)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_item_prev</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>gbaa2a241055402438a0cae6f40cf6a78</anchor>
       <arglist>(const stp_list_item_t *item)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_item_next</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga29</anchor>
+      <anchor>g81ab310caf6432ce1e492eaafdb6c0d7</anchor>
       <arglist>(const stp_list_item_t *item)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_list_item_get_data</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga30</anchor>
+      <anchor>gd6f6b303b40fa75f22a86391785178cb</anchor>
       <arglist>(const stp_list_item_t *item)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_item_set_data</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga31</anchor>
+      <anchor>gc1e34edcd47ffdc119cdcaf5ad38e1c4</anchor>
       <arglist>(stp_list_item_t *item, void *data)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>module.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>module_8h</filename>
     <includes id="list_8h" name="list.h" local="no" imported="no">gutenprint/list.h</includes>
     <class kind="struct">stp_module_version</class>
@@ -1796,92 +1817,92 @@
       <type>stp_module_version</type>
       <name>stp_module_version_t</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>753a8450e5ac6b73134c12b89533f16e</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_module</type>
       <name>stp_module_t</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>e1e92953e8ffaa00cfbf7fc01e51f36d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_module_class_t</name>
-      <anchor>a13</anchor>
+      <anchor>b3da7c3525c26e1d63d7fe1f95da5a42</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_INVALID</name>
-      <anchor>a13a2</anchor>
+      <anchor>b3da7c3525c26e1d63d7fe1f95da5a42dbc54c5b64945a0585177cbfe3cf8e8c</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_MISC</name>
-      <anchor>a13a3</anchor>
+      <anchor>b3da7c3525c26e1d63d7fe1f95da5a42c250fc9ff4abf739d975edcbe4694030</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_FAMILY</name>
-      <anchor>a13a4</anchor>
+      <anchor>b3da7c3525c26e1d63d7fe1f95da5a42b8bfa675fcede245786ec7eb9a220090</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_COLOR</name>
-      <anchor>a13a5</anchor>
+      <anchor>b3da7c3525c26e1d63d7fe1f95da5a4200077e69aa7fcad42f21bf58d3d8edaa</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_DITHER</name>
-      <anchor>a13a6</anchor>
+      <anchor>b3da7c3525c26e1d63d7fe1f95da5a42904bbf21de98c76882970ca29aee8841</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_module_load</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>00007a419775e60142cefd98b1dd3f2c</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_module_exit</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>cdfae1da0f4df678750f59c9eb6123f4</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_module_open</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>38df0c9e639b108f785be84d087923e9</anchor>
       <arglist>(const char *modulename)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_module_init</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>121493dc584ab4e64059e9594673a756</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_module_close</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a11</anchor>
+      <anchor>bef0168688427992adb80588beadcb62</anchor>
       <arglist>(stp_list_item_t *module)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_t *</type>
       <name>stp_module_get_class</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a12</anchor>
+      <anchor>5eee8809d0134f4e7540bc5552bccd7f</anchor>
       <arglist>(stp_module_class_t class)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>mxml.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>mxml_8h</filename>
     <class kind="struct">stp_mxml_attr_s</class>
     <class kind="struct">stp_mxml_value_s</class>
@@ -1892,388 +1913,388 @@
       <type>#define</type>
       <name>STP_MXML_WRAP</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>0958b60267481400b1037902e060027f</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_TAB</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>f14eeab60ef7298e7fbb04f9f80ec81f</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_NO_CALLBACK</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>e7115822f446a7b9bde7ce872bd73d83</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_NO_PARENT</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>4d9598080b3b0381f5c94518a885e867</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_DESCEND</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>7c552ec507bb896f89f002de30a21378</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_NO_DESCEND</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>df7d31182924f15ecbeae9b6c0f35ca2</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_DESCEND_FIRST</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>bff818057f8c875f4152aa49ed5c046b</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_WS_BEFORE_OPEN</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>60a753631e81e819a2dad91834b0a7f5</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_WS_AFTER_OPEN</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>4e7558f3b8bc4d9b3e39c57108b11cea</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_WS_BEFORE_CLOSE</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>a8d71b9879129c853422282b2b728131</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_WS_AFTER_CLOSE</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>010da4f7fffd4a3b3eec433031d466f9</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_ADD_BEFORE</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a11</anchor>
+      <anchor>1920c86773f4394ebd778b6e6b8f1aba</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_ADD_AFTER</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a12</anchor>
+      <anchor>a046bb0b67f278cb7ffdd0be5336b4f3</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_ADD_TO_PARENT</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a13</anchor>
+      <anchor>5c364d2523fb6f7a133df3fdfd7f44d5</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>enum stp_mxml_type_e</type>
       <name>stp_mxml_type_t</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a14</anchor>
+      <anchor>3ff7086c4e8f1557e81c32a61420017e</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_mxml_attr_s</type>
       <name>stp_mxml_attr_t</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a15</anchor>
+      <anchor>b271ad8c2bb8d7e6b4b453ffe5589564</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_mxml_value_s</type>
       <name>stp_mxml_element_t</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a16</anchor>
+      <anchor>70e20b752807f49a56b56d80ee470b47</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_mxml_text_s</type>
       <name>stp_mxml_text_t</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a17</anchor>
+      <anchor>b9c0236a2d70c3bcb210a9f6fadf00a3</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_mxml_value_u</type>
       <name>stp_mxml_value_t</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a18</anchor>
+      <anchor>9a2e2ffccac3c73524e76f3e816d35bf</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_mxml_node_s</type>
       <name>stp_mxml_node_t</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a19</anchor>
+      <anchor>8fb80a78e3ac8d8aa9eb14c35326bd82</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_mxml_type_e</name>
-      <anchor>a43</anchor>
+      <anchor>f8b58610b5fb382d0f075cb3bcf3b6ba</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_ELEMENT</name>
-      <anchor>a43a20</anchor>
+      <anchor>f8b58610b5fb382d0f075cb3bcf3b6ba10846b9327c59bbfee28dd522a0c258e</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_INTEGER</name>
-      <anchor>a43a21</anchor>
+      <anchor>f8b58610b5fb382d0f075cb3bcf3b6baeb129c9841502a2f3d095751f4e21a79</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_OPAQUE</name>
-      <anchor>a43a22</anchor>
+      <anchor>f8b58610b5fb382d0f075cb3bcf3b6ba4ebe16a2dc2aac2531e09b56051eb47a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_REAL</name>
-      <anchor>a43a23</anchor>
+      <anchor>f8b58610b5fb382d0f075cb3bcf3b6ba9411f902a8e7e839252b7a440ef53790</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_TEXT</name>
-      <anchor>a43a24</anchor>
+      <anchor>f8b58610b5fb382d0f075cb3bcf3b6baccc874638f0a0d375e1066d8c82c8be9</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_mxmlAdd</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a25</anchor>
+      <anchor>b1227e00e25c3b91220a93ff65a978be</anchor>
       <arglist>(stp_mxml_node_t *parent, int where, stp_mxml_node_t *child, stp_mxml_node_t *node)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_mxmlDelete</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a26</anchor>
+      <anchor>72999dc22e850ea456b336f3e802be28</anchor>
       <arglist>(stp_mxml_node_t *node)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_mxmlElementGetAttr</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a27</anchor>
+      <anchor>c60696919428e3b2e34ee8e2eb110962</anchor>
       <arglist>(stp_mxml_node_t *node, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_mxmlElementSetAttr</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a28</anchor>
+      <anchor>6cac6d18e5cddb0847268c46a8d4dbfa</anchor>
       <arglist>(stp_mxml_node_t *node, const char *name, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlFindElement</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a29</anchor>
+      <anchor>65c27e9c331c88b3f010f040591cc401</anchor>
       <arglist>(stp_mxml_node_t *node, stp_mxml_node_t *top, const char *name, const char *attr, const char *value, int descend)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlLoadFile</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a30</anchor>
+      <anchor>88f8bf556fb254728ab23ce931ee9224</anchor>
       <arglist>(stp_mxml_node_t *top, FILE *fp, stp_mxml_type_t(*cb)(stp_mxml_node_t *))</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlLoadString</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a31</anchor>
+      <anchor>4a2465973559fe7815386d0d59d9a8ee</anchor>
       <arglist>(stp_mxml_node_t *top, const char *s, stp_mxml_type_t(*cb)(stp_mxml_node_t *))</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlNewElement</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a32</anchor>
+      <anchor>9430b1f2b1d6b6060d9e358309de3772</anchor>
       <arglist>(stp_mxml_node_t *parent, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlNewInteger</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a33</anchor>
+      <anchor>cefddfa295df71e8617b607d207980eb</anchor>
       <arglist>(stp_mxml_node_t *parent, int integer)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlNewOpaque</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a34</anchor>
+      <anchor>1897cb8faa2141879d45d9fec0463119</anchor>
       <arglist>(stp_mxml_node_t *parent, const char *opaque)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlNewReal</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a35</anchor>
+      <anchor>1b4b2ee1a0c75a31981d70e35398d6dd</anchor>
       <arglist>(stp_mxml_node_t *parent, double real)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlNewText</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a36</anchor>
+      <anchor>05bd9944cadbef034730a53ca47c9f6a</anchor>
       <arglist>(stp_mxml_node_t *parent, int whitespace, const char *string)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_mxmlRemove</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a37</anchor>
+      <anchor>7e0322b42cbe0398de7bbe38c4b0a9e6</anchor>
       <arglist>(stp_mxml_node_t *node)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stp_mxmlSaveAllocString</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a38</anchor>
+      <anchor>de7e653595e3ea46d9f3b5545d0a10ea</anchor>
       <arglist>(stp_mxml_node_t *node, int(*cb)(stp_mxml_node_t *, int))</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_mxmlSaveFile</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a39</anchor>
+      <anchor>1038b1003e9a3fbd8396cdbe989a64c8</anchor>
       <arglist>(stp_mxml_node_t *node, FILE *fp, int(*cb)(stp_mxml_node_t *, int))</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_mxmlSaveString</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a40</anchor>
+      <anchor>054f6b6df45f2e0072a61c1a438d3ebe</anchor>
       <arglist>(stp_mxml_node_t *node, char *buffer, int bufsize, int(*cb)(stp_mxml_node_t *, int))</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlWalkNext</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a41</anchor>
+      <anchor>f478d00f31cfae58314bd6f40531923b</anchor>
       <arglist>(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlWalkPrev</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a42</anchor>
+      <anchor>cc0525bdade1c9e0e83c154592fe815c</anchor>
       <arglist>(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>paper.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>paper_8h</filename>
     <includes id="vars_8h" name="vars.h" local="no" imported="no">gutenprint/vars.h</includes>
     <class kind="struct">stp_papersize_t</class>
     <member kind="enumeration">
       <name>stp_papersize_unit_t</name>
-      <anchor>ga5</anchor>
+      <anchor>g72e4619e373e38dc02dc452813b7b958</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_ENGLISH_STANDARD</name>
-      <anchor>gga5a0</anchor>
+      <anchor>gg72e4619e373e38dc02dc452813b7b958db394159413ade42022509cd3280fef3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_METRIC_STANDARD</name>
-      <anchor>gga5a1</anchor>
+      <anchor>gg72e4619e373e38dc02dc452813b7b9586d5868bc6707f8801ce4d584428c2ae8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_ENGLISH_EXTENDED</name>
-      <anchor>gga5a2</anchor>
+      <anchor>gg72e4619e373e38dc02dc452813b7b95800b7e9a18afc172872861b26dbcc8cb8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_METRIC_EXTENDED</name>
-      <anchor>gga5a3</anchor>
+      <anchor>gg72e4619e373e38dc02dc452813b7b95862e2906a87fa4bcf32913943fd5b225a</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_known_papersizes</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g84fd0bad33b134217f54fa8c1e6c8b99</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_name</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g60f3dee8f26cac05d8d6fcaff1e39630</anchor>
       <arglist>(const char *name)</arglist>
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_size</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g1484a5e75a2b2921bbe0c9e17deb0b77</anchor>
       <arglist>(int length, int width)</arglist>
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_index</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gb2e9f694a3b90aeaaa14d6af3b5fe75a</anchor>
       <arglist>(int idx)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_default_media_size</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g33c0be56646361b1ce85a9d338336dd3</anchor>
       <arglist>(const stp_vars_t *v, int *width, int *height)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>path.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>path_8h</filename>
     <member kind="function">
       <type>stp_list_t *</type>
       <name>stp_path_search</name>
       <anchorfile>path_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>b1754e7b09717741f4bdc7a4b973d4a5</anchor>
       <arglist>(stp_list_t *dirlist, const char *suffix)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_path_split</name>
       <anchorfile>path_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>f08851d96a1197c5ce39f7dc812cef3f</anchor>
       <arglist>(stp_list_t *list, const char *path)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>printers.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>printers_8h</filename>
     <includes id="list_8h" name="list.h" local="no" imported="no">gutenprint/list.h</includes>
     <includes id="vars_8h" name="vars.h" local="no" imported="no">gutenprint/vars.h</includes>
@@ -2283,871 +2304,885 @@
       <type>stp_printer</type>
       <name>stp_printer_t</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>gcddc2ce7fa4e0a68fcc30c123503738f</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_family</type>
       <name>stp_family_t</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g66a5e7cf2b1743a46bd78cb851e1d0a4</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_printer_model_count</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g6a76f8f76106eddd51af4b1593b4f3af</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const stp_printer_t *</type>
       <name>stp_get_printer_by_index</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g440501ca226e0a9ac1335c7e52ee55a6</anchor>
       <arglist>(int idx)</arglist>
     </member>
     <member kind="function">
       <type>const stp_printer_t *</type>
       <name>stp_get_printer_by_long_name</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g6bd5abd876100c17fc9029659fed92f4</anchor>
       <arglist>(const char *long_name)</arglist>
     </member>
     <member kind="function">
       <type>const stp_printer_t *</type>
       <name>stp_get_printer_by_driver</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>ge45de9ef94fb609c2a54f1d80144552e</anchor>
       <arglist>(const char *driver)</arglist>
     </member>
     <member kind="function">
       <type>const stp_printer_t *</type>
       <name>stp_get_printer</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>gc649c4b3d0a93f26f99deb4b081305c1</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_printer_index_by_driver</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g41094e69b71eb930e770bd2cf8bbf795</anchor>
       <arglist>(const char *driver)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_printer_get_long_name</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g11804fb9b8d87ed1f2a3acbd39f5f85a</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_printer_get_driver</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>gc345b8cf8cd78da98fdb4c6b2d9cf7ca</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_printer_get_family</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g487b74bf101a842f30b5941b8db4769a</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_printer_get_manufacturer</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>gb99dd05c42aed848d1567f2b346fb4f4</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_printer_get_model</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>gae84d3fb263c4a171b7b63b6d93a940e</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>const stp_vars_t *</type>
       <name>stp_printer_get_defaults</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g4f6859e0f21ed2062075d6b9f680a202</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_printer_defaults</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>gf5084888feed9878811ac491cb5313ee</anchor>
       <arglist>(stp_vars_t *v, const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_print</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>g6065874cbb246875925e14d8801898cc</anchor>
       <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_start_job</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>g31ef7bcc34dda5d3fd46b2d04fcb0c64</anchor>
       <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_end_job</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>ge61d056dd504facc72ff56d7f16eb23c</anchor>
       <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_model_id</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>g2057c5fcfc31d8b4cf7f3291cf3c0cf4</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_verify_printer_params</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g5b5cb603c9432c03ea459b57a2039bdc</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_family_register</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g1c6d389f49a185ca24546107bd6f4993</anchor>
       <arglist>(stp_list_t *family)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_family_unregister</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g67e5c18254f7ad0b0fd77b4cc2265405</anchor>
       <arglist>(stp_list_t *family)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_initialize_printer_defaults</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>g381f3a4f132a00d6d2e2a9b54f9ed675</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_printer_list_parameters</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>g09bf7aebf0385f7b5aac537a13b6e3ed</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_printer_describe_parameter</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>g07bc634c85950526155b711aac42c6a0</anchor>
       <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_describe_output</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>g50b48bab8d6d1734c3a0f6622d65582e</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>sequence.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>sequence_8h</filename>
     <member kind="typedef">
       <type>stp_sequence</type>
       <name>stp_sequence_t</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g327a46aa1d782a4cd53abf306068e272</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_sequence_t *</type>
       <name>stp_sequence_create</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g9f0233f39d6a27c796bb283c80974618</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_destroy</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g3d571f155c1d00e7794b8299a41c5099</anchor>
       <arglist>(stp_sequence_t *sequence)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_copy</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g28087c76e1106ca11c2d247956e3a3c3</anchor>
       <arglist>(stp_sequence_t *dest, const stp_sequence_t *source)</arglist>
     </member>
     <member kind="function">
       <type>stp_sequence_t *</type>
       <name>stp_sequence_create_copy</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gb03a34a03ffd4163f51126916d737df7</anchor>
       <arglist>(const stp_sequence_t *sequence)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_bounds</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g1720509809473bc33e6f11b277c78bf6</anchor>
       <arglist>(stp_sequence_t *sequence, double low, double high)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_get_bounds</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g14ad64c63f45a2716ff8d9ceaf00697d</anchor>
       <arglist>(const stp_sequence_t *sequence, double *low, double *high)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_get_range</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g999021f2caf1a9d0d6d133123031ce17</anchor>
       <arglist>(const stp_sequence_t *sequence, double *low, double *high)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_size</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>ge0af31b854e61e0e047b3ba6dc6ec528</anchor>
       <arglist>(stp_sequence_t *sequence, size_t size)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_sequence_get_size</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>gfa512afc64116f673ae2061d04a5ef90</anchor>
       <arglist>(const stp_sequence_t *sequence)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g44bf5a48231675305718162559205fb6</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const double *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_subrange</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g5bb962248581af2c3c54193442d9c82f</anchor>
       <arglist>(stp_sequence_t *sequence, size_t where, size_t size, const double *data)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_get_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g755c8a35e2e9e83a1dfac4f6138c4122</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *size, const double **data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_point</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g42c76060886da02cb4a7d843ffe6d21c</anchor>
       <arglist>(stp_sequence_t *sequence, size_t where, double data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_get_point</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>ga79c5f747a80ab2ad9d09b09e0330cc7</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t where, double *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_float_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>g35972a289b95891699ade61246882ab4</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const float *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_long_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>gaa76cdc9094ee3c05c49a782fea64478</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const long *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_ulong_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g3e274a2095f2e6986892384ee89e1255</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const unsigned long *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_int_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>g9d3e18b8e576b5c00531dac444397051</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const int *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_uint_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g497c32dec3d745a2602c5e97819de21d</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const unsigned int *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_short_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g572ecad03d772a255481bb8b6d79106f</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const short *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_ushort_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g317d484a67a2b775bee27f3dfe67fed4</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const unsigned short *data)</arglist>
     </member>
     <member kind="function">
       <type>const float *</type>
       <name>stp_sequence_get_float_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>gff096d5b027157151c65978b95d4e29e</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const long *</type>
       <name>stp_sequence_get_long_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>g039d9054cfd0f7d5a892a7fec3f734f4</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned long *</type>
       <name>stp_sequence_get_ulong_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>g12f54f27144d490893f46dd1b0037b8b</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const int *</type>
       <name>stp_sequence_get_int_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>g01b0bc9e181a097aff3e97254dbfcb14</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned int *</type>
       <name>stp_sequence_get_uint_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>ge7189582ef9e4d638f909a2b1ee0c1b2</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const short *</type>
       <name>stp_sequence_get_short_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>g4d1cf137e4a77e9123e2afcdf7d63bec</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned short *</type>
       <name>stp_sequence_get_ushort_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>g20007077e1d8365a0eddaa922a5967c3</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>string-list.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>string-list_8h</filename>
     <class kind="struct">stp_param_string_t</class>
     <member kind="typedef">
       <type>stp_string_list</type>
       <name>stp_string_list_t</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>5e3b69c7c2eca2523184cce51ca26543</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_string_list_t *</type>
       <name>stp_string_list_create</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>b964b745d73a6d5e2e141f31941bea42</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_string_list_destroy</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>aa57feca43ce7cdf50af1dd8b4dd3a1b</anchor>
       <arglist>(stp_string_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>stp_param_string_t *</type>
       <name>stp_string_list_param</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>e254c1408b96ab6cc373643f1b4d91d0</anchor>
       <arglist>(const stp_string_list_t *list, size_t element)</arglist>
     </member>
     <member kind="function">
       <type>stp_param_string_t *</type>
       <name>stp_string_list_find</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>0b5f5c20933a0f9c50259de3f16dc649</anchor>
       <arglist>(const stp_string_list_t *list, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_string_list_count</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>9bed3cf935ed01fa9a0066c5e2a47ffb</anchor>
       <arglist>(const stp_string_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>stp_string_list_t *</type>
       <name>stp_string_list_create_copy</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>6318f71fac5645c37e2d353f0881cc5b</anchor>
       <arglist>(const stp_string_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_string_list_add_string</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>6aa3d7cf2dabfefb3e3162827d086d3d</anchor>
       <arglist>(stp_string_list_t *list, const char *name, const char *text)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_string_list_remove_string</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>087298f0cc92cc8864016a2f65a9c012</anchor>
       <arglist>(stp_string_list_t *list, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>stp_string_list_t *</type>
       <name>stp_string_list_create_from_params</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>4f78d1a53d017db20fe5b690d9362e7a</anchor>
       <arglist>(const stp_param_string_t *list, size_t count)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_string_list_is_present</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>c776e9cd6ca5690b446cd6e4869978a1</anchor>
       <arglist>(const stp_string_list_t *list, const char *value)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>util.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>util_8h</filename>
     <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprint/curve.h</includes>
     <includes id="vars_8h" name="vars.h" local="no" imported="no">gutenprint/vars.h</includes>
     <member kind="define">
       <type>#define</type>
+      <name>__attribute__</name>
+      <anchorfile>util_8h.html</anchorfile>
+      <anchor>9d373a9b65ff25b2db84c07394e1c212</anchor>
+      <arglist>(x)</arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
       <name>STP_DBG_LUT</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga33</anchor>
+      <anchor>g4472d3ba849ed203d43005f04583decc</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_COLORFUNC</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga34</anchor>
+      <anchor>g0beee5fa281098eab25e3f22570c0fdc</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_INK</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga35</anchor>
+      <anchor>g1c6936662d2cbe95de396fe8af2f254d</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga36</anchor>
+      <anchor>g90d230dd93fa96d34b438e82ed3f9639</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PCL</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga37</anchor>
+      <anchor>gf8162186c8118e5c3a8543bc0c410a78</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_ESCP2</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga38</anchor>
+      <anchor>gda7c4766db0c05ecb5ce435ddd81ecdd</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CANON</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga39</anchor>
+      <anchor>g109cde96d907cbd28f0b631f07a3d696</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_LEXMARK</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga40</anchor>
+      <anchor>gc71c7cb5cdf49c881d944ef813a3733f</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_WEAVE_PARAMS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga41</anchor>
+      <anchor>g2af8b3f36dbda4cfd313b50ba2dae636</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_ROWS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga42</anchor>
+      <anchor>g698ce0ddb2e4f0a8b6d7a77ad7a0fbf0</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_MARK_FILE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga43</anchor>
+      <anchor>g01f4480bda8819f337b2be4c41e0ebe1</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_LIST</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga44</anchor>
+      <anchor>g3c5672b14a2e2ccdffca5b6277b1aac2</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_MODULE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga45</anchor>
+      <anchor>g9ace1ab545abac936101248caf9a50c6</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PATH</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga46</anchor>
+      <anchor>g6f8cdfb28d0d73e9579fb1751f540dc7</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PAPER</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga47</anchor>
+      <anchor>gd5eeaeabba7a0a861ae0dc936057aabd</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PRINTERS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga48</anchor>
+      <anchor>gdbfb451ebbd246d62bd52e0120fa232b</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_XML</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga49</anchor>
+      <anchor>gcf72e68aa70e333b06b0bb821218d967</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_VARS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga50</anchor>
+      <anchor>g4c481c5ea8d87ae6c0e556593ab2020e</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_OLYMPUS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga51</anchor>
+      <anchor>g574664feccffc4527df73e32c7e863bf</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CURVE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga52</anchor>
+      <anchor>g8f3e76af1b2564a5763e790a45215438</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CURVE_ERRORS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga53</anchor>
+      <anchor>gabbc2868668663cc28d6289d50e5f83d</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_SAFE_FREE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga54</anchor>
+      <anchor>ga5a86efbbd3e2eb391718d82a1d7ffcc</anchor>
       <arglist>(x)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_init</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g2ce0a2e8887fe5ff7f3eed1370d0d691</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_set_output_codeset</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g7fcc19f0abdc6513dfba7eaebeb16cb9</anchor>
       <arglist>(const char *codeset)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_read_and_compose_curves</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>gdbe8c167230b49bc10391d2c246e6dc0</anchor>
       <arglist>(const char *s1, const char *s2, stp_curve_compose_t comp, size_t piecewise_point_count)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_abort</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gd0c145dc5cebecab0bb4e3ac40fc8e4d</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_prune_inactive_options</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g13aa8afef5b0872704390adc6a01924e</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_zprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>gd7ffe058decb939af6a5c1ec1d0d77fa</anchor>
       <arglist>(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void</type>
       <name>stp_zfwrite</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g183d8f36f187530f9d7acdb176be3409</anchor>
       <arglist>(const char *buf, size_t bytes, size_t nitems, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_putc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g39e4c5f6fa2a07dfca3090a50a8858f9</anchor>
       <arglist>(int ch, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_put16_le</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g1ffcb45ea3c37bb6b485addcaf945c99</anchor>
       <arglist>(unsigned short sh, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_put16_be</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g23b504253ceda208b9a4985e6de8a5f7</anchor>
       <arglist>(unsigned short sh, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_put32_le</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>gadf69b8b3f713d2bd7ca3a5648da0c56</anchor>
       <arglist>(unsigned int sh, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_put32_be</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g258b7b5f8808d0a3168f798e8bf72608</anchor>
       <arglist>(unsigned int sh, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_puts</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>gf6cf72e5e45f175ae8c332c0588832b9</anchor>
       <arglist>(const char *s, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
+      <name>stp_putraw</name>
+      <anchorfile>group__util.html</anchorfile>
+      <anchor>g79dd0a6f5c63f4fbf8591d3c041a7720</anchor>
+      <arglist>(const stp_raw_t *r, const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
       <name>stp_send_command</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>gdb49b9cba9ddf4e506b6f530353ad93d</anchor>
       <arglist>(const stp_vars_t *v, const char *command, const char *format,...)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_erputc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>g15987fbd850e04f2520cb151e08908e1</anchor>
       <arglist>(int ch)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_eprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>ge53707df5c9945f289c58bfbe08a8d88</anchor>
       <arglist>(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void</type>
       <name>stp_erprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>g1df22de14e3275cb26ede10da66eebdf</anchor>
       <arglist>(const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void void</type>
       <name>stp_asprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g3f57c5298a5c6140ac56771dd62bd036</anchor>
       <arglist>(char **strp, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void void void</type>
       <name>stp_catprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>gd4f33438f0103a143d90dc9c48d248eb</anchor>
       <arglist>(char **strp, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>unsigned long</type>
       <name>stp_get_debug_level</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>geba8c24f265ee904c5876704b767841c</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g511e0c4cac91c674797da98ab96b83e6</anchor>
       <arglist>(unsigned long level, const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void</type>
       <name>stp_deprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g129f45d7df47fd58d8653538fd13a1f2</anchor>
       <arglist>(unsigned long level, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void void</type>
       <name>stp_init_debug_messages</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>g6d15e5b4e00f9d242166edb5332f8368</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_flush_debug_messages</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>gbe74390c1422e9746745da55692f47b8</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_malloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>g86a2976738a237df953655e733c75b3a</anchor>
       <arglist>(size_t)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_zalloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>gc8fd1a439fa2d8e1ff1a2b104cd0137b</anchor>
       <arglist>(size_t)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_realloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>g2420936ab8b3492581f389deea44f58c</anchor>
       <arglist>(void *ptr, size_t)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_free</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>g7d0c40c3157b2c5c630200352064874c</anchor>
       <arglist>(void *ptr)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_strlen</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>g56b08d3e12750bdfae8b53263f97aba9</anchor>
       <arglist>(const char *s)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stp_strndup</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga29</anchor>
+      <anchor>gb026f7022963acd694a8b89e4decbde5</anchor>
       <arglist>(const char *s, int n)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stp_strdup</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga30</anchor>
+      <anchor>g5c0731867697f555a94b2a1229804381</anchor>
       <arglist>(const char *s)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_version</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga31</anchor>
+      <anchor>g1f0797636484393574cb95e667819dc1</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_release_version</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga32</anchor>
+      <anchor>g5ba7edc43ed094f32ae7d9158a362a7b</anchor>
       <arglist>(void)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>vars.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>vars_8h</filename>
     <includes id="array_8h" name="array.h" local="no" imported="no">gutenprint/array.h</includes>
     <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprint/curve.h</includes>
@@ -3156,1111 +3191,1125 @@
     <class kind="struct">stp_double_bound_t</class>
     <class kind="struct">stp_int_bound_t</class>
     <class kind="struct">stp_parameter_t</class>
+    <member kind="define">
+      <type>#define</type>
+      <name>STP_RAW</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g9fc3819cba14f7f4c5654508a08a1adf</anchor>
+      <arglist>(x)</arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>STP_RAW_STRING</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>gd888c1f6a36f999ffebfffa7b74f28d2</anchor>
+      <arglist>(x)</arglist>
+    </member>
     <member kind="typedef">
       <type>stp_vars</type>
       <name>stp_vars_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g2d49c94847d18d8b62a214995b14680f</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>void *</type>
       <name>stp_parameter_list_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g40c1035f88ac38d77eddb65195b28595</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>const void *</type>
       <name>stp_const_parameter_list_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g53c035a67629ae3b3eb86b3c09df7774</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
-      <type>void(*</type>
+      <type>void(*)</type>
       <name>stp_outfunc_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga3</anchor>
-      <arglist>)(void *data, const char *buffer, size_t bytes)</arglist>
+      <anchor>g6922054c644d73006bff95a8ad268a1a</anchor>
+      <arglist>(void *data, const char *buffer, size_t bytes)</arglist>
     </member>
     <member kind="typedef">
-      <type>void *(*</type>
+      <type>void *(*)</type>
       <name>stp_copy_data_func_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga4</anchor>
-      <arglist>)(void *)</arglist>
+      <anchor>g4541229554178e84408cccd89f532cb0</anchor>
+      <arglist>(void *)</arglist>
     </member>
     <member kind="typedef">
-      <type>void(*</type>
+      <type>void(*)</type>
       <name>stp_free_data_func_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga5</anchor>
-      <arglist>)(void *)</arglist>
+      <anchor>g7974f89cff4cbb5b225d0c4fbb92e9bb</anchor>
+      <arglist>(void *)</arglist>
     </member>
     <member kind="typedef">
       <type>stp_compdata</type>
       <name>compdata_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g4d45b95baae036143e14adfc0014f562</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_type_t</name>
-      <anchor>ga133</anchor>
+      <anchor>g9b3d4f47a44c0c8c9b150cddc56d2a91</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_STRING_LIST</name>
-      <anchor>gga133a7</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a917a6f3e019c8a92ddecd34c71013acde0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INT</name>
-      <anchor>gga133a8</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91ae2cac85ef78157b53c7a79706dc0f70</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_BOOLEAN</name>
-      <anchor>gga133a9</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91f97ef629defc99977bd1cb35daabe0c1</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DOUBLE</name>
-      <anchor>gga133a10</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91e0dc60c8435ce0b1355bd5a134395f0c</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_CURVE</name>
-      <anchor>gga133a11</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a910d283c33f755969ded0751bbfc5d1912</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_FILE</name>
-      <anchor>gga133a12</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a918224a918efbef96fffaa90e31654f7ff</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_RAW</name>
-      <anchor>gga133a13</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a9133bb02d9ae5b2169d2f75da7684b04e9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_ARRAY</name>
-      <anchor>gga133a14</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a918789c2b5cc718eafca6d1d0022cfe3f3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DIMENSION</name>
-      <anchor>gga133a15</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91aa6f89008bf237c6f0aa2f0ee176e8b7</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INVALID</name>
-      <anchor>gga133a16</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91d053047279b4c82034d26c4aa4c818d5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_class_t</name>
-      <anchor>ga134</anchor>
+      <anchor>g4eba7e712c0e17b76e472f26e202d7b8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_FEATURE</name>
-      <anchor>gga134a17</anchor>
+      <anchor>gg4eba7e712c0e17b76e472f26e202d7b8a7ed8b66836057aa58b9a74811057b4a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_OUTPUT</name>
-      <anchor>gga134a18</anchor>
+      <anchor>gg4eba7e712c0e17b76e472f26e202d7b8ffc6ff4bfbf2873ce55dfc03776bb6d9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_CORE</name>
-      <anchor>gga134a19</anchor>
+      <anchor>gg4eba7e712c0e17b76e472f26e202d7b8a05ce344ff3338e69638d69f9c120d01</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_INVALID</name>
-      <anchor>gga134a20</anchor>
+      <anchor>gg4eba7e712c0e17b76e472f26e202d7b82e17ce7ebc18801c11af7ea0a61e93ca</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_level_t</name>
-      <anchor>ga135</anchor>
+      <anchor>gaa9c9265ffe70122bd33659cf2983207</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_BASIC</name>
-      <anchor>gga135a21</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf2983207e9d7192607a6e1ec92dfed3f13a3a46f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED</name>
-      <anchor>gga135a22</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf29832073130e7060a3b901ea8dcb37d986d47e0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED1</name>
-      <anchor>gga135a23</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf29832073d016c9587f698ee400bc7e66071f06c</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED2</name>
-      <anchor>gga135a24</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf298320759a909a8953b8724d57ce85e2b4306bf</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED3</name>
-      <anchor>gga135a25</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf29832071241066935e94def6ab6d524ed1fabae</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED4</name>
-      <anchor>gga135a26</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf29832076036d5761aa9710a66429c625c334a80</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INTERNAL</name>
-      <anchor>gga135a27</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf2983207b2bc3be82f619147d9a45564fd53a4a0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_EXTERNAL</name>
-      <anchor>gga135a28</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf2983207e478f67e409adabc8679d3801604861d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INVALID</name>
-      <anchor>gga135a29</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf2983207b8bf539d78e56f06f463d00f7a3b56b3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_activity_t</name>
-      <anchor>ga136</anchor>
+      <anchor>g70ebf70dc8e6199d84fc91985c94bae9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_INACTIVE</name>
-      <anchor>gga136a30</anchor>
+      <anchor>gg70ebf70dc8e6199d84fc91985c94bae96517762c5800eac253f43eeacd96c22f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_DEFAULTED</name>
-      <anchor>gga136a31</anchor>
+      <anchor>gg70ebf70dc8e6199d84fc91985c94bae9410b7e080ef62fb8896f2f844b1c1e00</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_ACTIVE</name>
-      <anchor>gga136a32</anchor>
+      <anchor>gg70ebf70dc8e6199d84fc91985c94bae9dbc7323a015e40652fd256e49c8d5b8c</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_verify_t</name>
-      <anchor>ga137</anchor>
+      <anchor>gc061852de3627383cd415cd80a979e02</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_BAD</name>
-      <anchor>gga137a33</anchor>
+      <anchor>ggc061852de3627383cd415cd80a979e02326a171221148779ec7df761b3eee967</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_OK</name>
-      <anchor>gga137a34</anchor>
+      <anchor>ggc061852de3627383cd415cd80a979e022df363618282a9164433c0f212b18616</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_INACTIVE</name>
-      <anchor>gga137a35</anchor>
+      <anchor>ggc061852de3627383cd415cd80a979e025cb96da6c2e3ae7187e85a1ef6e41fc6</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_vars_t *</type>
       <name>stp_vars_create</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g5d641ab7093c9ba82cbd4cfbf904fabc</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_vars_copy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g88376207367adb4260ff14e5d9ec76e9</anchor>
       <arglist>(stp_vars_t *dest, const stp_vars_t *source)</arglist>
     </member>
     <member kind="function">
       <type>stp_vars_t *</type>
       <name>stp_vars_create_copy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>gec00fba49ad08d20890e64773bcdbd48</anchor>
       <arglist>(const stp_vars_t *source)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_vars_destroy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>gd3f1ff7a86c3cd1c9f9f62cfa8814437</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_driver</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>gcf237afcbc26436ebedac5b11f469fdf</anchor>
       <arglist>(stp_vars_t *v, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_driver_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g188d298a8739b84fcb965f211fc7dc4e</anchor>
       <arglist>(stp_vars_t *v, const char *val, int bytes)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_driver</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g20c45707399ef6fdf6ee8c8209b5c7c0</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_color_conversion</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>g7eb2a1c4b892efd5507fcd4b7a434cea</anchor>
       <arglist>(stp_vars_t *v, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_color_conversion_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>g5a842b31f0a572d8e64f1a5616e25a99</anchor>
       <arglist>(stp_vars_t *v, const char *val, int bytes)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_color_conversion</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>g2bac9212773ecf603b7667bd0268c23e</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_left</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g3b0cc83e87247854ecafd46a6e446bcb</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_left</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>g5c02ee2422d86e4bcdcae613c70c9e1e</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_top</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g557b5ad44d3b1da8392496681624ad8b</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_top</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g292132b97b20a6d034e22f4146d36131</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g3a852ce7e42d7f8e0cef6c7d399e0491</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>g1c54d99b94c69a67eb4ae0349a4720e7</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>g8ce73c5efa41f005936d5f84c44c6667</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>g8731a92f5d3047e00ba33577821d5aec</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_page_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>g639be0da07c3e5b7dc6d68ac2aa999e9</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_page_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>gad2d305eed993707d22263b54578a39b</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_page_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>g83326bacb8b92149af1b70457b23bc8f</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_page_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>gc0c4928fa488bb95e73ba9b8aa932584</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_outfunc</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga29</anchor>
+      <anchor>g075ffc274f0d2d2b6edd8326de1d7142</anchor>
       <arglist>(stp_vars_t *v, stp_outfunc_t val)</arglist>
     </member>
     <member kind="function">
       <type>stp_outfunc_t</type>
       <name>stp_get_outfunc</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga30</anchor>
+      <anchor>g7c6c7c547d0c973ac801362db5ca4879</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_errfunc</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga31</anchor>
+      <anchor>g82f6a7514840de82c9ed7edd30f16b5d</anchor>
       <arglist>(stp_vars_t *v, stp_outfunc_t val)</arglist>
     </member>
     <member kind="function">
       <type>stp_outfunc_t</type>
       <name>stp_get_errfunc</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga32</anchor>
+      <anchor>g2f246d3af2be9e108abe423691e16049</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_outdata</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga33</anchor>
+      <anchor>gc2b3408200a9676e6c6063cc0ae2f4bd</anchor>
       <arglist>(stp_vars_t *v, void *val)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_get_outdata</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga34</anchor>
+      <anchor>g7042b05e0df5b32206d54397429bbac5</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_errdata</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga35</anchor>
+      <anchor>g8b30fbadf3475c59101af9d7d37c33b7</anchor>
       <arglist>(stp_vars_t *v, void *val)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_get_errdata</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga36</anchor>
+      <anchor>gd08bdcd721d37f52993c1862e25ebaf7</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_merge_printvars</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga37</anchor>
+      <anchor>g086303d36b835d539e75f16187e99e8f</anchor>
       <arglist>(stp_vars_t *user, const stp_vars_t *print)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_get_parameter_list</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga38</anchor>
+      <anchor>g12e8bb617e5c90da99d6d74519664634</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_parameter_list_count</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga39</anchor>
+      <anchor>g7a94856ce75482a5edb6153fe8916a54</anchor>
       <arglist>(stp_const_parameter_list_t list)</arglist>
     </member>
     <member kind="function">
       <type>const stp_parameter_t *</type>
       <name>stp_parameter_find</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga40</anchor>
+      <anchor>gdcd8062af7b643c734f53c545694d258</anchor>
       <arglist>(stp_const_parameter_list_t list, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>const stp_parameter_t *</type>
       <name>stp_parameter_list_param</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga41</anchor>
+      <anchor>g70d69ef7dec383004bf4570e57b76e18</anchor>
       <arglist>(stp_const_parameter_list_t list, size_t item)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_list_destroy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga42</anchor>
+      <anchor>g3ffaadbe73187aa1f298c4eaa80ea82e</anchor>
       <arglist>(stp_parameter_list_t list)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_parameter_list_create</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga43</anchor>
+      <anchor>g404bf7f1b3632178d559f6980478a312</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_list_add_param</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga44</anchor>
+      <anchor>g8f4f06610d1f58bae9e70e632919c405</anchor>
       <arglist>(stp_parameter_list_t list, const stp_parameter_t *item)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_parameter_list_copy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga45</anchor>
+      <anchor>g92be87a573b883584e5a036743c1bb7d</anchor>
       <arglist>(stp_const_parameter_list_t list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_list_append</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga46</anchor>
+      <anchor>g4b62bc6d0133704b3a2568b1654b6678</anchor>
       <arglist>(stp_parameter_list_t list, stp_const_parameter_list_t append)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_describe_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga47</anchor>
+      <anchor>g0b8991bd1a91e2cac7d0b355b1186c8e</anchor>
       <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_description_destroy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga48</anchor>
+      <anchor>gd598d95a82767e05c958ccd44534c51d</anchor>
       <arglist>(stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>const stp_parameter_t *</type>
       <name>stp_parameter_find_in_settings</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga49</anchor>
+      <anchor>g6ce39557b61706421232b5f1ac604b1b</anchor>
       <arglist>(const stp_vars_t *v, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga50</anchor>
+      <anchor>ga147483996fa118516ddb36fe3366aa9</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_string_parameter_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga51</anchor>
+      <anchor>gfe6c8b3d86ca16239a63ce9d2ef57f48</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga52</anchor>
+      <anchor>g537f2ba6c74c9562b2f6883d7e36c59f</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_file_parameter_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga53</anchor>
+      <anchor>g6f7816adbce50ca9e2fdacad35282e6a</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga54</anchor>
+      <anchor>gf3a3283247deaad7d1ac19818aa4b796</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, double value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga55</anchor>
+      <anchor>g70eded5d0df4677dd4b357b4b934f75a</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga56</anchor>
+      <anchor>g6ca7898c212230cdbdc70ada2efb1417</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga57</anchor>
+      <anchor>g2167971895eea887eaaa656ed075beff</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga58</anchor>
+      <anchor>gfe5f1f6364b89437664b2bbc55288025</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const stp_curve_t *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga59</anchor>
+      <anchor>g88f25e09f9a4b76aca7ba8316cbf9c8b</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const stp_array_t *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga60</anchor>
+      <anchor>g0155de75bf2aa95ab45a3319539cda56</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_scale_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga61</anchor>
+      <anchor>g227ec3e75a78a5c3dd01c85dbc1e7004</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, double scale)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga62</anchor>
+      <anchor>gf299bd0827a4d86aca59fb0d9015a866</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_string_parameter_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga63</anchor>
+      <anchor>ga5d6d8858b266517f5899196b062d00d</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga64</anchor>
+      <anchor>gf5e225475c66f966f4ba8d8c88374186</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_file_parameter_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga65</anchor>
+      <anchor>g217eece123630113cfcf8181d475fb53</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga66</anchor>
+      <anchor>ge52dbb466422a18dec110220c45fe64e</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, double value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga67</anchor>
+      <anchor>g3c0418772a82144f317dc973f01a8d55</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga68</anchor>
+      <anchor>gb6f1820cadd75a4311bfc49b01de447b</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga69</anchor>
+      <anchor>g81d5f09980407b4310dada2a68fc4b09</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga70</anchor>
+      <anchor>gfe38044cc067b2c2afa3da469d1cb860</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const stp_curve_t *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga71</anchor>
+      <anchor>g63e7ff7b4c3e1d092f95c6234f21e39f</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const stp_array_t *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga72</anchor>
+      <anchor>g8159b3f5bea06a99711921f0201f5e0f</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga73</anchor>
+      <anchor>gb5b21e5606b8ca755c5eac7774260efa</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga74</anchor>
+      <anchor>g2021992d89c92b10138fb012a9554a08</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_get_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga75</anchor>
+      <anchor>g365412d9c176fd3ac9375ded3f22ddb3</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga76</anchor>
+      <anchor>g7c0d95ba35aba0786bfc5f918efa79fc</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga77</anchor>
+      <anchor>g3c8d1333086ca5a01a3439f94d9f94d3</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga78</anchor>
+      <anchor>g8a30b26fa842805384b6ad663cabaea2</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>const stp_curve_t *</type>
       <name>stp_get_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga79</anchor>
+      <anchor>g553dec81dd8b3e5590d963ba72223557</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>const stp_array_t *</type>
       <name>stp_get_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga80</anchor>
+      <anchor>gc50c216c2d5cd56a9704f48d4338b179</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>const stp_raw_t *</type>
       <name>stp_get_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga81</anchor>
+      <anchor>g9fff6c14a71f5f8ec28620ef64a92fd5</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga82</anchor>
+      <anchor>g9e98ef9a9b1b84a0c0580fe024e35490</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga83</anchor>
+      <anchor>g4fad48e3e6453842559bd872650cb88f</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga84</anchor>
+      <anchor>g4eccbbe421f8b0c9342b17cef40b263d</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga85</anchor>
+      <anchor>g2107c08f37e31f45253f7d75a3773d46</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga86</anchor>
+      <anchor>g514a21602ae7a8ebe8e5072a5a4b6f89</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga87</anchor>
+      <anchor>g42ebfed8dec2054799e4943a8ca84267</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga88</anchor>
+      <anchor>gf52a0b0c3b0e0fee1fc46516b1bc0c4e</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga89</anchor>
+      <anchor>g7c67cef38cead5f519fd04ae09265b53</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga90</anchor>
+      <anchor>g11b79add82faf23b0e3c758f9530d95c</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_string_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga91</anchor>
+      <anchor>g6ed828e872f7678a89e1b065d377112e</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_file_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga92</anchor>
+      <anchor>gaecd310feb8bd9a2188a9b287656aa1a</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_float_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga93</anchor>
+      <anchor>g15a5458adea6ad4eecda3c990acbc6cb</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_int_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga94</anchor>
+      <anchor>g7487203059e7ccd71c4673656b3042b1</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_dimension_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga95</anchor>
+      <anchor>g0f6e91baac5e78703b162e9d23c0a65c</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_boolean_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga96</anchor>
+      <anchor>g9ad15a73dd8c755a8b80edbe335285ee</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_curve_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga97</anchor>
+      <anchor>ge7f21b118a8dfb5607334a6141d5dc5c</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_array_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga98</anchor>
+      <anchor>gb78f4273798c6e3e720afe01680cf752</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_raw_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga99</anchor>
+      <anchor>g364fcdb2e57b8ca99867c94954cf14cd</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga100</anchor>
+      <anchor>g8189b61073bfcd0244d5d6f2a2c8ba86</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga101</anchor>
+      <anchor>ga7db6701be5d05e545c79db905e4c7eb</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga102</anchor>
+      <anchor>gb12bebb419eb1ae8f323aa931e324389</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga103</anchor>
+      <anchor>g4fd7914c01e2e1b34797736dfd2c9b9c</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga104</anchor>
+      <anchor>gc1f2b865c76da441b6c1bd9b5b93aa1f</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga105</anchor>
+      <anchor>g23b9c17426210460618c4f95c5f34229</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga106</anchor>
+      <anchor>g6c94a1df4388b142d00d5d30df904b47</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga107</anchor>
+      <anchor>g5a629e6da1f5008f0db034191ad8b1d5</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga108</anchor>
+      <anchor>g285f05c648724c80bf05af30f87120a3</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_string_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga109</anchor>
+      <anchor>g0b7be7ba9f763be692dd833a434ed13d</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_file_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga110</anchor>
+      <anchor>g47e7a69ff8e23eed6188542c5c8bff4f</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_float_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga111</anchor>
+      <anchor>g4b8f9847f2eebfff53446a9bc235ab68</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_int_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga112</anchor>
+      <anchor>gb74fd69c4ef62af7b5ab33c6baf48b8b</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_dimension_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga113</anchor>
+      <anchor>g45f9abd8ac6772ea850344c513f6c436</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_boolean_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga114</anchor>
+      <anchor>gb33cf5376adc63e826cd3dedae33e930</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_curve_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga115</anchor>
+      <anchor>ge36bf982c52215f11fe8e392b4b3d705</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_array_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga116</anchor>
+      <anchor>gc9f85c3a8bf99e09150cbf4220e4b983</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_raw_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga117</anchor>
+      <anchor>gb6e41a5edb7474ed7ac26e236e00c80c</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_media_size</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga118</anchor>
+      <anchor>gc9e6d740ffc4cff5dc7d0bf106a3e7df</anchor>
       <arglist>(const stp_vars_t *v, int *width, int *height)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_imageable_area</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga119</anchor>
+      <anchor>g67d1e68ed47e5b554f2021fca1f01978</anchor>
       <arglist>(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_maximum_imageable_area</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga120</anchor>
+      <anchor>gd17cadb7fd78bffb759f2213a1a90df6</anchor>
       <arglist>(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_size_limit</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga121</anchor>
+      <anchor>g0c8ee62453baff3d2c00e0ccae67b049</anchor>
       <arglist>(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_describe_resolution</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga122</anchor>
+      <anchor>g88715b31fcec18778f769ffbc1b55384</anchor>
       <arglist>(const stp_vars_t *v, int *x, int *y)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_verify</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga123</anchor>
+      <anchor>gb926417b2f601c78d85df44694cc6d38</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>const stp_vars_t *</type>
       <name>stp_default_settings</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga124</anchor>
+      <anchor>gf63982a6e44f8b62532346d9ceb3d91c</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_allocate_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga125</anchor>
+      <anchor>gfd4f81ca2ad497bd21f005344844f9c4</anchor>
       <arglist>(stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_destroy_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga126</anchor>
+      <anchor>g151b7d922a3e1e5e9d9f0ea8de6ab70a</anchor>
       <arglist>(stp_vars_t *v, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_get_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga127</anchor>
+      <anchor>g1666dd1571bdb866a85d4318858893be</anchor>
       <arglist>(const stp_vars_t *v, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_verify_t</type>
       <name>stp_verify_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga128</anchor>
+      <anchor>gbfffe0d654de156874decdc0338216f4</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, int quiet)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_verified</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga129</anchor>
+      <anchor>g6d04a3c444753f11004ad6259a91e853</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_verified</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga130</anchor>
+      <anchor>g1023ad18d2c97763137909b6191b0940</anchor>
       <arglist>(stp_vars_t *v, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_copy_options</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga131</anchor>
+      <anchor>gf7d2d5a9897c9ce77bb16f4a1addaa62</anchor>
       <arglist>(stp_vars_t *vd, const stp_vars_t *vs)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_fill_parameter_settings</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga132</anchor>
+      <anchor>g7f2c578ff7ae28a3db502476aa10137e</anchor>
       <arglist>(stp_parameter_t *desc, const stp_parameter_t *param)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>weave.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>weave_8h</filename>
     <class kind="struct">stp_weave_t</class>
     <class kind="struct">stp_pass_t</class>
@@ -4273,1646 +4322,338 @@
       <type>#define</type>
       <name>STP_MAX_WEAVE</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>6e5fd9b98567e1fd3fde622fd42dec67</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>int</type>
       <name>stp_packfunc</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>e8aea6782f8e438961332cb7cc18bcdc</anchor>
       <arglist>(stp_vars_t *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)</arglist>
     </member>
     <member kind="typedef">
       <type>void</type>
       <name>stp_fillfunc</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>3bb2000973de2f8a9a2b50a1b5e18097</anchor>
       <arglist>(stp_vars_t *v, int row, int subpass, int width, int missingstartrows, int color)</arglist>
     </member>
     <member kind="typedef">
       <type>void</type>
       <name>stp_flushfunc</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>d25d63c939f6ace90d029473ad33ce63</anchor>
       <arglist>(stp_vars_t *v, int passno, int vertical_subpass)</arglist>
     </member>
     <member kind="typedef">
       <type>int</type>
       <name>stp_compute_linewidth_func</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>6e7058d252c95199e92f783d84775fa1</anchor>
       <arglist>(stp_vars_t *v, int n)</arglist>
     </member>
     <member kind="enumeration">
       <name>stp_weave_strategy_t</name>
-      <anchor>a26</anchor>
+      <anchor>059ef2763c95a5cc47d51dcf38580991</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_ZIGZAG</name>
-      <anchor>a26a11</anchor>
+      <anchor>059ef2763c95a5cc47d51dcf385809916077c1fbd3cc6c79a1ac5f23d31bd2b3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_ASCENDING</name>
-      <anchor>a26a12</anchor>
+      <anchor>059ef2763c95a5cc47d51dcf385809919b5dcc799a9afed0063f052196fa8d6b</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_DESCENDING</name>
-      <anchor>a26a13</anchor>
+      <anchor>059ef2763c95a5cc47d51dcf38580991faf7b19bfde4be5241cb112835325797</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_ASCENDING_2X</name>
-      <anchor>a26a14</anchor>
+      <anchor>059ef2763c95a5cc47d51dcf385809917bfa24511bcbc811272e385372c61936</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_STAGGERED</name>
-      <anchor>a26a15</anchor>
+      <anchor>059ef2763c95a5cc47d51dcf385809918e37ffcadb7b41a3276029206a80d5e6</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_ASCENDING_3X</name>
-      <anchor>a26a16</anchor>
+      <anchor>059ef2763c95a5cc47d51dcf38580991ecb24603379f9f3dd682bf692326a8e1</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_initialize_weave</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a17</anchor>
+      <anchor>5b4fc76c83f5408182f90fb139c06b50</anchor>
       <arglist>(stp_vars_t *v, int jets, int separation, int oversample, int horizontal, int vertical, int ncolors, int bitwidth, int linewidth, int line_count, int first_line, int page_height, const int *head_offset, stp_weave_strategy_t, stp_flushfunc, stp_fillfunc, stp_packfunc, stp_compute_linewidth_func)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_flush_all</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a18</anchor>
+      <anchor>b9694e4381a005efb70daea2429345a3</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_write_weave</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a19</anchor>
+      <anchor>ea7e0ed7877aa1e98b2ce9c210ad9ff4</anchor>
       <arglist>(stp_vars_t *v, unsigned char *const cols[])</arglist>
     </member>
     <member kind="function">
       <type>stp_lineoff_t *</type>
       <name>stp_get_lineoffsets_by_pass</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a20</anchor>
+      <anchor>986bb835225820c68d85041e797cf2a5</anchor>
       <arglist>(const stp_vars_t *v, int pass)</arglist>
     </member>
     <member kind="function">
       <type>stp_lineactive_t *</type>
       <name>stp_get_lineactive_by_pass</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a21</anchor>
+      <anchor>4c7e67ed92ac3427c94fb0e6a85bfce9</anchor>
       <arglist>(const stp_vars_t *v, int pass)</arglist>
     </member>
     <member kind="function">
       <type>stp_linecount_t *</type>
       <name>stp_get_linecount_by_pass</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a22</anchor>
+      <anchor>5acdf7cc603254e68b0ae39e45ea52f3</anchor>
       <arglist>(const stp_vars_t *v, int pass)</arglist>
     </member>
     <member kind="function">
       <type>const stp_linebufs_t *</type>
       <name>stp_get_linebases_by_pass</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a23</anchor>
+      <anchor>1ec75a70b7dad8a5d0e4c963d67677c3</anchor>
       <arglist>(const stp_vars_t *v, int pass)</arglist>
     </member>
     <member kind="function">
       <type>stp_pass_t *</type>
       <name>stp_get_pass_by_pass</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a24</anchor>
+      <anchor>5412630e5a7ba809b6ef84ab4e6c9f09</anchor>
       <arglist>(const stp_vars_t *v, int pass)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_weave_parameters_by_row</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a25</anchor>
+      <anchor>39d760951513fd171f9dc25b57daf229</anchor>
       <arglist>(const stp_vars_t *v, int row, int vertical_subpass, stp_weave_t *w)</arglist>
     </member>
     <member kind="variable">
       <type>stp_packfunc</type>
       <name>stp_pack_tiff</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>525feabe0775e573007678b2da863b24</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_packfunc</type>
       <name>stp_pack_uncompressed</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>561a5fd614c279fdc9ea9c14c7a5b540</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_fillfunc</type>
       <name>stp_fill_tiff</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>87a7e015e79b03ec26069ddf9ab64c50</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_fillfunc</type>
       <name>stp_fill_uncompressed</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>581ae80f8594763f27620d3338407fef</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_compute_linewidth_func</type>
       <name>stp_compute_tiff_linewidth</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>9907d0fcce9e3c336fa7c6d66e1c91a5</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_compute_linewidth_func</type>
       <name>stp_compute_uncompressed_linewidth</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>4046c403128b61705309b05700120e41</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>xml.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprint/</path>
     <filename>xml_8h</filename>
     <includes id="mxml_8h" name="mxml.h" local="no" imported="no">gutenprint/mxml.h</includes>
     <member kind="typedef">
-      <type>int(*</type>
+      <type>int(*)</type>
       <name>stp_xml_parse_func</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a0</anchor>
-      <arglist>)(stp_mxml_node_t *node, const char *file)</arglist>
+      <anchor>68816020e4f2e76d9b87379fe5b5edb2</anchor>
+      <arglist>(stp_mxml_node_t *node, const char *file)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_register_xml_parser</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>9082cdb0bef669a2c1cd463874d56cb3</anchor>
       <arglist>(const char *name, stp_xml_parse_func parse_func)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_unregister_xml_parser</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>018dc99b4a78447b2e8cf66fec5a47b8</anchor>
       <arglist>(const char *name)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_register_xml_preload</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>8ce0a404da56d87db34ee50562f3154d</anchor>
       <arglist>(const char *filename)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_unregister_xml_preload</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>07bde9804f5e759aea971fea06e8cff7</anchor>
       <arglist>(const char *filename)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_xml_init_defaults</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>3cfa9b65f1620621f0a0c6c7038fd316</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_xml_parse_file</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>c18d19df318ec2e3b4c850c68f07fe8f</anchor>
       <arglist>(const char *file)</arglist>
     </member>
     <member kind="function">
       <type>long</type>
       <name>stp_xmlstrtol</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>28f6df53b5a7623b654dff6ec26db8c7</anchor>
       <arglist>(const char *value)</arglist>
     </member>
     <member kind="function">
       <type>unsigned long</type>
       <name>stp_xmlstrtoul</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>1c1ba2f2312544bda8b3ce2e919e4687</anchor>
       <arglist>(const char *value)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_xmlstrtod</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>955626cb67a5067d67a116f8ab67007d</anchor>
       <arglist>(const char *textval)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_xml_init</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>1a82a8dc830a6f7f81ec4e6f2344a5af</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_xml_exit</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a11</anchor>
+      <anchor>b7b7abdceb4f1e6e6c6a607cd2eedead</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_xml_get_node</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a12</anchor>
+      <anchor>3f776c6582845b20c4f76b239d590ec6</anchor>
       <arglist>(stp_mxml_node_t *xmlroot,...)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_xmldoc_create_generic</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a13</anchor>
+      <anchor>31f7bc9f5f2b2ce79dcfc87d7f4630f2</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_xml_preinit</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a14</anchor>
+      <anchor>57035ed4be23f4527c9515198bf37a9d</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>stp_sequence_t *</type>
       <name>stp_sequence_create_from_xmltree</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a15</anchor>
+      <anchor>fa6f69121eb86b2aee998635b79d21ac</anchor>
       <arglist>(stp_mxml_node_t *da)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_xmltree_create_from_sequence</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a16</anchor>
+      <anchor>d03ea12e2b0089daf469c6af120ef180</anchor>
       <arglist>(const stp_sequence_t *seq)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_from_xmltree</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a17</anchor>
+      <anchor>112e57d9f022170ee00b0a66fea1770f</anchor>
       <arglist>(stp_mxml_node_t *da)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_xmltree_create_from_curve</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a18</anchor>
+      <anchor>e8c5f8944f4921f772eb12e52c7fb95d</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>stp_array_t *</type>
       <name>stp_array_create_from_xmltree</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a19</anchor>
+      <anchor>ce5ac81af291e43504d5c0200276e543</anchor>
       <arglist>(stp_mxml_node_t *array)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_xmltree_create_from_array</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a20</anchor>
+      <anchor>e02d45dc8cae7bea5c4e378e121d6623</anchor>
       <arglist>(const stp_array_t *array)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_xml_parse_file_named</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a21</anchor>
+      <anchor>c3ebefda15f3996388895a4408c3b030</anchor>
       <arglist>(const char *name)</arglist>
     </member>
   </compound>
-  <compound kind="struct">
-    <name>dither_matrix_impl</name>
-    <filename>structdither__matrix__impl.html</filename>
-    <member kind="variable">
-      <type>int</type>
-      <name>base</name>
-      <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>exp</name>
-      <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>x_size</name>
-      <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>y_size</name>
-      <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>total_size</name>
-      <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o4</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>last_x</name>
-      <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o5</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>last_x_mod</name>
-      <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o6</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>last_y</name>
-      <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o7</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>last_y_mod</name>
-      <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o8</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>index</name>
-      <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o9</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>i_own</name>
-      <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o10</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>x_offset</name>
-      <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o11</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>y_offset</name>
-      <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o12</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned</type>
-      <name>fast_mask</name>
-      <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o13</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned *</type>
-      <name>matrix</name>
-      <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o14</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_cached_curve_t</name>
-    <filename>structstp__cached__curve__t.html</filename>
-    <member kind="variable">
-      <type>stp_curve_t *</type>
-      <name>curve</name>
-      <anchorfile>structstp__cached__curve__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const double *</type>
-      <name>d_cache</name>
-      <anchorfile>structstp__cached__curve__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const unsigned short *</type>
-      <name>s_cache</name>
-      <anchorfile>structstp__cached__curve__t.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>size_t</type>
-      <name>count</name>
-      <anchorfile>structstp__cached__curve__t.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_color</name>
-    <filename>structstp__color.html</filename>
-    <member kind="variable">
-      <type>const char *</type>
-      <name>short_name</name>
-      <anchorfile>structstp__color.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const char *</type>
-      <name>long_name</name>
-      <anchorfile>structstp__color.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const stp_colorfuncs_t *</type>
-      <name>colorfuncs</name>
-      <anchorfile>structstp__color.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_colorfuncs_t</name>
-    <filename>structstp__colorfuncs__t.html</filename>
-    <member kind="variable">
-      <type>int(*</type>
-      <name>init</name>
-      <anchorfile>structstp__colorfuncs__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist>)(stp_vars_t *v, stp_image_t *image, size_t steps)</arglist>
-    </member>
-    <member kind="variable">
-      <type>int(*</type>
-      <name>get_row</name>
-      <anchorfile>structstp__colorfuncs__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist>)(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)</arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_parameter_list_t(*</type>
-      <name>list_parameters</name>
-      <anchorfile>structstp__colorfuncs__t.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist>)(const stp_vars_t *v)</arglist>
-    </member>
-    <member kind="variable">
-      <type>void(*</type>
-      <name>describe_parameter</name>
-      <anchorfile>structstp__colorfuncs__t.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist>)(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_curve_point_t</name>
-    <filename>structstp__curve__point__t.html</filename>
-    <member kind="variable">
-      <type>double</type>
-      <name>x</name>
-      <anchorfile>structstp__curve__point__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>double</type>
-      <name>y</name>
-      <anchorfile>structstp__curve__point__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_dither_matrix_generic</name>
-    <filename>structstp__dither__matrix__generic.html</filename>
-    <member kind="variable">
-      <type>int</type>
-      <name>x</name>
-      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>y</name>
-      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>bytes</name>
-      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>prescaled</name>
-      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const void *</type>
-      <name>data</name>
-      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>o4</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_dither_matrix_normal</name>
-    <filename>structstp__dither__matrix__normal.html</filename>
-    <member kind="variable">
-      <type>int</type>
-      <name>x</name>
-      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>y</name>
-      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>bytes</name>
-      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>prescaled</name>
-      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const unsigned *</type>
-      <name>data</name>
-      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>o4</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_dither_matrix_short</name>
-    <filename>structstp__dither__matrix__short.html</filename>
-    <member kind="variable">
-      <type>int</type>
-      <name>x</name>
-      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>y</name>
-      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>bytes</name>
-      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>prescaled</name>
-      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const unsigned short *</type>
-      <name>data</name>
-      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>o4</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_dotsize</name>
-    <filename>structstp__dotsize.html</filename>
-    <member kind="variable">
-      <type>unsigned</type>
-      <name>bit_pattern</name>
-      <anchorfile>structstp__dotsize.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>double</type>
-      <name>value</name>
-      <anchorfile>structstp__dotsize.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_double_bound_t</name>
-    <filename>structstp__double__bound__t.html</filename>
-    <member kind="variable">
-      <type>double</type>
-      <name>lower</name>
-      <anchorfile>structstp__double__bound__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>double</type>
-      <name>upper</name>
-      <anchorfile>structstp__double__bound__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_family</name>
-    <filename>structstp__family.html</filename>
-    <member kind="variable">
-      <type>const stp_printfuncs_t *</type>
-      <name>printfuncs</name>
-      <anchorfile>structstp__family.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_list_t *</type>
-      <name>printer_list</name>
-      <anchorfile>structstp__family.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_image</name>
-    <filename>structstp__image.html</filename>
-    <member kind="variable">
-      <type>void(*</type>
-      <name>init</name>
-      <anchorfile>structstp__image.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist>)(struct stp_image *image)</arglist>
-    </member>
-    <member kind="variable">
-      <type>void(*</type>
-      <name>reset</name>
-      <anchorfile>structstp__image.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist>)(struct stp_image *image)</arglist>
-    </member>
-    <member kind="variable">
-      <type>int(*</type>
-      <name>width</name>
-      <anchorfile>structstp__image.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist>)(struct stp_image *image)</arglist>
-    </member>
-    <member kind="variable">
-      <type>int(*</type>
-      <name>height</name>
-      <anchorfile>structstp__image.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist>)(struct stp_image *image)</arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_image_status_t(*</type>
-      <name>get_row</name>
-      <anchorfile>structstp__image.html</anchorfile>
-      <anchor>o4</anchor>
-      <arglist>)(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)</arglist>
-    </member>
-    <member kind="variable">
-      <type>const char *(*</type>
-      <name>get_appname</name>
-      <anchorfile>structstp__image.html</anchorfile>
-      <anchor>o5</anchor>
-      <arglist>)(struct stp_image *image)</arglist>
-    </member>
-    <member kind="variable">
-      <type>void(*</type>
-      <name>conclude</name>
-      <anchorfile>structstp__image.html</anchorfile>
-      <anchor>o6</anchor>
-      <arglist>)(struct stp_image *image)</arglist>
-    </member>
-    <member kind="variable">
-      <type>void *</type>
-      <name>rep</name>
-      <anchorfile>structstp__image.html</anchorfile>
-      <anchor>o7</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_int_bound_t</name>
-    <filename>structstp__int__bound__t.html</filename>
-    <member kind="variable">
-      <type>int</type>
-      <name>lower</name>
-      <anchorfile>structstp__int__bound__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>upper</name>
-      <anchorfile>structstp__int__bound__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_lineactive_t</name>
-    <filename>structstp__lineactive__t.html</filename>
-    <member kind="variable">
-      <type>int</type>
-      <name>ncolors</name>
-      <anchorfile>structstp__lineactive__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>char *</type>
-      <name>v</name>
-      <anchorfile>structstp__lineactive__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_linebounds_t</name>
-    <filename>structstp__linebounds__t.html</filename>
-    <member kind="variable">
-      <type>int</type>
-      <name>ncolors</name>
-      <anchorfile>structstp__linebounds__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int *</type>
-      <name>start_pos</name>
-      <anchorfile>structstp__linebounds__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int *</type>
-      <name>end_pos</name>
-      <anchorfile>structstp__linebounds__t.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_linebufs_t</name>
-    <filename>structstp__linebufs__t.html</filename>
-    <member kind="variable">
-      <type>int</type>
-      <name>ncolors</name>
-      <anchorfile>structstp__linebufs__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned char **</type>
-      <name>v</name>
-      <anchorfile>structstp__linebufs__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_linecount_t</name>
-    <filename>structstp__linecount__t.html</filename>
-    <member kind="variable">
-      <type>int</type>
-      <name>ncolors</name>
-      <anchorfile>structstp__linecount__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int *</type>
-      <name>v</name>
-      <anchorfile>structstp__linecount__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_lineoff_t</name>
-    <filename>structstp__lineoff__t.html</filename>
-    <member kind="variable">
-      <type>int</type>
-      <name>ncolors</name>
-      <anchorfile>structstp__lineoff__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned long *</type>
-      <name>v</name>
-      <anchorfile>structstp__lineoff__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_module</name>
-    <filename>structstp__module.html</filename>
-    <member kind="variable">
-      <type>const char *</type>
-      <name>name</name>
-      <anchorfile>structstp__module.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const char *</type>
-      <name>version</name>
-      <anchorfile>structstp__module.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const char *</type>
-      <name>comment</name>
-      <anchorfile>structstp__module.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_module_class_t</type>
-      <name>class</name>
-      <anchorfile>structstp__module.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>void *</type>
-      <name>handle</name>
-      <anchorfile>structstp__module.html</anchorfile>
-      <anchor>o4</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int(*</type>
-      <name>init</name>
-      <anchorfile>structstp__module.html</anchorfile>
-      <anchor>o5</anchor>
-      <arglist>)(void)</arglist>
-    </member>
-    <member kind="variable">
-      <type>int(*</type>
-      <name>fini</name>
-      <anchorfile>structstp__module.html</anchorfile>
-      <anchor>o6</anchor>
-      <arglist>)(void)</arglist>
-    </member>
-    <member kind="variable">
-      <type>void *</type>
-      <name>syms</name>
-      <anchorfile>structstp__module.html</anchorfile>
-      <anchor>o7</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_module_version</name>
-    <filename>structstp__module__version.html</filename>
-    <member kind="variable">
-      <type>int</type>
-      <name>major</name>
-      <anchorfile>structstp__module__version.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>minor</name>
-      <anchorfile>structstp__module__version.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_mxml_attr_s</name>
-    <filename>structstp__mxml__attr__s.html</filename>
-    <member kind="variable">
-      <type>char *</type>
-      <name>name</name>
-      <anchorfile>structstp__mxml__attr__s.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>char *</type>
-      <name>value</name>
-      <anchorfile>structstp__mxml__attr__s.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_mxml_node_s</name>
-    <filename>structstp__mxml__node__s.html</filename>
-    <member kind="variable">
-      <type>stp_mxml_type_t</type>
-      <name>type</name>
-      <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_mxml_node_t *</type>
-      <name>next</name>
-      <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_mxml_node_t *</type>
-      <name>prev</name>
-      <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_mxml_node_t *</type>
-      <name>parent</name>
-      <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_mxml_node_t *</type>
-      <name>child</name>
-      <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>o4</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_mxml_node_t *</type>
-      <name>last_child</name>
-      <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>o5</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_mxml_value_t</type>
-      <name>value</name>
-      <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>o6</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_mxml_text_s</name>
-    <filename>structstp__mxml__text__s.html</filename>
-    <member kind="variable">
-      <type>int</type>
-      <name>whitespace</name>
-      <anchorfile>structstp__mxml__text__s.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>char *</type>
-      <name>string</name>
-      <anchorfile>structstp__mxml__text__s.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_mxml_value_s</name>
-    <filename>structstp__mxml__value__s.html</filename>
-    <member kind="variable">
-      <type>char *</type>
-      <name>name</name>
-      <anchorfile>structstp__mxml__value__s.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>num_attrs</name>
-      <anchorfile>structstp__mxml__value__s.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_mxml_attr_t *</type>
-      <name>attrs</name>
-      <anchorfile>structstp__mxml__value__s.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="union">
-    <name>stp_mxml_value_u</name>
-    <filename>unionstp__mxml__value__u.html</filename>
-    <member kind="variable">
-      <type>stp_mxml_element_t</type>
-      <name>element</name>
-      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>integer</name>
-      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>char *</type>
-      <name>opaque</name>
-      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>double</type>
-      <name>real</name>
-      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_mxml_text_t</type>
-      <name>text</name>
-      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>o4</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_papersize_t</name>
-    <filename>structstp__papersize__t.html</filename>
-    <member kind="variable">
-      <type>char *</type>
-      <name>name</name>
-      <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>char *</type>
-      <name>text</name>
-      <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>char *</type>
-      <name>comment</name>
-      <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned</type>
-      <name>width</name>
-      <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned</type>
-      <name>height</name>
-      <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o4</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned</type>
-      <name>top</name>
-      <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o5</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned</type>
-      <name>left</name>
-      <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o6</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned</type>
-      <name>bottom</name>
-      <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o7</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned</type>
-      <name>right</name>
-      <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o8</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_papersize_unit_t</type>
-      <name>paper_unit</name>
-      <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o9</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_param_string_t</name>
-    <filename>structstp__param__string__t.html</filename>
-    <member kind="variable">
-      <type>const char *</type>
-      <name>name</name>
-      <anchorfile>structstp__param__string__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const char *</type>
-      <name>text</name>
-      <anchorfile>structstp__param__string__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_parameter_t</name>
-    <filename>structstp__parameter__t.html</filename>
-    <member kind="variable">
-      <type>const char *</type>
-      <name>name</name>
-      <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const char *</type>
-      <name>text</name>
-      <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const char *</type>
-      <name>category</name>
-      <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const char *</type>
-      <name>help</name>
-      <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_parameter_type_t</type>
-      <name>p_type</name>
-      <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o4</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_parameter_class_t</type>
-      <name>p_class</name>
-      <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o5</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_parameter_level_t</type>
-      <name>p_level</name>
-      <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o6</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned char</type>
-      <name>is_mandatory</name>
-      <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o7</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned char</type>
-      <name>is_active</name>
-      <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o8</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned char</type>
-      <name>channel</name>
-      <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o9</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned char</type>
-      <name>verify_this_parameter</name>
-      <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o10</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>unsigned char</type>
-      <name>read_only</name>
-      <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o11</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_parameter_t::@0</type>
-      <name>bounds</name>
-      <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o18</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_curve_t *</type>
-      <name>curve</name>
-      <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_double_bound_t</type>
-      <name>dbl</name>
-      <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_int_bound_t</type>
-      <name>integer</name>
-      <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_int_bound_t</type>
-      <name>dimension</name>
-      <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_string_list_t *</type>
-      <name>str</name>
-      <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
-      <anchor>o4</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_array_t *</type>
-      <name>array</name>
-      <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
-      <anchor>o5</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_parameter_t::@1</type>
-      <name>deflt</name>
-      <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o26</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_curve_t *</type>
-      <name>curve</name>
-      <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>double</type>
-      <name>dbl</name>
-      <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>dimension</name>
-      <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>integer</name>
-      <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>boolean</name>
-      <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>o4</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const char *</type>
-      <name>str</name>
-      <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>o5</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_array_t *</type>
-      <name>array</name>
-      <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>o6</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_pass_t</name>
-    <filename>structstp__pass__t.html</filename>
-    <member kind="variable">
-      <type>int</type>
-      <name>pass</name>
-      <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>missingstartrows</name>
-      <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>logicalpassstart</name>
-      <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>physpassstart</name>
-      <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>physpassend</name>
-      <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>o4</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>subpass</name>
-      <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>o5</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_printfuncs_t</name>
-    <filename>structstp__printfuncs__t.html</filename>
-    <member kind="variable">
-      <type>stp_parameter_list_t(*</type>
-      <name>list_parameters</name>
-      <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist>)(const stp_vars_t *v)</arglist>
-    </member>
-    <member kind="variable">
-      <type>void(*</type>
-      <name>parameters</name>
-      <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist>)(const stp_vars_t *v, const char *name, stp_parameter_t *)</arglist>
-    </member>
-    <member kind="variable">
-      <type>void(*</type>
-      <name>media_size</name>
-      <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist>)(const stp_vars_t *v, int *width, int *height)</arglist>
-    </member>
-    <member kind="variable">
-      <type>void(*</type>
-      <name>imageable_area</name>
-      <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist>)(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
-    </member>
-    <member kind="variable">
-      <type>void(*</type>
-      <name>maximum_imageable_area</name>
-      <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o4</anchor>
-      <arglist>)(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
-    </member>
-    <member kind="variable">
-      <type>void(*</type>
-      <name>limit</name>
-      <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o5</anchor>
-      <arglist>)(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)</arglist>
-    </member>
-    <member kind="variable">
-      <type>int(*</type>
-      <name>print</name>
-      <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o6</anchor>
-      <arglist>)(const stp_vars_t *v, stp_image_t *image)</arglist>
-    </member>
-    <member kind="variable">
-      <type>void(*</type>
-      <name>describe_resolution</name>
-      <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o7</anchor>
-      <arglist>)(const stp_vars_t *v, int *x, int *y)</arglist>
-    </member>
-    <member kind="variable">
-      <type>const char *(*</type>
-      <name>describe_output</name>
-      <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o8</anchor>
-      <arglist>)(const stp_vars_t *v)</arglist>
-    </member>
-    <member kind="variable">
-      <type>int(*</type>
-      <name>verify</name>
-      <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o9</anchor>
-      <arglist>)(stp_vars_t *v)</arglist>
-    </member>
-    <member kind="variable">
-      <type>int(*</type>
-      <name>start_job</name>
-      <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o10</anchor>
-      <arglist>)(const stp_vars_t *v, stp_image_t *image)</arglist>
-    </member>
-    <member kind="variable">
-      <type>int(*</type>
-      <name>end_job</name>
-      <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o11</anchor>
-      <arglist>)(const stp_vars_t *v, stp_image_t *image)</arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_raw_t</name>
-    <filename>structstp__raw__t.html</filename>
-    <member kind="variable">
-      <type>size_t</type>
-      <name>bytes</name>
-      <anchorfile>structstp__raw__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const void *</type>
-      <name>data</name>
-      <anchorfile>structstp__raw__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_shade</name>
-    <filename>structstp__shade.html</filename>
-    <member kind="variable">
-      <type>double</type>
-      <name>value</name>
-      <anchorfile>structstp__shade.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>numsizes</name>
-      <anchorfile>structstp__shade.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const stp_dotsize_t *</type>
-      <name>dot_sizes</name>
-      <anchorfile>structstp__shade.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
-  <compound kind="struct">
-    <name>stp_weave_t</name>
-    <filename>structstp__weave__t.html</filename>
-    <member kind="variable">
-      <type>int</type>
-      <name>row</name>
-      <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>o0</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>pass</name>
-      <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>o1</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>jet</name>
-      <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>o2</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>missingstartrows</name>
-      <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>o3</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>logicalpassstart</name>
-      <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>o4</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>physpassstart</name>
-      <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>o5</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>int</type>
-      <name>physpassend</name>
-      <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>o6</anchor>
-      <arglist></arglist>
-    </member>
-  </compound>
   <compound kind="group">
     <name>array</name>
     <title>array</title>
@@ -5921,84 +4662,84 @@
       <type>stp_array</type>
       <name>stp_array_t</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g26a474575a39c1c36ad520b95aa813b0</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_array_t *</type>
       <name>stp_array_create</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>ga3d385d3e2f248b1c1ac88d5f103e9a2</anchor>
       <arglist>(int x_size, int y_size)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_destroy</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>gafb2573df35220ef9be3f6ba4b8c871b</anchor>
       <arglist>(stp_array_t *array)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_copy</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gaa9bf798890e01b4bbce8cda45615021</anchor>
       <arglist>(stp_array_t *dest, const stp_array_t *source)</arglist>
     </member>
     <member kind="function">
       <type>stp_array_t *</type>
       <name>stp_array_create_copy</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gd0b50228ca40df79196197f9c21f4b56</anchor>
       <arglist>(const stp_array_t *array)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_set_size</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>ge6fb91b246ef5abd388927cb9674503e</anchor>
       <arglist>(stp_array_t *array, int x_size, int y_size)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_get_size</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>gfe61db801ab3b0326646178e536dd161</anchor>
       <arglist>(const stp_array_t *array, int *x_size, int *y_size)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_set_data</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gea0493f5bec9c5c185679adfde3edc9a</anchor>
       <arglist>(stp_array_t *array, const double *data)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_get_data</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>ge0d44ee80048189d244b16f231c54b80</anchor>
       <arglist>(const stp_array_t *array, size_t *size, const double **data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_array_set_point</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>gd6b95b2efd500007b098594826f4467f</anchor>
       <arglist>(stp_array_t *array, int x, int y, double data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_array_get_point</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g9078af984a5e1ec80a6068bdb51c9a6d</anchor>
       <arglist>(const stp_array_t *array, int x, int y, double *data)</arglist>
     </member>
     <member kind="function">
       <type>const stp_sequence_t *</type>
       <name>stp_array_get_sequence</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>ge05ba5cfe8c03e2435348d6c5488d87e</anchor>
       <arglist>(const stp_array_t *array)</arglist>
     </member>
   </compound>
@@ -6012,91 +4753,91 @@
       <type>stp_color</type>
       <name>stp_color_t</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>gd1408f9835b72f266ec7c7e1e1202a74</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_init</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g23392fc53078d51fcd14d6d565d56423</anchor>
       <arglist>(stp_vars_t *v, stp_image_t *image, size_t steps)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_get_row</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g0cf28c3c9638987df4b1740deadba0cb</anchor>
       <arglist>(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_color_list_parameters</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>ga282220724877a57738b047140835141</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_color_describe_parameter</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g83bc80c9fd84d741099bc20285a1b655</anchor>
       <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_register</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g47d6a8163ef21a6e700b1371228b851d</anchor>
       <arglist>(const stp_color_t *color)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_unregister</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g2b62ec8e0afe1b6297bc71466f8a334c</anchor>
       <arglist>(const stp_color_t *color)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_count</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g68c13c36d723e5604507bf33fe629f8b</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const stp_color_t *</type>
       <name>stp_get_color_by_name</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g3b8f62108f3604480e7b89b253527f4a</anchor>
       <arglist>(const char *name)</arglist>
     </member>
     <member kind="function">
       <type>const stp_color_t *</type>
       <name>stp_get_color_by_index</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g68ba525119da39ae854645ae649557d3</anchor>
       <arglist>(int idx)</arglist>
     </member>
     <member kind="function">
       <type>const stp_color_t *</type>
       <name>stp_get_color_by_colorfuncs</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g578f80b2bc3937df38ce7e803f5f472c</anchor>
       <arglist>(stp_colorfuncs_t *colorfuncs)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_color_get_name</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g5a4a4da67cb5c3f1c0a2a9618e46ed50</anchor>
       <arglist>(const stp_color_t *c)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_color_get_long_name</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g612389b45f09358f6bad0e376c91b057</anchor>
       <arglist>(const stp_color_t *c)</arglist>
     </member>
   </compound>
@@ -6109,399 +4850,399 @@
       <type>stp_curve</type>
       <name>stp_curve_t</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g375a2b23705fb0698ae1d823243c8524</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_type_t</name>
-      <anchor>ga47</anchor>
+      <anchor>g982f8191c84b049cc3ad3cee1558fc23</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_TYPE_LINEAR</name>
-      <anchor>gga47a1</anchor>
+      <anchor>gg982f8191c84b049cc3ad3cee1558fc2346228ddaa2d52a85ccd79c4dc0f76ad3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_TYPE_SPLINE</name>
-      <anchor>gga47a2</anchor>
+      <anchor>gg982f8191c84b049cc3ad3cee1558fc23fb1ffdc3754f428d8e3a2124e014ff77</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_wrap_mode_t</name>
-      <anchor>ga48</anchor>
+      <anchor>g3ae3af552b490b0ca8b02e442ac9547a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_WRAP_NONE</name>
-      <anchor>gga48a3</anchor>
+      <anchor>gg3ae3af552b490b0ca8b02e442ac9547ad840485ad7df768a06ee4be02d93b97a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_WRAP_AROUND</name>
-      <anchor>gga48a4</anchor>
+      <anchor>gg3ae3af552b490b0ca8b02e442ac9547ac0361aebddfabfb263dc0205a61f6fbd</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_compose_t</name>
-      <anchor>ga49</anchor>
+      <anchor>g7eddbee28cb1f3c76a19408b86ea142e</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_ADD</name>
-      <anchor>gga49a5</anchor>
+      <anchor>gg7eddbee28cb1f3c76a19408b86ea142ec38b0bf09e93edb67c3e5c53035295f3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_MULTIPLY</name>
-      <anchor>gga49a6</anchor>
+      <anchor>gg7eddbee28cb1f3c76a19408b86ea142ed3bd2cdb63498d5d22686e79e2c0ed95</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_EXPONENTIATE</name>
-      <anchor>gga49a7</anchor>
+      <anchor>gg7eddbee28cb1f3c76a19408b86ea142e8de151149fdfd4fcca78826e6352246a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_bounds_t</name>
-      <anchor>ga50</anchor>
+      <anchor>g86d146e483ca1902f973d574f542b85f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_RESCALE</name>
-      <anchor>gga50a8</anchor>
+      <anchor>gg86d146e483ca1902f973d574f542b85f118d303bf7bdf4f00bda71cc6eac49c3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_CLIP</name>
-      <anchor>gga50a9</anchor>
+      <anchor>gg86d146e483ca1902f973d574f542b85fec9e6673edac9d34e3aad376fa711aa5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_ERROR</name>
-      <anchor>gga50a10</anchor>
+      <anchor>gg86d146e483ca1902f973d574f542b85fd699d675d5df223055388cd83d0b362b</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g6b3640f0e25bd9d38e46bdc1b2ee58a4</anchor>
       <arglist>(stp_curve_wrap_mode_t wrap)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_copy</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g972ed591394396e0c66e928a0695b3bf</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_copy</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gcd7861bf1c9d61ac4ec87844a15ab9d3</anchor>
       <arglist>(stp_curve_t *dest, const stp_curve_t *source)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_destroy</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g4294b85e848fe421496469e2406ef380</anchor>
       <arglist>(stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_bounds</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>ge32fb850963b8694d3739c0ed8475f75</anchor>
       <arglist>(stp_curve_t *curve, double low, double high)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_get_bounds</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g63c3386fbfd75da9fe985673bf7b1ca3</anchor>
       <arglist>(const stp_curve_t *curve, double *low, double *high)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_wrap_mode_t</type>
       <name>stp_curve_get_wrap</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g859020827897bac0f4671322ec027dc4</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_is_piecewise</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g29b022a3055afe0b48d1f2736ff2f4da</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_get_range</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>gcb8e51731b9385556747744a0d4f43fb</anchor>
       <arglist>(const stp_curve_t *curve, double *low, double *high)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_curve_count_points</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g766ff02b29b976372779f719076ad017</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_interpolation_type</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g82890cef78f5861a88c5789c33693423</anchor>
       <arglist>(stp_curve_t *curve, stp_curve_type_t itype)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_type_t</type>
       <name>stp_curve_get_interpolation_type</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g42c98a6a6d2512516738b6df9367510e</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g81bceb4cb991cef1cda2298cf7bb9f15</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const double *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_data_points</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>gce09cab4e6ae3d55f75aacae3689e8e6</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const stp_curve_point_t *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_float_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>gbd7a39289471607311141c7fc3bbb415</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const float *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_long_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>ge6a435a21a5c4b5e582d42095a7b06fc</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const long *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_ulong_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g723173297f5b67af937205c7d74ac353</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const unsigned long *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_int_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>g31e76843f4d2f207701755b58766a670</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const int *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_uint_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g3ee80f8e4f33691a78b3ad8c3fd7c34f</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const unsigned int *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_short_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g2fa5222aab07e85f215e389734b6dbea</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const short *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_ushort_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g0af395eefa7bfe0d19acc1acbaeefe48</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const unsigned short *data)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_get_subrange</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>g5cbf7c4b6ad96ecb35fc06f46c0319f0</anchor>
       <arglist>(const stp_curve_t *curve, size_t start, size_t count)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_subrange</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>g73dfcc4c95734449965227e21deb3037</anchor>
       <arglist>(stp_curve_t *curve, const stp_curve_t *range, size_t start)</arglist>
     </member>
     <member kind="function">
       <type>const double *</type>
       <name>stp_curve_get_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>gb2208f56694e47e4300d10e057f59ee8</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const stp_curve_point_t *</type>
       <name>stp_curve_get_data_points</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>g79e0d6afa3573917c756af64b56a0d82</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const float *</type>
       <name>stp_curve_get_float_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>g251f105cb5f2b126ea02b7908f717c18</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const long *</type>
       <name>stp_curve_get_long_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>gf59bd38c9dfc7beb08a283dc9e400bf2</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned long *</type>
       <name>stp_curve_get_ulong_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>g24a862eda4cdbb626f51aeb7d8ae9a50</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const int *</type>
       <name>stp_curve_get_int_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga29</anchor>
+      <anchor>g6de80e81b64262e0051441f697ae4de4</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned int *</type>
       <name>stp_curve_get_uint_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga30</anchor>
+      <anchor>g19b3160a57dc6959fe08c631c7206a8a</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const short *</type>
       <name>stp_curve_get_short_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga31</anchor>
+      <anchor>g87c5d1904efa58be8a21ab6b2c41d0b9</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned short *</type>
       <name>stp_curve_get_ushort_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga32</anchor>
+      <anchor>ga02125af6b9c192e34985851370391b8</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const stp_sequence_t *</type>
       <name>stp_curve_get_sequence</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga33</anchor>
+      <anchor>gde323594e84d4380c88ecf122a5a4da8</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_gamma</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga34</anchor>
+      <anchor>gcb8a2b9b21f97f32faacb99a6125e152</anchor>
       <arglist>(stp_curve_t *curve, double f_gamma)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_curve_get_gamma</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga35</anchor>
+      <anchor>g0420a6cfa87aa96e5c9a56142aa0178d</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_point</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga36</anchor>
+      <anchor>g2d3b8372bde3fce699a3b7bb3c9d8582</anchor>
       <arglist>(stp_curve_t *curve, size_t where, double data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_get_point</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga37</anchor>
+      <anchor>g569aae57147ed7681f23e0e60bd8af35</anchor>
       <arglist>(const stp_curve_t *curve, size_t where, double *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_interpolate_value</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga38</anchor>
+      <anchor>gb33642ee6c49334f379a4dc185ecd355</anchor>
       <arglist>(const stp_curve_t *curve, double where, double *result)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_resample</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga39</anchor>
+      <anchor>g87298cf562468cbcf2c1f76a0ab80b62</anchor>
       <arglist>(stp_curve_t *curve, size_t points)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_rescale</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga40</anchor>
+      <anchor>gad611b3ddbd667ec204fa7b42f8d7546</anchor>
       <arglist>(stp_curve_t *curve, double scale, stp_curve_compose_t mode, stp_curve_bounds_t bounds_mode)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_write</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga41</anchor>
+      <anchor>gc12af55cf0eb2f76db967886f8996313</anchor>
       <arglist>(FILE *file, const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stp_curve_write_string</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga42</anchor>
+      <anchor>gf2f0da590278ff74af1eccb0aa0c7169</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_from_stream</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga43</anchor>
+      <anchor>g478a24e44a3ce345f7207cf7ded12e37</anchor>
       <arglist>(FILE *fp)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_from_file</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga44</anchor>
+      <anchor>gd96d7d1cda5f037f7d6a9b651ebbbb46</anchor>
       <arglist>(const char *file)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_from_string</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga45</anchor>
+      <anchor>gb8c0df217306a6e0597f058efbfaca82</anchor>
       <arglist>(const char *string)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_compose</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga46</anchor>
+      <anchor>g55c83a9139fc1b06b90e983d7c1ceff7</anchor>
       <arglist>(stp_curve_t **retval, stp_curve_t *a, stp_curve_t *b, stp_curve_compose_t mode, int points)</arglist>
     </member>
   </compound>
@@ -6513,49 +5254,49 @@
       <type>#define</type>
       <name>textdomain</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g5f80e8482ab93869489531a8c7ce7006</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>gettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g83b8be0887dede025766d25e2bb884c6</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dgettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>gd24abc7110e1bdf384dc2ef2b63e5d07</anchor>
       <arglist>(Domain, Message)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dcgettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g115dd6a6dd9d7a249f6374a7c06deef5</anchor>
       <arglist>(Domain, Message, Type)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>bindtextdomain</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gdd6dfc1077058ff26d79cdb18099d58a</anchor>
       <arglist>(Domain, Directory)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>_</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g32a3cf3d9dd914f5aeeca5423c157934</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>N_</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g75278405e7f034d2b1af80bfd94675fe</anchor>
       <arglist>(String)</arglist>
     </member>
   </compound>
@@ -6567,49 +5308,49 @@
       <type>#define</type>
       <name>textdomain</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g5f80e8482ab93869489531a8c7ce7006</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>gettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g83b8be0887dede025766d25e2bb884c6</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dgettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>gd24abc7110e1bdf384dc2ef2b63e5d07</anchor>
       <arglist>(Domain, Message)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dcgettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g115dd6a6dd9d7a249f6374a7c06deef5</anchor>
       <arglist>(Domain, Message, Type)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>bindtextdomain</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gdd6dfc1077058ff26d79cdb18099d58a</anchor>
       <arglist>(Domain, Directory)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>_</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g32a3cf3d9dd914f5aeeca5423c157934</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>N_</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g75278405e7f034d2b1af80bfd94675fe</anchor>
       <arglist>(String)</arglist>
     </member>
   </compound>
@@ -6621,98 +5362,98 @@
       <type>#define</type>
       <name>STP_MAJOR_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gdd0b07630653da8e46b91c2c1bafc2b9</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MINOR_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g87507431ad6b7504b129eafad863cb1f</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MICRO_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>gb860ee8cb0b05ea1385e01d130d7358e</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_CURRENT_INTERFACE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g1969d8a5a74a5c70a978f99aa68d9f4b</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_BINARY_AGE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g509ecd9be5329eef0f8d49e0b25f63da</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_INTERFACE_AGE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g6485cd073e75e01f9df68ecd67b14372</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_CHECK_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>gf20320940416f43ed7735137296fa12b</anchor>
       <arglist>(major, minor, micro)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_check_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g05a93cb4ac52cc50875b5839c59bcafc</anchor>
       <arglist>(unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_major_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g4d72666d9093df7a31e7cd448b7cfd1d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_minor_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g5efc986430f0d27f5d11236c4bc48079</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_micro_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g2c7e65e276ce5af050b3ea9f859f1f89</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_current_interface</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gfc84e89ce8d6d3302270c56ebe01d5ef</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_binary_age</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g44593f7714544c5886ab34521e05d0bd</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_interface_age</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g1284e8ef76a4c864e85b7b698b91bf0c</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -6725,78 +5466,78 @@
       <type>#define</type>
       <name>STP_CHANNEL_LIMIT</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g0b7daa7e9e9b26fea847d71ca9de7c02</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_image</type>
       <name>stp_image_t</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>gae0b5ef92b619849a51cb75d376a90fb</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_image_status_t</name>
-      <anchor>ga9</anchor>
+      <anchor>g58672e1989d582c14328048b207657c8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_IMAGE_STATUS_OK</name>
-      <anchor>gga9a2</anchor>
+      <anchor>gg58672e1989d582c14328048b207657c8b5574da151b93391a337f29b2a7c96cf</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_IMAGE_STATUS_ABORT</name>
-      <anchor>gga9a3</anchor>
+      <anchor>gg58672e1989d582c14328048b207657c8224b8ac15cf785b24b2f3f53b4fdc274</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_image_init</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>gd257f72ac5272e94ff9314f8ecd24f1e</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_image_reset</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>gf2fc433dba580b9ec8e69aebc2e65338</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_image_width</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gbe86b2ff9a3a0c0e98248990f9be5652</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_image_height</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gf9dcdf718ad99df9eb71fc542d5b47e1</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>stp_image_status_t</type>
       <name>stp_image_get_row</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g01d72a16de9e98722859ca651561e8f5</anchor>
       <arglist>(stp_image_t *image, unsigned char *data, size_t limit, int row)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_image_get_appname</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g1643f6b9eb180e98f3c1c267950f18d2</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_image_conclude</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g7598151354fbeb5f6a8b3f92d1e40ad7</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
   </compound>
@@ -6808,224 +5549,224 @@
       <type>stp_list_item</type>
       <name>stp_list_item_t</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g67b4fafe1ab6ead5be7500f88874bdb0</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_list</type>
       <name>stp_list_t</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g53cf4f01ab7d712f771cb5fb479d2ba7</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
-      <type>void(*</type>
+      <type>void(*)</type>
       <name>stp_node_freefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga2</anchor>
-      <arglist>)(void *)</arglist>
+      <anchor>g4102fc776ec5bbd84eb589cfba97dfc2</anchor>
+      <arglist>(void *)</arglist>
     </member>
     <member kind="typedef">
-      <type>void *(*</type>
+      <type>void *(*)</type>
       <name>stp_node_copyfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga3</anchor>
-      <arglist>)(const void *)</arglist>
+      <anchor>g846d759413f07e91bed397f1fe3224d1</anchor>
+      <arglist>(const void *)</arglist>
     </member>
     <member kind="typedef">
-      <type>const char *(*</type>
+      <type>const char *(*)</type>
       <name>stp_node_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga4</anchor>
-      <arglist>)(const void *)</arglist>
+      <anchor>g7ecf51e54538837d4e0804da3ce58f12</anchor>
+      <arglist>(const void *)</arglist>
     </member>
     <member kind="typedef">
-      <type>int(*</type>
+      <type>int(*)</type>
       <name>stp_node_sortfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga5</anchor>
-      <arglist>)(const void *, const void *)</arglist>
+      <anchor>gd12571e44981e7acd62137c83652121a</anchor>
+      <arglist>(const void *, const void *)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_node_free_data</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g55fbb8f7a3920b783b02183c5ea57624</anchor>
       <arglist>(void *item)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_t *</type>
       <name>stp_list_create</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g3cfea94cd07f50d7d9b4ce384d349fca</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_t *</type>
       <name>stp_list_copy</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g0ba249dd06efbf5c0af8511ceab671e8</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_destroy</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>ge23ef06175b27dd6772d4d4c098999b1</anchor>
       <arglist>(stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_start</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>gd185100e8d7969a473e9d42bc8084572</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_end</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>ge939f15ee1a6e4c0aaad7a7be7f40b74</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_item_by_index</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>gd377973e8b13d02c9c111d970f491993</anchor>
       <arglist>(const stp_list_t *list, int idx)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_item_by_name</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g729867c847dd8282f74806968c708f28</anchor>
       <arglist>(const stp_list_t *list, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_item_by_long_name</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>gcc9140df3f4311cd750ba10a1cbf37d1</anchor>
       <arglist>(const stp_list_t *list, const char *long_name)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_get_length</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>ge22741060734c9cbc47656c5ea35c3f3</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_freefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>ge3300d7971c393d119d6fd62e2b578ec</anchor>
       <arglist>(stp_list_t *list, stp_node_freefunc freefunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_freefunc</type>
       <name>stp_list_get_freefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>gbfc1ef258084a3e1ad959aa3d2f053f4</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_copyfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>g7e002ed25bbfbad236c1c619841f1ac6</anchor>
       <arglist>(stp_list_t *list, stp_node_copyfunc copyfunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_copyfunc</type>
       <name>stp_list_get_copyfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g686e92ee802147171e5fc723d0079b8d</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g889af512d87a00d696acc0b6b3fafe78</anchor>
       <arglist>(stp_list_t *list, stp_node_namefunc namefunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_namefunc</type>
       <name>stp_list_get_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g50b1ab3c3b6b0ba7c0cf2128e2024369</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_long_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>g5be91978431b0ed48ea7919807bdcb73</anchor>
       <arglist>(stp_list_t *list, stp_node_namefunc long_namefunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_namefunc</type>
       <name>stp_list_get_long_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>gb99b3ed6da1ea739eed3f2c04fbb7fa7</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_sortfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>gb1d2486542b858b44b299cfcdf7d8784</anchor>
       <arglist>(stp_list_t *list, stp_node_sortfunc sortfunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_sortfunc</type>
       <name>stp_list_get_sortfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>g4b32e315d3fd23eabeffcc8d931ea454</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_item_create</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>ge726297a82e140672a018e135ffc6a0e</anchor>
       <arglist>(stp_list_t *list, stp_list_item_t *next, const void *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_item_destroy</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>g5e36d4f61e00cb3e4c4a759f5e7e9f4b</anchor>
       <arglist>(stp_list_t *list, stp_list_item_t *item)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_item_prev</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>gbaa2a241055402438a0cae6f40cf6a78</anchor>
       <arglist>(const stp_list_item_t *item)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_item_next</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga29</anchor>
+      <anchor>g81ab310caf6432ce1e492eaafdb6c0d7</anchor>
       <arglist>(const stp_list_item_t *item)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_list_item_get_data</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga30</anchor>
+      <anchor>gd6f6b303b40fa75f22a86391785178cb</anchor>
       <arglist>(const stp_list_item_t *item)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_item_set_data</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga31</anchor>
+      <anchor>gc1e34edcd47ffdc119cdcaf5ad38e1c4</anchor>
       <arglist>(stp_list_item_t *item, void *data)</arglist>
     </member>
   </compound>
@@ -7036,62 +5777,62 @@
     <class kind="struct">stp_papersize_t</class>
     <member kind="enumeration">
       <name>stp_papersize_unit_t</name>
-      <anchor>ga5</anchor>
+      <anchor>g72e4619e373e38dc02dc452813b7b958</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_ENGLISH_STANDARD</name>
-      <anchor>gga5a0</anchor>
+      <anchor>gg72e4619e373e38dc02dc452813b7b958db394159413ade42022509cd3280fef3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_METRIC_STANDARD</name>
-      <anchor>gga5a1</anchor>
+      <anchor>gg72e4619e373e38dc02dc452813b7b9586d5868bc6707f8801ce4d584428c2ae8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_ENGLISH_EXTENDED</name>
-      <anchor>gga5a2</anchor>
+      <anchor>gg72e4619e373e38dc02dc452813b7b95800b7e9a18afc172872861b26dbcc8cb8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_METRIC_EXTENDED</name>
-      <anchor>gga5a3</anchor>
+      <anchor>gg72e4619e373e38dc02dc452813b7b95862e2906a87fa4bcf32913943fd5b225a</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_known_papersizes</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g84fd0bad33b134217f54fa8c1e6c8b99</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_name</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g60f3dee8f26cac05d8d6fcaff1e39630</anchor>
       <arglist>(const char *name)</arglist>
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_size</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g1484a5e75a2b2921bbe0c9e17deb0b77</anchor>
       <arglist>(int length, int width)</arglist>
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_index</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gb2e9f694a3b90aeaaa14d6af3b5fe75a</anchor>
       <arglist>(int idx)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_default_media_size</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g33c0be56646361b1ce85a9d338336dd3</anchor>
       <arglist>(const stp_vars_t *v, int *width, int *height)</arglist>
     </member>
   </compound>
@@ -7105,182 +5846,182 @@
       <type>stp_printer</type>
       <name>stp_printer_t</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>gcddc2ce7fa4e0a68fcc30c123503738f</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_family</type>
       <name>stp_family_t</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g66a5e7cf2b1743a46bd78cb851e1d0a4</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_printer_model_count</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g6a76f8f76106eddd51af4b1593b4f3af</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const stp_printer_t *</type>
       <name>stp_get_printer_by_index</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g440501ca226e0a9ac1335c7e52ee55a6</anchor>
       <arglist>(int idx)</arglist>
     </member>
     <member kind="function">
       <type>const stp_printer_t *</type>
       <name>stp_get_printer_by_long_name</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g6bd5abd876100c17fc9029659fed92f4</anchor>
       <arglist>(const char *long_name)</arglist>
     </member>
     <member kind="function">
       <type>const stp_printer_t *</type>
       <name>stp_get_printer_by_driver</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>ge45de9ef94fb609c2a54f1d80144552e</anchor>
       <arglist>(const char *driver)</arglist>
     </member>
     <member kind="function">
       <type>const stp_printer_t *</type>
       <name>stp_get_printer</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>gc649c4b3d0a93f26f99deb4b081305c1</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_printer_index_by_driver</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g41094e69b71eb930e770bd2cf8bbf795</anchor>
       <arglist>(const char *driver)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_printer_get_long_name</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g11804fb9b8d87ed1f2a3acbd39f5f85a</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_printer_get_driver</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>gc345b8cf8cd78da98fdb4c6b2d9cf7ca</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_printer_get_family</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g487b74bf101a842f30b5941b8db4769a</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_printer_get_manufacturer</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>gb99dd05c42aed848d1567f2b346fb4f4</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_printer_get_model</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>gae84d3fb263c4a171b7b63b6d93a940e</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>const stp_vars_t *</type>
       <name>stp_printer_get_defaults</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g4f6859e0f21ed2062075d6b9f680a202</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_printer_defaults</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>gf5084888feed9878811ac491cb5313ee</anchor>
       <arglist>(stp_vars_t *v, const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_print</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>g6065874cbb246875925e14d8801898cc</anchor>
       <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_start_job</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>g31ef7bcc34dda5d3fd46b2d04fcb0c64</anchor>
       <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_end_job</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>ge61d056dd504facc72ff56d7f16eb23c</anchor>
       <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_model_id</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>g2057c5fcfc31d8b4cf7f3291cf3c0cf4</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_verify_printer_params</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g5b5cb603c9432c03ea459b57a2039bdc</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_family_register</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g1c6d389f49a185ca24546107bd6f4993</anchor>
       <arglist>(stp_list_t *family)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_family_unregister</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g67e5c18254f7ad0b0fd77b4cc2265405</anchor>
       <arglist>(stp_list_t *family)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_initialize_printer_defaults</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>g381f3a4f132a00d6d2e2a9b54f9ed675</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_printer_list_parameters</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>g09bf7aebf0385f7b5aac537a13b6e3ed</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_printer_describe_parameter</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>g07bc634c85950526155b711aac42c6a0</anchor>
       <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_describe_output</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>g50b48bab8d6d1734c3a0f6622d65582e</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
   </compound>
@@ -7292,203 +6033,203 @@
       <type>stp_sequence</type>
       <name>stp_sequence_t</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g327a46aa1d782a4cd53abf306068e272</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_sequence_t *</type>
       <name>stp_sequence_create</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g9f0233f39d6a27c796bb283c80974618</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_destroy</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g3d571f155c1d00e7794b8299a41c5099</anchor>
       <arglist>(stp_sequence_t *sequence)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_copy</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g28087c76e1106ca11c2d247956e3a3c3</anchor>
       <arglist>(stp_sequence_t *dest, const stp_sequence_t *source)</arglist>
     </member>
     <member kind="function">
       <type>stp_sequence_t *</type>
       <name>stp_sequence_create_copy</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gb03a34a03ffd4163f51126916d737df7</anchor>
       <arglist>(const stp_sequence_t *sequence)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_bounds</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g1720509809473bc33e6f11b277c78bf6</anchor>
       <arglist>(stp_sequence_t *sequence, double low, double high)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_get_bounds</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g14ad64c63f45a2716ff8d9ceaf00697d</anchor>
       <arglist>(const stp_sequence_t *sequence, double *low, double *high)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_get_range</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g999021f2caf1a9d0d6d133123031ce17</anchor>
       <arglist>(const stp_sequence_t *sequence, double *low, double *high)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_size</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>ge0af31b854e61e0e047b3ba6dc6ec528</anchor>
       <arglist>(stp_sequence_t *sequence, size_t size)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_sequence_get_size</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>gfa512afc64116f673ae2061d04a5ef90</anchor>
       <arglist>(const stp_sequence_t *sequence)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g44bf5a48231675305718162559205fb6</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const double *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_subrange</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g5bb962248581af2c3c54193442d9c82f</anchor>
       <arglist>(stp_sequence_t *sequence, size_t where, size_t size, const double *data)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_get_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g755c8a35e2e9e83a1dfac4f6138c4122</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *size, const double **data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_point</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g42c76060886da02cb4a7d843ffe6d21c</anchor>
       <arglist>(stp_sequence_t *sequence, size_t where, double data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_get_point</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>ga79c5f747a80ab2ad9d09b09e0330cc7</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t where, double *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_float_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>g35972a289b95891699ade61246882ab4</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const float *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_long_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>gaa76cdc9094ee3c05c49a782fea64478</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const long *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_ulong_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g3e274a2095f2e6986892384ee89e1255</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const unsigned long *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_int_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>g9d3e18b8e576b5c00531dac444397051</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const int *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_uint_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g497c32dec3d745a2602c5e97819de21d</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const unsigned int *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_short_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g572ecad03d772a255481bb8b6d79106f</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const short *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_ushort_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g317d484a67a2b775bee27f3dfe67fed4</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const unsigned short *data)</arglist>
     </member>
     <member kind="function">
       <type>const float *</type>
       <name>stp_sequence_get_float_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>gff096d5b027157151c65978b95d4e29e</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const long *</type>
       <name>stp_sequence_get_long_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>g039d9054cfd0f7d5a892a7fec3f734f4</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned long *</type>
       <name>stp_sequence_get_ulong_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>g12f54f27144d490893f46dd1b0037b8b</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const int *</type>
       <name>stp_sequence_get_int_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>g01b0bc9e181a097aff3e97254dbfcb14</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned int *</type>
       <name>stp_sequence_get_uint_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>ge7189582ef9e4d638f909a2b1ee0c1b2</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const short *</type>
       <name>stp_sequence_get_short_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>g4d1cf137e4a77e9123e2afcdf7d63bec</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned short *</type>
       <name>stp_sequence_get_ushort_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>g20007077e1d8365a0eddaa922a5967c3</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
   </compound>
@@ -7500,385 +6241,392 @@
       <type>#define</type>
       <name>STP_DBG_LUT</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga33</anchor>
+      <anchor>g4472d3ba849ed203d43005f04583decc</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_COLORFUNC</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga34</anchor>
+      <anchor>g0beee5fa281098eab25e3f22570c0fdc</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_INK</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga35</anchor>
+      <anchor>g1c6936662d2cbe95de396fe8af2f254d</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga36</anchor>
+      <anchor>g90d230dd93fa96d34b438e82ed3f9639</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PCL</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga37</anchor>
+      <anchor>gf8162186c8118e5c3a8543bc0c410a78</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_ESCP2</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga38</anchor>
+      <anchor>gda7c4766db0c05ecb5ce435ddd81ecdd</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CANON</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga39</anchor>
+      <anchor>g109cde96d907cbd28f0b631f07a3d696</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_LEXMARK</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga40</anchor>
+      <anchor>gc71c7cb5cdf49c881d944ef813a3733f</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_WEAVE_PARAMS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga41</anchor>
+      <anchor>g2af8b3f36dbda4cfd313b50ba2dae636</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_ROWS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga42</anchor>
+      <anchor>g698ce0ddb2e4f0a8b6d7a77ad7a0fbf0</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_MARK_FILE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga43</anchor>
+      <anchor>g01f4480bda8819f337b2be4c41e0ebe1</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_LIST</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga44</anchor>
+      <anchor>g3c5672b14a2e2ccdffca5b6277b1aac2</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_MODULE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga45</anchor>
+      <anchor>g9ace1ab545abac936101248caf9a50c6</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PATH</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga46</anchor>
+      <anchor>g6f8cdfb28d0d73e9579fb1751f540dc7</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PAPER</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga47</anchor>
+      <anchor>gd5eeaeabba7a0a861ae0dc936057aabd</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PRINTERS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga48</anchor>
+      <anchor>gdbfb451ebbd246d62bd52e0120fa232b</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_XML</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga49</anchor>
+      <anchor>gcf72e68aa70e333b06b0bb821218d967</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_VARS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga50</anchor>
+      <anchor>g4c481c5ea8d87ae6c0e556593ab2020e</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_OLYMPUS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga51</anchor>
+      <anchor>g574664feccffc4527df73e32c7e863bf</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CURVE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga52</anchor>
+      <anchor>g8f3e76af1b2564a5763e790a45215438</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CURVE_ERRORS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga53</anchor>
+      <anchor>gabbc2868668663cc28d6289d50e5f83d</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_SAFE_FREE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga54</anchor>
+      <anchor>ga5a86efbbd3e2eb391718d82a1d7ffcc</anchor>
       <arglist>(x)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_init</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g2ce0a2e8887fe5ff7f3eed1370d0d691</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_set_output_codeset</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g7fcc19f0abdc6513dfba7eaebeb16cb9</anchor>
       <arglist>(const char *codeset)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_read_and_compose_curves</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>gdbe8c167230b49bc10391d2c246e6dc0</anchor>
       <arglist>(const char *s1, const char *s2, stp_curve_compose_t comp, size_t piecewise_point_count)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_abort</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gd0c145dc5cebecab0bb4e3ac40fc8e4d</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_prune_inactive_options</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g13aa8afef5b0872704390adc6a01924e</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_zprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>gd7ffe058decb939af6a5c1ec1d0d77fa</anchor>
       <arglist>(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void</type>
       <name>stp_zfwrite</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g183d8f36f187530f9d7acdb176be3409</anchor>
       <arglist>(const char *buf, size_t bytes, size_t nitems, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_putc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g39e4c5f6fa2a07dfca3090a50a8858f9</anchor>
       <arglist>(int ch, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_put16_le</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g1ffcb45ea3c37bb6b485addcaf945c99</anchor>
       <arglist>(unsigned short sh, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_put16_be</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g23b504253ceda208b9a4985e6de8a5f7</anchor>
       <arglist>(unsigned short sh, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_put32_le</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>gadf69b8b3f713d2bd7ca3a5648da0c56</anchor>
       <arglist>(unsigned int sh, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_put32_be</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g258b7b5f8808d0a3168f798e8bf72608</anchor>
       <arglist>(unsigned int sh, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_puts</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>gf6cf72e5e45f175ae8c332c0588832b9</anchor>
       <arglist>(const char *s, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
+      <name>stp_putraw</name>
+      <anchorfile>group__util.html</anchorfile>
+      <anchor>g79dd0a6f5c63f4fbf8591d3c041a7720</anchor>
+      <arglist>(const stp_raw_t *r, const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
       <name>stp_send_command</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>gdb49b9cba9ddf4e506b6f530353ad93d</anchor>
       <arglist>(const stp_vars_t *v, const char *command, const char *format,...)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_erputc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>g15987fbd850e04f2520cb151e08908e1</anchor>
       <arglist>(int ch)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_eprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>ge53707df5c9945f289c58bfbe08a8d88</anchor>
       <arglist>(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void</type>
       <name>stp_erprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>g1df22de14e3275cb26ede10da66eebdf</anchor>
       <arglist>(const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void void</type>
       <name>stp_asprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g3f57c5298a5c6140ac56771dd62bd036</anchor>
       <arglist>(char **strp, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void void void</type>
       <name>stp_catprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>gd4f33438f0103a143d90dc9c48d248eb</anchor>
       <arglist>(char **strp, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>unsigned long</type>
       <name>stp_get_debug_level</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>geba8c24f265ee904c5876704b767841c</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g511e0c4cac91c674797da98ab96b83e6</anchor>
       <arglist>(unsigned long level, const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void</type>
       <name>stp_deprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g129f45d7df47fd58d8653538fd13a1f2</anchor>
       <arglist>(unsigned long level, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void void</type>
       <name>stp_init_debug_messages</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>g6d15e5b4e00f9d242166edb5332f8368</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_flush_debug_messages</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>gbe74390c1422e9746745da55692f47b8</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_malloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>g86a2976738a237df953655e733c75b3a</anchor>
       <arglist>(size_t)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_zalloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>gc8fd1a439fa2d8e1ff1a2b104cd0137b</anchor>
       <arglist>(size_t)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_realloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>g2420936ab8b3492581f389deea44f58c</anchor>
       <arglist>(void *ptr, size_t)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_free</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>g7d0c40c3157b2c5c630200352064874c</anchor>
       <arglist>(void *ptr)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_strlen</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>g56b08d3e12750bdfae8b53263f97aba9</anchor>
       <arglist>(const char *s)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stp_strndup</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga29</anchor>
+      <anchor>gb026f7022963acd694a8b89e4decbde5</anchor>
       <arglist>(const char *s, int n)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stp_strdup</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga30</anchor>
+      <anchor>g5c0731867697f555a94b2a1229804381</anchor>
       <arglist>(const char *s)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_version</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga31</anchor>
+      <anchor>g1f0797636484393574cb95e667819dc1</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_release_version</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga32</anchor>
+      <anchor>g5ba7edc43ed094f32ae7d9158a362a7b</anchor>
       <arglist>(void)</arglist>
     </member>
   </compound>
@@ -7890,1142 +6638,2428 @@
     <class kind="struct">stp_double_bound_t</class>
     <class kind="struct">stp_int_bound_t</class>
     <class kind="struct">stp_parameter_t</class>
+    <member kind="define">
+      <type>#define</type>
+      <name>STP_RAW</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>g9fc3819cba14f7f4c5654508a08a1adf</anchor>
+      <arglist>(x)</arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>STP_RAW_STRING</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>gd888c1f6a36f999ffebfffa7b74f28d2</anchor>
+      <arglist>(x)</arglist>
+    </member>
     <member kind="typedef">
       <type>stp_vars</type>
       <name>stp_vars_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g2d49c94847d18d8b62a214995b14680f</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>void *</type>
       <name>stp_parameter_list_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g40c1035f88ac38d77eddb65195b28595</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>const void *</type>
       <name>stp_const_parameter_list_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g53c035a67629ae3b3eb86b3c09df7774</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
-      <type>void(*</type>
+      <type>void(*)</type>
       <name>stp_outfunc_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga3</anchor>
-      <arglist>)(void *data, const char *buffer, size_t bytes)</arglist>
+      <anchor>g6922054c644d73006bff95a8ad268a1a</anchor>
+      <arglist>(void *data, const char *buffer, size_t bytes)</arglist>
     </member>
     <member kind="typedef">
-      <type>void *(*</type>
+      <type>void *(*)</type>
       <name>stp_copy_data_func_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga4</anchor>
-      <arglist>)(void *)</arglist>
+      <anchor>g4541229554178e84408cccd89f532cb0</anchor>
+      <arglist>(void *)</arglist>
     </member>
     <member kind="typedef">
-      <type>void(*</type>
+      <type>void(*)</type>
       <name>stp_free_data_func_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga5</anchor>
-      <arglist>)(void *)</arglist>
+      <anchor>g7974f89cff4cbb5b225d0c4fbb92e9bb</anchor>
+      <arglist>(void *)</arglist>
     </member>
     <member kind="typedef">
       <type>stp_compdata</type>
       <name>compdata_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g4d45b95baae036143e14adfc0014f562</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_type_t</name>
-      <anchor>ga133</anchor>
+      <anchor>g9b3d4f47a44c0c8c9b150cddc56d2a91</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_STRING_LIST</name>
-      <anchor>gga133a7</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a917a6f3e019c8a92ddecd34c71013acde0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INT</name>
-      <anchor>gga133a8</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91ae2cac85ef78157b53c7a79706dc0f70</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_BOOLEAN</name>
-      <anchor>gga133a9</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91f97ef629defc99977bd1cb35daabe0c1</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DOUBLE</name>
-      <anchor>gga133a10</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91e0dc60c8435ce0b1355bd5a134395f0c</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_CURVE</name>
-      <anchor>gga133a11</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a910d283c33f755969ded0751bbfc5d1912</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_FILE</name>
-      <anchor>gga133a12</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a918224a918efbef96fffaa90e31654f7ff</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_RAW</name>
-      <anchor>gga133a13</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a9133bb02d9ae5b2169d2f75da7684b04e9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_ARRAY</name>
-      <anchor>gga133a14</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a918789c2b5cc718eafca6d1d0022cfe3f3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DIMENSION</name>
-      <anchor>gga133a15</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91aa6f89008bf237c6f0aa2f0ee176e8b7</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INVALID</name>
-      <anchor>gga133a16</anchor>
+      <anchor>gg9b3d4f47a44c0c8c9b150cddc56d2a91d053047279b4c82034d26c4aa4c818d5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_class_t</name>
-      <anchor>ga134</anchor>
+      <anchor>g4eba7e712c0e17b76e472f26e202d7b8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_FEATURE</name>
-      <anchor>gga134a17</anchor>
+      <anchor>gg4eba7e712c0e17b76e472f26e202d7b8a7ed8b66836057aa58b9a74811057b4a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_OUTPUT</name>
-      <anchor>gga134a18</anchor>
+      <anchor>gg4eba7e712c0e17b76e472f26e202d7b8ffc6ff4bfbf2873ce55dfc03776bb6d9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_CORE</name>
-      <anchor>gga134a19</anchor>
+      <anchor>gg4eba7e712c0e17b76e472f26e202d7b8a05ce344ff3338e69638d69f9c120d01</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_INVALID</name>
-      <anchor>gga134a20</anchor>
+      <anchor>gg4eba7e712c0e17b76e472f26e202d7b82e17ce7ebc18801c11af7ea0a61e93ca</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_level_t</name>
-      <anchor>ga135</anchor>
+      <anchor>gaa9c9265ffe70122bd33659cf2983207</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_BASIC</name>
-      <anchor>gga135a21</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf2983207e9d7192607a6e1ec92dfed3f13a3a46f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED</name>
-      <anchor>gga135a22</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf29832073130e7060a3b901ea8dcb37d986d47e0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED1</name>
-      <anchor>gga135a23</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf29832073d016c9587f698ee400bc7e66071f06c</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED2</name>
-      <anchor>gga135a24</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf298320759a909a8953b8724d57ce85e2b4306bf</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED3</name>
-      <anchor>gga135a25</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf29832071241066935e94def6ab6d524ed1fabae</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED4</name>
-      <anchor>gga135a26</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf29832076036d5761aa9710a66429c625c334a80</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INTERNAL</name>
-      <anchor>gga135a27</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf2983207b2bc3be82f619147d9a45564fd53a4a0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_EXTERNAL</name>
-      <anchor>gga135a28</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf2983207e478f67e409adabc8679d3801604861d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INVALID</name>
-      <anchor>gga135a29</anchor>
+      <anchor>ggaa9c9265ffe70122bd33659cf2983207b8bf539d78e56f06f463d00f7a3b56b3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_activity_t</name>
-      <anchor>ga136</anchor>
+      <anchor>g70ebf70dc8e6199d84fc91985c94bae9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_INACTIVE</name>
-      <anchor>gga136a30</anchor>
+      <anchor>gg70ebf70dc8e6199d84fc91985c94bae96517762c5800eac253f43eeacd96c22f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_DEFAULTED</name>
-      <anchor>gga136a31</anchor>
+      <anchor>gg70ebf70dc8e6199d84fc91985c94bae9410b7e080ef62fb8896f2f844b1c1e00</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_ACTIVE</name>
-      <anchor>gga136a32</anchor>
+      <anchor>gg70ebf70dc8e6199d84fc91985c94bae9dbc7323a015e40652fd256e49c8d5b8c</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_verify_t</name>
-      <anchor>ga137</anchor>
+      <anchor>gc061852de3627383cd415cd80a979e02</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_BAD</name>
-      <anchor>gga137a33</anchor>
+      <anchor>ggc061852de3627383cd415cd80a979e02326a171221148779ec7df761b3eee967</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_OK</name>
-      <anchor>gga137a34</anchor>
+      <anchor>ggc061852de3627383cd415cd80a979e022df363618282a9164433c0f212b18616</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_INACTIVE</name>
-      <anchor>gga137a35</anchor>
+      <anchor>ggc061852de3627383cd415cd80a979e025cb96da6c2e3ae7187e85a1ef6e41fc6</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_vars_t *</type>
       <name>stp_vars_create</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g5d641ab7093c9ba82cbd4cfbf904fabc</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_vars_copy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g88376207367adb4260ff14e5d9ec76e9</anchor>
       <arglist>(stp_vars_t *dest, const stp_vars_t *source)</arglist>
     </member>
     <member kind="function">
       <type>stp_vars_t *</type>
       <name>stp_vars_create_copy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>gec00fba49ad08d20890e64773bcdbd48</anchor>
       <arglist>(const stp_vars_t *source)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_vars_destroy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>gd3f1ff7a86c3cd1c9f9f62cfa8814437</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_driver</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>gcf237afcbc26436ebedac5b11f469fdf</anchor>
       <arglist>(stp_vars_t *v, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_driver_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g188d298a8739b84fcb965f211fc7dc4e</anchor>
       <arglist>(stp_vars_t *v, const char *val, int bytes)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_driver</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g20c45707399ef6fdf6ee8c8209b5c7c0</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_color_conversion</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>g7eb2a1c4b892efd5507fcd4b7a434cea</anchor>
       <arglist>(stp_vars_t *v, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_color_conversion_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>g5a842b31f0a572d8e64f1a5616e25a99</anchor>
       <arglist>(stp_vars_t *v, const char *val, int bytes)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_color_conversion</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>g2bac9212773ecf603b7667bd0268c23e</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_left</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g3b0cc83e87247854ecafd46a6e446bcb</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_left</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>g5c02ee2422d86e4bcdcae613c70c9e1e</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_top</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g557b5ad44d3b1da8392496681624ad8b</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_top</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g292132b97b20a6d034e22f4146d36131</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g3a852ce7e42d7f8e0cef6c7d399e0491</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>g1c54d99b94c69a67eb4ae0349a4720e7</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>g8ce73c5efa41f005936d5f84c44c6667</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>g8731a92f5d3047e00ba33577821d5aec</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_page_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>g639be0da07c3e5b7dc6d68ac2aa999e9</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_page_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>gad2d305eed993707d22263b54578a39b</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_page_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>g83326bacb8b92149af1b70457b23bc8f</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_page_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>gc0c4928fa488bb95e73ba9b8aa932584</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_outfunc</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga29</anchor>
+      <anchor>g075ffc274f0d2d2b6edd8326de1d7142</anchor>
       <arglist>(stp_vars_t *v, stp_outfunc_t val)</arglist>
     </member>
     <member kind="function">
       <type>stp_outfunc_t</type>
       <name>stp_get_outfunc</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga30</anchor>
+      <anchor>g7c6c7c547d0c973ac801362db5ca4879</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_errfunc</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga31</anchor>
+      <anchor>g82f6a7514840de82c9ed7edd30f16b5d</anchor>
       <arglist>(stp_vars_t *v, stp_outfunc_t val)</arglist>
     </member>
     <member kind="function">
       <type>stp_outfunc_t</type>
       <name>stp_get_errfunc</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga32</anchor>
+      <anchor>g2f246d3af2be9e108abe423691e16049</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_outdata</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga33</anchor>
+      <anchor>gc2b3408200a9676e6c6063cc0ae2f4bd</anchor>
       <arglist>(stp_vars_t *v, void *val)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_get_outdata</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga34</anchor>
+      <anchor>g7042b05e0df5b32206d54397429bbac5</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_errdata</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga35</anchor>
+      <anchor>g8b30fbadf3475c59101af9d7d37c33b7</anchor>
       <arglist>(stp_vars_t *v, void *val)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_get_errdata</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga36</anchor>
+      <anchor>gd08bdcd721d37f52993c1862e25ebaf7</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_merge_printvars</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga37</anchor>
+      <anchor>g086303d36b835d539e75f16187e99e8f</anchor>
       <arglist>(stp_vars_t *user, const stp_vars_t *print)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_get_parameter_list</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga38</anchor>
+      <anchor>g12e8bb617e5c90da99d6d74519664634</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_parameter_list_count</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga39</anchor>
+      <anchor>g7a94856ce75482a5edb6153fe8916a54</anchor>
       <arglist>(stp_const_parameter_list_t list)</arglist>
     </member>
     <member kind="function">
       <type>const stp_parameter_t *</type>
       <name>stp_parameter_find</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga40</anchor>
+      <anchor>gdcd8062af7b643c734f53c545694d258</anchor>
       <arglist>(stp_const_parameter_list_t list, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>const stp_parameter_t *</type>
       <name>stp_parameter_list_param</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga41</anchor>
+      <anchor>g70d69ef7dec383004bf4570e57b76e18</anchor>
       <arglist>(stp_const_parameter_list_t list, size_t item)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_list_destroy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga42</anchor>
+      <anchor>g3ffaadbe73187aa1f298c4eaa80ea82e</anchor>
       <arglist>(stp_parameter_list_t list)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_parameter_list_create</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga43</anchor>
+      <anchor>g404bf7f1b3632178d559f6980478a312</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_list_add_param</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga44</anchor>
+      <anchor>g8f4f06610d1f58bae9e70e632919c405</anchor>
       <arglist>(stp_parameter_list_t list, const stp_parameter_t *item)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_parameter_list_copy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga45</anchor>
+      <anchor>g92be87a573b883584e5a036743c1bb7d</anchor>
       <arglist>(stp_const_parameter_list_t list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_list_append</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga46</anchor>
+      <anchor>g4b62bc6d0133704b3a2568b1654b6678</anchor>
       <arglist>(stp_parameter_list_t list, stp_const_parameter_list_t append)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_describe_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga47</anchor>
+      <anchor>g0b8991bd1a91e2cac7d0b355b1186c8e</anchor>
       <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_description_destroy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga48</anchor>
+      <anchor>gd598d95a82767e05c958ccd44534c51d</anchor>
       <arglist>(stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>const stp_parameter_t *</type>
       <name>stp_parameter_find_in_settings</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga49</anchor>
+      <anchor>g6ce39557b61706421232b5f1ac604b1b</anchor>
       <arglist>(const stp_vars_t *v, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga50</anchor>
+      <anchor>ga147483996fa118516ddb36fe3366aa9</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_string_parameter_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga51</anchor>
+      <anchor>gfe6c8b3d86ca16239a63ce9d2ef57f48</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga52</anchor>
+      <anchor>g537f2ba6c74c9562b2f6883d7e36c59f</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_file_parameter_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga53</anchor>
+      <anchor>g6f7816adbce50ca9e2fdacad35282e6a</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga54</anchor>
+      <anchor>gf3a3283247deaad7d1ac19818aa4b796</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, double value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga55</anchor>
+      <anchor>g70eded5d0df4677dd4b357b4b934f75a</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga56</anchor>
+      <anchor>g6ca7898c212230cdbdc70ada2efb1417</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga57</anchor>
+      <anchor>g2167971895eea887eaaa656ed075beff</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga58</anchor>
+      <anchor>gfe5f1f6364b89437664b2bbc55288025</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const stp_curve_t *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga59</anchor>
+      <anchor>g88f25e09f9a4b76aca7ba8316cbf9c8b</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const stp_array_t *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga60</anchor>
+      <anchor>g0155de75bf2aa95ab45a3319539cda56</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_scale_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga61</anchor>
+      <anchor>g227ec3e75a78a5c3dd01c85dbc1e7004</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, double scale)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga62</anchor>
+      <anchor>gf299bd0827a4d86aca59fb0d9015a866</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_string_parameter_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga63</anchor>
+      <anchor>ga5d6d8858b266517f5899196b062d00d</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga64</anchor>
+      <anchor>gf5e225475c66f966f4ba8d8c88374186</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_file_parameter_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga65</anchor>
+      <anchor>g217eece123630113cfcf8181d475fb53</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga66</anchor>
+      <anchor>ge52dbb466422a18dec110220c45fe64e</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, double value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga67</anchor>
+      <anchor>g3c0418772a82144f317dc973f01a8d55</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga68</anchor>
+      <anchor>gb6f1820cadd75a4311bfc49b01de447b</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga69</anchor>
+      <anchor>g81d5f09980407b4310dada2a68fc4b09</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga70</anchor>
+      <anchor>gfe38044cc067b2c2afa3da469d1cb860</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const stp_curve_t *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga71</anchor>
+      <anchor>g63e7ff7b4c3e1d092f95c6234f21e39f</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const stp_array_t *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga72</anchor>
+      <anchor>g8159b3f5bea06a99711921f0201f5e0f</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga73</anchor>
+      <anchor>gb5b21e5606b8ca755c5eac7774260efa</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga74</anchor>
+      <anchor>g2021992d89c92b10138fb012a9554a08</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_get_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga75</anchor>
+      <anchor>g365412d9c176fd3ac9375ded3f22ddb3</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga76</anchor>
+      <anchor>g7c0d95ba35aba0786bfc5f918efa79fc</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga77</anchor>
+      <anchor>g3c8d1333086ca5a01a3439f94d9f94d3</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga78</anchor>
+      <anchor>g8a30b26fa842805384b6ad663cabaea2</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>const stp_curve_t *</type>
       <name>stp_get_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga79</anchor>
+      <anchor>g553dec81dd8b3e5590d963ba72223557</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>const stp_array_t *</type>
       <name>stp_get_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga80</anchor>
+      <anchor>gc50c216c2d5cd56a9704f48d4338b179</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>const stp_raw_t *</type>
       <name>stp_get_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga81</anchor>
+      <anchor>g9fff6c14a71f5f8ec28620ef64a92fd5</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga82</anchor>
+      <anchor>g9e98ef9a9b1b84a0c0580fe024e35490</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga83</anchor>
+      <anchor>g4fad48e3e6453842559bd872650cb88f</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga84</anchor>
+      <anchor>g4eccbbe421f8b0c9342b17cef40b263d</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga85</anchor>
+      <anchor>g2107c08f37e31f45253f7d75a3773d46</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga86</anchor>
+      <anchor>g514a21602ae7a8ebe8e5072a5a4b6f89</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga87</anchor>
+      <anchor>g42ebfed8dec2054799e4943a8ca84267</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga88</anchor>
+      <anchor>gf52a0b0c3b0e0fee1fc46516b1bc0c4e</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga89</anchor>
+      <anchor>g7c67cef38cead5f519fd04ae09265b53</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga90</anchor>
+      <anchor>g11b79add82faf23b0e3c758f9530d95c</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_string_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga91</anchor>
+      <anchor>g6ed828e872f7678a89e1b065d377112e</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_file_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga92</anchor>
+      <anchor>gaecd310feb8bd9a2188a9b287656aa1a</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_float_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga93</anchor>
+      <anchor>g15a5458adea6ad4eecda3c990acbc6cb</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_int_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga94</anchor>
+      <anchor>g7487203059e7ccd71c4673656b3042b1</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_dimension_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga95</anchor>
+      <anchor>g0f6e91baac5e78703b162e9d23c0a65c</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_boolean_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga96</anchor>
+      <anchor>g9ad15a73dd8c755a8b80edbe335285ee</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_curve_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga97</anchor>
+      <anchor>ge7f21b118a8dfb5607334a6141d5dc5c</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_array_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga98</anchor>
+      <anchor>gb78f4273798c6e3e720afe01680cf752</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_raw_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga99</anchor>
+      <anchor>g364fcdb2e57b8ca99867c94954cf14cd</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga100</anchor>
+      <anchor>g8189b61073bfcd0244d5d6f2a2c8ba86</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga101</anchor>
+      <anchor>ga7db6701be5d05e545c79db905e4c7eb</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga102</anchor>
+      <anchor>gb12bebb419eb1ae8f323aa931e324389</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga103</anchor>
+      <anchor>g4fd7914c01e2e1b34797736dfd2c9b9c</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga104</anchor>
+      <anchor>gc1f2b865c76da441b6c1bd9b5b93aa1f</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga105</anchor>
+      <anchor>g23b9c17426210460618c4f95c5f34229</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga106</anchor>
+      <anchor>g6c94a1df4388b142d00d5d30df904b47</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga107</anchor>
+      <anchor>g5a629e6da1f5008f0db034191ad8b1d5</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga108</anchor>
+      <anchor>g285f05c648724c80bf05af30f87120a3</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_string_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga109</anchor>
+      <anchor>g0b7be7ba9f763be692dd833a434ed13d</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_file_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga110</anchor>
+      <anchor>g47e7a69ff8e23eed6188542c5c8bff4f</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_float_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga111</anchor>
+      <anchor>g4b8f9847f2eebfff53446a9bc235ab68</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_int_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga112</anchor>
+      <anchor>gb74fd69c4ef62af7b5ab33c6baf48b8b</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_dimension_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga113</anchor>
+      <anchor>g45f9abd8ac6772ea850344c513f6c436</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_boolean_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga114</anchor>
+      <anchor>gb33cf5376adc63e826cd3dedae33e930</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_curve_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga115</anchor>
+      <anchor>ge36bf982c52215f11fe8e392b4b3d705</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_array_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga116</anchor>
+      <anchor>gc9f85c3a8bf99e09150cbf4220e4b983</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_raw_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga117</anchor>
+      <anchor>gb6e41a5edb7474ed7ac26e236e00c80c</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_media_size</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga118</anchor>
+      <anchor>gc9e6d740ffc4cff5dc7d0bf106a3e7df</anchor>
       <arglist>(const stp_vars_t *v, int *width, int *height)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_imageable_area</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga119</anchor>
+      <anchor>g67d1e68ed47e5b554f2021fca1f01978</anchor>
       <arglist>(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_maximum_imageable_area</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga120</anchor>
+      <anchor>gd17cadb7fd78bffb759f2213a1a90df6</anchor>
       <arglist>(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_size_limit</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga121</anchor>
+      <anchor>g0c8ee62453baff3d2c00e0ccae67b049</anchor>
       <arglist>(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_describe_resolution</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga122</anchor>
+      <anchor>g88715b31fcec18778f769ffbc1b55384</anchor>
       <arglist>(const stp_vars_t *v, int *x, int *y)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_verify</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga123</anchor>
+      <anchor>gb926417b2f601c78d85df44694cc6d38</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>const stp_vars_t *</type>
       <name>stp_default_settings</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga124</anchor>
+      <anchor>gf63982a6e44f8b62532346d9ceb3d91c</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_allocate_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga125</anchor>
+      <anchor>gfd4f81ca2ad497bd21f005344844f9c4</anchor>
       <arglist>(stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_destroy_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga126</anchor>
+      <anchor>g151b7d922a3e1e5e9d9f0ea8de6ab70a</anchor>
       <arglist>(stp_vars_t *v, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_get_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga127</anchor>
+      <anchor>g1666dd1571bdb866a85d4318858893be</anchor>
       <arglist>(const stp_vars_t *v, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_verify_t</type>
       <name>stp_verify_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga128</anchor>
+      <anchor>gbfffe0d654de156874decdc0338216f4</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, int quiet)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_verified</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga129</anchor>
+      <anchor>g6d04a3c444753f11004ad6259a91e853</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_verified</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga130</anchor>
+      <anchor>g1023ad18d2c97763137909b6191b0940</anchor>
       <arglist>(stp_vars_t *v, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_copy_options</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga131</anchor>
+      <anchor>gf7d2d5a9897c9ce77bb16f4a1addaa62</anchor>
       <arglist>(stp_vars_t *vd, const stp_vars_t *vs)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_fill_parameter_settings</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga132</anchor>
+      <anchor>g7f2c578ff7ae28a3db502476aa10137e</anchor>
       <arglist>(stp_parameter_t *desc, const stp_parameter_t *param)</arglist>
     </member>
   </compound>
-  <compound kind="dir">
-    <name>include/gutenprint/</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprint/</path>
-    <filename>dir_000001.html</filename>
-    <file>array.h</file>
-    <file>bit-ops.h</file>
-    <file>channel.h</file>
-    <file>color.h</file>
-    <file>curve-cache.h</file>
-    <file>curve.h</file>
-    <file>dither.h</file>
-    <file>gutenprint-intl-internal.h</file>
-    <file>gutenprint-intl.h</file>
-    <file>gutenprint-module.h</file>
-    <file>gutenprint-version.h</file>
-    <file>gutenprint.h</file>
-    <file>image.h</file>
-    <file>list.h</file>
-    <file>module.h</file>
-    <file>mxml.h</file>
-    <file>paper.h</file>
-    <file>path.h</file>
-    <file>printers.h</file>
-    <file>sequence.h</file>
-    <file>string-list.h</file>
-    <file>util.h</file>
-    <file>vars.h</file>
-    <file>weave.h</file>
-    <file>xml.h</file>
+  <compound kind="struct">
+    <name>dither_matrix_impl</name>
+    <filename>structdither__matrix__impl.html</filename>
+    <member kind="variable">
+      <type>int</type>
+      <name>base</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>331debb887e076f8b52952ba6cc2b50b</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>exp</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>db0e7fb4b5e5149f0815af448676df8b</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>x_size</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>063e3b3617c3a9b4883f3b01cd7dfb48</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>y_size</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>33370af30d4c6cb0e441744c8d1c3686</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>total_size</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>54645c1c4edad222cf3f5aba03cdfae5</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>last_x</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>f0728348e6da1cf904204ef88e0a5853</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>last_x_mod</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>16f516218f0c5a31a1eac49e5c57add5</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>last_y</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>c1a83c82c364098dce631ec7174574be</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>last_y_mod</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>d03881dd78211b5bcb1a62453c060d2e</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>index</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>b744f40c883acc93ad0afbf5f048f27a</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>i_own</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>78152fe120c430f6400b731e5c722bd3</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>x_offset</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>665c02056a2d046a15aab462492d9dbc</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>y_offset</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>844cb19ea61f035bc2a21536f6f392c4</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned</type>
+      <name>fast_mask</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>8c7141e2e35f6cc14896d23d15a81914</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned *</type>
+      <name>matrix</name>
+      <anchorfile>structdither__matrix__impl.html</anchorfile>
+      <anchor>e28102f9e3d3cfb8eb48d9e69e807f96</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_cached_curve_t</name>
+    <filename>structstp__cached__curve__t.html</filename>
+    <member kind="variable">
+      <type>stp_curve_t *</type>
+      <name>curve</name>
+      <anchorfile>structstp__cached__curve__t.html</anchorfile>
+      <anchor>e9b4170bfafe7d85b36689cbd8eea41e</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>const double *</type>
+      <name>d_cache</name>
+      <anchorfile>structstp__cached__curve__t.html</anchorfile>
+      <anchor>59c26647178724471f383dea6e85f8ae</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>const unsigned short *</type>
+      <name>s_cache</name>
+      <anchorfile>structstp__cached__curve__t.html</anchorfile>
+      <anchor>c55d549f6d2f567ba84ecb9e0417f074</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>size_t</type>
+      <name>count</name>
+      <anchorfile>structstp__cached__curve__t.html</anchorfile>
+      <anchor>99b772c3f4db71d58a4ee2315e712f04</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_color</name>
+    <filename>structstp__color.html</filename>
+    <member kind="variable">
+      <type>const char *</type>
+      <name>short_name</name>
+      <anchorfile>structstp__color.html</anchorfile>
+      <anchor>23ed4d11629625e2ad24b124c36c7fab</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>const char *</type>
+      <name>long_name</name>
+      <anchorfile>structstp__color.html</anchorfile>
+      <anchor>b7c0a627b31ebfb97fd1db2677032479</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>const stp_colorfuncs_t *</type>
+      <name>colorfuncs</name>
+      <anchorfile>structstp__color.html</anchorfile>
+      <anchor>4442d36d0bcf746130f82ffe6f90147f</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_colorfuncs_t</name>
+    <filename>structstp__colorfuncs__t.html</filename>
+    <member kind="variable">
+      <type>int(*</type>
+      <name>init</name>
+      <anchorfile>structstp__colorfuncs__t.html</anchorfile>
+      <anchor>a10cf47dc6db374ef209d0d96592b1fe</anchor>
+      <arglist>)(stp_vars_t *v, stp_image_t *image, size_t steps)</arglist>
+    </member>
+    <member kind="variable">
+      <type>int(*</type>
+      <name>get_row</name>
+      <anchorfile>structstp__colorfuncs__t.html</anchorfile>
+      <anchor>f00aab442da969ffa5c6c1e592bad7cd</anchor>
+      <arglist>)(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)</arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_parameter_list_t(*</type>
+      <name>list_parameters</name>
+      <anchorfile>structstp__colorfuncs__t.html</anchorfile>
+      <anchor>14c6ae1a87ba1ba33f88fa71038f9ec9</anchor>
+      <arglist>)(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="variable">
+      <type>void(*</type>
+      <name>describe_parameter</name>
+      <anchorfile>structstp__colorfuncs__t.html</anchorfile>
+      <anchor>bf691142b608f4f02f33283dd3e67bae</anchor>
+      <arglist>)(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_curve_point_t</name>
+    <filename>structstp__curve__point__t.html</filename>
+    <member kind="variable">
+      <type>double</type>
+      <name>x</name>
+      <anchorfile>structstp__curve__point__t.html</anchorfile>
+      <anchor>92b13b94109b1270563a1116dc19b926</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>double</type>
+      <name>y</name>
+      <anchorfile>structstp__curve__point__t.html</anchorfile>
+      <anchor>132b1e8be20525667ece971d02f60b9d</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_dither_matrix_generic</name>
+    <filename>structstp__dither__matrix__generic.html</filename>
+    <member kind="variable">
+      <type>int</type>
+      <name>x</name>
+      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
+      <anchor>6b8bd1cc589c2195f055e5a57a05e03a</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>y</name>
+      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
+      <anchor>aaddcac2ca33a3e822ded567bbbecfb9</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>bytes</name>
+      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
+      <anchor>b963ddf7c0826bd3cc316c2375f1205b</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>prescaled</name>
+      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
+      <anchor>478d54ddf9ba50e783ddec1532a0eff6</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>const void *</type>
+      <name>data</name>
+      <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
+      <anchor>52acbda296a57a6087852eab62bc62db</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_dither_matrix_normal</name>
+    <filename>structstp__dither__matrix__normal.html</filename>
+    <member kind="variable">
+      <type>int</type>
+      <name>x</name>
+      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
+      <anchor>b9564690be42859d88ea264a29321af3</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>y</name>
+      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
+      <anchor>410560f5186761cb7430f5b0a804b09c</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>bytes</name>
+      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
+      <anchor>d72d088edfe3223c2df8fd4fb6178b98</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>prescaled</name>
+      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
+      <anchor>042561ad856d67506fe81b1bbbffd966</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>const unsigned *</type>
+      <name>data</name>
+      <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
+      <anchor>e67cb37136c5e9d9c4b1a44cd2dab87b</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_dither_matrix_short</name>
+    <filename>structstp__dither__matrix__short.html</filename>
+    <member kind="variable">
+      <type>int</type>
+      <name>x</name>
+      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
+      <anchor>81e0b20e763080b79faa837a00cac832</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>y</name>
+      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
+      <anchor>2bbc6c72006541250ba23b48bcab60e8</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>bytes</name>
+      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
+      <anchor>d4d85727401505eab74e3e667f4a38f4</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>prescaled</name>
+      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
+      <anchor>755361acae80fa4cba01a1cc71638274</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>const unsigned short *</type>
+      <name>data</name>
+      <anchorfile>structstp__dither__matrix__short.html</anchorfile>
+      <anchor>f4f6b5634ea79cf694782e35a8d7607d</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_dotsize</name>
+    <filename>structstp__dotsize.html</filename>
+    <member kind="variable">
+      <type>unsigned</type>
+      <name>bit_pattern</name>
+      <anchorfile>structstp__dotsize.html</anchorfile>
+      <anchor>8d5273395d0e27004f779de0ea81ff23</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>double</type>
+      <name>value</name>
+      <anchorfile>structstp__dotsize.html</anchorfile>
+      <anchor>d259e8d169a7d140e4964b80790c7ddd</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_double_bound_t</name>
+    <filename>structstp__double__bound__t.html</filename>
+    <member kind="variable">
+      <type>double</type>
+      <name>lower</name>
+      <anchorfile>structstp__double__bound__t.html</anchorfile>
+      <anchor>a00903ee6e04e01b6b2bb7033e3c76ce</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>double</type>
+      <name>upper</name>
+      <anchorfile>structstp__double__bound__t.html</anchorfile>
+      <anchor>07d734f8f82f059460cee55927b0216c</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_family</name>
+    <filename>structstp__family.html</filename>
+    <member kind="variable">
+      <type>const stp_printfuncs_t *</type>
+      <name>printfuncs</name>
+      <anchorfile>structstp__family.html</anchorfile>
+      <anchor>d29f00ba3565e93c138b00e4a48cde77</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_list_t *</type>
+      <name>printer_list</name>
+      <anchorfile>structstp__family.html</anchorfile>
+      <anchor>6e4f0c216f5ced14a819fbacdb26547d</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_image</name>
+    <filename>structstp__image.html</filename>
+    <member kind="variable">
+      <type>void(*</type>
+      <name>init</name>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>ce69bf25344a814cabea38afa4527086</anchor>
+      <arglist>)(struct stp_image *image)</arglist>
+    </member>
+    <member kind="variable">
+      <type>void(*</type>
+      <name>reset</name>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>7bb2244368c6b1e07d27afb3dd249ffd</anchor>
+      <arglist>)(struct stp_image *image)</arglist>
+    </member>
+    <member kind="variable">
+      <type>int(*</type>
+      <name>width</name>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>890033525988e15f4f4a0b4132e5f19b</anchor>
+      <arglist>)(struct stp_image *image)</arglist>
+    </member>
+    <member kind="variable">
+      <type>int(*</type>
+      <name>height</name>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>4977ad211581999a3f3290983929cce9</anchor>
+      <arglist>)(struct stp_image *image)</arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_image_status_t(*</type>
+      <name>get_row</name>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>8f7f8fb5826f52b8bd820f422c583350</anchor>
+      <arglist>)(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)</arglist>
+    </member>
+    <member kind="variable">
+      <type>const char *(*</type>
+      <name>get_appname</name>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>56636ad7c0dbf0a82284241f796d95cd</anchor>
+      <arglist>)(struct stp_image *image)</arglist>
+    </member>
+    <member kind="variable">
+      <type>void(*</type>
+      <name>conclude</name>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>5d2385711b303e055258c28f42ab7f4c</anchor>
+      <arglist>)(struct stp_image *image)</arglist>
+    </member>
+    <member kind="variable">
+      <type>void *</type>
+      <name>rep</name>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>b18e6ee35037589bf485213022e2d871</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_int_bound_t</name>
+    <filename>structstp__int__bound__t.html</filename>
+    <member kind="variable">
+      <type>int</type>
+      <name>lower</name>
+      <anchorfile>structstp__int__bound__t.html</anchorfile>
+      <anchor>c5ae98fad865ad6d4816016e233f5a53</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>upper</name>
+      <anchorfile>structstp__int__bound__t.html</anchorfile>
+      <anchor>a71bcebaae24712ee7a66955b345de19</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_lineactive_t</name>
+    <filename>structstp__lineactive__t.html</filename>
+    <member kind="variable">
+      <type>int</type>
+      <name>ncolors</name>
+      <anchorfile>structstp__lineactive__t.html</anchorfile>
+      <anchor>266bdeb14e62fb5b17a31746ad511761</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>char *</type>
+      <name>v</name>
+      <anchorfile>structstp__lineactive__t.html</anchorfile>
+      <anchor>5bb5843aa2a4817ef84fb83714b200f3</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_linebounds_t</name>
+    <filename>structstp__linebounds__t.html</filename>
+    <member kind="variable">
+      <type>int</type>
+      <name>ncolors</name>
+      <anchorfile>structstp__linebounds__t.html</anchorfile>
+      <anchor>dc4641abb41a9204c258a380aa00b7f4</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int *</type>
+      <name>start_pos</name>
+      <anchorfile>structstp__linebounds__t.html</anchorfile>
+      <anchor>b46a1a4ec130dd043009fb96b0115467</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int *</type>
+      <name>end_pos</name>
+      <anchorfile>structstp__linebounds__t.html</anchorfile>
+      <anchor>9bc2a60779ccf4ac3d90d47441e883ab</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_linebufs_t</name>
+    <filename>structstp__linebufs__t.html</filename>
+    <member kind="variable">
+      <type>int</type>
+      <name>ncolors</name>
+      <anchorfile>structstp__linebufs__t.html</anchorfile>
+      <anchor>5ad1c52050c8d71da5609d2526854696</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned char **</type>
+      <name>v</name>
+      <anchorfile>structstp__linebufs__t.html</anchorfile>
+      <anchor>485ecae7a892476331d31079d33b9891</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_linecount_t</name>
+    <filename>structstp__linecount__t.html</filename>
+    <member kind="variable">
+      <type>int</type>
+      <name>ncolors</name>
+      <anchorfile>structstp__linecount__t.html</anchorfile>
+      <anchor>69275ad8687438976d07950fa65a1728</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int *</type>
+      <name>v</name>
+      <anchorfile>structstp__linecount__t.html</anchorfile>
+      <anchor>2164f4045d892c45105f5780c80489a4</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_lineoff_t</name>
+    <filename>structstp__lineoff__t.html</filename>
+    <member kind="variable">
+      <type>int</type>
+      <name>ncolors</name>
+      <anchorfile>structstp__lineoff__t.html</anchorfile>
+      <anchor>97c5a2281b3cddb9c546e8299ea4e2b0</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned long *</type>
+      <name>v</name>
+      <anchorfile>structstp__lineoff__t.html</anchorfile>
+      <anchor>88bbe86454fbda432487952640948328</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_module</name>
+    <filename>structstp__module.html</filename>
+    <member kind="variable">
+      <type>const char *</type>
+      <name>name</name>
+      <anchorfile>structstp__module.html</anchorfile>
+      <anchor>32e2db7046f281afd6748afe111aee76</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>const char *</type>
+      <name>version</name>
+      <anchorfile>structstp__module.html</anchorfile>
+      <anchor>e2038239913d3ddbece919082501c8d0</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>const char *</type>
+      <name>comment</name>
+      <anchorfile>structstp__module.html</anchorfile>
+      <anchor>b60ac536d9ec7b3a306cddf4c06e18bb</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_module_class_t</type>
+      <name>class</name>
+      <anchorfile>structstp__module.html</anchorfile>
+      <anchor>4ebc727be1ec8edaaa1b25415a3932e3</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>void *</type>
+      <name>handle</name>
+      <anchorfile>structstp__module.html</anchorfile>
+      <anchor>1a96aa2db220972e124717cc6dd03c8e</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int(*</type>
+      <name>init</name>
+      <anchorfile>structstp__module.html</anchorfile>
+      <anchor>fa7d4259940b8d42a36f14108f504944</anchor>
+      <arglist>)(void)</arglist>
+    </member>
+    <member kind="variable">
+      <type>int(*</type>
+      <name>fini</name>
+      <anchorfile>structstp__module.html</anchorfile>
+      <anchor>e04ff0565f8ebd56b383917b602ffc4a</anchor>
+      <arglist>)(void)</arglist>
+    </member>
+    <member kind="variable">
+      <type>void *</type>
+      <name>syms</name>
+      <anchorfile>structstp__module.html</anchorfile>
+      <anchor>0e7297a93920d8f6849718d0a32fa2ba</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_module_version</name>
+    <filename>structstp__module__version.html</filename>
+    <member kind="variable">
+      <type>int</type>
+      <name>major</name>
+      <anchorfile>structstp__module__version.html</anchorfile>
+      <anchor>15add43e03d0e1624f40c083fa958692</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>minor</name>
+      <anchorfile>structstp__module__version.html</anchorfile>
+      <anchor>eced49a93c5e461fa95f809ad077fced</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_mxml_attr_s</name>
+    <filename>structstp__mxml__attr__s.html</filename>
+    <member kind="variable">
+      <type>char *</type>
+      <name>name</name>
+      <anchorfile>structstp__mxml__attr__s.html</anchorfile>
+      <anchor>4ea32ac1f797cf7722bf3e8638b21dee</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>char *</type>
+      <name>value</name>
+      <anchorfile>structstp__mxml__attr__s.html</anchorfile>
+      <anchor>25554324bd8ccf8e9558e4705eda0daa</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_mxml_node_s</name>
+    <filename>structstp__mxml__node__s.html</filename>
+    <member kind="variable">
+      <type>stp_mxml_type_t</type>
+      <name>type</name>
+      <anchorfile>structstp__mxml__node__s.html</anchorfile>
+      <anchor>e1bff9adee67699067516eee014a7510</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_mxml_node_t *</type>
+      <name>next</name>
+      <anchorfile>structstp__mxml__node__s.html</anchorfile>
+      <anchor>8831071db5a4b4df95ea3c5c2e95476b</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_mxml_node_t *</type>
+      <name>prev</name>
+      <anchorfile>structstp__mxml__node__s.html</anchorfile>
+      <anchor>2174125dc205e7c760e4e8c9c9048ddf</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_mxml_node_t *</type>
+      <name>parent</name>
+      <anchorfile>structstp__mxml__node__s.html</anchorfile>
+      <anchor>353df68e26a33380dcacda213a741487</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_mxml_node_t *</type>
+      <name>child</name>
+      <anchorfile>structstp__mxml__node__s.html</anchorfile>
+      <anchor>44550ea8d68a483ccc130c58b66ddd33</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_mxml_node_t *</type>
+      <name>last_child</name>
+      <anchorfile>structstp__mxml__node__s.html</anchorfile>
+      <anchor>5fb356e73f91b24211882f42cbbe7a08</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_mxml_value_t</type>
+      <name>value</name>
+      <anchorfile>structstp__mxml__node__s.html</anchorfile>
+      <anchor>ad44d6b2fe0842de0bbf1312035372cd</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_mxml_text_s</name>
+    <filename>structstp__mxml__text__s.html</filename>
+    <member kind="variable">
+      <type>int</type>
+      <name>whitespace</name>
+      <anchorfile>structstp__mxml__text__s.html</anchorfile>
+      <anchor>76bcfbb8c3de4e1c597468d51ef47184</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>char *</type>
+      <name>string</name>
+      <anchorfile>structstp__mxml__text__s.html</anchorfile>
+      <anchor>ef1865e8cab7d5ab175c6e67f122be15</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_mxml_value_s</name>
+    <filename>structstp__mxml__value__s.html</filename>
+    <member kind="variable">
+      <type>char *</type>
+      <name>name</name>
+      <anchorfile>structstp__mxml__value__s.html</anchorfile>
+      <anchor>959d5315fd98119aa5d23d2b8d307c58</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>num_attrs</name>
+      <anchorfile>structstp__mxml__value__s.html</anchorfile>
+      <anchor>f29b9bbc769c278dad18ff2cb098ef6a</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_mxml_attr_t *</type>
+      <name>attrs</name>
+      <anchorfile>structstp__mxml__value__s.html</anchorfile>
+      <anchor>69974b612f59fd3ef1d5db85db2d1a07</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="union">
+    <name>stp_mxml_value_u</name>
+    <filename>unionstp__mxml__value__u.html</filename>
+    <member kind="variable">
+      <type>stp_mxml_element_t</type>
+      <name>element</name>
+      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
+      <anchor>d4d8442bb433ac3da208e22ff0eaccf7</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>integer</name>
+      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
+      <anchor>9540870864c06f2bf901024b7cc9048d</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>char *</type>
+      <name>opaque</name>
+      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
+      <anchor>ca8f6bf03f29248dee0b8d364454d051</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>double</type>
+      <name>real</name>
+      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
+      <anchor>3f253397958ad919a1fc97c42a58bc67</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_mxml_text_t</type>
+      <name>text</name>
+      <anchorfile>unionstp__mxml__value__u.html</anchorfile>
+      <anchor>82c76c9aca350baca3b72723d0a4e99d</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_papersize_t</name>
+    <filename>structstp__papersize__t.html</filename>
+    <member kind="variable">
+      <type>char *</type>
+      <name>name</name>
+      <anchorfile>structstp__papersize__t.html</anchorfile>
+      <anchor>660431e579bf100782f7164b45597982</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>char *</type>
+      <name>text</name>
+      <anchorfile>structstp__papersize__t.html</anchorfile>
+      <anchor>26e8b5d0ce282614f128dd9d4aeaf9f6</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>char *</type>
+      <name>comment</name>
+      <anchorfile>structstp__papersize__t.html</anchorfile>
+      <anchor>5cdc973122b8cc2e612d2dee306cbf1d</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned</type>
+      <name>width</name>
+      <anchorfile>structstp__papersize__t.html</anchorfile>
+      <anchor>edcca3776ddeb5ed815df3aa112147dd</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned</type>
+      <name>height</name>
+      <anchorfile>structstp__papersize__t.html</anchorfile>
+      <anchor>040d59e39abdef9b12c929734fb7a08c</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned</type>
+      <name>top</name>
+      <anchorfile>structstp__papersize__t.html</anchorfile>
+      <anchor>7fc8acdb1d905d6ca4a0b9b247a6c48e</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned</type>
+      <name>left</name>
+      <anchorfile>structstp__papersize__t.html</anchorfile>
+      <anchor>9ceb7ef01ea56c990eddbef4140b34a0</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned</type>
+      <name>bottom</name>
+      <anchorfile>structstp__papersize__t.html</anchorfile>
+      <anchor>9c7fcf4d0bac23817b6f56996fed4043</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned</type>
+      <name>right</name>
+      <anchorfile>structstp__papersize__t.html</anchorfile>
+      <anchor>6899599f2f940e95e03545ff71e2b4c5</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_papersize_unit_t</type>
+      <name>paper_unit</name>
+      <anchorfile>structstp__papersize__t.html</anchorfile>
+      <anchor>5692b27332297abca9e4715e3e9e3ce8</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_param_string_t</name>
+    <filename>structstp__param__string__t.html</filename>
+    <member kind="variable">
+      <type>const char *</type>
+      <name>name</name>
+      <anchorfile>structstp__param__string__t.html</anchorfile>
+      <anchor>c4ccea0dded827b9acdb2d22aa25857b</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>const char *</type>
+      <name>text</name>
+      <anchorfile>structstp__param__string__t.html</anchorfile>
+      <anchor>db032e80e118c233adb9f27544920bd1</anchor>
+      <arglist></arglist>
+    </member>
   </compound>
-  <compound kind="dir">
-    <name>include/</name>
-    <path>/home/rlk/sandbox/print-4.3/include/</path>
-    <filename>dir_000000.html</filename>
-    <dir>include/gutenprint/</dir>
+  <compound kind="struct">
+    <name>stp_parameter_t</name>
+    <filename>structstp__parameter__t.html</filename>
+    <member kind="variable">
+      <type>const char *</type>
+      <name>name</name>
+      <anchorfile>structstp__parameter__t.html</anchorfile>
+      <anchor>092430e582e7560fb532f546f78ca70c</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>const char *</type>
+      <name>text</name>
+      <anchorfile>structstp__parameter__t.html</anchorfile>
+      <anchor>396e4980926c200e9ce4454f19e7311a</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>const char *</type>
+      <name>category</name>
+      <anchorfile>structstp__parameter__t.html</anchorfile>
+      <anchor>2cb67e4324a017746ca9bfda772aa50f</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>const char *</type>
+      <name>help</name>
+      <anchorfile>structstp__parameter__t.html</anchorfile>
+      <anchor>9f0637d6b97f0daa3122840eb2bd13db</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_parameter_type_t</type>
+      <name>p_type</name>
+      <anchorfile>structstp__parameter__t.html</anchorfile>
+      <anchor>ebe5dea02843240fe03461abf007f154</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_parameter_class_t</type>
+      <name>p_class</name>
+      <anchorfile>structstp__parameter__t.html</anchorfile>
+      <anchor>410388e541bdb14fbd0af2984e229217</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_parameter_level_t</type>
+      <name>p_level</name>
+      <anchorfile>structstp__parameter__t.html</anchorfile>
+      <anchor>2a4a1195c06243e08acb03475fb1e7cc</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned char</type>
+      <name>is_mandatory</name>
+      <anchorfile>structstp__parameter__t.html</anchorfile>
+      <anchor>ce4d02e3665f9cdfe83ed7dd559e1c1a</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned char</type>
+      <name>is_active</name>
+      <anchorfile>structstp__parameter__t.html</anchorfile>
+      <anchor>8b1af01f0874c79b6dbc4d0eca432952</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned char</type>
+      <name>channel</name>
+      <anchorfile>structstp__parameter__t.html</anchorfile>
+      <anchor>79bc0b76d5d5e238ddd205aa4a97ebad</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned char</type>
+      <name>verify_this_parameter</name>
+      <anchorfile>structstp__parameter__t.html</anchorfile>
+      <anchor>56100203c262c60d4cb18c7a49cde27d</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>unsigned char</type>
+      <name>read_only</name>
+      <anchorfile>structstp__parameter__t.html</anchorfile>
+      <anchor>4421135f9985be49d156cbc9aa74c710</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_parameter_t::@0</type>
+      <name>bounds</name>
+      <anchorfile>structstp__parameter__t.html</anchorfile>
+      <anchor>bb297424036e868212f5086d5c5235fe</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_curve_t *</type>
+      <name>curve</name>
+      <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
+      <anchor>961c3d2bda59bd51442ccd91e3a3c4db</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_double_bound_t</type>
+      <name>dbl</name>
+      <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
+      <anchor>aaf1168d0e60e5b0d14d6eac3195d155</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_int_bound_t</type>
+      <name>integer</name>
+      <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
+      <anchor>1abb03e94bd77eddd2c44e6a177d3415</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_int_bound_t</type>
+      <name>dimension</name>
+      <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
+      <anchor>546499b136b121799bc75ad56fd286d5</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_string_list_t *</type>
+      <name>str</name>
+      <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
+      <anchor>665bbcb7f57f89d704be5c987e1c10df</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_array_t *</type>
+      <name>array</name>
+      <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
+      <anchor>094c908ad9a0a4ea85347626a8b04132</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_parameter_t::@1</type>
+      <name>deflt</name>
+      <anchorfile>structstp__parameter__t.html</anchorfile>
+      <anchor>79042d88fa0ab284a8e3e4ad7b969f90</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_curve_t *</type>
+      <name>curve</name>
+      <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
+      <anchor>da5683dbd1673eb24636556c8dd3a609</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>double</type>
+      <name>dbl</name>
+      <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
+      <anchor>493fa67847909678ae85e87e10513e44</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>dimension</name>
+      <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
+      <anchor>1b8941a7efb86e8f4b2e93f35076a399</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>integer</name>
+      <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
+      <anchor>41113c2c977223b166b72c99bca983f0</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>boolean</name>
+      <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
+      <anchor>747a79ce320a5b7658a98ab72581f994</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>const char *</type>
+      <name>str</name>
+      <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
+      <anchor>23b79b91bf3204e5236cbbc75af274e1</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>stp_array_t *</type>
+      <name>array</name>
+      <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
+      <anchor>288d935eeb30de6487aeba0d4f5d49ee</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_pass_t</name>
+    <filename>structstp__pass__t.html</filename>
+    <member kind="variable">
+      <type>int</type>
+      <name>pass</name>
+      <anchorfile>structstp__pass__t.html</anchorfile>
+      <anchor>fdb7d267dad9bfc69e8deb86da07ee7b</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>missingstartrows</name>
+      <anchorfile>structstp__pass__t.html</anchorfile>
+      <anchor>462d1714bab638212fcae32b869c11d2</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>logicalpassstart</name>
+      <anchorfile>structstp__pass__t.html</anchorfile>
+      <anchor>e93d9d32f282f62426160626ff6c5ca3</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>physpassstart</name>
+      <anchorfile>structstp__pass__t.html</anchorfile>
+      <anchor>0da3d73932d6c07aceaf4bce93cf6163</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>physpassend</name>
+      <anchorfile>structstp__pass__t.html</anchorfile>
+      <anchor>4d75f7e07ebbffb75c2a7f36f43b3c9e</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>subpass</name>
+      <anchorfile>structstp__pass__t.html</anchorfile>
+      <anchor>a4a3363d8de9121ba3d8bf28076b1c89</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_printfuncs_t</name>
+    <filename>structstp__printfuncs__t.html</filename>
+    <member kind="variable">
+      <type>stp_parameter_list_t(*</type>
+      <name>list_parameters</name>
+      <anchorfile>structstp__printfuncs__t.html</anchorfile>
+      <anchor>19dc0ba4351a154cf9450ac4fce1ca1a</anchor>
+      <arglist>)(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="variable">
+      <type>void(*</type>
+      <name>parameters</name>
+      <anchorfile>structstp__printfuncs__t.html</anchorfile>
+      <anchor>c4eab991ca917968e0f264b7105faaa4</anchor>
+      <arglist>)(const stp_vars_t *v, const char *name, stp_parameter_t *)</arglist>
+    </member>
+    <member kind="variable">
+      <type>void(*</type>
+      <name>media_size</name>
+      <anchorfile>structstp__printfuncs__t.html</anchorfile>
+      <anchor>102e995ff1ce583f84e38409852bf95f</anchor>
+      <arglist>)(const stp_vars_t *v, int *width, int *height)</arglist>
+    </member>
+    <member kind="variable">
+      <type>void(*</type>
+      <name>imageable_area</name>
+      <anchorfile>structstp__printfuncs__t.html</anchorfile>
+      <anchor>68c9339cc1b74382ec07eed78c2bd501</anchor>
+      <arglist>)(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
+    </member>
+    <member kind="variable">
+      <type>void(*</type>
+      <name>maximum_imageable_area</name>
+      <anchorfile>structstp__printfuncs__t.html</anchorfile>
+      <anchor>3661a4612e62e8e5aef31eaab345675c</anchor>
+      <arglist>)(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
+    </member>
+    <member kind="variable">
+      <type>void(*</type>
+      <name>limit</name>
+      <anchorfile>structstp__printfuncs__t.html</anchorfile>
+      <anchor>36e471ee24b92cfd67390a025cbc427e</anchor>
+      <arglist>)(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)</arglist>
+    </member>
+    <member kind="variable">
+      <type>int(*</type>
+      <name>print</name>
+      <anchorfile>structstp__printfuncs__t.html</anchorfile>
+      <anchor>7704d7a1e997039deedfdf76a353c35d</anchor>
+      <arglist>)(const stp_vars_t *v, stp_image_t *image)</arglist>
+    </member>
+    <member kind="variable">
+      <type>void(*</type>
+      <name>describe_resolution</name>
+      <anchorfile>structstp__printfuncs__t.html</anchorfile>
+      <anchor>18e0da9638360173e0d75d839ce72b92</anchor>
+      <arglist>)(const stp_vars_t *v, int *x, int *y)</arglist>
+    </member>
+    <member kind="variable">
+      <type>const char *(*</type>
+      <name>describe_output</name>
+      <anchorfile>structstp__printfuncs__t.html</anchorfile>
+      <anchor>444ec86f3fe02ac479cbf2fc152d3423</anchor>
+      <arglist>)(const stp_vars_t *v)</arglist>
+    </member>
+    <member kind="variable">
+      <type>int(*</type>
+      <name>verify</name>
+      <anchorfile>structstp__printfuncs__t.html</anchorfile>
+      <anchor>948b6d7219dbb30f47a93eef2f85fde2</anchor>
+      <arglist>)(stp_vars_t *v)</arglist>
+    </member>
+    <member kind="variable">
+      <type>int(*</type>
+      <name>start_job</name>
+      <anchorfile>structstp__printfuncs__t.html</anchorfile>
+      <anchor>5c99986ad02cbcc4dce313bc7f5293fc</anchor>
+      <arglist>)(const stp_vars_t *v, stp_image_t *image)</arglist>
+    </member>
+    <member kind="variable">
+      <type>int(*</type>
+      <name>end_job</name>
+      <anchorfile>structstp__printfuncs__t.html</anchorfile>
+      <anchor>81fa6b507a316a8d6d7404b29920936e</anchor>
+      <arglist>)(const stp_vars_t *v, stp_image_t *image)</arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_raw_t</name>
+    <filename>structstp__raw__t.html</filename>
+    <member kind="variable">
+      <type>size_t</type>
+      <name>bytes</name>
+      <anchorfile>structstp__raw__t.html</anchorfile>
+      <anchor>5e4620104d47e7e593d75d1ebc977407</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>const void *</type>
+      <name>data</name>
+      <anchorfile>structstp__raw__t.html</anchorfile>
+      <anchor>36151f67569592aeac5c549a2a0daa2a</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_shade</name>
+    <filename>structstp__shade.html</filename>
+    <member kind="variable">
+      <type>double</type>
+      <name>value</name>
+      <anchorfile>structstp__shade.html</anchorfile>
+      <anchor>07a72426c7bcbf22f1cc253a97a453d4</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>numsizes</name>
+      <anchorfile>structstp__shade.html</anchorfile>
+      <anchor>8e68774d99e3eecb76f06f7704f1eb90</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>const stp_dotsize_t *</type>
+      <name>dot_sizes</name>
+      <anchorfile>structstp__shade.html</anchorfile>
+      <anchor>5057a856d4a6f7095af66b8cefc3cdc3</anchor>
+      <arglist></arglist>
+    </member>
+  </compound>
+  <compound kind="struct">
+    <name>stp_weave_t</name>
+    <filename>structstp__weave__t.html</filename>
+    <member kind="variable">
+      <type>int</type>
+      <name>row</name>
+      <anchorfile>structstp__weave__t.html</anchorfile>
+      <anchor>708ad2c7d2f76b864fe92b9e0582eece</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>pass</name>
+      <anchorfile>structstp__weave__t.html</anchorfile>
+      <anchor>2536ce303e27f679c4afd6c33eea8d07</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>jet</name>
+      <anchorfile>structstp__weave__t.html</anchorfile>
+      <anchor>31163b246a77f7959161edb6dd9ff61e</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>missingstartrows</name>
+      <anchorfile>structstp__weave__t.html</anchorfile>
+      <anchor>f60b909adb3f9efb541be500c08cf87e</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>logicalpassstart</name>
+      <anchorfile>structstp__weave__t.html</anchorfile>
+      <anchor>1e50ffa910d33a365572ceb93f0197c6</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>physpassstart</name>
+      <anchorfile>structstp__weave__t.html</anchorfile>
+      <anchor>aec693e98c7587da452ac604b675be3c</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="variable">
+      <type>int</type>
+      <name>physpassend</name>
+      <anchorfile>structstp__weave__t.html</anchorfile>
+      <anchor>3041aa5f7a90d0d7d82d1b2406044bb3</anchor>
+      <arglist></arglist>
+    </member>
   </compound>
 </tagfile>
diff --git a/doc/gutenprint/html/annotated.html b/doc/gutenprint/html/annotated.html
index a11ecac..33c149c 100644
--- a/doc/gutenprint/html/annotated.html
+++ b/doc/gutenprint/html/annotated.html
@@ -1,10 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Structures</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindexHL" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>libgutenprint API Reference Data Structures</h1>Here are the data structures with brief descriptions:<table>
   <tr><td class="indexkey"><a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a></td><td class="indexvalue"></td></tr>
@@ -40,8 +56,8 @@
   <tr><td class="indexkey"><a class="el" href="structstp__shade.html">stp_shade</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__weave__t.html">stp_weave_t</a></td><td class="indexvalue"></td></tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/array_8h.html b/doc/gutenprint/html/array_8h.html
index fc037b0..86f322d 100644
--- a/doc/gutenprint/html/array_8h.html
+++ b/doc/gutenprint/html/array_8h.html
@@ -1,61 +1,74 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/array.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>array.h File Reference</h1>Array functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/array.h File Reference</h1>Array functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="sequence_8h.html">gutenprint/sequence.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_array&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga0">stp_array_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_array&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The array opaque data type.  <a href="group__array.html#ga0"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The array opaque data type.  <a href="group__array.html#g26a474575a39c1c36ad520b95aa813b0"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga1">stp_array_create</a> (int x_size, int y_size)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga3d385d3e2f248b1c1ac88d5f103e9a2">stp_array_create</a> (int x_size, int y_size)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new array.  <a href="group__array.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga2">stp_array_destroy</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *array)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new array.  <a href="group__array.html#ga3d385d3e2f248b1c1ac88d5f103e9a2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gafb2573df35220ef9be3f6ba4b8c871b">stp_array_destroy</a> (<a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy an array.  <a href="group__array.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga3">stp_array_copy</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *dest, const <a class="el" href="group__array.html#ga0">stp_array_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy an array.  <a href="group__array.html#gafb2573df35220ef9be3f6ba4b8c871b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaa9bf798890e01b4bbce8cda45615021">stp_array_copy</a> (<a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *dest, const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an array.  <a href="group__array.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga4">stp_array_create_copy</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an array.  <a href="group__array.html#gaa9bf798890e01b4bbce8cda45615021"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gd0b50228ca40df79196197f9c21f4b56">stp_array_create_copy</a> (const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an array.  <a href="group__array.html#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga5">stp_array_set_size</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int x_size, int y_size)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an array.  <a href="group__array.html#gd0b50228ca40df79196197f9c21f4b56"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ge6fb91b246ef5abd388927cb9674503e">stp_array_set_size</a> (<a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x_size, int y_size)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resize an array.  <a href="group__array.html#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga6">stp_array_get_size</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int *x_size, int *y_size)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resize an array.  <a href="group__array.html#ge6fb91b246ef5abd388927cb9674503e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gfe61db801ab3b0326646178e536dd161">stp_array_get_size</a> (const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int *x_size, int *y_size)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the size of an array.  <a href="group__array.html#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga7">stp_array_set_data</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *array, const double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the size of an array.  <a href="group__array.html#gfe61db801ab3b0326646178e536dd161"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gea0493f5bec9c5c185679adfde3edc9a">stp_array_set_data</a> (<a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, const double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in an array.  <a href="group__array.html#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga8">stp_array_get_data</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array, size_t *size, const double **data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in an array.  <a href="group__array.html#gea0493f5bec9c5c185679adfde3edc9a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ge0d44ee80048189d244b16f231c54b80">stp_array_get_data</a> (const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, size_t *size, const double **data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in an array.  <a href="group__array.html#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga9">stp_array_set_point</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int x, int y, double data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in an array.  <a href="group__array.html#ge0d44ee80048189d244b16f231c54b80"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gd6b95b2efd500007b098594826f4467f">stp_array_set_point</a> (<a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x, int y, double data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data at a single point in the array.  <a href="group__array.html#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga10">stp_array_get_point</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int x, int y, double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data at a single point in the array.  <a href="group__array.html#gd6b95b2efd500007b098594826f4467f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g9078af984a5e1ec80a6068bdb51c9a6d">stp_array_get_point</a> (const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x, int y, double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data at a single point in the array.  <a href="group__array.html#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga11">stp_array_get_sequence</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data at a single point in the array.  <a href="group__array.html#g9078af984a5e1ec80a6068bdb51c9a6d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ge05ba5cfe8c03e2435348d6c5488d87e">stp_array_get_sequence</a> (const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t.  <a href="group__array.html#ga11"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t.  <a href="group__array.html#ge05ba5cfe8c03e2435348d6c5488d87e"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Array functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/bit-ops_8h.html b/doc/gutenprint/html/bit-ops_8h.html
index 14cfefe..c6a727b 100644
--- a/doc/gutenprint/html/bit-ops_8h.html
+++ b/doc/gutenprint/html/bit-ops_8h.html
@@ -1,555 +1,623 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/bit-ops.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>bit-ops.h File Reference</h1>Bit operations. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/bit-ops.h File Reference</h1>Bit operations. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a0">stp_fold</a> (const unsigned char *line, int single_height, unsigned char *outbuf)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#1a36a9f23f967528df8fffbd71b5e96c">stp_fold</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a1">stp_split_2</a> (int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#0ee5e547d025f7113f275dbb4614230c">stp_fold_3bit</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a2">stp_split_4</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#fe47834318158a214ca693f1433996f1">stp_fold_3bit_323</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a3">stp_unpack_2</a> (int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#62ac3ec2651afff5fbe6c63544a13c66">stp_fold_4bit</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a4">stp_unpack_4</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#260a00a6551c9e27e56ea1fab9444d80">stp_split_2</a> (int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a5">stp_unpack_8</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#6d93a70fcc820df08fcf8d380b9743f5">stp_split_4</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a6">stp_unpack_16</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7, unsigned char *out8, unsigned char *out9, unsigned char *out10, unsigned char *out11, unsigned char *out12, unsigned char *out13, unsigned char *out14, unsigned char *out15)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#e04e96586931b37257f4547eca77b116">stp_unpack_2</a> (int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#c5bb5a178b5c6275e7e7c2f6b5064342">stp_unpack_4</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#958196e6b7349e883a450e52cae83d93">stp_unpack_8</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#8ddfbe4f60566d4111b4c4d88a956d1b">stp_unpack_16</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7, unsigned char *out8, unsigned char *out9, unsigned char *out10, unsigned char *out11, unsigned char *out12, unsigned char *out13, unsigned char *out14, unsigned char *out15)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Bit operations. 
 <p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0"></a><!-- doxytag: member="bit-ops.h::stp_fold" ref="a0" args="(const unsigned char *line, int single_height, unsigned char *outbuf)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="1a36a9f23f967528df8fffbd71b5e96c"></a><!-- doxytag: member="bit-ops.h::stp_fold" ref="1a36a9f23f967528df8fffbd71b5e96c" args="(const unsigned char *line, int single_length, unsigned char *outbuf)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_fold           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>line</em>, </td>
+          <td class="memname">void stp_fold           </td>
+          <td>(</td>
+          <td class="paramtype">const unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>line</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>single_height</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>single_length</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>outbuf</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>outbuf</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a1"></a><!-- doxytag: member="bit-ops.h::stp_split_2" ref="a1" args="(int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="0ee5e547d025f7113f275dbb4614230c"></a><!-- doxytag: member="bit-ops.h::stp_fold_3bit" ref="0ee5e547d025f7113f275dbb4614230c" args="(const unsigned char *line, int single_length, unsigned char *outbuf)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_split_2           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em>, </td>
+          <td class="memname">void stp_fold_3bit           </td>
+          <td>(</td>
+          <td class="paramtype">const unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>line</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>bits</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>single_length</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>in</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>outbuf</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>outhi</em>, </td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="fe47834318158a214ca693f1433996f1"></a><!-- doxytag: member="bit-ops.h::stp_fold_3bit_323" ref="fe47834318158a214ca693f1433996f1" args="(const unsigned char *line, int single_length, unsigned char *outbuf)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_fold_3bit_323           </td>
+          <td>(</td>
+          <td class="paramtype">const unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>line</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>outlo</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>single_length</em>, </td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>outbuf</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="bit-ops.h::stp_split_4" ref="a2" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="62ac3ec2651afff5fbe6c63544a13c66"></a><!-- doxytag: member="bit-ops.h::stp_fold_4bit" ref="62ac3ec2651afff5fbe6c63544a13c66" args="(const unsigned char *line, int single_length, unsigned char *outbuf)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_fold_4bit           </td>
+          <td>(</td>
+          <td class="paramtype">const unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>line</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top">void stp_split_4           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>single_length</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>bits</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>outbuf</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>in</em>, </td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="260a00a6551c9e27e56ea1fab9444d80"></a><!-- doxytag: member="bit-ops.h::stp_split_2" ref="260a00a6551c9e27e56ea1fab9444d80" args="(int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out0</em>, </td>
+          <td class="memname">void stp_split_2           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>height</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out1</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>bits</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out2</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>in</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out3</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>outhi</em>, </td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>outlo</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a6"></a><!-- doxytag: member="bit-ops.h::stp_unpack_16" ref="a6" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7, unsigned char *out8, unsigned char *out9, unsigned char *out10, unsigned char *out11, unsigned char *out12, unsigned char *out13, unsigned char *out14, unsigned char *out15)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="6d93a70fcc820df08fcf8d380b9743f5"></a><!-- doxytag: member="bit-ops.h::stp_split_4" ref="6d93a70fcc820df08fcf8d380b9743f5" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_split_4           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>height</em>, </td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top">void stp_unpack_16           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>bits</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>bits</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>in</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>in</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out0</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out0</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out1</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out1</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out2</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out2</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out3</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out3</em>, </td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="8ddfbe4f60566d4111b4c4d88a956d1b"></a><!-- doxytag: member="bit-ops.h::stp_unpack_16" ref="8ddfbe4f60566d4111b4c4d88a956d1b" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7, unsigned char *out8, unsigned char *out9, unsigned char *out10, unsigned char *out11, unsigned char *out12, unsigned char *out13, unsigned char *out14, unsigned char *out15)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_unpack_16           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>height</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>bits</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>in</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out0</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out1</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out2</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out3</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out4</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out4</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out5</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out5</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out6</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out6</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out7</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out7</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out8</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out8</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out9</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out9</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out10</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out10</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out11</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out11</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out12</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out12</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out13</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out13</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out14</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out14</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out15</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out15</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="bit-ops.h::stp_unpack_2" ref="a3" args="(int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="e04e96586931b37257f4547eca77b116"></a><!-- doxytag: member="bit-ops.h::stp_unpack_2" ref="e04e96586931b37257f4547eca77b116" args="(int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_unpack_2           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em>, </td>
+          <td class="memname">void stp_unpack_2           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>height</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>bits</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>bits</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>in</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>in</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>outlo</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>outlo</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>outhi</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>outhi</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="bit-ops.h::stp_unpack_4" ref="a4" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="c5bb5a178b5c6275e7e7c2f6b5064342"></a><!-- doxytag: member="bit-ops.h::stp_unpack_4" ref="c5bb5a178b5c6275e7e7c2f6b5064342" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_unpack_4           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em>, </td>
+          <td class="memname">void stp_unpack_4           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>height</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>bits</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>bits</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>in</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>in</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out0</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out0</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out1</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out1</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out2</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out2</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out3</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out3</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="bit-ops.h::stp_unpack_8" ref="a5" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="958196e6b7349e883a450e52cae83d93"></a><!-- doxytag: member="bit-ops.h::stp_unpack_8" ref="958196e6b7349e883a450e52cae83d93" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_unpack_8           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em>, </td>
+          <td class="memname">void stp_unpack_8           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>height</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>bits</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>bits</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>in</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>in</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out0</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out0</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out1</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out1</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out2</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out2</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out3</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out3</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out4</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out4</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out5</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out5</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out6</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out6</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>out7</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>out7</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/channel_8h.html b/doc/gutenprint/html/channel_8h.html
index 386984b..bfc264f 100644
--- a/doc/gutenprint/html/channel_8h.html
+++ b/doc/gutenprint/html/channel_8h.html
@@ -1,954 +1,775 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/channel.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>channel.h File Reference</h1>Channel functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/channel.h File Reference</h1>Channel functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a0">stp_channel_reset</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#90026b1db4586b08df148db41a676b50">stp_channel_reset</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a1">stp_channel_reset_channel</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int channel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#b4b4591b1709146874c0218bc0591255">stp_channel_reset_channel</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int channel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a2">stp_channel_add</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, unsigned channel, unsigned subchannel, double value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#f03151796a167ec708b5412a31ddced5">stp_channel_add</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned channel, unsigned subchannel, double value)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a3">stp_channel_get_value</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, unsigned channel, unsigned subchannel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#748f1fc90c60e70016998953b1adcde2">stp_channel_get_value</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned channel, unsigned subchannel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a4">stp_channel_set_density_adjustment</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, int subchannel, double adjustment)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#e7bd4572fb2ac86694555d0b827a2db9">stp_channel_set_density_adjustment</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchannel, double adjustment)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a5">stp_channel_get_density_adjustment</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, int subchannel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#43188fd2c70d894e1e050277c1e4da35">stp_channel_get_density_adjustment</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchannel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a6">stp_channel_set_ink_limit</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, double limit)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#68afca52a3f3c0c72c1ff0329ef245c7">stp_channel_set_ink_limit</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, double limit)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a7">stp_channel_get_ink_limit</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#fe8ad41148d568cb1d662064ec721ac1">stp_channel_get_ink_limit</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a8">stp_channel_set_cutoff_adjustment</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, int subchannel, double adjustment)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#59a4810ca297444fb16a5a1a1db319ed">stp_channel_set_cutoff_adjustment</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchannel, double adjustment)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a9">stp_channel_get_cutoff_adjustment</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, int subchannel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#f903f5318c045567f6aa3b6f1496b5ba">stp_channel_get_cutoff_adjustment</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchannel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a10">stp_channel_set_black_channel</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int channel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#1c1101b3f21368b26241a0db2877364e">stp_channel_set_black_channel</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int channel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a11">stp_channel_get_black_channel</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#8a3cf94dfe1461bd0c8fb7464d5c99a6">stp_channel_get_black_channel</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a12">stp_channel_set_gloss_channel</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int channel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#b09858181233a7777b2d49ca50a327c6">stp_channel_set_gloss_channel</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int channel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a13">stp_channel_get_gloss_channel</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#7771fa6878d414b4cd3b08743aadc3fc">stp_channel_get_gloss_channel</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a14">stp_channel_set_gloss_limit</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, double limit)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#774df9fbabb8fcd9241976cc50c9501d">stp_channel_set_gloss_limit</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, double limit)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a15">stp_channel_get_gloss_limit</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#9231b8d3be7ec55dc657da2e6a5c406e">stp_channel_get_gloss_limit</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a16">stp_channel_set_curve</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int channel, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#9e2107aa3cc118db2b6540f939064fed">stp_channel_set_curve</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int channel, const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a17">stp_channel_get_curve</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int channel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#36feed643e8768ff93308980203a92be">stp_channel_get_curve</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int channel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a18">stp_channel_set_gcr_curve</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#4f0863196d55416aa58ea9815eb33312">stp_channel_set_gcr_curve</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a19">stp_channel_get_gcr_curve</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#c5c6578307d574f53c8f9110053fe9c5">stp_channel_get_gcr_curve</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a20">stp_channel_initialize</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int input_channel_count)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#35b64c052b8dcfd4f1576b10d999e022">stp_channel_initialize</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int input_channel_count)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a21">stp_channel_convert</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, unsigned *zero_mask)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#4559ad54f7de2403438baab1c97789f7">stp_channel_convert</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned *zero_mask)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a22">stp_channel_get_input</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#c73acbaeb300c75912529c5064ea507a">stp_channel_get_input</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a23">stp_channel_get_output</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#3ad58abee1208b328da69e49d230a54f">stp_channel_get_output</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Channel functions. 
 <p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a2"></a><!-- doxytag: member="channel.h::stp_channel_add" ref="a2" args="(stp_vars_t *v, unsigned channel, unsigned subchannel, double value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="f03151796a167ec708b5412a31ddced5"></a><!-- doxytag: member="channel.h::stp_channel_add" ref="f03151796a167ec708b5412a31ddced5" args="(stp_vars_t *v, unsigned channel, unsigned subchannel, double value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_channel_add           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_channel_add           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned&nbsp;</td>
-          <td class="mdname" nowrap> <em>channel</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned&nbsp;</td>
+          <td class="paramname"> <em>channel</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned&nbsp;</td>
-          <td class="mdname" nowrap> <em>subchannel</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned&nbsp;</td>
+          <td class="paramname"> <em>subchannel</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a21"></a><!-- doxytag: member="channel.h::stp_channel_convert" ref="a21" args="(const stp_vars_t *v, unsigned *zero_mask)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="4559ad54f7de2403438baab1c97789f7"></a><!-- doxytag: member="channel.h::stp_channel_convert" ref="4559ad54f7de2403438baab1c97789f7" args="(const stp_vars_t *v, unsigned *zero_mask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_channel_convert           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_channel_convert           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned *&nbsp;</td>
-          <td class="mdname" nowrap> <em>zero_mask</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned *&nbsp;</td>
+          <td class="paramname"> <em>zero_mask</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a11"></a><!-- doxytag: member="channel.h::stp_channel_get_black_channel" ref="a11" args="(stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_channel_get_black_channel           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="8a3cf94dfe1461bd0c8fb7464d5c99a6"></a><!-- doxytag: member="channel.h::stp_channel_get_black_channel" ref="8a3cf94dfe1461bd0c8fb7464d5c99a6" args="(stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_channel_get_black_channel           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a17"></a><!-- doxytag: member="channel.h::stp_channel_get_curve" ref="a17" args="(stp_vars_t *v, int channel)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="36feed643e8768ff93308980203a92be"></a><!-- doxytag: member="channel.h::stp_channel_get_curve" ref="36feed643e8768ff93308980203a92be" args="(stp_vars_t *v, int channel)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_channel_get_curve           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* stp_channel_get_curve           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>channel</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>channel</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a9"></a><!-- doxytag: member="channel.h::stp_channel_get_cutoff_adjustment" ref="a9" args="(stp_vars_t *v, int color, int subchannel)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f903f5318c045567f6aa3b6f1496b5ba"></a><!-- doxytag: member="channel.h::stp_channel_get_cutoff_adjustment" ref="f903f5318c045567f6aa3b6f1496b5ba" args="(stp_vars_t *v, int color, int subchannel)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">double stp_channel_get_cutoff_adjustment           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">double stp_channel_get_cutoff_adjustment           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>color</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>color</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>subchannel</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>subchannel</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="channel.h::stp_channel_get_density_adjustment" ref="a5" args="(stp_vars_t *v, int color, int subchannel)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="43188fd2c70d894e1e050277c1e4da35"></a><!-- doxytag: member="channel.h::stp_channel_get_density_adjustment" ref="43188fd2c70d894e1e050277c1e4da35" args="(stp_vars_t *v, int color, int subchannel)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">double stp_channel_get_density_adjustment           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">double stp_channel_get_density_adjustment           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>color</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>color</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>subchannel</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>subchannel</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a19"></a><!-- doxytag: member="channel.h::stp_channel_get_gcr_curve" ref="a19" args="(stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_channel_get_gcr_curve           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="c5c6578307d574f53c8f9110053fe9c5"></a><!-- doxytag: member="channel.h::stp_channel_get_gcr_curve" ref="c5c6578307d574f53c8f9110053fe9c5" args="(stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* stp_channel_get_gcr_curve           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a13"></a><!-- doxytag: member="channel.h::stp_channel_get_gloss_channel" ref="a13" args="(stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_channel_get_gloss_channel           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="7771fa6878d414b4cd3b08743aadc3fc"></a><!-- doxytag: member="channel.h::stp_channel_get_gloss_channel" ref="7771fa6878d414b4cd3b08743aadc3fc" args="(stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_channel_get_gloss_channel           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a15"></a><!-- doxytag: member="channel.h::stp_channel_get_gloss_limit" ref="a15" args="(stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">double stp_channel_get_gloss_limit           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="9231b8d3be7ec55dc657da2e6a5c406e"></a><!-- doxytag: member="channel.h::stp_channel_get_gloss_limit" ref="9231b8d3be7ec55dc657da2e6a5c406e" args="(stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">double stp_channel_get_gloss_limit           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a7"></a><!-- doxytag: member="channel.h::stp_channel_get_ink_limit" ref="a7" args="(stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">double stp_channel_get_ink_limit           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="fe8ad41148d568cb1d662064ec721ac1"></a><!-- doxytag: member="channel.h::stp_channel_get_ink_limit" ref="fe8ad41148d568cb1d662064ec721ac1" args="(stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">double stp_channel_get_ink_limit           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a22"></a><!-- doxytag: member="channel.h::stp_channel_get_input" ref="a22" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">unsigned short* stp_channel_get_input           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="c73acbaeb300c75912529c5064ea507a"></a><!-- doxytag: member="channel.h::stp_channel_get_input" ref="c73acbaeb300c75912529c5064ea507a" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned short* stp_channel_get_input           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a23"></a><!-- doxytag: member="channel.h::stp_channel_get_output" ref="a23" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">unsigned short* stp_channel_get_output           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="3ad58abee1208b328da69e49d230a54f"></a><!-- doxytag: member="channel.h::stp_channel_get_output" ref="3ad58abee1208b328da69e49d230a54f" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned short* stp_channel_get_output           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="channel.h::stp_channel_get_value" ref="a3" args="(stp_vars_t *v, unsigned channel, unsigned subchannel)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="748f1fc90c60e70016998953b1adcde2"></a><!-- doxytag: member="channel.h::stp_channel_get_value" ref="748f1fc90c60e70016998953b1adcde2" args="(stp_vars_t *v, unsigned channel, unsigned subchannel)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">double stp_channel_get_value           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">double stp_channel_get_value           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned&nbsp;</td>
-          <td class="mdname" nowrap> <em>channel</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned&nbsp;</td>
+          <td class="paramname"> <em>channel</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned&nbsp;</td>
-          <td class="mdname" nowrap> <em>subchannel</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned&nbsp;</td>
+          <td class="paramname"> <em>subchannel</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a20"></a><!-- doxytag: member="channel.h::stp_channel_initialize" ref="a20" args="(stp_vars_t *v, stp_image_t *image, int input_channel_count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="35b64c052b8dcfd4f1576b10d999e022"></a><!-- doxytag: member="channel.h::stp_channel_initialize" ref="35b64c052b8dcfd4f1576b10d999e022" args="(stp_vars_t *v, stp_image_t *image, int input_channel_count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_channel_initialize           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_channel_initialize           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>image</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>image</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>input_channel_count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>input_channel_count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="channel.h::stp_channel_reset" ref="a0" args="(stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_channel_reset           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="90026b1db4586b08df148db41a676b50"></a><!-- doxytag: member="channel.h::stp_channel_reset" ref="90026b1db4586b08df148db41a676b50" args="(stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_channel_reset           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a1"></a><!-- doxytag: member="channel.h::stp_channel_reset_channel" ref="a1" args="(stp_vars_t *v, int channel)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="b4b4591b1709146874c0218bc0591255"></a><!-- doxytag: member="channel.h::stp_channel_reset_channel" ref="b4b4591b1709146874c0218bc0591255" args="(stp_vars_t *v, int channel)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_channel_reset_channel           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_channel_reset_channel           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>channel</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>channel</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="channel.h::stp_channel_set_black_channel" ref="a10" args="(stp_vars_t *v, int channel)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="1c1101b3f21368b26241a0db2877364e"></a><!-- doxytag: member="channel.h::stp_channel_set_black_channel" ref="1c1101b3f21368b26241a0db2877364e" args="(stp_vars_t *v, int channel)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_channel_set_black_channel           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_channel_set_black_channel           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>channel</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>channel</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a16"></a><!-- doxytag: member="channel.h::stp_channel_set_curve" ref="a16" args="(stp_vars_t *v, int channel, const stp_curve_t *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="9e2107aa3cc118db2b6540f939064fed"></a><!-- doxytag: member="channel.h::stp_channel_set_curve" ref="9e2107aa3cc118db2b6540f939064fed" args="(stp_vars_t *v, int channel, const stp_curve_t *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_channel_set_curve           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_channel_set_curve           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>channel</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>channel</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a8"></a><!-- doxytag: member="channel.h::stp_channel_set_cutoff_adjustment" ref="a8" args="(stp_vars_t *v, int color, int subchannel, double adjustment)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="59a4810ca297444fb16a5a1a1db319ed"></a><!-- doxytag: member="channel.h::stp_channel_set_cutoff_adjustment" ref="59a4810ca297444fb16a5a1a1db319ed" args="(stp_vars_t *v, int color, int subchannel, double adjustment)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_channel_set_cutoff_adjustment           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_channel_set_cutoff_adjustment           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>color</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>color</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>subchannel</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>subchannel</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>adjustment</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>adjustment</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="channel.h::stp_channel_set_density_adjustment" ref="a4" args="(stp_vars_t *v, int color, int subchannel, double adjustment)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="e7bd4572fb2ac86694555d0b827a2db9"></a><!-- doxytag: member="channel.h::stp_channel_set_density_adjustment" ref="e7bd4572fb2ac86694555d0b827a2db9" args="(stp_vars_t *v, int color, int subchannel, double adjustment)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_channel_set_density_adjustment           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_channel_set_density_adjustment           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>color</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>color</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>subchannel</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>subchannel</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>adjustment</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>adjustment</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a18"></a><!-- doxytag: member="channel.h::stp_channel_set_gcr_curve" ref="a18" args="(stp_vars_t *v, const stp_curve_t *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="4f0863196d55416aa58ea9815eb33312"></a><!-- doxytag: member="channel.h::stp_channel_set_gcr_curve" ref="4f0863196d55416aa58ea9815eb33312" args="(stp_vars_t *v, const stp_curve_t *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_channel_set_gcr_curve           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_channel_set_gcr_curve           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a12"></a><!-- doxytag: member="channel.h::stp_channel_set_gloss_channel" ref="a12" args="(stp_vars_t *v, int channel)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="b09858181233a7777b2d49ca50a327c6"></a><!-- doxytag: member="channel.h::stp_channel_set_gloss_channel" ref="b09858181233a7777b2d49ca50a327c6" args="(stp_vars_t *v, int channel)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_channel_set_gloss_channel           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_channel_set_gloss_channel           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>channel</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>channel</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a14"></a><!-- doxytag: member="channel.h::stp_channel_set_gloss_limit" ref="a14" args="(stp_vars_t *v, double limit)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="774df9fbabb8fcd9241976cc50c9501d"></a><!-- doxytag: member="channel.h::stp_channel_set_gloss_limit" ref="774df9fbabb8fcd9241976cc50c9501d" args="(stp_vars_t *v, double limit)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_channel_set_gloss_limit           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_channel_set_gloss_limit           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>limit</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>limit</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a6"></a><!-- doxytag: member="channel.h::stp_channel_set_ink_limit" ref="a6" args="(stp_vars_t *v, double limit)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="68afca52a3f3c0c72c1ff0329ef245c7"></a><!-- doxytag: member="channel.h::stp_channel_set_ink_limit" ref="68afca52a3f3c0c72c1ff0329ef245c7" args="(stp_vars_t *v, double limit)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_channel_set_ink_limit           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_channel_set_ink_limit           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>limit</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>limit</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/classes.html b/doc/gutenprint/html/classes.html
index 37cedf5..44d9f76 100644
--- a/doc/gutenprint/html/classes.html
+++ b/doc/gutenprint/html/classes.html
@@ -1,17 +1,33 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Alphabetical List</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindexHL" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>libgutenprint API Reference Data Structure Index</h1><p><div class="qindex"><a class="qindex" href="#letter_D">D</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a></div><p>
 <table align="center" width="95%" border="0" cellspacing="0" cellpadding="0">
 <tr><td><a name="letter_D"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;D&nbsp;&nbsp;</div></td></tr></table>
 </td><td><a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__module__version.html">stp_module_version</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;S&nbsp;&nbsp;</div></td></tr></table>
 </td><td><a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linebounds__t.html">stp_linebounds_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__pass__t.html">stp_pass_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__dotsize.html">stp_dotsize</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__color.html">stp_color</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__raw__t.html">stp_raw_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__family.html">stp_family</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__shade.html">stp_shade</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__image.html">stp_image</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__module.html">stp_module</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__papersize__t.html">stp_papersize_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__weave__t.html">stp_weave_t</a>&nbsp;&nbsp;&nbsp;</td></tr></table><p><div class="qindex"><a class="qindex" href="#letter_D">D</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a></div><p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/color_8h.html b/doc/gutenprint/html/color_8h.html
index d46f0ed..28544d0 100644
--- a/doc/gutenprint/html/color_8h.html
+++ b/doc/gutenprint/html/color_8h.html
@@ -1,13 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/color.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>color.h File Reference</h1>Color functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/color.h File Reference</h1>Color functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -17,44 +30,44 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html">stp_color</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__color.html">stp_color</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga0">stp_color_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__color.html">stp_color</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gd1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga1">stp_color_init</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g23392fc53078d51fcd14d6d565d56423">stp_color_init</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga2">stp_color_get_row</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g0cf28c3c9638987df4b1740deadba0cb">stp_color_get_row</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga3">stp_color_list_parameters</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga282220724877a57738b047140835141">stp_color_list_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga4">stp_color_describe_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g83bc80c9fd84d741099bc20285a1b655">stp_color_describe_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga5">stp_color_register</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g47d6a8163ef21a6e700b1371228b851d">stp_color_register</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga6">stp_color_unregister</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g2b62ec8e0afe1b6297bc71466f8a334c">stp_color_unregister</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga7">stp_color_count</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g68c13c36d723e5604507bf33fe629f8b">stp_color_count</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available color modules.  <a href="group__color.html#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga8">stp_get_color_by_name</a> (const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available color modules.  <a href="group__color.html#g68c13c36d723e5604507bf33fe629f8b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g3b8f62108f3604480e7b89b253527f4a">stp_get_color_by_name</a> (const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its name.  <a href="group__color.html#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga9">stp_get_color_by_index</a> (int idx)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its name.  <a href="group__color.html#g3b8f62108f3604480e7b89b253527f4a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g68ba525119da39ae854645ae649557d3">stp_get_color_by_index</a> (int idx)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its index number.  <a href="group__color.html#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga10">stp_get_color_by_colorfuncs</a> (<a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *colorfuncs)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its index number.  <a href="group__color.html#g68ba525119da39ae854645ae649557d3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g578f80b2bc3937df38ce7e803f5f472c">stp_get_color_by_colorfuncs</a> (<a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *colorfuncs)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga11">stp_color_get_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g5a4a4da67cb5c3f1c0a2a9618e46ed50">stp_color_get_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the short (untranslated) name of a color module.  <a href="group__color.html#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga12">stp_color_get_long_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the short (untranslated) name of a color module.  <a href="group__color.html#g5a4a4da67cb5c3f1c0a2a9618e46ed50"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g612389b45f09358f6bad0e376c91b057">stp_color_get_long_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the long (translated) name of a color module.  <a href="group__color.html#ga12"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the long (translated) name of a color module.  <a href="group__color.html#g612389b45f09358f6bad0e376c91b057"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Color functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/curve-cache_8h.html b/doc/gutenprint/html/curve-cache_8h.html
index 0aaee7c..30dd680 100644
--- a/doc/gutenprint/html/curve-cache_8h.html
+++ b/doc/gutenprint/html/curve-cache_8h.html
@@ -1,13 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/curve-cache.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>curve-cache.h File Reference</h1>Curve caching functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/curve-cache.h File Reference</h1>Curve caching functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="curve_8h.html">gutenprint/curve.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -16,432 +29,328 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a0">CURVE_CACHE_FAST_USHORT</a>(cache)&nbsp;&nbsp;&nbsp;((cache)-&gt;s_cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#4b278e86a2f914893307fb20cf218e7c">CURVE_CACHE_FAST_USHORT</a>(cache)&nbsp;&nbsp;&nbsp;((cache)-&gt;s_cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a1">CURVE_CACHE_FAST_DOUBLE</a>(cache)&nbsp;&nbsp;&nbsp;((cache)-&gt;d_cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#f79c26492d6e6fd726498df18cae11fe">CURVE_CACHE_FAST_DOUBLE</a>(cache)&nbsp;&nbsp;&nbsp;((cache)-&gt;d_cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a2">CURVE_CACHE_FAST_COUNT</a>(cache)&nbsp;&nbsp;&nbsp;((cache)-&gt;count)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#70b70d0328c61f17925402a4b1bb9a90">CURVE_CACHE_FAST_COUNT</a>(cache)&nbsp;&nbsp;&nbsp;((cache)-&gt;count)</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a3">stp_curve_free_curve_cache</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#80cb29d2d12707901ca9261df5f3cd1c">stp_curve_free_curve_cache</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a4">stp_curve_cache_curve_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#f3e398d179e00c2e7d8b7c2e5dcbfd5c">stp_curve_cache_curve_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a5">stp_curve_cache_get_curve</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#26161d0b2b6c8b97e0de2dc12619cc6c">stp_curve_cache_get_curve</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a6">stp_curve_cache_curve_invalidate</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#8d9c7b9a9aca371b6d2e72dcfc367f88">stp_curve_cache_curve_invalidate</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a7">stp_curve_cache_set_curve</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache, <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#8469e7bd7d80cfb01fc470a42e6ac805">stp_curve_cache_set_curve</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache, <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a8">stp_curve_cache_set_curve_copy</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#cd8bbfbdb0b60d079b6615cc4a19ee56">stp_curve_cache_set_curve_copy</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache, const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a9">stp_curve_cache_get_count</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#aefb6ef535ba108e0fdba1db4b58bd34">stp_curve_cache_get_count</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a10">stp_curve_cache_get_ushort_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#204df5bd2ecc318cccf6e2541d8b4830">stp_curve_cache_get_ushort_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const double *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a11">stp_curve_cache_get_double_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const double *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#45415b5aa0600b60b65880803aea84b4">stp_curve_cache_get_double_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a12">stp_curve_cache_copy</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *dest, const <a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *src)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#f5642e9d4e265b8d16db6075e1309a20">stp_curve_cache_copy</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *dest, const <a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *src)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Curve caching functions. 
 <p>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="a2"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_COUNT" ref="a2" args="(cache)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="70b70d0328c61f17925402a4b1bb9a90"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_COUNT" ref="70b70d0328c61f17925402a4b1bb9a90" args="(cache)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define CURVE_CACHE_FAST_COUNT          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">cache&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;((cache)-&gt;count)</td>
+          <td class="memname">#define CURVE_CACHE_FAST_COUNT          </td>
+          <td>(</td>
+          <td class="paramtype">cache&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;((cache)-&gt;count)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a1"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_DOUBLE" ref="a1" args="(cache)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f79c26492d6e6fd726498df18cae11fe"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_DOUBLE" ref="f79c26492d6e6fd726498df18cae11fe" args="(cache)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define CURVE_CACHE_FAST_DOUBLE          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">cache&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;((cache)-&gt;d_cache)</td>
+          <td class="memname">#define CURVE_CACHE_FAST_DOUBLE          </td>
+          <td>(</td>
+          <td class="paramtype">cache&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;((cache)-&gt;d_cache)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_USHORT" ref="a0" args="(cache)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="4b278e86a2f914893307fb20cf218e7c"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_USHORT" ref="4b278e86a2f914893307fb20cf218e7c" args="(cache)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define CURVE_CACHE_FAST_USHORT          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">cache&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;((cache)-&gt;s_cache)</td>
+          <td class="memname">#define CURVE_CACHE_FAST_USHORT          </td>
+          <td>(</td>
+          <td class="paramtype">cache&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;((cache)-&gt;s_cache)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a12"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_copy" ref="a12" args="(stp_cached_curve_t *dest, const stp_cached_curve_t *src)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="f5642e9d4e265b8d16db6075e1309a20"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_copy" ref="f5642e9d4e265b8d16db6075e1309a20" args="(stp_cached_curve_t *dest, const stp_cached_curve_t *src)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_curve_cache_copy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dest</em>, </td>
+          <td class="memname">void stp_curve_cache_copy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>dest</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>src</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>src</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_curve_data" ref="a4" args="(stp_cached_curve_t *cache)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f3e398d179e00c2e7d8b7c2e5dcbfd5c"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_curve_data" ref="f3e398d179e00c2e7d8b7c2e5dcbfd5c" args="(stp_cached_curve_t *cache)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_curve_cache_curve_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>cache</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void stp_curve_cache_curve_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>cache</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a6"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_curve_invalidate" ref="a6" args="(stp_cached_curve_t *cache)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="8d9c7b9a9aca371b6d2e72dcfc367f88"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_curve_invalidate" ref="8d9c7b9a9aca371b6d2e72dcfc367f88" args="(stp_cached_curve_t *cache)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_curve_cache_curve_invalidate           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>cache</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void stp_curve_cache_curve_invalidate           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>cache</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a9"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_get_count" ref="a9" args="(stp_cached_curve_t *cache)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="aefb6ef535ba108e0fdba1db4b58bd34"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_get_count" ref="aefb6ef535ba108e0fdba1db4b58bd34" args="(stp_cached_curve_t *cache)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">size_t stp_curve_cache_get_count           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>cache</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">size_t stp_curve_cache_get_count           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>cache</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_get_curve" ref="a5" args="(stp_cached_curve_t *cache)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="26161d0b2b6c8b97e0de2dc12619cc6c"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_get_curve" ref="26161d0b2b6c8b97e0de2dc12619cc6c" args="(stp_cached_curve_t *cache)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_curve_cache_get_curve           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>cache</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* stp_curve_cache_get_curve           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>cache</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a11"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_get_double_data" ref="a11" args="(stp_cached_curve_t *cache)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="45415b5aa0600b60b65880803aea84b4"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_get_double_data" ref="45415b5aa0600b60b65880803aea84b4" args="(stp_cached_curve_t *cache)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const double* stp_curve_cache_get_double_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>cache</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">const double* stp_curve_cache_get_double_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>cache</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_get_ushort_data" ref="a10" args="(stp_cached_curve_t *cache)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="204df5bd2ecc318cccf6e2541d8b4830"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_get_ushort_data" ref="204df5bd2ecc318cccf6e2541d8b4830" args="(stp_cached_curve_t *cache)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned short* stp_curve_cache_get_ushort_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>cache</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">const unsigned short* stp_curve_cache_get_ushort_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>cache</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a7"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_set_curve" ref="a7" args="(stp_cached_curve_t *cache, stp_curve_t *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="8469e7bd7d80cfb01fc470a42e6ac805"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_set_curve" ref="8469e7bd7d80cfb01fc470a42e6ac805" args="(stp_cached_curve_t *cache, stp_curve_t *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_curve_cache_set_curve           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>cache</em>, </td>
+          <td class="memname">void stp_curve_cache_set_curve           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>cache</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a8"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_set_curve_copy" ref="a8" args="(stp_cached_curve_t *cache, const stp_curve_t *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="cd8bbfbdb0b60d079b6615cc4a19ee56"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_set_curve_copy" ref="cd8bbfbdb0b60d079b6615cc4a19ee56" args="(stp_cached_curve_t *cache, const stp_curve_t *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_curve_cache_set_curve_copy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>cache</em>, </td>
+          <td class="memname">void stp_curve_cache_set_curve_copy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>cache</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="curve-cache.h::stp_curve_free_curve_cache" ref="a3" args="(stp_cached_curve_t *cache)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="80cb29d2d12707901ca9261df5f3cd1c"></a><!-- doxytag: member="curve-cache.h::stp_curve_free_curve_cache" ref="80cb29d2d12707901ca9261df5f3cd1c" args="(stp_cached_curve_t *cache)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_curve_free_curve_cache           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>cache</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void stp_curve_free_curve_cache           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>cache</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/curve_8h.html b/doc/gutenprint/html/curve_8h.html
index 816e2e2..5d071bc 100644
--- a/doc/gutenprint/html/curve_8h.html
+++ b/doc/gutenprint/html/curve_8h.html
@@ -1,13 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/curve.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>curve.h File Reference</h1>Curve functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/curve.h File Reference</h1>Curve functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;stdio.h&gt;</code><br>
 <code>#include &lt;stdlib.h&gt;</code><br>
@@ -19,175 +32,175 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Point (x,y) for piecewise curve.  <a href="structstp__curve__point__t.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_curve&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga0">stp_curve_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_curve&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The curve opaque data type.  <a href="group__curve.html#ga0"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The curve opaque data type.  <a href="group__curve.html#g375a2b23705fb0698ae1d823243c8524"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga47">stp_curve_type_t</a> { <a class="el" href="group__curve.html#gga47a1">STP_CURVE_TYPE_LINEAR</a>, 
-<a class="el" href="group__curve.html#gga47a2">STP_CURVE_TYPE_SPLINE</a>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a> { <a class="el" href="group__curve.html#gg982f8191c84b049cc3ad3cee1558fc2346228ddaa2d52a85ccd79c4dc0f76ad3">STP_CURVE_TYPE_LINEAR</a>, 
+<a class="el" href="group__curve.html#gg982f8191c84b049cc3ad3cee1558fc23fb1ffdc3754f428d8e3a2124e014ff77">STP_CURVE_TYPE_SPLINE</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Curve types.  <a href="group__curve.html#ga47">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a> { <a class="el" href="group__curve.html#gga48a3">STP_CURVE_WRAP_NONE</a>, 
-<a class="el" href="group__curve.html#gga48a4">STP_CURVE_WRAP_AROUND</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Curve types.  <a href="group__curve.html#g982f8191c84b049cc3ad3cee1558fc23">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a> { <a class="el" href="group__curve.html#gg3ae3af552b490b0ca8b02e442ac9547ad840485ad7df768a06ee4be02d93b97a">STP_CURVE_WRAP_NONE</a>, 
+<a class="el" href="group__curve.html#gg3ae3af552b490b0ca8b02e442ac9547ac0361aebddfabfb263dc0205a61f6fbd">STP_CURVE_WRAP_AROUND</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Wrapping mode.  <a href="group__curve.html#ga48">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a> { <a class="el" href="group__curve.html#gga49a5">STP_CURVE_COMPOSE_ADD</a>, 
-<a class="el" href="group__curve.html#gga49a6">STP_CURVE_COMPOSE_MULTIPLY</a>, 
-<a class="el" href="group__curve.html#gga49a7">STP_CURVE_COMPOSE_EXPONENTIATE</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Wrapping mode.  <a href="group__curve.html#g3ae3af552b490b0ca8b02e442ac9547a">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> { <a class="el" href="group__curve.html#gg7eddbee28cb1f3c76a19408b86ea142ec38b0bf09e93edb67c3e5c53035295f3">STP_CURVE_COMPOSE_ADD</a>, 
+<a class="el" href="group__curve.html#gg7eddbee28cb1f3c76a19408b86ea142ed3bd2cdb63498d5d22686e79e2c0ed95">STP_CURVE_COMPOSE_MULTIPLY</a>, 
+<a class="el" href="group__curve.html#gg7eddbee28cb1f3c76a19408b86ea142e8de151149fdfd4fcca78826e6352246a">STP_CURVE_COMPOSE_EXPONENTIATE</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Composition types.  <a href="group__curve.html#ga49">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga50">stp_curve_bounds_t</a> { <a class="el" href="group__curve.html#gga50a8">STP_CURVE_BOUNDS_RESCALE</a>, 
-<a class="el" href="group__curve.html#gga50a9">STP_CURVE_BOUNDS_CLIP</a>, 
-<a class="el" href="group__curve.html#gga50a10">STP_CURVE_BOUNDS_ERROR</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Composition types.  <a href="group__curve.html#g7eddbee28cb1f3c76a19408b86ea142e">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g86d146e483ca1902f973d574f542b85f">stp_curve_bounds_t</a> { <a class="el" href="group__curve.html#gg86d146e483ca1902f973d574f542b85f118d303bf7bdf4f00bda71cc6eac49c3">STP_CURVE_BOUNDS_RESCALE</a>, 
+<a class="el" href="group__curve.html#gg86d146e483ca1902f973d574f542b85fec9e6673edac9d34e3aad376fa711aa5">STP_CURVE_BOUNDS_CLIP</a>, 
+<a class="el" href="group__curve.html#gg86d146e483ca1902f973d574f542b85fd699d675d5df223055388cd83d0b362b">STP_CURVE_BOUNDS_ERROR</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Behaviour when curve exceeds bounds.  <a href="group__curve.html#ga50">More...</a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Behaviour when curve exceeds bounds.  <a href="group__curve.html#g86d146e483ca1902f973d574f542b85f">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga1">stp_curve_create</a> (<a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a> wrap)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g6b3640f0e25bd9d38e46bdc1b2ee58a4">stp_curve_create</a> (<a class="el" href="group__curve.html#g3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a> wrap)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new curve.  <a href="group__curve.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga2">stp_curve_create_copy</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new curve.  <a href="group__curve.html#g6b3640f0e25bd9d38e46bdc1b2ee58a4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g972ed591394396e0c66e928a0695b3bf">stp_curve_create_copy</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an curve.  <a href="group__curve.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga3">stp_curve_copy</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *dest, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an curve.  <a href="group__curve.html#g972ed591394396e0c66e928a0695b3bf"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gcd7861bf1c9d61ac4ec87844a15ab9d3">stp_curve_copy</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *dest, const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an curve.  <a href="group__curve.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga4">stp_curve_destroy</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an curve.  <a href="group__curve.html#gcd7861bf1c9d61ac4ec87844a15ab9d3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g4294b85e848fe421496469e2406ef380">stp_curve_destroy</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy an curve.  <a href="group__curve.html#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga5">stp_curve_set_bounds</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double low, double high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy an curve.  <a href="group__curve.html#g4294b85e848fe421496469e2406ef380"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ge32fb850963b8694d3739c0ed8475f75">stp_curve_set_bounds</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double low, double high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the lower and upper bounds on a curve.  <a href="group__curve.html#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga6">stp_curve_get_bounds</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the lower and upper bounds on a curve.  <a href="group__curve.html#ge32fb850963b8694d3739c0ed8475f75"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g63c3386fbfd75da9fe985673bf7b1ca3">stp_curve_get_bounds</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the lower and upper bounds on a curve.  <a href="group__curve.html#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga7">stp_curve_get_wrap</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the lower and upper bounds on a curve.  <a href="group__curve.html#g63c3386fbfd75da9fe985673bf7b1ca3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g859020827897bac0f4671322ec027dc4">stp_curve_get_wrap</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the wrapping mode.  <a href="group__curve.html#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga8">stp_curve_is_piecewise</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the wrapping mode.  <a href="group__curve.html#g859020827897bac0f4671322ec027dc4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g29b022a3055afe0b48d1f2736ff2f4da">stp_curve_is_piecewise</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Determine whether the curve is piecewise.  <a href="group__curve.html#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga9">stp_curve_get_range</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Determine whether the curve is piecewise.  <a href="group__curve.html#g29b022a3055afe0b48d1f2736ff2f4da"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gcb8e51731b9385556747744a0d4f43fb">stp_curve_get_range</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga10">stp_curve_count_points</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g766ff02b29b976372779f719076ad017">stp_curve_count_points</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of allocated points in the curve.  <a href="group__curve.html#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga11">stp_curve_set_interpolation_type</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, <a class="el" href="group__curve.html#ga47">stp_curve_type_t</a> itype)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of allocated points in the curve.  <a href="group__curve.html#g766ff02b29b976372779f719076ad017"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g82890cef78f5861a88c5789c33693423">stp_curve_set_interpolation_type</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, <a class="el" href="group__curve.html#g982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a> itype)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the curve interpolation type.  <a href="group__curve.html#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga47">stp_curve_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga12">stp_curve_get_interpolation_type</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the curve interpolation type.  <a href="group__curve.html#g82890cef78f5861a88c5789c33693423"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g42c98a6a6d2512516738b6df9367510e">stp_curve_get_interpolation_type</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the curve interpolation type.  <a href="group__curve.html#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga13">stp_curve_set_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the curve interpolation type.  <a href="group__curve.html#g42c98a6a6d2512516738b6df9367510e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g81bceb4cb991cef1cda2298cf7bb9f15">stp_curve_set_data</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set all data points of the curve.  <a href="group__curve.html#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga14">stp_curve_set_data_points</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set all data points of the curve.  <a href="group__curve.html#g81bceb4cb991cef1cda2298cf7bb9f15"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gce09cab4e6ae3d55f75aacae3689e8e6">stp_curve_set_data_points</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set all data points of the curve.  <a href="group__curve.html#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga15">stp_curve_set_float_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const float *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set all data points of the curve.  <a href="group__curve.html#gce09cab4e6ae3d55f75aacae3689e8e6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gbd7a39289471607311141c7fc3bbb415">stp_curve_set_float_data</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const float *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from float values.  <a href="group__curve.html#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga16">stp_curve_set_long_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const long *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from float values.  <a href="group__curve.html#gbd7a39289471607311141c7fc3bbb415"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ge6a435a21a5c4b5e582d42095a7b06fc">stp_curve_set_long_data</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const long *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from long values.  <a href="group__curve.html#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga17">stp_curve_set_ulong_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const unsigned long *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from long values.  <a href="group__curve.html#ge6a435a21a5c4b5e582d42095a7b06fc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g723173297f5b67af937205c7d74ac353">stp_curve_set_ulong_data</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned long *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned long values.  <a href="group__curve.html#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga18">stp_curve_set_int_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const int *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned long values.  <a href="group__curve.html#g723173297f5b67af937205c7d74ac353"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g31e76843f4d2f207701755b58766a670">stp_curve_set_int_data</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const int *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from integer values.  <a href="group__curve.html#ga18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga19">stp_curve_set_uint_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const unsigned int *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from integer values.  <a href="group__curve.html#g31e76843f4d2f207701755b58766a670"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g3ee80f8e4f33691a78b3ad8c3fd7c34f">stp_curve_set_uint_data</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned int *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned integer values.  <a href="group__curve.html#ga19"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga20">stp_curve_set_short_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const short *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned integer values.  <a href="group__curve.html#g3ee80f8e4f33691a78b3ad8c3fd7c34f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g2fa5222aab07e85f215e389734b6dbea">stp_curve_set_short_data</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const short *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from short values.  <a href="group__curve.html#ga20"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga21">stp_curve_set_ushort_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const unsigned short *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from short values.  <a href="group__curve.html#g2fa5222aab07e85f215e389734b6dbea"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g0af395eefa7bfe0d19acc1acbaeefe48">stp_curve_set_ushort_data</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned short *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned short values.  <a href="group__curve.html#ga21"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga22">stp_curve_get_subrange</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t start, size_t count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned short values.  <a href="group__curve.html#g0af395eefa7bfe0d19acc1acbaeefe48"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g5cbf7c4b6ad96ecb35fc06f46c0319f0">stp_curve_get_subrange</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t start, size_t count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a curve containing a subrange of data.  <a href="group__curve.html#ga22"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga23">stp_curve_set_subrange</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *range, size_t start)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a curve containing a subrange of data.  <a href="group__curve.html#g5cbf7c4b6ad96ecb35fc06f46c0319f0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g73dfcc4c95734449965227e21deb3037">stp_curve_set_subrange</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *range, size_t start)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const double *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga24">stp_curve_get_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const double *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gb2208f56694e47e4300d10e057f59ee8">stp_curve_get_data</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a pointer to the curve's raw data.  <a href="group__curve.html#ga24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga25">stp_curve_get_data_points</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a pointer to the curve's raw data.  <a href="group__curve.html#gb2208f56694e47e4300d10e057f59ee8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g79e0d6afa3573917c756af64b56a0d82">stp_curve_get_data_points</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a pointer to the curve's raw data as points.  <a href="group__curve.html#ga25"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const float *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga26">stp_curve_get_float_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a pointer to the curve's raw data as points.  <a href="group__curve.html#g79e0d6afa3573917c756af64b56a0d82"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const float *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g251f105cb5f2b126ea02b7908f717c18">stp_curve_get_float_data</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as floats.  <a href="group__curve.html#ga26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga27">stp_curve_get_long_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as floats.  <a href="group__curve.html#g251f105cb5f2b126ea02b7908f717c18"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gf59bd38c9dfc7beb08a283dc9e400bf2">stp_curve_get_long_data</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as longs.  <a href="group__curve.html#ga27"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga28">stp_curve_get_ulong_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as longs.  <a href="group__curve.html#gf59bd38c9dfc7beb08a283dc9e400bf2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g24a862eda4cdbb626f51aeb7d8ae9a50">stp_curve_get_ulong_data</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned longs.  <a href="group__curve.html#ga28"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga29">stp_curve_get_int_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned longs.  <a href="group__curve.html#g24a862eda4cdbb626f51aeb7d8ae9a50"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g6de80e81b64262e0051441f697ae4de4">stp_curve_get_int_data</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as integers.  <a href="group__curve.html#ga29"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga30">stp_curve_get_uint_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as integers.  <a href="group__curve.html#g6de80e81b64262e0051441f697ae4de4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g19b3160a57dc6959fe08c631c7206a8a">stp_curve_get_uint_data</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned integers.  <a href="group__curve.html#ga30"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga31">stp_curve_get_short_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned integers.  <a href="group__curve.html#g19b3160a57dc6959fe08c631c7206a8a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g87c5d1904efa58be8a21ab6b2c41d0b9">stp_curve_get_short_data</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as shorts.  <a href="group__curve.html#ga31"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga32">stp_curve_get_ushort_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as shorts.  <a href="group__curve.html#g87c5d1904efa58be8a21ab6b2c41d0b9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga02125af6b9c192e34985851370391b8">stp_curve_get_ushort_data</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned shorts.  <a href="group__curve.html#ga32"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga33">stp_curve_get_sequence</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned shorts.  <a href="group__curve.html#ga02125af6b9c192e34985851370391b8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gde323594e84d4380c88ecf122a5a4da8">stp_curve_get_sequence</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t data structure which stp_curve_t is derived from.  <a href="group__curve.html#ga33"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga34">stp_curve_set_gamma</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double f_gamma)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t data structure which stp_curve_t is derived from.  <a href="group__curve.html#gde323594e84d4380c88ecf122a5a4da8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gcb8a2b9b21f97f32faacb99a6125e152">stp_curve_set_gamma</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double f_gamma)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the gamma of a curve.  <a href="group__curve.html#ga34"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga35">stp_curve_get_gamma</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the gamma of a curve.  <a href="group__curve.html#gcb8a2b9b21f97f32faacb99a6125e152"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g0420a6cfa87aa96e5c9a56142aa0178d">stp_curve_get_gamma</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the gamma value of the curve.  <a href="group__curve.html#ga35"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga36">stp_curve_set_point</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t where, double data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the gamma value of the curve.  <a href="group__curve.html#g0420a6cfa87aa96e5c9a56142aa0178d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g2d3b8372bde3fce699a3b7bb3c9d8582">stp_curve_set_point</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t where, double data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a point along the curve.  <a href="group__curve.html#ga36"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga37">stp_curve_get_point</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t where, double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a point along the curve.  <a href="group__curve.html#g2d3b8372bde3fce699a3b7bb3c9d8582"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g569aae57147ed7681f23e0e60bd8af35">stp_curve_get_point</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t where, double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a point along the curve.  <a href="group__curve.html#ga37"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga38">stp_curve_interpolate_value</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double where, double *result)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a point along the curve.  <a href="group__curve.html#g569aae57147ed7681f23e0e60bd8af35"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gb33642ee6c49334f379a4dc185ecd355">stp_curve_interpolate_value</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double where, double *result)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Interpolate a point along the curve.  <a href="group__curve.html#ga38"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga39">stp_curve_resample</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t points)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Interpolate a point along the curve.  <a href="group__curve.html#gb33642ee6c49334f379a4dc185ecd355"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g87298cf562468cbcf2c1f76a0ab80b62">stp_curve_resample</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t points)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resample a curve (change the number of points).  <a href="group__curve.html#ga39"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga40">stp_curve_rescale</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double scale, <a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a> mode, <a class="el" href="group__curve.html#ga50">stp_curve_bounds_t</a> bounds_mode)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resample a curve (change the number of points).  <a href="group__curve.html#g87298cf562468cbcf2c1f76a0ab80b62"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gad611b3ddbd667ec204fa7b42f8d7546">stp_curve_rescale</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double scale, <a class="el" href="group__curve.html#g7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> mode, <a class="el" href="group__curve.html#g86d146e483ca1902f973d574f542b85f">stp_curve_bounds_t</a> bounds_mode)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Rescale a curve (multiply all points by a scaling constant).  <a href="group__curve.html#ga40"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga41">stp_curve_write</a> (FILE *file, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Rescale a curve (multiply all points by a scaling constant).  <a href="group__curve.html#gad611b3ddbd667ec204fa7b42f8d7546"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gc12af55cf0eb2f76db967886f8996313">stp_curve_write</a> (FILE *file, const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Write a curve to a file.  <a href="group__curve.html#ga41"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga42">stp_curve_write_string</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Write a curve to a file.  <a href="group__curve.html#gc12af55cf0eb2f76db967886f8996313"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gf2f0da590278ff74af1eccb0aa0c7169">stp_curve_write_string</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Write a curve to a string.  <a href="group__curve.html#ga42"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga43">stp_curve_create_from_stream</a> (FILE *fp)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Write a curve to a string.  <a href="group__curve.html#gf2f0da590278ff74af1eccb0aa0c7169"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g478a24e44a3ce345f7207cf7ded12e37">stp_curve_create_from_stream</a> (FILE *fp)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a stream.  <a href="group__curve.html#ga43"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga44">stp_curve_create_from_file</a> (const char *file)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a stream.  <a href="group__curve.html#g478a24e44a3ce345f7207cf7ded12e37"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gd96d7d1cda5f037f7d6a9b651ebbbb46">stp_curve_create_from_file</a> (const char *file)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a stream.  <a href="group__curve.html#ga44"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga45">stp_curve_create_from_string</a> (const char *string)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a stream.  <a href="group__curve.html#gd96d7d1cda5f037f7d6a9b651ebbbb46"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gb8c0df217306a6e0597f058efbfaca82">stp_curve_create_from_string</a> (const char *string)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a string.  <a href="group__curve.html#ga45"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga46">stp_curve_compose</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> **retval, <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *a, <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *b, <a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a> mode, int points)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a string.  <a href="group__curve.html#gb8c0df217306a6e0597f058efbfaca82"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g55c83a9139fc1b06b90e983d7c1ceff7">stp_curve_compose</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> **retval, <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *a, <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *b, <a class="el" href="group__curve.html#g7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> mode, int points)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compose two curves, creating a third curve.  <a href="group__curve.html#ga46"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compose two curves, creating a third curve.  <a href="group__curve.html#g55c83a9139fc1b06b90e983d7c1ceff7"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Curve functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/deprecated.html b/doc/gutenprint/html/deprecated.html
index fb08bd0..f908fd2 100644
--- a/doc/gutenprint/html/deprecated.html
+++ b/doc/gutenprint/html/deprecated.html
@@ -1,21 +1,30 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Deprecated List</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1><a class="anchor" name="deprecated">Deprecated List</a></h1><a class="anchor" name="_deprecated000001"></a> <dl>
-<dt>Global <a class="el" href="group__printer.html#ga7">stp_get_printer_index_by_driver</a>  </dt>
-<dd>There should never be any need to use this function.</dd>
+<dt>Global <a class="el" href="group__printer.html#g41094e69b71eb930e770bd2cf8bbf795">stp_get_printer_index_by_driver</a>  </dt>
+<dd>There should never be any need to use this function. </dd>
 </dl>
 <p>
 <a class="anchor" name="_deprecated000002"></a> <dl>
-<dt>Global <a class="el" href="group__vars.html#ga37">stp_merge_printvars</a>  </dt>
-<dd>This is likely to go away.</dd>
+<dt>Global <a class="el" href="group__vars.html#g086303d36b835d539e75f16187e99e8f">stp_merge_printvars</a>  </dt>
+<dd>This is likely to go away. </dd>
 </dl>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/dir_000000.html b/doc/gutenprint/html/dir_000000.html
deleted file mode 100644
index 173af1a..0000000
--- a/doc/gutenprint/html/dir_000000.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-<title>libgutenprint API Reference: include/ Directory Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a></div>
-<h1>include Directory Reference</h1><table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Directories</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">directory &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dir_000001.html">gutenprint</a></td></tr>
-
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprint/html/dir_000001.html b/doc/gutenprint/html/dir_000001.html
deleted file mode 100644
index e016d70..0000000
--- a/doc/gutenprint/html/dir_000001.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-<title>libgutenprint API Reference: include/gutenprint/ Directory Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>gutenprint Directory Reference</h1><table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Files</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="array_8h.html">array.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Array functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html">bit-ops.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Bit operations. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html">channel.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Channel functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="color_8h.html">color.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Color functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html">curve-cache.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Curve caching functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html">curve.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Curve functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html">dither.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Dither functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprint-intl-internal_8h.html">gutenprint-intl-internal.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Internationalisation functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprint-intl_8h.html">gutenprint-intl.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Internationalisation functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprint-module_8h.html">gutenprint-module.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Gutenprint module header. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprint-version_8h.html">gutenprint-version.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Version functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprint_8h.html">gutenprint.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Gutenprint master header. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="image_8h.html">image.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Image functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="list_8h.html">list.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Generic list functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html">module.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Module functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html">mxml.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Mini-XML XML parsing functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="paper_8h.html">paper.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Paper size functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html">path.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Simple directory path functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="printers_8h.html">printers.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Printer functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="sequence_8h.html">sequence.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Sequence functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html">string-list.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">String list functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="util_8h.html">util.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Utility functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="vars_8h.html">vars.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Print job functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html">weave.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Softweave functions. <br></td></tr>
-
-<p>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html">xml.h</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">XML tree functions. <br></td></tr>
-
-<p>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprint/html/dirs.html b/doc/gutenprint/html/dirs.html
deleted file mode 100644
index 3635557..0000000
--- a/doc/gutenprint/html/dirs.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-<title>libgutenprint API Reference: Directory Hierarchy</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindexHL" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<h1>libgutenprint API Reference Directories</h1>This directory hierarchy is sorted roughly, but not completely, alphabetically:<ul>
-<li><a class="el" href="dir_000000.html">include</a>
-<ul>
-<li><a class="el" href="dir_000001.html">gutenprint</a>
-</ul>
-</ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprint/html/dither_8h.html b/doc/gutenprint/html/dither_8h.html
index 6daef41..dc764ea 100644
--- a/doc/gutenprint/html/dither_8h.html
+++ b/doc/gutenprint/html/dither_8h.html
@@ -1,13 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/dither.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>dither.h File Reference</h1>Dither functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/dither.h File Reference</h1>Dither functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -25,1798 +38,1462 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html">stp_shade</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a0">STP_ECOLOR_K</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#9da4fbd724d498250c7129ccbb88c9a3">STP_ECOLOR_K</a>&nbsp;&nbsp;&nbsp;0</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a1">STP_ECOLOR_C</a>&nbsp;&nbsp;&nbsp;1</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#fb855574a9dd1ce3c0ac8e353917cf40">STP_ECOLOR_C</a>&nbsp;&nbsp;&nbsp;1</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a2">STP_ECOLOR_M</a>&nbsp;&nbsp;&nbsp;2</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#42c70bd6031d27d8ce2ab23133f7ed71">STP_ECOLOR_M</a>&nbsp;&nbsp;&nbsp;2</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a3">STP_ECOLOR_Y</a>&nbsp;&nbsp;&nbsp;3</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ac7bfac809059b8c99338dfa9347cf85">STP_ECOLOR_Y</a>&nbsp;&nbsp;&nbsp;3</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a4">STP_NCOLORS</a>&nbsp;&nbsp;&nbsp;(4)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#bda31f8e7a9e473057644a5fe4a2339b">STP_NCOLORS</a>&nbsp;&nbsp;&nbsp;(4)</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a5">stp_dither_matrix_short_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#9a2c54a4730e2c9bb25cf95f6cd3e597">stp_dither_matrix_short_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a6">stp_dither_matrix_normal_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#febf0484e151cf3cce4ef0b9911d0022">stp_dither_matrix_normal_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a7">stp_dither_matrix_generic_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#9f5f63d4f792df1d7becccf3fb5c8fdd">stp_dither_matrix_generic_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a8">stp_dither_matrix_impl_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#f823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__dotsize.html">stp_dotsize</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a9">stp_dotsize_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__dotsize.html">stp_dotsize</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#7a74b9371fd47b48d961d2316e2126e4">stp_dotsize_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__shade.html">stp_shade</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a10">stp_shade_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__shade.html">stp_shade</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#5baefb325bf92b7ca10c2d057c04b835">stp_shade_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a11">stp_dither_matrix_iterated_init</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, size_t size, size_t exponent, const unsigned *array)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#36691189c1f859d82675f32f5046e674">stp_dither_matrix_iterated_init</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, size_t size, size_t exponent, const unsigned *array)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a12">stp_dither_matrix_shear</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_shear, int y_shear)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#df8bb5a54d552846dcf4d1534d612b65">stp_dither_matrix_shear</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_shear, int y_shear)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a13">stp_dither_matrix_init</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#2c42ec7156263c024ea6f51ab3b17530">stp_dither_matrix_init</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a14">stp_dither_matrix_init_short</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#588103d2a828a6c5f51577a917b09cdf">stp_dither_matrix_init_short</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a15">stp_dither_matrix_validate_array</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ad322d923e2d9c3141cc50863d627b25">stp_dither_matrix_validate_array</a> (const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a16">stp_dither_matrix_init_from_dither_array</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int transpose)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#53b7ba7fd141db6ef43c68a6f500bda2">stp_dither_matrix_init_from_dither_array</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int transpose)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a17">stp_dither_matrix_destroy</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#49ff7bd6b10cd34f9164b4414adbb87c">stp_dither_matrix_destroy</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a18">stp_dither_matrix_clone</a> (const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *src, <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *dest, int x_offset, int y_offset)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#d0dfe2800ed318431a0a54c1ed7d383b">stp_dither_matrix_clone</a> (const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *src, <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *dest, int x_offset, int y_offset)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a19">stp_dither_matrix_copy</a> (const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *src, <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *dest)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#3ea3c72ff26afef246873edc0bc542d3">stp_dither_matrix_copy</a> (const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *src, <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *dest)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a20">stp_dither_matrix_scale_exponentially</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, double exponent)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a62e8e672a125150074ea9bddb474423">stp_dither_matrix_scale_exponentially</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, double exponent)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a21">stp_dither_matrix_set_row</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int y)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a6ca0a88b0bef517cc1909fb7074e8ac">stp_dither_matrix_set_row</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int y)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a22">stp_find_standard_dither_array</a> (int x_aspect, int y_aspect)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#c523d1ba539398308a7ea83f4188d6ae">stp_find_standard_dither_array</a> (int x_aspect, int y_aspect)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a23">stp_dither_list_parameters</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#27fa3e870e438b0c399472a908555630">stp_dither_list_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a24">stp_dither_describe_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#f1c4669d2bed56e2e1403a7d0f36f6ba">stp_dither_describe_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a25">stp_dither_init</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int out_width, int xdpi, int ydpi)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#9835738585d6a9053eaeacdca25d0fe6">stp_dither_init</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int out_width, int xdpi, int ydpi)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a26">stp_dither_set_iterated_matrix</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#57aecb702251a2e18848b02109521aed">stp_dither_set_iterated_matrix</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a27">stp_dither_set_matrix</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic_t</a> *mat, int transpose, int x_shear, int y_shear)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a973f651768626a6eb7ab9ad4ce09b2c">stp_dither_set_matrix</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic_t</a> *mat, int transpose, int x_shear, int y_shear)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a28">stp_dither_set_matrix_from_dither_array</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int transpose)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#3155913bdc63c0545786fc427ca2396a">stp_dither_set_matrix_from_dither_array</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int transpose)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a29">stp_dither_set_transition</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, double)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#6f4efd170562a43139f7d6a4b41ecaf3">stp_dither_set_transition</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, double)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a30">stp_dither_set_randomizer</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, double)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#560bcf46dfa233a01bdf6042e4680f54">stp_dither_set_randomizer</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, double)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a31">stp_dither_set_ink_spread</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int spread)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#b47439fc32e7f669f8cd6c41acdcf398">stp_dither_set_ink_spread</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int spread)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a32">stp_dither_set_adaptive_limit</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, double limit)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#c6a4aa7bda3af1ae03d87f243311ebba">stp_dither_set_adaptive_limit</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, double limit)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a33">stp_dither_get_first_position</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, int subchan)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#fe180672fad52d306e737a333ea113fb">stp_dither_get_first_position</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchan)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a34">stp_dither_get_last_position</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, int subchan)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ddc996112f61432ff66a10eb502d9a4d">stp_dither_get_last_position</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchan)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a35">stp_dither_set_inks_simple</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, int nlevels, const double *levels, double density, double darkness)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#4dd13ea23fe601571d864eabae4b0c40">stp_dither_set_inks_simple</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int nlevels, const double *levels, double density, double darkness)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a36">stp_dither_set_inks_full</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, int nshades, const <a class="el" href="structstp__shade.html">stp_shade_t</a> *shades, double density, double darkness)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#f5822743e380d0d51a397dcb3eb6247c">stp_dither_set_inks_full</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int nshades, const <a class="el" href="structstp__shade.html">stp_shade_t</a> *shades, double density, double darkness)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a37">stp_dither_set_inks</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#5b8786ffa17dcc1604521b1d1cc5a3a5">stp_dither_set_inks</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a38">stp_dither_add_channel</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, unsigned char *data, unsigned channel, unsigned subchannel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#d70196f1a4510c43f3651bf1450be5fa">stp_dither_add_channel</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned char *data, unsigned channel, unsigned subchannel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a39">stp_dither_get_channel</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, unsigned channel, unsigned subchannel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#8866521ed5c139e2048e5548cc4fb43f">stp_dither_get_channel</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned channel, unsigned subchannel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a40">stp_dither</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#0a470a9c9daef26e90bdb890479a7f87">stp_dither</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a41">stp_dither_internal</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int row, const unsigned short *input, int duplicate_line, int zero_mask, const unsigned char *mask)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#70a6b29366005ba76ee77e9f1aaae105">stp_dither_internal</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int row, const unsigned short *input, int duplicate_line, int zero_mask, const unsigned char *mask)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Dither functions. 
 <p>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="a1"></a><!-- doxytag: member="dither.h::STP_ECOLOR_C" ref="a1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="fb855574a9dd1ce3c0ac8e353917cf40"></a><!-- doxytag: member="dither.h::STP_ECOLOR_C" ref="fb855574a9dd1ce3c0ac8e353917cf40" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_ECOLOR_C&nbsp;&nbsp;&nbsp;1          </td>
+          <td class="memname">#define STP_ECOLOR_C&nbsp;&nbsp;&nbsp;1          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="dither.h::STP_ECOLOR_K" ref="a0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="9da4fbd724d498250c7129ccbb88c9a3"></a><!-- doxytag: member="dither.h::STP_ECOLOR_K" ref="9da4fbd724d498250c7129ccbb88c9a3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_ECOLOR_K&nbsp;&nbsp;&nbsp;0          </td>
+          <td class="memname">#define STP_ECOLOR_K&nbsp;&nbsp;&nbsp;0          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="dither.h::STP_ECOLOR_M" ref="a2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="42c70bd6031d27d8ce2ab23133f7ed71"></a><!-- doxytag: member="dither.h::STP_ECOLOR_M" ref="42c70bd6031d27d8ce2ab23133f7ed71" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_ECOLOR_M&nbsp;&nbsp;&nbsp;2          </td>
+          <td class="memname">#define STP_ECOLOR_M&nbsp;&nbsp;&nbsp;2          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="dither.h::STP_ECOLOR_Y" ref="a3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ac7bfac809059b8c99338dfa9347cf85"></a><!-- doxytag: member="dither.h::STP_ECOLOR_Y" ref="ac7bfac809059b8c99338dfa9347cf85" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_ECOLOR_Y&nbsp;&nbsp;&nbsp;3          </td>
+          <td class="memname">#define STP_ECOLOR_Y&nbsp;&nbsp;&nbsp;3          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="dither.h::STP_NCOLORS" ref="a4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="bda31f8e7a9e473057644a5fe4a2339b"></a><!-- doxytag: member="dither.h::STP_NCOLORS" ref="bda31f8e7a9e473057644a5fe4a2339b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_NCOLORS&nbsp;&nbsp;&nbsp;(4)          </td>
+          <td class="memname">#define STP_NCOLORS&nbsp;&nbsp;&nbsp;(4)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a7"></a><!-- doxytag: member="dither.h::stp_dither_matrix_generic_t" ref="a7" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="9f5f63d4f792df1d7becccf3fb5c8fdd"></a><!-- doxytag: member="dither.h::stp_dither_matrix_generic_t" ref="9f5f63d4f792df1d7becccf3fb5c8fdd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>  <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic_t</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>  <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a8"></a><!-- doxytag: member="dither.h::stp_dither_matrix_impl_t" ref="a8" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f823fed10cb9591c0e659033ec49f55f"></a><!-- doxytag: member="dither.h::stp_dither_matrix_impl_t" ref="f823fed10cb9591c0e659033ec49f55f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>  <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>  <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a6"></a><!-- doxytag: member="dither.h::stp_dither_matrix_normal_t" ref="a6" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="febf0484e151cf3cce4ef0b9911d0022"></a><!-- doxytag: member="dither.h::stp_dither_matrix_normal_t" ref="febf0484e151cf3cce4ef0b9911d0022" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>  <a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal_t</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>  <a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="dither.h::stp_dither_matrix_short_t" ref="a5" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="9a2c54a4730e2c9bb25cf95f6cd3e597"></a><!-- doxytag: member="dither.h::stp_dither_matrix_short_t" ref="9a2c54a4730e2c9bb25cf95f6cd3e597" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>  <a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short_t</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>  <a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a9"></a><!-- doxytag: member="dither.h::stp_dotsize_t" ref="a9" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="7a74b9371fd47b48d961d2316e2126e4"></a><!-- doxytag: member="dither.h::stp_dotsize_t" ref="7a74b9371fd47b48d961d2316e2126e4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="structstp__dotsize.html">stp_dotsize</a>  <a class="el" href="structstp__dotsize.html">stp_dotsize_t</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="structstp__dotsize.html">stp_dotsize</a>  <a class="el" href="structstp__dotsize.html">stp_dotsize_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="dither.h::stp_shade_t" ref="a10" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="5baefb325bf92b7ca10c2d057c04b835"></a><!-- doxytag: member="dither.h::stp_shade_t" ref="5baefb325bf92b7ca10c2d057c04b835" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="structstp__shade.html">stp_shade</a>  <a class="el" href="structstp__shade.html">stp_shade_t</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="structstp__shade.html">stp_shade</a>  <a class="el" href="structstp__shade.html">stp_shade_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a40"></a><!-- doxytag: member="dither.h::stp_dither" ref="a40" args="(stp_vars_t *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="0a470a9c9daef26e90bdb890479a7f87"></a><!-- doxytag: member="dither.h::stp_dither" ref="0a470a9c9daef26e90bdb890479a7f87" args="(stp_vars_t *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_dither           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>row</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>row</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>duplicate_line</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>duplicate_line</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>zero_mask</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>zero_mask</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>mask</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a38"></a><!-- doxytag: member="dither.h::stp_dither_add_channel" ref="a38" args="(stp_vars_t *v, unsigned char *data, unsigned channel, unsigned subchannel)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="d70196f1a4510c43f3651bf1450be5fa"></a><!-- doxytag: member="dither.h::stp_dither_add_channel" ref="d70196f1a4510c43f3651bf1450be5fa" args="(stp_vars_t *v, unsigned char *data, unsigned channel, unsigned subchannel)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_add_channel           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_dither_add_channel           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>data</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned&nbsp;</td>
-          <td class="mdname" nowrap> <em>channel</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned&nbsp;</td>
+          <td class="paramname"> <em>channel</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned&nbsp;</td>
-          <td class="mdname" nowrap> <em>subchannel</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned&nbsp;</td>
+          <td class="paramname"> <em>subchannel</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a24"></a><!-- doxytag: member="dither.h::stp_dither_describe_parameter" ref="a24" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f1c4669d2bed56e2e1403a7d0f36f6ba"></a><!-- doxytag: member="dither.h::stp_dither_describe_parameter" ref="f1c4669d2bed56e2e1403a7d0f36f6ba" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_describe_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_dither_describe_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>description</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>description</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a39"></a><!-- doxytag: member="dither.h::stp_dither_get_channel" ref="a39" args="(stp_vars_t *v, unsigned channel, unsigned subchannel)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="8866521ed5c139e2048e5548cc4fb43f"></a><!-- doxytag: member="dither.h::stp_dither_get_channel" ref="8866521ed5c139e2048e5548cc4fb43f" args="(stp_vars_t *v, unsigned channel, unsigned subchannel)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned char* stp_dither_get_channel           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">unsigned char* stp_dither_get_channel           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned&nbsp;</td>
-          <td class="mdname" nowrap> <em>channel</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned&nbsp;</td>
+          <td class="paramname"> <em>channel</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned&nbsp;</td>
-          <td class="mdname" nowrap> <em>subchannel</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned&nbsp;</td>
+          <td class="paramname"> <em>subchannel</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a33"></a><!-- doxytag: member="dither.h::stp_dither_get_first_position" ref="a33" args="(stp_vars_t *v, int color, int subchan)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="fe180672fad52d306e737a333ea113fb"></a><!-- doxytag: member="dither.h::stp_dither_get_first_position" ref="fe180672fad52d306e737a333ea113fb" args="(stp_vars_t *v, int color, int subchan)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_dither_get_first_position           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_dither_get_first_position           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>color</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>color</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>subchan</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>subchan</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a34"></a><!-- doxytag: member="dither.h::stp_dither_get_last_position" ref="a34" args="(stp_vars_t *v, int color, int subchan)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ddc996112f61432ff66a10eb502d9a4d"></a><!-- doxytag: member="dither.h::stp_dither_get_last_position" ref="ddc996112f61432ff66a10eb502d9a4d" args="(stp_vars_t *v, int color, int subchan)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_dither_get_last_position           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_dither_get_last_position           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>color</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>color</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>subchan</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>subchan</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a25"></a><!-- doxytag: member="dither.h::stp_dither_init" ref="a25" args="(stp_vars_t *v, stp_image_t *image, int out_width, int xdpi, int ydpi)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="9835738585d6a9053eaeacdca25d0fe6"></a><!-- doxytag: member="dither.h::stp_dither_init" ref="9835738585d6a9053eaeacdca25d0fe6" args="(stp_vars_t *v, stp_image_t *image, int out_width, int xdpi, int ydpi)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_init           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_dither_init           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>image</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>image</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>out_width</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>out_width</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>xdpi</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>xdpi</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>ydpi</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>ydpi</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a41"></a><!-- doxytag: member="dither.h::stp_dither_internal" ref="a41" args="(stp_vars_t *v, int row, const unsigned short *input, int duplicate_line, int zero_mask, const unsigned char *mask)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="70a6b29366005ba76ee77e9f1aaae105"></a><!-- doxytag: member="dither.h::stp_dither_internal" ref="70a6b29366005ba76ee77e9f1aaae105" args="(stp_vars_t *v, int row, const unsigned short *input, int duplicate_line, int zero_mask, const unsigned char *mask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_internal           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_dither_internal           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>row</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>row</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned short *&nbsp;</td>
-          <td class="mdname" nowrap> <em>input</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned short *&nbsp;</td>
+          <td class="paramname"> <em>input</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>duplicate_line</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>duplicate_line</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>zero_mask</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>zero_mask</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>mask</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>mask</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a23"></a><!-- doxytag: member="dither.h::stp_dither_list_parameters" ref="a23" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> stp_dither_list_parameters           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="27fa3e870e438b0c399472a908555630"></a><!-- doxytag: member="dither.h::stp_dither_list_parameters" ref="27fa3e870e438b0c399472a908555630" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> stp_dither_list_parameters           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a18"></a><!-- doxytag: member="dither.h::stp_dither_matrix_clone" ref="a18" args="(const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest, int x_offset, int y_offset)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="d0dfe2800ed318431a0a54c1ed7d383b"></a><!-- doxytag: member="dither.h::stp_dither_matrix_clone" ref="d0dfe2800ed318431a0a54c1ed7d383b" args="(const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest, int x_offset, int y_offset)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_matrix_clone           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>src</em>, </td>
+          <td class="memname">void stp_dither_matrix_clone           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>src</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dest</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>dest</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x_offset</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x_offset</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y_offset</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y_offset</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a19"></a><!-- doxytag: member="dither.h::stp_dither_matrix_copy" ref="a19" args="(const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="3ea3c72ff26afef246873edc0bc542d3"></a><!-- doxytag: member="dither.h::stp_dither_matrix_copy" ref="3ea3c72ff26afef246873edc0bc542d3" args="(const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_matrix_copy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>src</em>, </td>
+          <td class="memname">void stp_dither_matrix_copy           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>src</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dest</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>dest</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a17"></a><!-- doxytag: member="dither.h::stp_dither_matrix_destroy" ref="a17" args="(stp_dither_matrix_impl_t *mat)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_dither_matrix_destroy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>mat</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="49ff7bd6b10cd34f9164b4414adbb87c"></a><!-- doxytag: member="dither.h::stp_dither_matrix_destroy" ref="49ff7bd6b10cd34f9164b4414adbb87c" args="(stp_dither_matrix_impl_t *mat)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_dither_matrix_destroy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>mat</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a13"></a><!-- doxytag: member="dither.h::stp_dither_matrix_init" ref="a13" args="(stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="2c42ec7156263c024ea6f51ab3b17530"></a><!-- doxytag: member="dither.h::stp_dither_matrix_init" ref="2c42ec7156263c024ea6f51ab3b17530" args="(stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_matrix_init           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>mat</em>, </td>
+          <td class="memname">void stp_dither_matrix_init           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x_size</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x_size</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y_size</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y_size</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>array</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned int *&nbsp;</td>
+          <td class="paramname"> <em>array</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>transpose</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>transpose</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>prescaled</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>prescaled</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a16"></a><!-- doxytag: member="dither.h::stp_dither_matrix_init_from_dither_array" ref="a16" args="(stp_dither_matrix_impl_t *mat, const stp_array_t *array, int transpose)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="53b7ba7fd141db6ef43c68a6f500bda2"></a><!-- doxytag: member="dither.h::stp_dither_matrix_init_from_dither_array" ref="53b7ba7fd141db6ef43c68a6f500bda2" args="(stp_dither_matrix_impl_t *mat, const stp_array_t *array, int transpose)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_matrix_init_from_dither_array           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>mat</em>, </td>
+          <td class="memname">void stp_dither_matrix_init_from_dither_array           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>array</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>array</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>transpose</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>transpose</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a14"></a><!-- doxytag: member="dither.h::stp_dither_matrix_init_short" ref="a14" args="(stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="588103d2a828a6c5f51577a917b09cdf"></a><!-- doxytag: member="dither.h::stp_dither_matrix_init_short" ref="588103d2a828a6c5f51577a917b09cdf" args="(stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_matrix_init_short           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>mat</em>, </td>
+          <td class="memname">void stp_dither_matrix_init_short           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x_size</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x_size</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y_size</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y_size</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned short *&nbsp;</td>
-          <td class="mdname" nowrap> <em>array</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned short *&nbsp;</td>
+          <td class="paramname"> <em>array</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>transpose</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>transpose</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>prescaled</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>prescaled</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a11"></a><!-- doxytag: member="dither.h::stp_dither_matrix_iterated_init" ref="a11" args="(stp_dither_matrix_impl_t *mat, size_t size, size_t exponent, const unsigned *array)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="36691189c1f859d82675f32f5046e674"></a><!-- doxytag: member="dither.h::stp_dither_matrix_iterated_init" ref="36691189c1f859d82675f32f5046e674" args="(stp_dither_matrix_impl_t *mat, size_t size, size_t exponent, const unsigned *array)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_matrix_iterated_init           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>mat</em>, </td>
+          <td class="memname">void stp_dither_matrix_iterated_init           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>size</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>size</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>exponent</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>exponent</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned *&nbsp;</td>
-          <td class="mdname" nowrap> <em>array</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned *&nbsp;</td>
+          <td class="paramname"> <em>array</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a20"></a><!-- doxytag: member="dither.h::stp_dither_matrix_scale_exponentially" ref="a20" args="(stp_dither_matrix_impl_t *mat, double exponent)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="a62e8e672a125150074ea9bddb474423"></a><!-- doxytag: member="dither.h::stp_dither_matrix_scale_exponentially" ref="a62e8e672a125150074ea9bddb474423" args="(stp_dither_matrix_impl_t *mat, double exponent)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_matrix_scale_exponentially           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>mat</em>, </td>
+          <td class="memname">void stp_dither_matrix_scale_exponentially           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>exponent</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>exponent</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a21"></a><!-- doxytag: member="dither.h::stp_dither_matrix_set_row" ref="a21" args="(stp_dither_matrix_impl_t *mat, int y)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="a6ca0a88b0bef517cc1909fb7074e8ac"></a><!-- doxytag: member="dither.h::stp_dither_matrix_set_row" ref="a6ca0a88b0bef517cc1909fb7074e8ac" args="(stp_dither_matrix_impl_t *mat, int y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_matrix_set_row           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>mat</em>, </td>
+          <td class="memname">void stp_dither_matrix_set_row           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a12"></a><!-- doxytag: member="dither.h::stp_dither_matrix_shear" ref="a12" args="(stp_dither_matrix_impl_t *mat, int x_shear, int y_shear)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="df8bb5a54d552846dcf4d1534d612b65"></a><!-- doxytag: member="dither.h::stp_dither_matrix_shear" ref="df8bb5a54d552846dcf4d1534d612b65" args="(stp_dither_matrix_impl_t *mat, int x_shear, int y_shear)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_matrix_shear           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>mat</em>, </td>
+          <td class="memname">void stp_dither_matrix_shear           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x_shear</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x_shear</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y_shear</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y_shear</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a15"></a><!-- doxytag: member="dither.h::stp_dither_matrix_validate_array" ref="a15" args="(const stp_array_t *array)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_dither_matrix_validate_array           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>array</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="ad322d923e2d9c3141cc50863d627b25"></a><!-- doxytag: member="dither.h::stp_dither_matrix_validate_array" ref="ad322d923e2d9c3141cc50863d627b25" args="(const stp_array_t *array)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_dither_matrix_validate_array           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>array</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a32"></a><!-- doxytag: member="dither.h::stp_dither_set_adaptive_limit" ref="a32" args="(stp_vars_t *v, double limit)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="c6a4aa7bda3af1ae03d87f243311ebba"></a><!-- doxytag: member="dither.h::stp_dither_set_adaptive_limit" ref="c6a4aa7bda3af1ae03d87f243311ebba" args="(stp_vars_t *v, double limit)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_set_adaptive_limit           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_dither_set_adaptive_limit           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>limit</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>limit</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a31"></a><!-- doxytag: member="dither.h::stp_dither_set_ink_spread" ref="a31" args="(stp_vars_t *v, int spread)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="b47439fc32e7f669f8cd6c41acdcf398"></a><!-- doxytag: member="dither.h::stp_dither_set_ink_spread" ref="b47439fc32e7f669f8cd6c41acdcf398" args="(stp_vars_t *v, int spread)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_set_ink_spread           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_dither_set_ink_spread           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>spread</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>spread</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a37"></a><!-- doxytag: member="dither.h::stp_dither_set_inks" ref="a37" args="(stp_vars_t *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="5b8786ffa17dcc1604521b1d1cc5a3a5"></a><!-- doxytag: member="dither.h::stp_dither_set_inks" ref="5b8786ffa17dcc1604521b1d1cc5a3a5" args="(stp_vars_t *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_set_inks           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_dither_set_inks           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>color</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>color</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>density</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>density</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>darkness</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>darkness</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nshades</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nshades</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>svalues</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const double *&nbsp;</td>
+          <td class="paramname"> <em>svalues</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>ndotsizes</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>ndotsizes</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dvalues</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const double *&nbsp;</td>
+          <td class="paramname"> <em>dvalues</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a36"></a><!-- doxytag: member="dither.h::stp_dither_set_inks_full" ref="a36" args="(stp_vars_t *v, int color, int nshades, const stp_shade_t *shades, double density, double darkness)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f5822743e380d0d51a397dcb3eb6247c"></a><!-- doxytag: member="dither.h::stp_dither_set_inks_full" ref="f5822743e380d0d51a397dcb3eb6247c" args="(stp_vars_t *v, int color, int nshades, const stp_shade_t *shades, double density, double darkness)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_set_inks_full           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_dither_set_inks_full           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>color</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>color</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nshades</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nshades</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="structstp__shade.html">stp_shade_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>shades</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="structstp__shade.html">stp_shade_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>shades</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>density</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>density</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>darkness</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>darkness</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a35"></a><!-- doxytag: member="dither.h::stp_dither_set_inks_simple" ref="a35" args="(stp_vars_t *v, int color, int nlevels, const double *levels, double density, double darkness)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="4dd13ea23fe601571d864eabae4b0c40"></a><!-- doxytag: member="dither.h::stp_dither_set_inks_simple" ref="4dd13ea23fe601571d864eabae4b0c40" args="(stp_vars_t *v, int color, int nlevels, const double *levels, double density, double darkness)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_set_inks_simple           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_dither_set_inks_simple           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>color</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>color</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>nlevels</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>nlevels</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>levels</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const double *&nbsp;</td>
+          <td class="paramname"> <em>levels</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>density</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>density</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>darkness</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>darkness</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a26"></a><!-- doxytag: member="dither.h::stp_dither_set_iterated_matrix" ref="a26" args="(stp_vars_t *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="57aecb702251a2e18848b02109521aed"></a><!-- doxytag: member="dither.h::stp_dither_set_iterated_matrix" ref="57aecb702251a2e18848b02109521aed" args="(stp_vars_t *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_set_iterated_matrix           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_dither_set_iterated_matrix           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>edge</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>edge</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>iterations</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>iterations</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned *&nbsp;</td>
+          <td class="paramname"> <em>data</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>prescaled</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>prescaled</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x_shear</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x_shear</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y_shear</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y_shear</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a27"></a><!-- doxytag: member="dither.h::stp_dither_set_matrix" ref="a27" args="(stp_vars_t *v, const stp_dither_matrix_generic_t *mat, int transpose, int x_shear, int y_shear)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="a973f651768626a6eb7ab9ad4ce09b2c"></a><!-- doxytag: member="dither.h::stp_dither_set_matrix" ref="a973f651768626a6eb7ab9ad4ce09b2c" args="(stp_vars_t *v, const stp_dither_matrix_generic_t *mat, int transpose, int x_shear, int y_shear)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_set_matrix           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_dither_set_matrix           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>mat</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>mat</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>transpose</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>transpose</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x_shear</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x_shear</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y_shear</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y_shear</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a28"></a><!-- doxytag: member="dither.h::stp_dither_set_matrix_from_dither_array" ref="a28" args="(stp_vars_t *v, const stp_array_t *array, int transpose)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="3155913bdc63c0545786fc427ca2396a"></a><!-- doxytag: member="dither.h::stp_dither_set_matrix_from_dither_array" ref="3155913bdc63c0545786fc427ca2396a" args="(stp_vars_t *v, const stp_array_t *array, int transpose)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_set_matrix_from_dither_array           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_dither_set_matrix_from_dither_array           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>array</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>array</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>transpose</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>transpose</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a30"></a><!-- doxytag: member="dither.h::stp_dither_set_randomizer" ref="a30" args="(stp_vars_t *v, int color, double)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="560bcf46dfa233a01bdf6042e4680f54"></a><!-- doxytag: member="dither.h::stp_dither_set_randomizer" ref="560bcf46dfa233a01bdf6042e4680f54" args="(stp_vars_t *v, int color, double)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_set_randomizer           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_dither_set_randomizer           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>color</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>color</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a29"></a><!-- doxytag: member="dither.h::stp_dither_set_transition" ref="a29" args="(stp_vars_t *v, double)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="6f4efd170562a43139f7d6a4b41ecaf3"></a><!-- doxytag: member="dither.h::stp_dither_set_transition" ref="6f4efd170562a43139f7d6a4b41ecaf3" args="(stp_vars_t *v, double)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dither_set_transition           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_dither_set_transition           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a22"></a><!-- doxytag: member="dither.h::stp_find_standard_dither_array" ref="a22" args="(int x_aspect, int y_aspect)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="c523d1ba539398308a7ea83f4188d6ae"></a><!-- doxytag: member="dither.h::stp_find_standard_dither_array" ref="c523d1ba539398308a7ea83f4188d6ae" args="(int x_aspect, int y_aspect)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a>* stp_find_standard_dither_array           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x_aspect</em>, </td>
+          <td class="memname"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a>* stp_find_standard_dither_array           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x_aspect</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y_aspect</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y_aspect</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/doxygen.css b/doc/gutenprint/html/doxygen.css
index decae9e..c7db1a8 100644
--- a/doc/gutenprint/html/doxygen.css
+++ b/doc/gutenprint/html/doxygen.css
@@ -17,8 +17,8 @@ H3 {
 CAPTION { font-weight: bold }
 DIV.qindex {
 	width: 100%;
-	background-color: #eeeeff;
-	border: 1px solid #b0b0b0;
+	background-color: #e8eef2;
+	border: 1px solid #84b0c7;
 	text-align: center;
 	margin: 2px;
 	padding: 2px;
@@ -26,16 +26,16 @@ DIV.qindex {
 }
 DIV.nav {
 	width: 100%;
-	background-color: #eeeeff;
-	border: 1px solid #b0b0b0;
+	background-color: #e8eef2;
+	border: 1px solid #84b0c7;
 	text-align: center;
 	margin: 2px;
 	padding: 2px;
 	line-height: 140%;
 }
 DIV.navtab {
-       background-color: #eeeeff;
-       border: 1px solid #b0b0b0;
+       background-color: #e8eef2;
+       border: 1px solid #84b0c7;
        text-align: center;
        margin: 2px;
        margin-right: 15px;
@@ -80,7 +80,7 @@ A.codeRef:visited { font-weight: normal; color: #0000FF}
 A:hover { text-decoration: none; background-color: #f2f2ff }
 DL.el { margin-left: -1cm }
 .fragment {
-       font-family: Fixed, monospace;
+       font-family: monospace, fixed;
        font-size: 95%;
 }
 PRE.fragment {
@@ -96,14 +96,7 @@ PRE.fragment {
 	padding-bottom: 4px;
 }
 DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px }
-TD.md { background-color: #F4F4FB; font-weight: bold; }
-TD.mdPrefix {
-       background-color: #F4F4FB;
-       color: #606060;
-	font-size: 80%;
-}
-TD.mdname1 { background-color: #F4F4FB; font-weight: bold; color: #602020; }
-TD.mdname { background-color: #F4F4FB; font-weight: bold; color: #602020; width: 600px; }
+
 DIV.groupHeader {
        margin-left: 16px;
        margin-top: 12px;
@@ -118,7 +111,7 @@ BODY {
 	margin-left: 20px;
 }
 TD.indexkey {
-	background-color: #eeeeff;
+	background-color: #e8eef2;
 	font-weight: bold;
 	padding-right  : 10px;
 	padding-top    : 2px;
@@ -131,7 +124,7 @@ TD.indexkey {
 	border: 1px solid #CCCCCC;
 }
 TD.indexvalue {
-	background-color: #eeeeff;
+	background-color: #e8eef2;
 	font-style: italic;
 	padding-right  : 10px;
 	padding-top    : 2px;
@@ -156,13 +149,6 @@ SPAN.comment       { color: #800000 }
 SPAN.preprocessor  { color: #806020 }
 SPAN.stringliteral { color: #002080 }
 SPAN.charliteral   { color: #008080 }
-.mdTable {
-	border: 1px solid #868686;
-	background-color: #F4F4FB;
-}
-.mdRow {
-	padding: 8px 10px;
-}
 .mdescLeft {
        padding: 0px 8px 4px 8px;
 	font-size: 80%;
@@ -286,24 +272,87 @@ FORM.search {
 INPUT.search { font-size: 75%;
                color: #000080;
                font-weight: normal;
-               background-color: #eeeeff;
+               background-color: #e8eef2;
 }
 TD.tiny      { font-size: 75%;
 }
 a {
-	color: #252E78;
+	color: #1A41A8;
 }
 a:visited {
-	color: #3D2185;
+	color: #2A3798;
 }
 .dirtab { padding: 4px;
           border-collapse: collapse;
-          border: 1px solid #b0b0b0;
+          border: 1px solid #84b0c7;
 }
-TH.dirtab { background: #eeeeff;
+TH.dirtab { background: #e8eef2;
             font-weight: bold;
 }
 HR { height: 1px;
      border: none;
      border-top: 1px solid black;
 }
+
+/* Style for detailed member documentation */
+.memtemplate {
+  font-size: 80%;
+  color: #606060;
+  font-weight: normal;
+} 
+.memnav { 
+  background-color: #e8eef2;
+  border: 1px solid #84b0c7;
+  text-align: center;
+  margin: 2px;
+  margin-right: 15px;
+  padding: 2px;
+}
+.memitem {
+  padding: 4px;
+  background-color: #eef3f5;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #dedeee;
+  -moz-border-radius: 8px 8px 8px 8px;
+}
+.memname {
+  white-space: nowrap;
+  font-weight: bold;
+}
+.memdoc{
+  padding-left: 10px;
+}
+.memproto {
+  background-color: #d5e1e8;
+  width: 100%;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #84b0c7;
+  font-weight: bold;
+  -moz-border-radius: 8px 8px 8px 8px;
+}
+.paramkey {
+  text-align: right;
+}
+.paramtype {
+  white-space: nowrap;
+}
+.paramname {
+  color: #602020;
+  font-style: italic;
+  white-space: nowrap;
+}
+/* End Styling for detailed member documentation */
+
+/* for the tree view */
+.ftvtree {
+	font-family: sans-serif;
+	margin:0.5em;
+}
+.directory { font-size: 9pt; font-weight: bold; }
+.directory h3 { margin: 0px; margin-top: 1em; font-size: 11pt; }
+.directory > h3 { margin-top: 0; }
+.directory p { margin: 0px; white-space: nowrap; }
+.directory div { display: none; margin: 0px; }
+.directory img { vertical-align: -30%; }
diff --git a/doc/gutenprint/html/files.html b/doc/gutenprint/html/files.html
index 68167d4..614f956 100644
--- a/doc/gutenprint/html/files.html
+++ b/doc/gutenprint/html/files.html
@@ -1,10 +1,25 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: File Index</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindexHL" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
 <h1>libgutenprint API Reference File List</h1>Here is a list of all files with brief descriptions:<table>
   <tr><td class="indexkey">include/gutenprint/<a class="el" href="array_8h.html">array.h</a></td><td class="indexvalue">Array functions </td></tr>
   <tr><td class="indexkey">include/gutenprint/<a class="el" href="bit-ops_8h.html">bit-ops.h</a></td><td class="indexvalue">Bit operations </td></tr>
@@ -32,8 +47,8 @@
   <tr><td class="indexkey">include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></td><td class="indexvalue">Softweave functions </td></tr>
   <tr><td class="indexkey">include/gutenprint/<a class="el" href="xml_8h.html">xml.h</a></td><td class="indexvalue">XML tree functions </td></tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/functions.html b/doc/gutenprint/html/functions.html
index c8b0a5c..ba17dca 100644
--- a/doc/gutenprint/html/functions.html
+++ b/doc/gutenprint/html/functions.html
@@ -1,178 +1,387 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindexHL" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindexHL" href="functions.html">All</a> | <a class="qindex" href="functions_vars.html">Variables</a></div>
-<div class="qindex"><a class="qindex" href="#index_a">a</a> | <a class="qindex" href="#index_b">b</a> | <a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_d">d</a> | <a class="qindex" href="#index_e">e</a> | <a class="qindex" href="#index_f">f</a> | <a class="qindex" href="#index_g">g</a> | <a class="qindex" href="#index_h">h</a> | <a class="qindex" href="#index_i">i</a> | <a class="qindex" href="#index_j">j</a> | <a class="qindex" href="#index_l">l</a> | <a class="qindex" href="#index_m">m</a> | <a class="qindex" href="#index_n">n</a> | <a class="qindex" href="#index_o">o</a> | <a class="qindex" href="#index_p">p</a> | <a class="qindex" href="#index_r">r</a> | <a class="qindex" href="#index_s">s</a> | <a class="qindex" href="#index_t">t</a> | <a class="qindex" href="#index_u">u</a> | <a class="qindex" href="#index_v">v</a> | <a class="qindex" href="#index_w">w</a> | <a class="qindex" href="#index_x">x</a> | <a class="qindex" href="#index_y">y</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="functions.html"><span>All</span></a></li>
+    <li><a href="functions_vars.html"><span>Variables</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index_a"><span>a</span></a></li>
+    <li><a href="#index_b"><span>b</span></a></li>
+    <li><a href="#index_c"><span>c</span></a></li>
+    <li><a href="#index_d"><span>d</span></a></li>
+    <li><a href="#index_e"><span>e</span></a></li>
+    <li><a href="#index_f"><span>f</span></a></li>
+    <li><a href="#index_g"><span>g</span></a></li>
+    <li><a href="#index_h"><span>h</span></a></li>
+    <li><a href="#index_i"><span>i</span></a></li>
+    <li><a href="#index_j"><span>j</span></a></li>
+    <li><a href="#index_l"><span>l</span></a></li>
+    <li><a href="#index_m"><span>m</span></a></li>
+    <li><a href="#index_n"><span>n</span></a></li>
+    <li><a href="#index_o"><span>o</span></a></li>
+    <li><a href="#index_p"><span>p</span></a></li>
+    <li><a href="#index_r"><span>r</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+    <li><a href="#index_t"><span>t</span></a></li>
+    <li><a href="#index_u"><span>u</span></a></li>
+    <li><a href="#index_v"><span>v</span></a></li>
+    <li><a href="#index_w"><span>w</span></a></li>
+    <li><a href="#index_x"><span>x</span></a></li>
+    <li><a href="#index_y"><span>y</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all struct and union fields with links to the structures/unions they belong to:
 <p>
 <h3><a class="anchor" name="index_a">- a -</a></h3><ul>
 <li>array
-: <a class="el" href="structstp__parameter__t.html#o25">stp_parameter_t</a><li>attrs
-: <a class="el" href="structstp__mxml__value__s.html#o2">stp_mxml_value_s</a></ul>
+: <a class="el" href="structstp__parameter__t.html#28aef58241d3a500968ca65df099ee3a">stp_parameter_t</a>
+<li>attrs
+: <a class="el" href="structstp__mxml__value__s.html#69974b612f59fd3ef1d5db85db2d1a07">stp_mxml_value_s</a>
+</ul>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>base
-: <a class="el" href="structdither__matrix__impl.html#o0">dither_matrix_impl</a><li>bit_pattern
-: <a class="el" href="structstp__dotsize.html#o0">stp_dotsize</a><li>boolean
-: <a class="el" href="structstp__parameter__t.html#o23">stp_parameter_t</a><li>bottom
-: <a class="el" href="structstp__papersize__t.html#o7">stp_papersize_t</a><li>bounds
-: <a class="el" href="structstp__parameter__t.html#o18">stp_parameter_t</a><li>bytes
-: <a class="el" href="structstp__raw__t.html#o0">stp_raw_t</a>, <a class="el" href="structstp__dither__matrix__generic.html#o2">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o2">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o2">stp_dither_matrix_short</a></ul>
+: <a class="el" href="structdither__matrix__impl.html#331debb887e076f8b52952ba6cc2b50b">dither_matrix_impl</a>
+<li>bit_pattern
+: <a class="el" href="structstp__dotsize.html#8d5273395d0e27004f779de0ea81ff23">stp_dotsize</a>
+<li>boolean
+: <a class="el" href="structstp__parameter__t.html#74aaa2515728660657133ca3191e422c">stp_parameter_t</a>
+<li>bottom
+: <a class="el" href="structstp__papersize__t.html#9c7fcf4d0bac23817b6f56996fed4043">stp_papersize_t</a>
+<li>bounds
+: <a class="el" href="structstp__parameter__t.html#bb297424036e868212f5086d5c5235fe">stp_parameter_t</a>
+<li>bytes
+: <a class="el" href="structstp__dither__matrix__short.html#d4d85727401505eab74e3e667f4a38f4">stp_dither_matrix_short</a>
+, <a class="el" href="structstp__dither__matrix__normal.html#d72d088edfe3223c2df8fd4fb6178b98">stp_dither_matrix_normal</a>
+, <a class="el" href="structstp__raw__t.html#5e4620104d47e7e593d75d1ebc977407">stp_raw_t</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#b963ddf7c0826bd3cc316c2375f1205b">stp_dither_matrix_generic</a>
+</ul>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>category
-: <a class="el" href="structstp__parameter__t.html#o2">stp_parameter_t</a><li>channel
-: <a class="el" href="structstp__parameter__t.html#o9">stp_parameter_t</a><li>child
-: <a class="el" href="structstp__mxml__node__s.html#o4">stp_mxml_node_s</a><li>class
-: <a class="el" href="structstp__module.html#o3">stp_module</a><li>colorfuncs
-: <a class="el" href="structstp__color.html#o2">stp_color</a><li>comment
-: <a class="el" href="structstp__papersize__t.html#o2">stp_papersize_t</a>, <a class="el" href="structstp__module.html#o2">stp_module</a><li>conclude
-: <a class="el" href="structstp__image.html#o6">stp_image</a><li>count
-: <a class="el" href="structstp__cached__curve__t.html#o3">stp_cached_curve_t</a><li>curve
-: <a class="el" href="structstp__parameter__t.html#o19">stp_parameter_t</a>, <a class="el" href="structstp__cached__curve__t.html#o0">stp_cached_curve_t</a></ul>
+: <a class="el" href="structstp__parameter__t.html#2cb67e4324a017746ca9bfda772aa50f">stp_parameter_t</a>
+<li>channel
+: <a class="el" href="structstp__parameter__t.html#79bc0b76d5d5e238ddd205aa4a97ebad">stp_parameter_t</a>
+<li>child
+: <a class="el" href="structstp__mxml__node__s.html#44550ea8d68a483ccc130c58b66ddd33">stp_mxml_node_s</a>
+<li>class
+: <a class="el" href="structstp__module.html#4ebc727be1ec8edaaa1b25415a3932e3">stp_module</a>
+<li>colorfuncs
+: <a class="el" href="structstp__color.html#4442d36d0bcf746130f82ffe6f90147f">stp_color</a>
+<li>comment
+: <a class="el" href="structstp__module.html#b60ac536d9ec7b3a306cddf4c06e18bb">stp_module</a>
+, <a class="el" href="structstp__papersize__t.html#5cdc973122b8cc2e612d2dee306cbf1d">stp_papersize_t</a>
+<li>conclude
+: <a class="el" href="structstp__image.html#5d2385711b303e055258c28f42ab7f4c">stp_image</a>
+<li>count
+: <a class="el" href="structstp__cached__curve__t.html#99b772c3f4db71d58a4ee2315e712f04">stp_cached_curve_t</a>
+<li>curve
+: <a class="el" href="structstp__cached__curve__t.html#e9b4170bfafe7d85b36689cbd8eea41e">stp_cached_curve_t</a>
+, <a class="el" href="structstp__parameter__t.html#d64f0c31d200d3d413725621b3ef9133">stp_parameter_t</a>
+</ul>
 <h3><a class="anchor" name="index_d">- d -</a></h3><ul>
 <li>d_cache
-: <a class="el" href="structstp__cached__curve__t.html#o1">stp_cached_curve_t</a><li>data
-: <a class="el" href="structstp__raw__t.html#o1">stp_raw_t</a>, <a class="el" href="structstp__dither__matrix__generic.html#o4">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o4">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o4">stp_dither_matrix_short</a><li>dbl
-: <a class="el" href="structstp__parameter__t.html#o20">stp_parameter_t</a><li>deflt
-: <a class="el" href="structstp__parameter__t.html#o26">stp_parameter_t</a><li>describe_output
-: <a class="el" href="structstp__printfuncs__t.html#o8">stp_printfuncs_t</a><li>describe_parameter
-: <a class="el" href="structstp__colorfuncs__t.html#o3">stp_colorfuncs_t</a><li>describe_resolution
-: <a class="el" href="structstp__printfuncs__t.html#o7">stp_printfuncs_t</a><li>dimension
-: <a class="el" href="structstp__parameter__t.html#o21">stp_parameter_t</a><li>dot_sizes
-: <a class="el" href="structstp__shade.html#o2">stp_shade</a></ul>
+: <a class="el" href="structstp__cached__curve__t.html#59c26647178724471f383dea6e85f8ae">stp_cached_curve_t</a>
+<li>data
+: <a class="el" href="structstp__dither__matrix__normal.html#e67cb37136c5e9d9c4b1a44cd2dab87b">stp_dither_matrix_normal</a>
+, <a class="el" href="structstp__raw__t.html#36151f67569592aeac5c549a2a0daa2a">stp_raw_t</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#52acbda296a57a6087852eab62bc62db">stp_dither_matrix_generic</a>
+, <a class="el" href="structstp__dither__matrix__short.html#f4f6b5634ea79cf694782e35a8d7607d">stp_dither_matrix_short</a>
+<li>dbl
+: <a class="el" href="structstp__parameter__t.html#12fc8869d3056687e576af63c6fbd675">stp_parameter_t</a>
+<li>deflt
+: <a class="el" href="structstp__parameter__t.html#79042d88fa0ab284a8e3e4ad7b969f90">stp_parameter_t</a>
+<li>describe_output
+: <a class="el" href="structstp__printfuncs__t.html#444ec86f3fe02ac479cbf2fc152d3423">stp_printfuncs_t</a>
+<li>describe_parameter
+: <a class="el" href="structstp__colorfuncs__t.html#bf691142b608f4f02f33283dd3e67bae">stp_colorfuncs_t</a>
+<li>describe_resolution
+: <a class="el" href="structstp__printfuncs__t.html#18e0da9638360173e0d75d839ce72b92">stp_printfuncs_t</a>
+<li>dimension
+: <a class="el" href="structstp__parameter__t.html#29505a2b48cd755e10cedf01f3683d61">stp_parameter_t</a>
+<li>dot_sizes
+: <a class="el" href="structstp__shade.html#5057a856d4a6f7095af66b8cefc3cdc3">stp_shade</a>
+</ul>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>element
-: <a class="el" href="unionstp__mxml__value__u.html#o0">stp_mxml_value_u</a><li>end_job
-: <a class="el" href="structstp__printfuncs__t.html#o11">stp_printfuncs_t</a><li>end_pos
-: <a class="el" href="structstp__linebounds__t.html#o2">stp_linebounds_t</a><li>exp
-: <a class="el" href="structdither__matrix__impl.html#o1">dither_matrix_impl</a></ul>
+: <a class="el" href="unionstp__mxml__value__u.html#d4d8442bb433ac3da208e22ff0eaccf7">stp_mxml_value_u</a>
+<li>end_job
+: <a class="el" href="structstp__printfuncs__t.html#81fa6b507a316a8d6d7404b29920936e">stp_printfuncs_t</a>
+<li>end_pos
+: <a class="el" href="structstp__linebounds__t.html#9bc2a60779ccf4ac3d90d47441e883ab">stp_linebounds_t</a>
+<li>exp
+: <a class="el" href="structdither__matrix__impl.html#db0e7fb4b5e5149f0815af448676df8b">dither_matrix_impl</a>
+</ul>
 <h3><a class="anchor" name="index_f">- f -</a></h3><ul>
 <li>fast_mask
-: <a class="el" href="structdither__matrix__impl.html#o13">dither_matrix_impl</a><li>fini
-: <a class="el" href="structstp__module.html#o6">stp_module</a></ul>
+: <a class="el" href="structdither__matrix__impl.html#8c7141e2e35f6cc14896d23d15a81914">dither_matrix_impl</a>
+<li>fini
+: <a class="el" href="structstp__module.html#e04ff0565f8ebd56b383917b602ffc4a">stp_module</a>
+</ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>get_appname
-: <a class="el" href="structstp__image.html#o5">stp_image</a><li>get_row
-: <a class="el" href="structstp__image.html#o4">stp_image</a>, <a class="el" href="structstp__colorfuncs__t.html#o1">stp_colorfuncs_t</a></ul>
+: <a class="el" href="structstp__image.html#56636ad7c0dbf0a82284241f796d95cd">stp_image</a>
+<li>get_row
+: <a class="el" href="structstp__colorfuncs__t.html#f00aab442da969ffa5c6c1e592bad7cd">stp_colorfuncs_t</a>
+, <a class="el" href="structstp__image.html#8f7f8fb5826f52b8bd820f422c583350">stp_image</a>
+</ul>
 <h3><a class="anchor" name="index_h">- h -</a></h3><ul>
 <li>handle
-: <a class="el" href="structstp__module.html#o4">stp_module</a><li>height
-: <a class="el" href="structstp__papersize__t.html#o4">stp_papersize_t</a>, <a class="el" href="structstp__image.html#o3">stp_image</a><li>help
-: <a class="el" href="structstp__parameter__t.html#o3">stp_parameter_t</a></ul>
+: <a class="el" href="structstp__module.html#1a96aa2db220972e124717cc6dd03c8e">stp_module</a>
+<li>height
+: <a class="el" href="structstp__image.html#4977ad211581999a3f3290983929cce9">stp_image</a>
+, <a class="el" href="structstp__papersize__t.html#040d59e39abdef9b12c929734fb7a08c">stp_papersize_t</a>
+<li>help
+: <a class="el" href="structstp__parameter__t.html#9f0637d6b97f0daa3122840eb2bd13db">stp_parameter_t</a>
+</ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
 <li>i_own
-: <a class="el" href="structdither__matrix__impl.html#o10">dither_matrix_impl</a><li>imageable_area
-: <a class="el" href="structstp__printfuncs__t.html#o3">stp_printfuncs_t</a><li>index
-: <a class="el" href="structdither__matrix__impl.html#o9">dither_matrix_impl</a><li>init
-: <a class="el" href="structstp__module.html#o5">stp_module</a>, <a class="el" href="structstp__image.html#o0">stp_image</a>, <a class="el" href="structstp__colorfuncs__t.html#o0">stp_colorfuncs_t</a><li>integer
-: <a class="el" href="structstp__parameter__t.html#o22">stp_parameter_t</a>, <a class="el" href="unionstp__mxml__value__u.html#o1">stp_mxml_value_u</a><li>is_active
-: <a class="el" href="structstp__parameter__t.html#o8">stp_parameter_t</a><li>is_mandatory
-: <a class="el" href="structstp__parameter__t.html#o7">stp_parameter_t</a></ul>
+: <a class="el" href="structdither__matrix__impl.html#78152fe120c430f6400b731e5c722bd3">dither_matrix_impl</a>
+<li>imageable_area
+: <a class="el" href="structstp__printfuncs__t.html#68c9339cc1b74382ec07eed78c2bd501">stp_printfuncs_t</a>
+<li>index
+: <a class="el" href="structdither__matrix__impl.html#b744f40c883acc93ad0afbf5f048f27a">dither_matrix_impl</a>
+<li>init
+: <a class="el" href="structstp__colorfuncs__t.html#a10cf47dc6db374ef209d0d96592b1fe">stp_colorfuncs_t</a>
+, <a class="el" href="structstp__image.html#ce69bf25344a814cabea38afa4527086">stp_image</a>
+, <a class="el" href="structstp__module.html#fa7d4259940b8d42a36f14108f504944">stp_module</a>
+<li>integer
+: <a class="el" href="unionstp__mxml__value__u.html#9540870864c06f2bf901024b7cc9048d">stp_mxml_value_u</a>
+, <a class="el" href="structstp__parameter__t.html#3563548500d3ec917d8e1cf88c34f8cd">stp_parameter_t</a>
+<li>is_active
+: <a class="el" href="structstp__parameter__t.html#8b1af01f0874c79b6dbc4d0eca432952">stp_parameter_t</a>
+<li>is_mandatory
+: <a class="el" href="structstp__parameter__t.html#ce4d02e3665f9cdfe83ed7dd559e1c1a">stp_parameter_t</a>
+</ul>
 <h3><a class="anchor" name="index_j">- j -</a></h3><ul>
 <li>jet
-: <a class="el" href="structstp__weave__t.html#o2">stp_weave_t</a></ul>
+: <a class="el" href="structstp__weave__t.html#31163b246a77f7959161edb6dd9ff61e">stp_weave_t</a>
+</ul>
 <h3><a class="anchor" name="index_l">- l -</a></h3><ul>
 <li>last_child
-: <a class="el" href="structstp__mxml__node__s.html#o5">stp_mxml_node_s</a><li>last_x
-: <a class="el" href="structdither__matrix__impl.html#o5">dither_matrix_impl</a><li>last_x_mod
-: <a class="el" href="structdither__matrix__impl.html#o6">dither_matrix_impl</a><li>last_y
-: <a class="el" href="structdither__matrix__impl.html#o7">dither_matrix_impl</a><li>last_y_mod
-: <a class="el" href="structdither__matrix__impl.html#o8">dither_matrix_impl</a><li>left
-: <a class="el" href="structstp__papersize__t.html#o6">stp_papersize_t</a><li>limit
-: <a class="el" href="structstp__printfuncs__t.html#o5">stp_printfuncs_t</a><li>list_parameters
-: <a class="el" href="structstp__printfuncs__t.html#o0">stp_printfuncs_t</a>, <a class="el" href="structstp__colorfuncs__t.html#o2">stp_colorfuncs_t</a><li>logicalpassstart
-: <a class="el" href="structstp__pass__t.html#o2">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o4">stp_weave_t</a><li>long_name
-: <a class="el" href="structstp__color.html#o1">stp_color</a><li>lower
-: <a class="el" href="structstp__int__bound__t.html#o0">stp_int_bound_t</a>, <a class="el" href="structstp__double__bound__t.html#o0">stp_double_bound_t</a></ul>
+: <a class="el" href="structstp__mxml__node__s.html#5fb356e73f91b24211882f42cbbe7a08">stp_mxml_node_s</a>
+<li>last_x
+: <a class="el" href="structdither__matrix__impl.html#f0728348e6da1cf904204ef88e0a5853">dither_matrix_impl</a>
+<li>last_x_mod
+: <a class="el" href="structdither__matrix__impl.html#16f516218f0c5a31a1eac49e5c57add5">dither_matrix_impl</a>
+<li>last_y
+: <a class="el" href="structdither__matrix__impl.html#c1a83c82c364098dce631ec7174574be">dither_matrix_impl</a>
+<li>last_y_mod
+: <a class="el" href="structdither__matrix__impl.html#d03881dd78211b5bcb1a62453c060d2e">dither_matrix_impl</a>
+<li>left
+: <a class="el" href="structstp__papersize__t.html#9ceb7ef01ea56c990eddbef4140b34a0">stp_papersize_t</a>
+<li>limit
+: <a class="el" href="structstp__printfuncs__t.html#36e471ee24b92cfd67390a025cbc427e">stp_printfuncs_t</a>
+<li>list_parameters
+: <a class="el" href="structstp__printfuncs__t.html#19dc0ba4351a154cf9450ac4fce1ca1a">stp_printfuncs_t</a>
+, <a class="el" href="structstp__colorfuncs__t.html#14c6ae1a87ba1ba33f88fa71038f9ec9">stp_colorfuncs_t</a>
+<li>logicalpassstart
+: <a class="el" href="structstp__weave__t.html#1e50ffa910d33a365572ceb93f0197c6">stp_weave_t</a>
+, <a class="el" href="structstp__pass__t.html#e93d9d32f282f62426160626ff6c5ca3">stp_pass_t</a>
+<li>long_name
+: <a class="el" href="structstp__color.html#b7c0a627b31ebfb97fd1db2677032479">stp_color</a>
+<li>lower
+: <a class="el" href="structstp__int__bound__t.html#c5ae98fad865ad6d4816016e233f5a53">stp_int_bound_t</a>
+, <a class="el" href="structstp__double__bound__t.html#a00903ee6e04e01b6b2bb7033e3c76ce">stp_double_bound_t</a>
+</ul>
 <h3><a class="anchor" name="index_m">- m -</a></h3><ul>
 <li>major
-: <a class="el" href="structstp__module__version.html#o0">stp_module_version</a><li>matrix
-: <a class="el" href="structdither__matrix__impl.html#o14">dither_matrix_impl</a><li>maximum_imageable_area
-: <a class="el" href="structstp__printfuncs__t.html#o4">stp_printfuncs_t</a><li>media_size
-: <a class="el" href="structstp__printfuncs__t.html#o2">stp_printfuncs_t</a><li>minor
-: <a class="el" href="structstp__module__version.html#o1">stp_module_version</a><li>missingstartrows
-: <a class="el" href="structstp__pass__t.html#o1">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o3">stp_weave_t</a></ul>
+: <a class="el" href="structstp__module__version.html#15add43e03d0e1624f40c083fa958692">stp_module_version</a>
+<li>matrix
+: <a class="el" href="structdither__matrix__impl.html#e28102f9e3d3cfb8eb48d9e69e807f96">dither_matrix_impl</a>
+<li>maximum_imageable_area
+: <a class="el" href="structstp__printfuncs__t.html#3661a4612e62e8e5aef31eaab345675c">stp_printfuncs_t</a>
+<li>media_size
+: <a class="el" href="structstp__printfuncs__t.html#102e995ff1ce583f84e38409852bf95f">stp_printfuncs_t</a>
+<li>minor
+: <a class="el" href="structstp__module__version.html#eced49a93c5e461fa95f809ad077fced">stp_module_version</a>
+<li>missingstartrows
+: <a class="el" href="structstp__weave__t.html#f60b909adb3f9efb541be500c08cf87e">stp_weave_t</a>
+, <a class="el" href="structstp__pass__t.html#462d1714bab638212fcae32b869c11d2">stp_pass_t</a>
+</ul>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>name
-: <a class="el" href="structstp__parameter__t.html#o0">stp_parameter_t</a>, <a class="el" href="structstp__param__string__t.html#o0">stp_param_string_t</a>, <a class="el" href="structstp__papersize__t.html#o0">stp_papersize_t</a>, <a class="el" href="structstp__mxml__value__s.html#o0">stp_mxml_value_s</a>, <a class="el" href="structstp__mxml__attr__s.html#o0">stp_mxml_attr_s</a>, <a class="el" href="structstp__module.html#o0">stp_module</a><li>ncolors
-: <a class="el" href="structstp__linebounds__t.html#o0">stp_linebounds_t</a>, <a class="el" href="structstp__linebufs__t.html#o0">stp_linebufs_t</a>, <a class="el" href="structstp__linecount__t.html#o0">stp_linecount_t</a>, <a class="el" href="structstp__lineactive__t.html#o0">stp_lineactive_t</a>, <a class="el" href="structstp__lineoff__t.html#o0">stp_lineoff_t</a><li>next
-: <a class="el" href="structstp__mxml__node__s.html#o1">stp_mxml_node_s</a><li>num_attrs
-: <a class="el" href="structstp__mxml__value__s.html#o1">stp_mxml_value_s</a><li>numsizes
-: <a class="el" href="structstp__shade.html#o1">stp_shade</a></ul>
+: <a class="el" href="structstp__module.html#32e2db7046f281afd6748afe111aee76">stp_module</a>
+, <a class="el" href="structstp__mxml__value__s.html#959d5315fd98119aa5d23d2b8d307c58">stp_mxml_value_s</a>
+, <a class="el" href="structstp__param__string__t.html#c4ccea0dded827b9acdb2d22aa25857b">stp_param_string_t</a>
+, <a class="el" href="structstp__parameter__t.html#092430e582e7560fb532f546f78ca70c">stp_parameter_t</a>
+, <a class="el" href="structstp__mxml__attr__s.html#4ea32ac1f797cf7722bf3e8638b21dee">stp_mxml_attr_s</a>
+, <a class="el" href="structstp__papersize__t.html#660431e579bf100782f7164b45597982">stp_papersize_t</a>
+<li>ncolors
+: <a class="el" href="structstp__linebufs__t.html#5ad1c52050c8d71da5609d2526854696">stp_linebufs_t</a>
+, <a class="el" href="structstp__linebounds__t.html#dc4641abb41a9204c258a380aa00b7f4">stp_linebounds_t</a>
+, <a class="el" href="structstp__lineactive__t.html#266bdeb14e62fb5b17a31746ad511761">stp_lineactive_t</a>
+, <a class="el" href="structstp__lineoff__t.html#97c5a2281b3cddb9c546e8299ea4e2b0">stp_lineoff_t</a>
+, <a class="el" href="structstp__linecount__t.html#69275ad8687438976d07950fa65a1728">stp_linecount_t</a>
+<li>next
+: <a class="el" href="structstp__mxml__node__s.html#8831071db5a4b4df95ea3c5c2e95476b">stp_mxml_node_s</a>
+<li>num_attrs
+: <a class="el" href="structstp__mxml__value__s.html#f29b9bbc769c278dad18ff2cb098ef6a">stp_mxml_value_s</a>
+<li>numsizes
+: <a class="el" href="structstp__shade.html#8e68774d99e3eecb76f06f7704f1eb90">stp_shade</a>
+</ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>opaque
-: <a class="el" href="unionstp__mxml__value__u.html#o2">stp_mxml_value_u</a></ul>
+: <a class="el" href="unionstp__mxml__value__u.html#ca8f6bf03f29248dee0b8d364454d051">stp_mxml_value_u</a>
+</ul>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>p_class
-: <a class="el" href="structstp__parameter__t.html#o5">stp_parameter_t</a><li>p_level
-: <a class="el" href="structstp__parameter__t.html#o6">stp_parameter_t</a><li>p_type
-: <a class="el" href="structstp__parameter__t.html#o4">stp_parameter_t</a><li>paper_unit
-: <a class="el" href="structstp__papersize__t.html#o9">stp_papersize_t</a><li>parameters
-: <a class="el" href="structstp__printfuncs__t.html#o1">stp_printfuncs_t</a><li>parent
-: <a class="el" href="structstp__mxml__node__s.html#o3">stp_mxml_node_s</a><li>pass
-: <a class="el" href="structstp__pass__t.html#o0">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o1">stp_weave_t</a><li>physpassend
-: <a class="el" href="structstp__pass__t.html#o4">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o6">stp_weave_t</a><li>physpassstart
-: <a class="el" href="structstp__pass__t.html#o3">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o5">stp_weave_t</a><li>prescaled
-: <a class="el" href="structstp__dither__matrix__generic.html#o3">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o3">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o3">stp_dither_matrix_short</a><li>prev
-: <a class="el" href="structstp__mxml__node__s.html#o2">stp_mxml_node_s</a><li>print
-: <a class="el" href="structstp__printfuncs__t.html#o6">stp_printfuncs_t</a><li>printer_list
-: <a class="el" href="structstp__family.html#o1">stp_family</a><li>printfuncs
-: <a class="el" href="structstp__family.html#o0">stp_family</a></ul>
+: <a class="el" href="structstp__parameter__t.html#410388e541bdb14fbd0af2984e229217">stp_parameter_t</a>
+<li>p_level
+: <a class="el" href="structstp__parameter__t.html#2a4a1195c06243e08acb03475fb1e7cc">stp_parameter_t</a>
+<li>p_type
+: <a class="el" href="structstp__parameter__t.html#ebe5dea02843240fe03461abf007f154">stp_parameter_t</a>
+<li>paper_unit
+: <a class="el" href="structstp__papersize__t.html#5692b27332297abca9e4715e3e9e3ce8">stp_papersize_t</a>
+<li>parameters
+: <a class="el" href="structstp__printfuncs__t.html#c4eab991ca917968e0f264b7105faaa4">stp_printfuncs_t</a>
+<li>parent
+: <a class="el" href="structstp__mxml__node__s.html#353df68e26a33380dcacda213a741487">stp_mxml_node_s</a>
+<li>pass
+: <a class="el" href="structstp__pass__t.html#fdb7d267dad9bfc69e8deb86da07ee7b">stp_pass_t</a>
+, <a class="el" href="structstp__weave__t.html#2536ce303e27f679c4afd6c33eea8d07">stp_weave_t</a>
+<li>physpassend
+: <a class="el" href="structstp__weave__t.html#3041aa5f7a90d0d7d82d1b2406044bb3">stp_weave_t</a>
+, <a class="el" href="structstp__pass__t.html#4d75f7e07ebbffb75c2a7f36f43b3c9e">stp_pass_t</a>
+<li>physpassstart
+: <a class="el" href="structstp__pass__t.html#0da3d73932d6c07aceaf4bce93cf6163">stp_pass_t</a>
+, <a class="el" href="structstp__weave__t.html#aec693e98c7587da452ac604b675be3c">stp_weave_t</a>
+<li>prescaled
+: <a class="el" href="structstp__dither__matrix__normal.html#042561ad856d67506fe81b1bbbffd966">stp_dither_matrix_normal</a>
+, <a class="el" href="structstp__dither__matrix__short.html#755361acae80fa4cba01a1cc71638274">stp_dither_matrix_short</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#478d54ddf9ba50e783ddec1532a0eff6">stp_dither_matrix_generic</a>
+<li>prev
+: <a class="el" href="structstp__mxml__node__s.html#2174125dc205e7c760e4e8c9c9048ddf">stp_mxml_node_s</a>
+<li>print
+: <a class="el" href="structstp__printfuncs__t.html#7704d7a1e997039deedfdf76a353c35d">stp_printfuncs_t</a>
+<li>printer_list
+: <a class="el" href="structstp__family.html#6e4f0c216f5ced14a819fbacdb26547d">stp_family</a>
+<li>printfuncs
+: <a class="el" href="structstp__family.html#d29f00ba3565e93c138b00e4a48cde77">stp_family</a>
+</ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
 <li>read_only
-: <a class="el" href="structstp__parameter__t.html#o11">stp_parameter_t</a><li>real
-: <a class="el" href="unionstp__mxml__value__u.html#o3">stp_mxml_value_u</a><li>rep
-: <a class="el" href="structstp__image.html#o7">stp_image</a><li>reset
-: <a class="el" href="structstp__image.html#o1">stp_image</a><li>right
-: <a class="el" href="structstp__papersize__t.html#o8">stp_papersize_t</a><li>row
-: <a class="el" href="structstp__weave__t.html#o0">stp_weave_t</a></ul>
+: <a class="el" href="structstp__parameter__t.html#4421135f9985be49d156cbc9aa74c710">stp_parameter_t</a>
+<li>real
+: <a class="el" href="unionstp__mxml__value__u.html#3f253397958ad919a1fc97c42a58bc67">stp_mxml_value_u</a>
+<li>rep
+: <a class="el" href="structstp__image.html#b18e6ee35037589bf485213022e2d871">stp_image</a>
+<li>reset
+: <a class="el" href="structstp__image.html#7bb2244368c6b1e07d27afb3dd249ffd">stp_image</a>
+<li>right
+: <a class="el" href="structstp__papersize__t.html#6899599f2f940e95e03545ff71e2b4c5">stp_papersize_t</a>
+<li>row
+: <a class="el" href="structstp__weave__t.html#708ad2c7d2f76b864fe92b9e0582eece">stp_weave_t</a>
+</ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>s_cache
-: <a class="el" href="structstp__cached__curve__t.html#o2">stp_cached_curve_t</a><li>short_name
-: <a class="el" href="structstp__color.html#o0">stp_color</a><li>start_job
-: <a class="el" href="structstp__printfuncs__t.html#o10">stp_printfuncs_t</a><li>start_pos
-: <a class="el" href="structstp__linebounds__t.html#o1">stp_linebounds_t</a><li>str
-: <a class="el" href="structstp__parameter__t.html#o24">stp_parameter_t</a><li>string
-: <a class="el" href="structstp__mxml__text__s.html#o1">stp_mxml_text_s</a><li>subpass
-: <a class="el" href="structstp__pass__t.html#o5">stp_pass_t</a><li>syms
-: <a class="el" href="structstp__module.html#o7">stp_module</a></ul>
+: <a class="el" href="structstp__cached__curve__t.html#c55d549f6d2f567ba84ecb9e0417f074">stp_cached_curve_t</a>
+<li>short_name
+: <a class="el" href="structstp__color.html#23ed4d11629625e2ad24b124c36c7fab">stp_color</a>
+<li>start_job
+: <a class="el" href="structstp__printfuncs__t.html#5c99986ad02cbcc4dce313bc7f5293fc">stp_printfuncs_t</a>
+<li>start_pos
+: <a class="el" href="structstp__linebounds__t.html#b46a1a4ec130dd043009fb96b0115467">stp_linebounds_t</a>
+<li>str
+: <a class="el" href="structstp__parameter__t.html#e4409d001a6f1b7f8bbf237016900e48">stp_parameter_t</a>
+<li>string
+: <a class="el" href="structstp__mxml__text__s.html#ef1865e8cab7d5ab175c6e67f122be15">stp_mxml_text_s</a>
+<li>subpass
+: <a class="el" href="structstp__pass__t.html#a4a3363d8de9121ba3d8bf28076b1c89">stp_pass_t</a>
+<li>syms
+: <a class="el" href="structstp__module.html#0e7297a93920d8f6849718d0a32fa2ba">stp_module</a>
+</ul>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>text
-: <a class="el" href="structstp__parameter__t.html#o1">stp_parameter_t</a>, <a class="el" href="structstp__param__string__t.html#o1">stp_param_string_t</a>, <a class="el" href="structstp__papersize__t.html#o1">stp_papersize_t</a>, <a class="el" href="unionstp__mxml__value__u.html#o4">stp_mxml_value_u</a><li>top
-: <a class="el" href="structstp__papersize__t.html#o5">stp_papersize_t</a><li>total_size
-: <a class="el" href="structdither__matrix__impl.html#o4">dither_matrix_impl</a><li>type
-: <a class="el" href="structstp__mxml__node__s.html#o0">stp_mxml_node_s</a></ul>
+: <a class="el" href="unionstp__mxml__value__u.html#82c76c9aca350baca3b72723d0a4e99d">stp_mxml_value_u</a>
+, <a class="el" href="structstp__parameter__t.html#396e4980926c200e9ce4454f19e7311a">stp_parameter_t</a>
+, <a class="el" href="structstp__papersize__t.html#26e8b5d0ce282614f128dd9d4aeaf9f6">stp_papersize_t</a>
+, <a class="el" href="structstp__param__string__t.html#db032e80e118c233adb9f27544920bd1">stp_param_string_t</a>
+<li>top
+: <a class="el" href="structstp__papersize__t.html#7fc8acdb1d905d6ca4a0b9b247a6c48e">stp_papersize_t</a>
+<li>total_size
+: <a class="el" href="structdither__matrix__impl.html#54645c1c4edad222cf3f5aba03cdfae5">dither_matrix_impl</a>
+<li>type
+: <a class="el" href="structstp__mxml__node__s.html#e1bff9adee67699067516eee014a7510">stp_mxml_node_s</a>
+</ul>
 <h3><a class="anchor" name="index_u">- u -</a></h3><ul>
 <li>upper
-: <a class="el" href="structstp__int__bound__t.html#o1">stp_int_bound_t</a>, <a class="el" href="structstp__double__bound__t.html#o1">stp_double_bound_t</a></ul>
+: <a class="el" href="structstp__double__bound__t.html#07d734f8f82f059460cee55927b0216c">stp_double_bound_t</a>
+, <a class="el" href="structstp__int__bound__t.html#a71bcebaae24712ee7a66955b345de19">stp_int_bound_t</a>
+</ul>
 <h3><a class="anchor" name="index_v">- v -</a></h3><ul>
 <li>v
-: <a class="el" href="structstp__linebufs__t.html#o1">stp_linebufs_t</a>, <a class="el" href="structstp__linecount__t.html#o1">stp_linecount_t</a>, <a class="el" href="structstp__lineactive__t.html#o1">stp_lineactive_t</a>, <a class="el" href="structstp__lineoff__t.html#o1">stp_lineoff_t</a><li>value
-: <a class="el" href="structstp__mxml__node__s.html#o6">stp_mxml_node_s</a>, <a class="el" href="structstp__mxml__attr__s.html#o1">stp_mxml_attr_s</a>, <a class="el" href="structstp__shade.html#o0">stp_shade</a>, <a class="el" href="structstp__dotsize.html#o1">stp_dotsize</a><li>verify
-: <a class="el" href="structstp__printfuncs__t.html#o9">stp_printfuncs_t</a><li>verify_this_parameter
-: <a class="el" href="structstp__parameter__t.html#o10">stp_parameter_t</a><li>version
-: <a class="el" href="structstp__module.html#o1">stp_module</a></ul>
+: <a class="el" href="structstp__lineoff__t.html#88bbe86454fbda432487952640948328">stp_lineoff_t</a>
+, <a class="el" href="structstp__linebufs__t.html#485ecae7a892476331d31079d33b9891">stp_linebufs_t</a>
+, <a class="el" href="structstp__lineactive__t.html#5bb5843aa2a4817ef84fb83714b200f3">stp_lineactive_t</a>
+, <a class="el" href="structstp__linecount__t.html#2164f4045d892c45105f5780c80489a4">stp_linecount_t</a>
+<li>value
+: <a class="el" href="structstp__mxml__attr__s.html#25554324bd8ccf8e9558e4705eda0daa">stp_mxml_attr_s</a>
+, <a class="el" href="structstp__shade.html#07a72426c7bcbf22f1cc253a97a453d4">stp_shade</a>
+, <a class="el" href="structstp__dotsize.html#d259e8d169a7d140e4964b80790c7ddd">stp_dotsize</a>
+, <a class="el" href="structstp__mxml__node__s.html#ad44d6b2fe0842de0bbf1312035372cd">stp_mxml_node_s</a>
+<li>verify
+: <a class="el" href="structstp__printfuncs__t.html#948b6d7219dbb30f47a93eef2f85fde2">stp_printfuncs_t</a>
+<li>verify_this_parameter
+: <a class="el" href="structstp__parameter__t.html#56100203c262c60d4cb18c7a49cde27d">stp_parameter_t</a>
+<li>version
+: <a class="el" href="structstp__module.html#e2038239913d3ddbece919082501c8d0">stp_module</a>
+</ul>
 <h3><a class="anchor" name="index_w">- w -</a></h3><ul>
 <li>whitespace
-: <a class="el" href="structstp__mxml__text__s.html#o0">stp_mxml_text_s</a><li>width
-: <a class="el" href="structstp__papersize__t.html#o3">stp_papersize_t</a>, <a class="el" href="structstp__image.html#o2">stp_image</a></ul>
+: <a class="el" href="structstp__mxml__text__s.html#76bcfbb8c3de4e1c597468d51ef47184">stp_mxml_text_s</a>
+<li>width
+: <a class="el" href="structstp__papersize__t.html#edcca3776ddeb5ed815df3aa112147dd">stp_papersize_t</a>
+, <a class="el" href="structstp__image.html#890033525988e15f4f4a0b4132e5f19b">stp_image</a>
+</ul>
 <h3><a class="anchor" name="index_x">- x -</a></h3><ul>
 <li>x
-: <a class="el" href="structstp__dither__matrix__generic.html#o0">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o0">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o0">stp_dither_matrix_short</a>, <a class="el" href="structstp__curve__point__t.html#o0">stp_curve_point_t</a><li>x_offset
-: <a class="el" href="structdither__matrix__impl.html#o11">dither_matrix_impl</a><li>x_size
-: <a class="el" href="structdither__matrix__impl.html#o2">dither_matrix_impl</a></ul>
+: <a class="el" href="structstp__curve__point__t.html#92b13b94109b1270563a1116dc19b926">stp_curve_point_t</a>
+, <a class="el" href="structstp__dither__matrix__short.html#81e0b20e763080b79faa837a00cac832">stp_dither_matrix_short</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#6b8bd1cc589c2195f055e5a57a05e03a">stp_dither_matrix_generic</a>
+, <a class="el" href="structstp__dither__matrix__normal.html#b9564690be42859d88ea264a29321af3">stp_dither_matrix_normal</a>
+<li>x_offset
+: <a class="el" href="structdither__matrix__impl.html#665c02056a2d046a15aab462492d9dbc">dither_matrix_impl</a>
+<li>x_size
+: <a class="el" href="structdither__matrix__impl.html#063e3b3617c3a9b4883f3b01cd7dfb48">dither_matrix_impl</a>
+</ul>
 <h3><a class="anchor" name="index_y">- y -</a></h3><ul>
 <li>y
-: <a class="el" href="structstp__dither__matrix__generic.html#o1">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o1">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o1">stp_dither_matrix_short</a>, <a class="el" href="structstp__curve__point__t.html#o1">stp_curve_point_t</a><li>y_offset
-: <a class="el" href="structdither__matrix__impl.html#o12">dither_matrix_impl</a><li>y_size
-: <a class="el" href="structdither__matrix__impl.html#o3">dither_matrix_impl</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="structstp__curve__point__t.html#132b1e8be20525667ece971d02f60b9d">stp_curve_point_t</a>
+, <a class="el" href="structstp__dither__matrix__short.html#2bbc6c72006541250ba23b48bcab60e8">stp_dither_matrix_short</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#aaddcac2ca33a3e822ded567bbbecfb9">stp_dither_matrix_generic</a>
+, <a class="el" href="structstp__dither__matrix__normal.html#410560f5186761cb7430f5b0a804b09c">stp_dither_matrix_normal</a>
+<li>y_offset
+: <a class="el" href="structdither__matrix__impl.html#844cb19ea61f035bc2a21536f6f392c4">dither_matrix_impl</a>
+<li>y_size
+: <a class="el" href="structdither__matrix__impl.html#33370af30d4c6cb0e441744c8d1c3686">dither_matrix_impl</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/functions_vars.html b/doc/gutenprint/html/functions_vars.html
index 6560480..fa8cb5f 100644
--- a/doc/gutenprint/html/functions_vars.html
+++ b/doc/gutenprint/html/functions_vars.html
@@ -1,178 +1,387 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields - Variables</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindexHL" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindex" href="functions.html">All</a> | <a class="qindexHL" href="functions_vars.html">Variables</a></div>
-<div class="qindex"><a class="qindex" href="#index_a">a</a> | <a class="qindex" href="#index_b">b</a> | <a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_d">d</a> | <a class="qindex" href="#index_e">e</a> | <a class="qindex" href="#index_f">f</a> | <a class="qindex" href="#index_g">g</a> | <a class="qindex" href="#index_h">h</a> | <a class="qindex" href="#index_i">i</a> | <a class="qindex" href="#index_j">j</a> | <a class="qindex" href="#index_l">l</a> | <a class="qindex" href="#index_m">m</a> | <a class="qindex" href="#index_n">n</a> | <a class="qindex" href="#index_o">o</a> | <a class="qindex" href="#index_p">p</a> | <a class="qindex" href="#index_r">r</a> | <a class="qindex" href="#index_s">s</a> | <a class="qindex" href="#index_t">t</a> | <a class="qindex" href="#index_u">u</a> | <a class="qindex" href="#index_v">v</a> | <a class="qindex" href="#index_w">w</a> | <a class="qindex" href="#index_x">x</a> | <a class="qindex" href="#index_y">y</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="functions.html"><span>All</span></a></li>
+    <li class="current"><a href="functions_vars.html"><span>Variables</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index_a"><span>a</span></a></li>
+    <li><a href="#index_b"><span>b</span></a></li>
+    <li><a href="#index_c"><span>c</span></a></li>
+    <li><a href="#index_d"><span>d</span></a></li>
+    <li><a href="#index_e"><span>e</span></a></li>
+    <li><a href="#index_f"><span>f</span></a></li>
+    <li><a href="#index_g"><span>g</span></a></li>
+    <li><a href="#index_h"><span>h</span></a></li>
+    <li><a href="#index_i"><span>i</span></a></li>
+    <li><a href="#index_j"><span>j</span></a></li>
+    <li><a href="#index_l"><span>l</span></a></li>
+    <li><a href="#index_m"><span>m</span></a></li>
+    <li><a href="#index_n"><span>n</span></a></li>
+    <li><a href="#index_o"><span>o</span></a></li>
+    <li><a href="#index_p"><span>p</span></a></li>
+    <li><a href="#index_r"><span>r</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+    <li><a href="#index_t"><span>t</span></a></li>
+    <li><a href="#index_u"><span>u</span></a></li>
+    <li><a href="#index_v"><span>v</span></a></li>
+    <li><a href="#index_w"><span>w</span></a></li>
+    <li><a href="#index_x"><span>x</span></a></li>
+    <li><a href="#index_y"><span>y</span></a></li>
+  </ul>
+</div>
 
 <p>
-
+&nbsp;
 <p>
 <h3><a class="anchor" name="index_a">- a -</a></h3><ul>
 <li>array
-: <a class="el" href="structstp__parameter__t.html#o25">stp_parameter_t</a><li>attrs
-: <a class="el" href="structstp__mxml__value__s.html#o2">stp_mxml_value_s</a></ul>
+: <a class="el" href="structstp__parameter__t.html#28aef58241d3a500968ca65df099ee3a">stp_parameter_t</a>
+<li>attrs
+: <a class="el" href="structstp__mxml__value__s.html#69974b612f59fd3ef1d5db85db2d1a07">stp_mxml_value_s</a>
+</ul>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>base
-: <a class="el" href="structdither__matrix__impl.html#o0">dither_matrix_impl</a><li>bit_pattern
-: <a class="el" href="structstp__dotsize.html#o0">stp_dotsize</a><li>boolean
-: <a class="el" href="structstp__parameter__t.html#o23">stp_parameter_t</a><li>bottom
-: <a class="el" href="structstp__papersize__t.html#o7">stp_papersize_t</a><li>bounds
-: <a class="el" href="structstp__parameter__t.html#o18">stp_parameter_t</a><li>bytes
-: <a class="el" href="structstp__raw__t.html#o0">stp_raw_t</a>, <a class="el" href="structstp__dither__matrix__generic.html#o2">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o2">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o2">stp_dither_matrix_short</a></ul>
+: <a class="el" href="structdither__matrix__impl.html#331debb887e076f8b52952ba6cc2b50b">dither_matrix_impl</a>
+<li>bit_pattern
+: <a class="el" href="structstp__dotsize.html#8d5273395d0e27004f779de0ea81ff23">stp_dotsize</a>
+<li>boolean
+: <a class="el" href="structstp__parameter__t.html#74aaa2515728660657133ca3191e422c">stp_parameter_t</a>
+<li>bottom
+: <a class="el" href="structstp__papersize__t.html#9c7fcf4d0bac23817b6f56996fed4043">stp_papersize_t</a>
+<li>bounds
+: <a class="el" href="structstp__parameter__t.html#bb297424036e868212f5086d5c5235fe">stp_parameter_t</a>
+<li>bytes
+: <a class="el" href="structstp__dither__matrix__short.html#d4d85727401505eab74e3e667f4a38f4">stp_dither_matrix_short</a>
+, <a class="el" href="structstp__dither__matrix__normal.html#d72d088edfe3223c2df8fd4fb6178b98">stp_dither_matrix_normal</a>
+, <a class="el" href="structstp__raw__t.html#5e4620104d47e7e593d75d1ebc977407">stp_raw_t</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#b963ddf7c0826bd3cc316c2375f1205b">stp_dither_matrix_generic</a>
+</ul>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>category
-: <a class="el" href="structstp__parameter__t.html#o2">stp_parameter_t</a><li>channel
-: <a class="el" href="structstp__parameter__t.html#o9">stp_parameter_t</a><li>child
-: <a class="el" href="structstp__mxml__node__s.html#o4">stp_mxml_node_s</a><li>class
-: <a class="el" href="structstp__module.html#o3">stp_module</a><li>colorfuncs
-: <a class="el" href="structstp__color.html#o2">stp_color</a><li>comment
-: <a class="el" href="structstp__papersize__t.html#o2">stp_papersize_t</a>, <a class="el" href="structstp__module.html#o2">stp_module</a><li>conclude
-: <a class="el" href="structstp__image.html#o6">stp_image</a><li>count
-: <a class="el" href="structstp__cached__curve__t.html#o3">stp_cached_curve_t</a><li>curve
-: <a class="el" href="structstp__parameter__t.html#o19">stp_parameter_t</a>, <a class="el" href="structstp__cached__curve__t.html#o0">stp_cached_curve_t</a></ul>
+: <a class="el" href="structstp__parameter__t.html#2cb67e4324a017746ca9bfda772aa50f">stp_parameter_t</a>
+<li>channel
+: <a class="el" href="structstp__parameter__t.html#79bc0b76d5d5e238ddd205aa4a97ebad">stp_parameter_t</a>
+<li>child
+: <a class="el" href="structstp__mxml__node__s.html#44550ea8d68a483ccc130c58b66ddd33">stp_mxml_node_s</a>
+<li>class
+: <a class="el" href="structstp__module.html#4ebc727be1ec8edaaa1b25415a3932e3">stp_module</a>
+<li>colorfuncs
+: <a class="el" href="structstp__color.html#4442d36d0bcf746130f82ffe6f90147f">stp_color</a>
+<li>comment
+: <a class="el" href="structstp__module.html#b60ac536d9ec7b3a306cddf4c06e18bb">stp_module</a>
+, <a class="el" href="structstp__papersize__t.html#5cdc973122b8cc2e612d2dee306cbf1d">stp_papersize_t</a>
+<li>conclude
+: <a class="el" href="structstp__image.html#5d2385711b303e055258c28f42ab7f4c">stp_image</a>
+<li>count
+: <a class="el" href="structstp__cached__curve__t.html#99b772c3f4db71d58a4ee2315e712f04">stp_cached_curve_t</a>
+<li>curve
+: <a class="el" href="structstp__cached__curve__t.html#e9b4170bfafe7d85b36689cbd8eea41e">stp_cached_curve_t</a>
+, <a class="el" href="structstp__parameter__t.html#d64f0c31d200d3d413725621b3ef9133">stp_parameter_t</a>
+</ul>
 <h3><a class="anchor" name="index_d">- d -</a></h3><ul>
 <li>d_cache
-: <a class="el" href="structstp__cached__curve__t.html#o1">stp_cached_curve_t</a><li>data
-: <a class="el" href="structstp__raw__t.html#o1">stp_raw_t</a>, <a class="el" href="structstp__dither__matrix__generic.html#o4">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o4">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o4">stp_dither_matrix_short</a><li>dbl
-: <a class="el" href="structstp__parameter__t.html#o20">stp_parameter_t</a><li>deflt
-: <a class="el" href="structstp__parameter__t.html#o26">stp_parameter_t</a><li>describe_output
-: <a class="el" href="structstp__printfuncs__t.html#o8">stp_printfuncs_t</a><li>describe_parameter
-: <a class="el" href="structstp__colorfuncs__t.html#o3">stp_colorfuncs_t</a><li>describe_resolution
-: <a class="el" href="structstp__printfuncs__t.html#o7">stp_printfuncs_t</a><li>dimension
-: <a class="el" href="structstp__parameter__t.html#o21">stp_parameter_t</a><li>dot_sizes
-: <a class="el" href="structstp__shade.html#o2">stp_shade</a></ul>
+: <a class="el" href="structstp__cached__curve__t.html#59c26647178724471f383dea6e85f8ae">stp_cached_curve_t</a>
+<li>data
+: <a class="el" href="structstp__dither__matrix__normal.html#e67cb37136c5e9d9c4b1a44cd2dab87b">stp_dither_matrix_normal</a>
+, <a class="el" href="structstp__raw__t.html#36151f67569592aeac5c549a2a0daa2a">stp_raw_t</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#52acbda296a57a6087852eab62bc62db">stp_dither_matrix_generic</a>
+, <a class="el" href="structstp__dither__matrix__short.html#f4f6b5634ea79cf694782e35a8d7607d">stp_dither_matrix_short</a>
+<li>dbl
+: <a class="el" href="structstp__parameter__t.html#12fc8869d3056687e576af63c6fbd675">stp_parameter_t</a>
+<li>deflt
+: <a class="el" href="structstp__parameter__t.html#79042d88fa0ab284a8e3e4ad7b969f90">stp_parameter_t</a>
+<li>describe_output
+: <a class="el" href="structstp__printfuncs__t.html#444ec86f3fe02ac479cbf2fc152d3423">stp_printfuncs_t</a>
+<li>describe_parameter
+: <a class="el" href="structstp__colorfuncs__t.html#bf691142b608f4f02f33283dd3e67bae">stp_colorfuncs_t</a>
+<li>describe_resolution
+: <a class="el" href="structstp__printfuncs__t.html#18e0da9638360173e0d75d839ce72b92">stp_printfuncs_t</a>
+<li>dimension
+: <a class="el" href="structstp__parameter__t.html#29505a2b48cd755e10cedf01f3683d61">stp_parameter_t</a>
+<li>dot_sizes
+: <a class="el" href="structstp__shade.html#5057a856d4a6f7095af66b8cefc3cdc3">stp_shade</a>
+</ul>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>element
-: <a class="el" href="unionstp__mxml__value__u.html#o0">stp_mxml_value_u</a><li>end_job
-: <a class="el" href="structstp__printfuncs__t.html#o11">stp_printfuncs_t</a><li>end_pos
-: <a class="el" href="structstp__linebounds__t.html#o2">stp_linebounds_t</a><li>exp
-: <a class="el" href="structdither__matrix__impl.html#o1">dither_matrix_impl</a></ul>
+: <a class="el" href="unionstp__mxml__value__u.html#d4d8442bb433ac3da208e22ff0eaccf7">stp_mxml_value_u</a>
+<li>end_job
+: <a class="el" href="structstp__printfuncs__t.html#81fa6b507a316a8d6d7404b29920936e">stp_printfuncs_t</a>
+<li>end_pos
+: <a class="el" href="structstp__linebounds__t.html#9bc2a60779ccf4ac3d90d47441e883ab">stp_linebounds_t</a>
+<li>exp
+: <a class="el" href="structdither__matrix__impl.html#db0e7fb4b5e5149f0815af448676df8b">dither_matrix_impl</a>
+</ul>
 <h3><a class="anchor" name="index_f">- f -</a></h3><ul>
 <li>fast_mask
-: <a class="el" href="structdither__matrix__impl.html#o13">dither_matrix_impl</a><li>fini
-: <a class="el" href="structstp__module.html#o6">stp_module</a></ul>
+: <a class="el" href="structdither__matrix__impl.html#8c7141e2e35f6cc14896d23d15a81914">dither_matrix_impl</a>
+<li>fini
+: <a class="el" href="structstp__module.html#e04ff0565f8ebd56b383917b602ffc4a">stp_module</a>
+</ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>get_appname
-: <a class="el" href="structstp__image.html#o5">stp_image</a><li>get_row
-: <a class="el" href="structstp__image.html#o4">stp_image</a>, <a class="el" href="structstp__colorfuncs__t.html#o1">stp_colorfuncs_t</a></ul>
+: <a class="el" href="structstp__image.html#56636ad7c0dbf0a82284241f796d95cd">stp_image</a>
+<li>get_row
+: <a class="el" href="structstp__colorfuncs__t.html#f00aab442da969ffa5c6c1e592bad7cd">stp_colorfuncs_t</a>
+, <a class="el" href="structstp__image.html#8f7f8fb5826f52b8bd820f422c583350">stp_image</a>
+</ul>
 <h3><a class="anchor" name="index_h">- h -</a></h3><ul>
 <li>handle
-: <a class="el" href="structstp__module.html#o4">stp_module</a><li>height
-: <a class="el" href="structstp__papersize__t.html#o4">stp_papersize_t</a>, <a class="el" href="structstp__image.html#o3">stp_image</a><li>help
-: <a class="el" href="structstp__parameter__t.html#o3">stp_parameter_t</a></ul>
+: <a class="el" href="structstp__module.html#1a96aa2db220972e124717cc6dd03c8e">stp_module</a>
+<li>height
+: <a class="el" href="structstp__image.html#4977ad211581999a3f3290983929cce9">stp_image</a>
+, <a class="el" href="structstp__papersize__t.html#040d59e39abdef9b12c929734fb7a08c">stp_papersize_t</a>
+<li>help
+: <a class="el" href="structstp__parameter__t.html#9f0637d6b97f0daa3122840eb2bd13db">stp_parameter_t</a>
+</ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
 <li>i_own
-: <a class="el" href="structdither__matrix__impl.html#o10">dither_matrix_impl</a><li>imageable_area
-: <a class="el" href="structstp__printfuncs__t.html#o3">stp_printfuncs_t</a><li>index
-: <a class="el" href="structdither__matrix__impl.html#o9">dither_matrix_impl</a><li>init
-: <a class="el" href="structstp__module.html#o5">stp_module</a>, <a class="el" href="structstp__image.html#o0">stp_image</a>, <a class="el" href="structstp__colorfuncs__t.html#o0">stp_colorfuncs_t</a><li>integer
-: <a class="el" href="structstp__parameter__t.html#o22">stp_parameter_t</a>, <a class="el" href="unionstp__mxml__value__u.html#o1">stp_mxml_value_u</a><li>is_active
-: <a class="el" href="structstp__parameter__t.html#o8">stp_parameter_t</a><li>is_mandatory
-: <a class="el" href="structstp__parameter__t.html#o7">stp_parameter_t</a></ul>
+: <a class="el" href="structdither__matrix__impl.html#78152fe120c430f6400b731e5c722bd3">dither_matrix_impl</a>
+<li>imageable_area
+: <a class="el" href="structstp__printfuncs__t.html#68c9339cc1b74382ec07eed78c2bd501">stp_printfuncs_t</a>
+<li>index
+: <a class="el" href="structdither__matrix__impl.html#b744f40c883acc93ad0afbf5f048f27a">dither_matrix_impl</a>
+<li>init
+: <a class="el" href="structstp__colorfuncs__t.html#a10cf47dc6db374ef209d0d96592b1fe">stp_colorfuncs_t</a>
+, <a class="el" href="structstp__image.html#ce69bf25344a814cabea38afa4527086">stp_image</a>
+, <a class="el" href="structstp__module.html#fa7d4259940b8d42a36f14108f504944">stp_module</a>
+<li>integer
+: <a class="el" href="unionstp__mxml__value__u.html#9540870864c06f2bf901024b7cc9048d">stp_mxml_value_u</a>
+, <a class="el" href="structstp__parameter__t.html#3563548500d3ec917d8e1cf88c34f8cd">stp_parameter_t</a>
+<li>is_active
+: <a class="el" href="structstp__parameter__t.html#8b1af01f0874c79b6dbc4d0eca432952">stp_parameter_t</a>
+<li>is_mandatory
+: <a class="el" href="structstp__parameter__t.html#ce4d02e3665f9cdfe83ed7dd559e1c1a">stp_parameter_t</a>
+</ul>
 <h3><a class="anchor" name="index_j">- j -</a></h3><ul>
 <li>jet
-: <a class="el" href="structstp__weave__t.html#o2">stp_weave_t</a></ul>
+: <a class="el" href="structstp__weave__t.html#31163b246a77f7959161edb6dd9ff61e">stp_weave_t</a>
+</ul>
 <h3><a class="anchor" name="index_l">- l -</a></h3><ul>
 <li>last_child
-: <a class="el" href="structstp__mxml__node__s.html#o5">stp_mxml_node_s</a><li>last_x
-: <a class="el" href="structdither__matrix__impl.html#o5">dither_matrix_impl</a><li>last_x_mod
-: <a class="el" href="structdither__matrix__impl.html#o6">dither_matrix_impl</a><li>last_y
-: <a class="el" href="structdither__matrix__impl.html#o7">dither_matrix_impl</a><li>last_y_mod
-: <a class="el" href="structdither__matrix__impl.html#o8">dither_matrix_impl</a><li>left
-: <a class="el" href="structstp__papersize__t.html#o6">stp_papersize_t</a><li>limit
-: <a class="el" href="structstp__printfuncs__t.html#o5">stp_printfuncs_t</a><li>list_parameters
-: <a class="el" href="structstp__printfuncs__t.html#o0">stp_printfuncs_t</a>, <a class="el" href="structstp__colorfuncs__t.html#o2">stp_colorfuncs_t</a><li>logicalpassstart
-: <a class="el" href="structstp__pass__t.html#o2">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o4">stp_weave_t</a><li>long_name
-: <a class="el" href="structstp__color.html#o1">stp_color</a><li>lower
-: <a class="el" href="structstp__int__bound__t.html#o0">stp_int_bound_t</a>, <a class="el" href="structstp__double__bound__t.html#o0">stp_double_bound_t</a></ul>
+: <a class="el" href="structstp__mxml__node__s.html#5fb356e73f91b24211882f42cbbe7a08">stp_mxml_node_s</a>
+<li>last_x
+: <a class="el" href="structdither__matrix__impl.html#f0728348e6da1cf904204ef88e0a5853">dither_matrix_impl</a>
+<li>last_x_mod
+: <a class="el" href="structdither__matrix__impl.html#16f516218f0c5a31a1eac49e5c57add5">dither_matrix_impl</a>
+<li>last_y
+: <a class="el" href="structdither__matrix__impl.html#c1a83c82c364098dce631ec7174574be">dither_matrix_impl</a>
+<li>last_y_mod
+: <a class="el" href="structdither__matrix__impl.html#d03881dd78211b5bcb1a62453c060d2e">dither_matrix_impl</a>
+<li>left
+: <a class="el" href="structstp__papersize__t.html#9ceb7ef01ea56c990eddbef4140b34a0">stp_papersize_t</a>
+<li>limit
+: <a class="el" href="structstp__printfuncs__t.html#36e471ee24b92cfd67390a025cbc427e">stp_printfuncs_t</a>
+<li>list_parameters
+: <a class="el" href="structstp__printfuncs__t.html#19dc0ba4351a154cf9450ac4fce1ca1a">stp_printfuncs_t</a>
+, <a class="el" href="structstp__colorfuncs__t.html#14c6ae1a87ba1ba33f88fa71038f9ec9">stp_colorfuncs_t</a>
+<li>logicalpassstart
+: <a class="el" href="structstp__weave__t.html#1e50ffa910d33a365572ceb93f0197c6">stp_weave_t</a>
+, <a class="el" href="structstp__pass__t.html#e93d9d32f282f62426160626ff6c5ca3">stp_pass_t</a>
+<li>long_name
+: <a class="el" href="structstp__color.html#b7c0a627b31ebfb97fd1db2677032479">stp_color</a>
+<li>lower
+: <a class="el" href="structstp__int__bound__t.html#c5ae98fad865ad6d4816016e233f5a53">stp_int_bound_t</a>
+, <a class="el" href="structstp__double__bound__t.html#a00903ee6e04e01b6b2bb7033e3c76ce">stp_double_bound_t</a>
+</ul>
 <h3><a class="anchor" name="index_m">- m -</a></h3><ul>
 <li>major
-: <a class="el" href="structstp__module__version.html#o0">stp_module_version</a><li>matrix
-: <a class="el" href="structdither__matrix__impl.html#o14">dither_matrix_impl</a><li>maximum_imageable_area
-: <a class="el" href="structstp__printfuncs__t.html#o4">stp_printfuncs_t</a><li>media_size
-: <a class="el" href="structstp__printfuncs__t.html#o2">stp_printfuncs_t</a><li>minor
-: <a class="el" href="structstp__module__version.html#o1">stp_module_version</a><li>missingstartrows
-: <a class="el" href="structstp__pass__t.html#o1">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o3">stp_weave_t</a></ul>
+: <a class="el" href="structstp__module__version.html#15add43e03d0e1624f40c083fa958692">stp_module_version</a>
+<li>matrix
+: <a class="el" href="structdither__matrix__impl.html#e28102f9e3d3cfb8eb48d9e69e807f96">dither_matrix_impl</a>
+<li>maximum_imageable_area
+: <a class="el" href="structstp__printfuncs__t.html#3661a4612e62e8e5aef31eaab345675c">stp_printfuncs_t</a>
+<li>media_size
+: <a class="el" href="structstp__printfuncs__t.html#102e995ff1ce583f84e38409852bf95f">stp_printfuncs_t</a>
+<li>minor
+: <a class="el" href="structstp__module__version.html#eced49a93c5e461fa95f809ad077fced">stp_module_version</a>
+<li>missingstartrows
+: <a class="el" href="structstp__weave__t.html#f60b909adb3f9efb541be500c08cf87e">stp_weave_t</a>
+, <a class="el" href="structstp__pass__t.html#462d1714bab638212fcae32b869c11d2">stp_pass_t</a>
+</ul>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>name
-: <a class="el" href="structstp__parameter__t.html#o0">stp_parameter_t</a>, <a class="el" href="structstp__param__string__t.html#o0">stp_param_string_t</a>, <a class="el" href="structstp__papersize__t.html#o0">stp_papersize_t</a>, <a class="el" href="structstp__mxml__value__s.html#o0">stp_mxml_value_s</a>, <a class="el" href="structstp__mxml__attr__s.html#o0">stp_mxml_attr_s</a>, <a class="el" href="structstp__module.html#o0">stp_module</a><li>ncolors
-: <a class="el" href="structstp__linebounds__t.html#o0">stp_linebounds_t</a>, <a class="el" href="structstp__linebufs__t.html#o0">stp_linebufs_t</a>, <a class="el" href="structstp__linecount__t.html#o0">stp_linecount_t</a>, <a class="el" href="structstp__lineactive__t.html#o0">stp_lineactive_t</a>, <a class="el" href="structstp__lineoff__t.html#o0">stp_lineoff_t</a><li>next
-: <a class="el" href="structstp__mxml__node__s.html#o1">stp_mxml_node_s</a><li>num_attrs
-: <a class="el" href="structstp__mxml__value__s.html#o1">stp_mxml_value_s</a><li>numsizes
-: <a class="el" href="structstp__shade.html#o1">stp_shade</a></ul>
+: <a class="el" href="structstp__module.html#32e2db7046f281afd6748afe111aee76">stp_module</a>
+, <a class="el" href="structstp__mxml__value__s.html#959d5315fd98119aa5d23d2b8d307c58">stp_mxml_value_s</a>
+, <a class="el" href="structstp__param__string__t.html#c4ccea0dded827b9acdb2d22aa25857b">stp_param_string_t</a>
+, <a class="el" href="structstp__parameter__t.html#092430e582e7560fb532f546f78ca70c">stp_parameter_t</a>
+, <a class="el" href="structstp__mxml__attr__s.html#4ea32ac1f797cf7722bf3e8638b21dee">stp_mxml_attr_s</a>
+, <a class="el" href="structstp__papersize__t.html#660431e579bf100782f7164b45597982">stp_papersize_t</a>
+<li>ncolors
+: <a class="el" href="structstp__linebufs__t.html#5ad1c52050c8d71da5609d2526854696">stp_linebufs_t</a>
+, <a class="el" href="structstp__linebounds__t.html#dc4641abb41a9204c258a380aa00b7f4">stp_linebounds_t</a>
+, <a class="el" href="structstp__lineactive__t.html#266bdeb14e62fb5b17a31746ad511761">stp_lineactive_t</a>
+, <a class="el" href="structstp__lineoff__t.html#97c5a2281b3cddb9c546e8299ea4e2b0">stp_lineoff_t</a>
+, <a class="el" href="structstp__linecount__t.html#69275ad8687438976d07950fa65a1728">stp_linecount_t</a>
+<li>next
+: <a class="el" href="structstp__mxml__node__s.html#8831071db5a4b4df95ea3c5c2e95476b">stp_mxml_node_s</a>
+<li>num_attrs
+: <a class="el" href="structstp__mxml__value__s.html#f29b9bbc769c278dad18ff2cb098ef6a">stp_mxml_value_s</a>
+<li>numsizes
+: <a class="el" href="structstp__shade.html#8e68774d99e3eecb76f06f7704f1eb90">stp_shade</a>
+</ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>opaque
-: <a class="el" href="unionstp__mxml__value__u.html#o2">stp_mxml_value_u</a></ul>
+: <a class="el" href="unionstp__mxml__value__u.html#ca8f6bf03f29248dee0b8d364454d051">stp_mxml_value_u</a>
+</ul>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>p_class
-: <a class="el" href="structstp__parameter__t.html#o5">stp_parameter_t</a><li>p_level
-: <a class="el" href="structstp__parameter__t.html#o6">stp_parameter_t</a><li>p_type
-: <a class="el" href="structstp__parameter__t.html#o4">stp_parameter_t</a><li>paper_unit
-: <a class="el" href="structstp__papersize__t.html#o9">stp_papersize_t</a><li>parameters
-: <a class="el" href="structstp__printfuncs__t.html#o1">stp_printfuncs_t</a><li>parent
-: <a class="el" href="structstp__mxml__node__s.html#o3">stp_mxml_node_s</a><li>pass
-: <a class="el" href="structstp__pass__t.html#o0">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o1">stp_weave_t</a><li>physpassend
-: <a class="el" href="structstp__pass__t.html#o4">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o6">stp_weave_t</a><li>physpassstart
-: <a class="el" href="structstp__pass__t.html#o3">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o5">stp_weave_t</a><li>prescaled
-: <a class="el" href="structstp__dither__matrix__generic.html#o3">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o3">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o3">stp_dither_matrix_short</a><li>prev
-: <a class="el" href="structstp__mxml__node__s.html#o2">stp_mxml_node_s</a><li>print
-: <a class="el" href="structstp__printfuncs__t.html#o6">stp_printfuncs_t</a><li>printer_list
-: <a class="el" href="structstp__family.html#o1">stp_family</a><li>printfuncs
-: <a class="el" href="structstp__family.html#o0">stp_family</a></ul>
+: <a class="el" href="structstp__parameter__t.html#410388e541bdb14fbd0af2984e229217">stp_parameter_t</a>
+<li>p_level
+: <a class="el" href="structstp__parameter__t.html#2a4a1195c06243e08acb03475fb1e7cc">stp_parameter_t</a>
+<li>p_type
+: <a class="el" href="structstp__parameter__t.html#ebe5dea02843240fe03461abf007f154">stp_parameter_t</a>
+<li>paper_unit
+: <a class="el" href="structstp__papersize__t.html#5692b27332297abca9e4715e3e9e3ce8">stp_papersize_t</a>
+<li>parameters
+: <a class="el" href="structstp__printfuncs__t.html#c4eab991ca917968e0f264b7105faaa4">stp_printfuncs_t</a>
+<li>parent
+: <a class="el" href="structstp__mxml__node__s.html#353df68e26a33380dcacda213a741487">stp_mxml_node_s</a>
+<li>pass
+: <a class="el" href="structstp__pass__t.html#fdb7d267dad9bfc69e8deb86da07ee7b">stp_pass_t</a>
+, <a class="el" href="structstp__weave__t.html#2536ce303e27f679c4afd6c33eea8d07">stp_weave_t</a>
+<li>physpassend
+: <a class="el" href="structstp__weave__t.html#3041aa5f7a90d0d7d82d1b2406044bb3">stp_weave_t</a>
+, <a class="el" href="structstp__pass__t.html#4d75f7e07ebbffb75c2a7f36f43b3c9e">stp_pass_t</a>
+<li>physpassstart
+: <a class="el" href="structstp__pass__t.html#0da3d73932d6c07aceaf4bce93cf6163">stp_pass_t</a>
+, <a class="el" href="structstp__weave__t.html#aec693e98c7587da452ac604b675be3c">stp_weave_t</a>
+<li>prescaled
+: <a class="el" href="structstp__dither__matrix__normal.html#042561ad856d67506fe81b1bbbffd966">stp_dither_matrix_normal</a>
+, <a class="el" href="structstp__dither__matrix__short.html#755361acae80fa4cba01a1cc71638274">stp_dither_matrix_short</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#478d54ddf9ba50e783ddec1532a0eff6">stp_dither_matrix_generic</a>
+<li>prev
+: <a class="el" href="structstp__mxml__node__s.html#2174125dc205e7c760e4e8c9c9048ddf">stp_mxml_node_s</a>
+<li>print
+: <a class="el" href="structstp__printfuncs__t.html#7704d7a1e997039deedfdf76a353c35d">stp_printfuncs_t</a>
+<li>printer_list
+: <a class="el" href="structstp__family.html#6e4f0c216f5ced14a819fbacdb26547d">stp_family</a>
+<li>printfuncs
+: <a class="el" href="structstp__family.html#d29f00ba3565e93c138b00e4a48cde77">stp_family</a>
+</ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
 <li>read_only
-: <a class="el" href="structstp__parameter__t.html#o11">stp_parameter_t</a><li>real
-: <a class="el" href="unionstp__mxml__value__u.html#o3">stp_mxml_value_u</a><li>rep
-: <a class="el" href="structstp__image.html#o7">stp_image</a><li>reset
-: <a class="el" href="structstp__image.html#o1">stp_image</a><li>right
-: <a class="el" href="structstp__papersize__t.html#o8">stp_papersize_t</a><li>row
-: <a class="el" href="structstp__weave__t.html#o0">stp_weave_t</a></ul>
+: <a class="el" href="structstp__parameter__t.html#4421135f9985be49d156cbc9aa74c710">stp_parameter_t</a>
+<li>real
+: <a class="el" href="unionstp__mxml__value__u.html#3f253397958ad919a1fc97c42a58bc67">stp_mxml_value_u</a>
+<li>rep
+: <a class="el" href="structstp__image.html#b18e6ee35037589bf485213022e2d871">stp_image</a>
+<li>reset
+: <a class="el" href="structstp__image.html#7bb2244368c6b1e07d27afb3dd249ffd">stp_image</a>
+<li>right
+: <a class="el" href="structstp__papersize__t.html#6899599f2f940e95e03545ff71e2b4c5">stp_papersize_t</a>
+<li>row
+: <a class="el" href="structstp__weave__t.html#708ad2c7d2f76b864fe92b9e0582eece">stp_weave_t</a>
+</ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>s_cache
-: <a class="el" href="structstp__cached__curve__t.html#o2">stp_cached_curve_t</a><li>short_name
-: <a class="el" href="structstp__color.html#o0">stp_color</a><li>start_job
-: <a class="el" href="structstp__printfuncs__t.html#o10">stp_printfuncs_t</a><li>start_pos
-: <a class="el" href="structstp__linebounds__t.html#o1">stp_linebounds_t</a><li>str
-: <a class="el" href="structstp__parameter__t.html#o24">stp_parameter_t</a><li>string
-: <a class="el" href="structstp__mxml__text__s.html#o1">stp_mxml_text_s</a><li>subpass
-: <a class="el" href="structstp__pass__t.html#o5">stp_pass_t</a><li>syms
-: <a class="el" href="structstp__module.html#o7">stp_module</a></ul>
+: <a class="el" href="structstp__cached__curve__t.html#c55d549f6d2f567ba84ecb9e0417f074">stp_cached_curve_t</a>
+<li>short_name
+: <a class="el" href="structstp__color.html#23ed4d11629625e2ad24b124c36c7fab">stp_color</a>
+<li>start_job
+: <a class="el" href="structstp__printfuncs__t.html#5c99986ad02cbcc4dce313bc7f5293fc">stp_printfuncs_t</a>
+<li>start_pos
+: <a class="el" href="structstp__linebounds__t.html#b46a1a4ec130dd043009fb96b0115467">stp_linebounds_t</a>
+<li>str
+: <a class="el" href="structstp__parameter__t.html#e4409d001a6f1b7f8bbf237016900e48">stp_parameter_t</a>
+<li>string
+: <a class="el" href="structstp__mxml__text__s.html#ef1865e8cab7d5ab175c6e67f122be15">stp_mxml_text_s</a>
+<li>subpass
+: <a class="el" href="structstp__pass__t.html#a4a3363d8de9121ba3d8bf28076b1c89">stp_pass_t</a>
+<li>syms
+: <a class="el" href="structstp__module.html#0e7297a93920d8f6849718d0a32fa2ba">stp_module</a>
+</ul>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>text
-: <a class="el" href="structstp__parameter__t.html#o1">stp_parameter_t</a>, <a class="el" href="structstp__param__string__t.html#o1">stp_param_string_t</a>, <a class="el" href="structstp__papersize__t.html#o1">stp_papersize_t</a>, <a class="el" href="unionstp__mxml__value__u.html#o4">stp_mxml_value_u</a><li>top
-: <a class="el" href="structstp__papersize__t.html#o5">stp_papersize_t</a><li>total_size
-: <a class="el" href="structdither__matrix__impl.html#o4">dither_matrix_impl</a><li>type
-: <a class="el" href="structstp__mxml__node__s.html#o0">stp_mxml_node_s</a></ul>
+: <a class="el" href="unionstp__mxml__value__u.html#82c76c9aca350baca3b72723d0a4e99d">stp_mxml_value_u</a>
+, <a class="el" href="structstp__parameter__t.html#396e4980926c200e9ce4454f19e7311a">stp_parameter_t</a>
+, <a class="el" href="structstp__papersize__t.html#26e8b5d0ce282614f128dd9d4aeaf9f6">stp_papersize_t</a>
+, <a class="el" href="structstp__param__string__t.html#db032e80e118c233adb9f27544920bd1">stp_param_string_t</a>
+<li>top
+: <a class="el" href="structstp__papersize__t.html#7fc8acdb1d905d6ca4a0b9b247a6c48e">stp_papersize_t</a>
+<li>total_size
+: <a class="el" href="structdither__matrix__impl.html#54645c1c4edad222cf3f5aba03cdfae5">dither_matrix_impl</a>
+<li>type
+: <a class="el" href="structstp__mxml__node__s.html#e1bff9adee67699067516eee014a7510">stp_mxml_node_s</a>
+</ul>
 <h3><a class="anchor" name="index_u">- u -</a></h3><ul>
 <li>upper
-: <a class="el" href="structstp__int__bound__t.html#o1">stp_int_bound_t</a>, <a class="el" href="structstp__double__bound__t.html#o1">stp_double_bound_t</a></ul>
+: <a class="el" href="structstp__double__bound__t.html#07d734f8f82f059460cee55927b0216c">stp_double_bound_t</a>
+, <a class="el" href="structstp__int__bound__t.html#a71bcebaae24712ee7a66955b345de19">stp_int_bound_t</a>
+</ul>
 <h3><a class="anchor" name="index_v">- v -</a></h3><ul>
 <li>v
-: <a class="el" href="structstp__linebufs__t.html#o1">stp_linebufs_t</a>, <a class="el" href="structstp__linecount__t.html#o1">stp_linecount_t</a>, <a class="el" href="structstp__lineactive__t.html#o1">stp_lineactive_t</a>, <a class="el" href="structstp__lineoff__t.html#o1">stp_lineoff_t</a><li>value
-: <a class="el" href="structstp__mxml__node__s.html#o6">stp_mxml_node_s</a>, <a class="el" href="structstp__mxml__attr__s.html#o1">stp_mxml_attr_s</a>, <a class="el" href="structstp__shade.html#o0">stp_shade</a>, <a class="el" href="structstp__dotsize.html#o1">stp_dotsize</a><li>verify
-: <a class="el" href="structstp__printfuncs__t.html#o9">stp_printfuncs_t</a><li>verify_this_parameter
-: <a class="el" href="structstp__parameter__t.html#o10">stp_parameter_t</a><li>version
-: <a class="el" href="structstp__module.html#o1">stp_module</a></ul>
+: <a class="el" href="structstp__lineoff__t.html#88bbe86454fbda432487952640948328">stp_lineoff_t</a>
+, <a class="el" href="structstp__linebufs__t.html#485ecae7a892476331d31079d33b9891">stp_linebufs_t</a>
+, <a class="el" href="structstp__lineactive__t.html#5bb5843aa2a4817ef84fb83714b200f3">stp_lineactive_t</a>
+, <a class="el" href="structstp__linecount__t.html#2164f4045d892c45105f5780c80489a4">stp_linecount_t</a>
+<li>value
+: <a class="el" href="structstp__mxml__attr__s.html#25554324bd8ccf8e9558e4705eda0daa">stp_mxml_attr_s</a>
+, <a class="el" href="structstp__shade.html#07a72426c7bcbf22f1cc253a97a453d4">stp_shade</a>
+, <a class="el" href="structstp__dotsize.html#d259e8d169a7d140e4964b80790c7ddd">stp_dotsize</a>
+, <a class="el" href="structstp__mxml__node__s.html#ad44d6b2fe0842de0bbf1312035372cd">stp_mxml_node_s</a>
+<li>verify
+: <a class="el" href="structstp__printfuncs__t.html#948b6d7219dbb30f47a93eef2f85fde2">stp_printfuncs_t</a>
+<li>verify_this_parameter
+: <a class="el" href="structstp__parameter__t.html#56100203c262c60d4cb18c7a49cde27d">stp_parameter_t</a>
+<li>version
+: <a class="el" href="structstp__module.html#e2038239913d3ddbece919082501c8d0">stp_module</a>
+</ul>
 <h3><a class="anchor" name="index_w">- w -</a></h3><ul>
 <li>whitespace
-: <a class="el" href="structstp__mxml__text__s.html#o0">stp_mxml_text_s</a><li>width
-: <a class="el" href="structstp__papersize__t.html#o3">stp_papersize_t</a>, <a class="el" href="structstp__image.html#o2">stp_image</a></ul>
+: <a class="el" href="structstp__mxml__text__s.html#76bcfbb8c3de4e1c597468d51ef47184">stp_mxml_text_s</a>
+<li>width
+: <a class="el" href="structstp__papersize__t.html#edcca3776ddeb5ed815df3aa112147dd">stp_papersize_t</a>
+, <a class="el" href="structstp__image.html#890033525988e15f4f4a0b4132e5f19b">stp_image</a>
+</ul>
 <h3><a class="anchor" name="index_x">- x -</a></h3><ul>
 <li>x
-: <a class="el" href="structstp__dither__matrix__generic.html#o0">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o0">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o0">stp_dither_matrix_short</a>, <a class="el" href="structstp__curve__point__t.html#o0">stp_curve_point_t</a><li>x_offset
-: <a class="el" href="structdither__matrix__impl.html#o11">dither_matrix_impl</a><li>x_size
-: <a class="el" href="structdither__matrix__impl.html#o2">dither_matrix_impl</a></ul>
+: <a class="el" href="structstp__curve__point__t.html#92b13b94109b1270563a1116dc19b926">stp_curve_point_t</a>
+, <a class="el" href="structstp__dither__matrix__short.html#81e0b20e763080b79faa837a00cac832">stp_dither_matrix_short</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#6b8bd1cc589c2195f055e5a57a05e03a">stp_dither_matrix_generic</a>
+, <a class="el" href="structstp__dither__matrix__normal.html#b9564690be42859d88ea264a29321af3">stp_dither_matrix_normal</a>
+<li>x_offset
+: <a class="el" href="structdither__matrix__impl.html#665c02056a2d046a15aab462492d9dbc">dither_matrix_impl</a>
+<li>x_size
+: <a class="el" href="structdither__matrix__impl.html#063e3b3617c3a9b4883f3b01cd7dfb48">dither_matrix_impl</a>
+</ul>
 <h3><a class="anchor" name="index_y">- y -</a></h3><ul>
 <li>y
-: <a class="el" href="structstp__dither__matrix__generic.html#o1">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o1">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o1">stp_dither_matrix_short</a>, <a class="el" href="structstp__curve__point__t.html#o1">stp_curve_point_t</a><li>y_offset
-: <a class="el" href="structdither__matrix__impl.html#o12">dither_matrix_impl</a><li>y_size
-: <a class="el" href="structdither__matrix__impl.html#o3">dither_matrix_impl</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="structstp__curve__point__t.html#132b1e8be20525667ece971d02f60b9d">stp_curve_point_t</a>
+, <a class="el" href="structstp__dither__matrix__short.html#2bbc6c72006541250ba23b48bcab60e8">stp_dither_matrix_short</a>
+, <a class="el" href="structstp__dither__matrix__generic.html#aaddcac2ca33a3e822ded567bbbecfb9">stp_dither_matrix_generic</a>
+, <a class="el" href="structstp__dither__matrix__normal.html#410560f5186761cb7430f5b0a804b09c">stp_dither_matrix_normal</a>
+<li>y_offset
+: <a class="el" href="structdither__matrix__impl.html#844cb19ea61f035bc2a21536f6f392c4">dither_matrix_impl</a>
+<li>y_size
+: <a class="el" href="structdither__matrix__impl.html#33370af30d4c6cb0e441744c8d1c3686">dither_matrix_impl</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals.html b/doc/gutenprint/html/globals.html
index 83862c8..c174a25 100644
--- a/doc/gutenprint/html/globals.html
+++ b/doc/gutenprint/html/globals.html
@@ -1,21 +1,62 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindexHL" href="globals.html#index__">_</a> | <a class="qindex" href="globals_0x62.html#index_b">b</a> | <a class="qindex" href="globals_0x63.html#index_c">c</a> | <a class="qindex" href="globals_0x64.html#index_d">d</a> | <a class="qindex" href="globals_0x67.html#index_g">g</a> | <a class="qindex" href="globals_0x6e.html#index_n">n</a> | <a class="qindex" href="globals_0x70.html#index_p">p</a> | <a class="qindex" href="globals_0x73.html#index_s">s</a> | <a class="qindex" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="globals.html#index__"><span>_</span></a></li>
+    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index__">- _ -</a></h3><ul>
 <li>_
-: <a class="el" href="group__intl.html#ga5">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga5">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__intl__internal.html#g32a3cf3d9dd914f5aeeca5423c157934">gutenprint-intl-internal.h</a>
+, <a class="el" href="group__intl.html#g32a3cf3d9dd914f5aeeca5423c157934">gutenprint-intl.h</a>
+<li>__attribute__
+: <a class="el" href="util_8h.html#9d373a9b65ff25b2db84c07394e1c212">util.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x62.html b/doc/gutenprint/html/globals_0x62.html
index 0905e93..f39a4ad 100644
--- a/doc/gutenprint/html/globals_0x62.html
+++ b/doc/gutenprint/html/globals_0x62.html
@@ -1,21 +1,60 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"> | <a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="globals.html#index__">_</a> | <a class="qindexHL" href="globals_0x62.html#index_b">b</a> | <a class="qindex" href="globals_0x63.html#index_c">c</a> | <a class="qindex" href="globals_0x64.html#index_d">d</a> | <a class="qindex" href="globals_0x67.html#index_g">g</a> | <a class="qindex" href="globals_0x6e.html#index_n">n</a> | <a class="qindex" href="globals_0x70.html#index_p">p</a> | <a class="qindex" href="globals_0x73.html#index_s">s</a> | <a class="qindex" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html#index__"><span>_</span></a></li>
+    <li class="current"><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>bindtextdomain
-: <a class="el" href="group__intl.html#ga4">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga4">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__intl__internal.html#gdd6dfc1077058ff26d79cdb18099d58a">gutenprint-intl-internal.h</a>
+, <a class="el" href="group__intl.html#gdd6dfc1077058ff26d79cdb18099d58a">gutenprint-intl.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x63.html b/doc/gutenprint/html/globals_0x63.html
index b67d85d..d31dffd 100644
--- a/doc/gutenprint/html/globals_0x63.html
+++ b/doc/gutenprint/html/globals_0x63.html
@@ -1,24 +1,65 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"> | <a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="globals.html#index__">_</a> | <a class="qindex" href="globals_0x62.html#index_b">b</a> | <a class="qindexHL" href="globals_0x63.html#index_c">c</a> | <a class="qindex" href="globals_0x64.html#index_d">d</a> | <a class="qindex" href="globals_0x67.html#index_g">g</a> | <a class="qindex" href="globals_0x6e.html#index_n">n</a> | <a class="qindex" href="globals_0x70.html#index_p">p</a> | <a class="qindex" href="globals_0x73.html#index_s">s</a> | <a class="qindex" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html#index__"><span>_</span></a></li>
+    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li class="current"><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>compdata_t
-: <a class="el" href="group__vars.html#ga6">vars.h</a><li>CURVE_CACHE_FAST_COUNT
-: <a class="el" href="curve-cache_8h.html#a2">curve-cache.h</a><li>CURVE_CACHE_FAST_DOUBLE
-: <a class="el" href="curve-cache_8h.html#a1">curve-cache.h</a><li>CURVE_CACHE_FAST_USHORT
-: <a class="el" href="curve-cache_8h.html#a0">curve-cache.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__vars.html#g4d45b95baae036143e14adfc0014f562">vars.h</a>
+<li>CURVE_CACHE_FAST_COUNT
+: <a class="el" href="curve-cache_8h.html#70b70d0328c61f17925402a4b1bb9a90">curve-cache.h</a>
+<li>CURVE_CACHE_FAST_DOUBLE
+: <a class="el" href="curve-cache_8h.html#f79c26492d6e6fd726498df18cae11fe">curve-cache.h</a>
+<li>CURVE_CACHE_FAST_USHORT
+: <a class="el" href="curve-cache_8h.html#4b278e86a2f914893307fb20cf218e7c">curve-cache.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x64.html b/doc/gutenprint/html/globals_0x64.html
index 3785bf6..f55eaeb 100644
--- a/doc/gutenprint/html/globals_0x64.html
+++ b/doc/gutenprint/html/globals_0x64.html
@@ -1,22 +1,63 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"> | <a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="globals.html#index__">_</a> | <a class="qindex" href="globals_0x62.html#index_b">b</a> | <a class="qindex" href="globals_0x63.html#index_c">c</a> | <a class="qindexHL" href="globals_0x64.html#index_d">d</a> | <a class="qindex" href="globals_0x67.html#index_g">g</a> | <a class="qindex" href="globals_0x6e.html#index_n">n</a> | <a class="qindex" href="globals_0x70.html#index_p">p</a> | <a class="qindex" href="globals_0x73.html#index_s">s</a> | <a class="qindex" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html#index__"><span>_</span></a></li>
+    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li class="current"><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_d">- d -</a></h3><ul>
 <li>dcgettext
-: <a class="el" href="group__intl.html#ga3">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga3">gutenprint-intl-internal.h</a><li>dgettext
-: <a class="el" href="group__intl.html#ga2">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga2">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__intl__internal.html#g115dd6a6dd9d7a249f6374a7c06deef5">gutenprint-intl-internal.h</a>
+, <a class="el" href="group__intl.html#g115dd6a6dd9d7a249f6374a7c06deef5">gutenprint-intl.h</a>
+<li>dgettext
+: <a class="el" href="group__intl.html#gd24abc7110e1bdf384dc2ef2b63e5d07">gutenprint-intl.h</a>
+, <a class="el" href="group__intl__internal.html#gd24abc7110e1bdf384dc2ef2b63e5d07">gutenprint-intl-internal.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x67.html b/doc/gutenprint/html/globals_0x67.html
index 901e25a..742204b 100644
--- a/doc/gutenprint/html/globals_0x67.html
+++ b/doc/gutenprint/html/globals_0x67.html
@@ -1,21 +1,60 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"> | <a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="globals.html#index__">_</a> | <a class="qindex" href="globals_0x62.html#index_b">b</a> | <a class="qindex" href="globals_0x63.html#index_c">c</a> | <a class="qindex" href="globals_0x64.html#index_d">d</a> | <a class="qindexHL" href="globals_0x67.html#index_g">g</a> | <a class="qindex" href="globals_0x6e.html#index_n">n</a> | <a class="qindex" href="globals_0x70.html#index_p">p</a> | <a class="qindex" href="globals_0x73.html#index_s">s</a> | <a class="qindex" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html#index__"><span>_</span></a></li>
+    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li class="current"><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>gettext
-: <a class="el" href="group__intl.html#ga1">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga1">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__intl__internal.html#g83b8be0887dede025766d25e2bb884c6">gutenprint-intl-internal.h</a>
+, <a class="el" href="group__intl.html#g83b8be0887dede025766d25e2bb884c6">gutenprint-intl.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x6e.html b/doc/gutenprint/html/globals_0x6e.html
index ce57d20..726d523 100644
--- a/doc/gutenprint/html/globals_0x6e.html
+++ b/doc/gutenprint/html/globals_0x6e.html
@@ -1,21 +1,60 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"> | <a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="globals.html#index__">_</a> | <a class="qindex" href="globals_0x62.html#index_b">b</a> | <a class="qindex" href="globals_0x63.html#index_c">c</a> | <a class="qindex" href="globals_0x64.html#index_d">d</a> | <a class="qindex" href="globals_0x67.html#index_g">g</a> | <a class="qindexHL" href="globals_0x6e.html#index_n">n</a> | <a class="qindex" href="globals_0x70.html#index_p">p</a> | <a class="qindex" href="globals_0x73.html#index_s">s</a> | <a class="qindex" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html#index__"><span>_</span></a></li>
+    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li class="current"><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>N_
-: <a class="el" href="group__intl.html#ga6">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga6">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__intl__internal.html#g75278405e7f034d2b1af80bfd94675fe">gutenprint-intl-internal.h</a>
+, <a class="el" href="group__intl.html#g75278405e7f034d2b1af80bfd94675fe">gutenprint-intl.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x70.html b/doc/gutenprint/html/globals_0x70.html
index f1e5977..136078b 100644
--- a/doc/gutenprint/html/globals_0x70.html
+++ b/doc/gutenprint/html/globals_0x70.html
@@ -1,27 +1,71 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"> | <a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="globals.html#index__">_</a> | <a class="qindex" href="globals_0x62.html#index_b">b</a> | <a class="qindex" href="globals_0x63.html#index_c">c</a> | <a class="qindex" href="globals_0x64.html#index_d">d</a> | <a class="qindex" href="globals_0x67.html#index_g">g</a> | <a class="qindex" href="globals_0x6e.html#index_n">n</a> | <a class="qindexHL" href="globals_0x70.html#index_p">p</a> | <a class="qindex" href="globals_0x73.html#index_s">s</a> | <a class="qindex" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html#index__"><span>_</span></a></li>
+    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li class="current"><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>PAPERSIZE_ENGLISH_EXTENDED
-: <a class="el" href="group__papersize.html#gga5a2">paper.h</a><li>PAPERSIZE_ENGLISH_STANDARD
-: <a class="el" href="group__papersize.html#gga5a0">paper.h</a><li>PAPERSIZE_METRIC_EXTENDED
-: <a class="el" href="group__papersize.html#gga5a3">paper.h</a><li>PAPERSIZE_METRIC_STANDARD
-: <a class="el" href="group__papersize.html#gga5a1">paper.h</a><li>PARAMETER_BAD
-: <a class="el" href="group__vars.html#gga137a33">vars.h</a><li>PARAMETER_INACTIVE
-: <a class="el" href="group__vars.html#gga137a35">vars.h</a><li>PARAMETER_OK
-: <a class="el" href="group__vars.html#gga137a34">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__papersize.html#gg72e4619e373e38dc02dc452813b7b95800b7e9a18afc172872861b26dbcc8cb8">paper.h</a>
+<li>PAPERSIZE_ENGLISH_STANDARD
+: <a class="el" href="group__papersize.html#gg72e4619e373e38dc02dc452813b7b958db394159413ade42022509cd3280fef3">paper.h</a>
+<li>PAPERSIZE_METRIC_EXTENDED
+: <a class="el" href="group__papersize.html#gg72e4619e373e38dc02dc452813b7b95862e2906a87fa4bcf32913943fd5b225a">paper.h</a>
+<li>PAPERSIZE_METRIC_STANDARD
+: <a class="el" href="group__papersize.html#gg72e4619e373e38dc02dc452813b7b9586d5868bc6707f8801ce4d584428c2ae8">paper.h</a>
+<li>PARAMETER_BAD
+: <a class="el" href="group__vars.html#ggc061852de3627383cd415cd80a979e02326a171221148779ec7df761b3eee967">vars.h</a>
+<li>PARAMETER_INACTIVE
+: <a class="el" href="group__vars.html#ggc061852de3627383cd415cd80a979e025cb96da6c2e3ae7187e85a1ef6e41fc6">vars.h</a>
+<li>PARAMETER_OK
+: <a class="el" href="group__vars.html#ggc061852de3627383cd415cd80a979e022df363618282a9164433c0f212b18616">vars.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x73.html b/doc/gutenprint/html/globals_0x73.html
index bd82a10..9a20521 100644
--- a/doc/gutenprint/html/globals_0x73.html
+++ b/doc/gutenprint/html/globals_0x73.html
@@ -1,647 +1,1323 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"> | <a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="globals.html#index__">_</a> | <a class="qindex" href="globals_0x62.html#index_b">b</a> | <a class="qindex" href="globals_0x63.html#index_c">c</a> | <a class="qindex" href="globals_0x64.html#index_d">d</a> | <a class="qindex" href="globals_0x67.html#index_g">g</a> | <a class="qindex" href="globals_0x6e.html#index_n">n</a> | <a class="qindex" href="globals_0x70.html#index_p">p</a> | <a class="qindexHL" href="globals_0x73.html#index_s">s</a> | <a class="qindex" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html#index__"><span>_</span></a></li>
+    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li class="current"><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>stp_abort()
-: <a class="el" href="group__util.html#ga3">util.h</a><li>stp_allocate_component_data()
-: <a class="el" href="group__vars.html#ga125">vars.h</a><li>stp_array_copy()
-: <a class="el" href="group__array.html#ga3">array.h</a><li>stp_array_create()
-: <a class="el" href="group__array.html#ga1">array.h</a><li>stp_array_create_copy()
-: <a class="el" href="group__array.html#ga4">array.h</a><li>stp_array_create_from_xmltree()
-: <a class="el" href="xml_8h.html#a19">xml.h</a><li>stp_array_destroy()
-: <a class="el" href="group__array.html#ga2">array.h</a><li>stp_array_get_data()
-: <a class="el" href="group__array.html#ga8">array.h</a><li>stp_array_get_point()
-: <a class="el" href="group__array.html#ga10">array.h</a><li>stp_array_get_sequence()
-: <a class="el" href="group__array.html#ga11">array.h</a><li>stp_array_get_size()
-: <a class="el" href="group__array.html#ga6">array.h</a><li>stp_array_set_data()
-: <a class="el" href="group__array.html#ga7">array.h</a><li>stp_array_set_point()
-: <a class="el" href="group__array.html#ga9">array.h</a><li>stp_array_set_size()
-: <a class="el" href="group__array.html#ga5">array.h</a><li>stp_array_t
-: <a class="el" href="group__array.html#ga0">array.h</a><li>stp_asprintf()
-: <a class="el" href="group__util.html#ga17">util.h</a><li>STP_BINARY_AGE
-: <a class="el" href="group__version.html#ga11">gutenprint-version.h</a><li>stp_binary_age
-: <a class="el" href="group__version.html#ga4">gutenprint-version.h</a><li>stp_catprintf()
-: <a class="el" href="group__util.html#ga18">util.h</a><li>stp_channel_add()
-: <a class="el" href="channel_8h.html#a2">channel.h</a><li>stp_channel_convert()
-: <a class="el" href="channel_8h.html#a21">channel.h</a><li>stp_channel_get_black_channel()
-: <a class="el" href="channel_8h.html#a11">channel.h</a><li>stp_channel_get_curve()
-: <a class="el" href="channel_8h.html#a17">channel.h</a><li>stp_channel_get_cutoff_adjustment()
-: <a class="el" href="channel_8h.html#a9">channel.h</a><li>stp_channel_get_density_adjustment()
-: <a class="el" href="channel_8h.html#a5">channel.h</a><li>stp_channel_get_gcr_curve()
-: <a class="el" href="channel_8h.html#a19">channel.h</a><li>stp_channel_get_gloss_channel()
-: <a class="el" href="channel_8h.html#a13">channel.h</a><li>stp_channel_get_gloss_limit()
-: <a class="el" href="channel_8h.html#a15">channel.h</a><li>stp_channel_get_ink_limit()
-: <a class="el" href="channel_8h.html#a7">channel.h</a><li>stp_channel_get_input()
-: <a class="el" href="channel_8h.html#a22">channel.h</a><li>stp_channel_get_output()
-: <a class="el" href="channel_8h.html#a23">channel.h</a><li>stp_channel_get_value()
-: <a class="el" href="channel_8h.html#a3">channel.h</a><li>stp_channel_initialize()
-: <a class="el" href="channel_8h.html#a20">channel.h</a><li>STP_CHANNEL_LIMIT
-: <a class="el" href="group__image.html#ga8">image.h</a><li>stp_channel_reset()
-: <a class="el" href="channel_8h.html#a0">channel.h</a><li>stp_channel_reset_channel()
-: <a class="el" href="channel_8h.html#a1">channel.h</a><li>stp_channel_set_black_channel()
-: <a class="el" href="channel_8h.html#a10">channel.h</a><li>stp_channel_set_curve()
-: <a class="el" href="channel_8h.html#a16">channel.h</a><li>stp_channel_set_cutoff_adjustment()
-: <a class="el" href="channel_8h.html#a8">channel.h</a><li>stp_channel_set_density_adjustment()
-: <a class="el" href="channel_8h.html#a4">channel.h</a><li>stp_channel_set_gcr_curve()
-: <a class="el" href="channel_8h.html#a18">channel.h</a><li>stp_channel_set_gloss_channel()
-: <a class="el" href="channel_8h.html#a12">channel.h</a><li>stp_channel_set_gloss_limit()
-: <a class="el" href="channel_8h.html#a14">channel.h</a><li>stp_channel_set_ink_limit()
-: <a class="el" href="channel_8h.html#a6">channel.h</a><li>stp_check_array_parameter()
-: <a class="el" href="group__vars.html#ga107">vars.h</a><li>stp_check_boolean_parameter()
-: <a class="el" href="group__vars.html#ga105">vars.h</a><li>stp_check_curve_parameter()
-: <a class="el" href="group__vars.html#ga106">vars.h</a><li>stp_check_dimension_parameter()
-: <a class="el" href="group__vars.html#ga104">vars.h</a><li>stp_check_file_parameter()
-: <a class="el" href="group__vars.html#ga101">vars.h</a><li>stp_check_float_parameter()
-: <a class="el" href="group__vars.html#ga102">vars.h</a><li>stp_check_int_parameter()
-: <a class="el" href="group__vars.html#ga103">vars.h</a><li>stp_check_raw_parameter()
-: <a class="el" href="group__vars.html#ga108">vars.h</a><li>stp_check_string_parameter()
-: <a class="el" href="group__vars.html#ga100">vars.h</a><li>stp_check_version()
-: <a class="el" href="group__version.html#ga6">gutenprint-version.h</a><li>STP_CHECK_VERSION
-: <a class="el" href="group__version.html#ga13">gutenprint-version.h</a><li>stp_clear_array_parameter()
-: <a class="el" href="group__vars.html#ga89">vars.h</a><li>stp_clear_boolean_parameter()
-: <a class="el" href="group__vars.html#ga87">vars.h</a><li>stp_clear_curve_parameter()
-: <a class="el" href="group__vars.html#ga88">vars.h</a><li>stp_clear_dimension_parameter()
-: <a class="el" href="group__vars.html#ga86">vars.h</a><li>stp_clear_file_parameter()
-: <a class="el" href="group__vars.html#ga83">vars.h</a><li>stp_clear_float_parameter()
-: <a class="el" href="group__vars.html#ga84">vars.h</a><li>stp_clear_int_parameter()
-: <a class="el" href="group__vars.html#ga85">vars.h</a><li>stp_clear_raw_parameter()
-: <a class="el" href="group__vars.html#ga90">vars.h</a><li>stp_clear_string_parameter()
-: <a class="el" href="group__vars.html#ga82">vars.h</a><li>stp_color_count()
-: <a class="el" href="group__color.html#ga7">color.h</a><li>stp_color_describe_parameter()
-: <a class="el" href="group__color.html#ga4">color.h</a><li>stp_color_get_long_name()
-: <a class="el" href="group__color.html#ga12">color.h</a><li>stp_color_get_name()
-: <a class="el" href="group__color.html#ga11">color.h</a><li>stp_color_get_row()
-: <a class="el" href="group__color.html#ga2">color.h</a><li>stp_color_init()
-: <a class="el" href="group__color.html#ga1">color.h</a><li>stp_color_list_parameters()
-: <a class="el" href="group__color.html#ga3">color.h</a><li>stp_color_register()
-: <a class="el" href="group__color.html#ga5">color.h</a><li>stp_color_t
-: <a class="el" href="group__color.html#ga0">color.h</a><li>stp_color_unregister()
-: <a class="el" href="group__color.html#ga6">color.h</a><li>stp_compute_linewidth_func
-: <a class="el" href="weave_8h.html#a4">weave.h</a><li>stp_compute_tiff_linewidth
-: <a class="el" href="weave_8h.html#a9">weave.h</a><li>stp_compute_uncompressed_linewidth
-: <a class="el" href="weave_8h.html#a10">weave.h</a><li>stp_const_parameter_list_t
-: <a class="el" href="group__vars.html#ga2">vars.h</a><li>stp_copy_data_func_t
-: <a class="el" href="group__vars.html#ga4">vars.h</a><li>stp_copy_options()
-: <a class="el" href="group__vars.html#ga131">vars.h</a><li>STP_CURRENT_INTERFACE
-: <a class="el" href="group__version.html#ga10">gutenprint-version.h</a><li>stp_current_interface
-: <a class="el" href="group__version.html#ga3">gutenprint-version.h</a><li>STP_CURVE_BOUNDS_CLIP
-: <a class="el" href="group__curve.html#gga50a9">curve.h</a><li>STP_CURVE_BOUNDS_ERROR
-: <a class="el" href="group__curve.html#gga50a10">curve.h</a><li>STP_CURVE_BOUNDS_RESCALE
-: <a class="el" href="group__curve.html#gga50a8">curve.h</a><li>stp_curve_bounds_t
-: <a class="el" href="group__curve.html#ga50">curve.h</a><li>stp_curve_cache_copy()
-: <a class="el" href="curve-cache_8h.html#a12">curve-cache.h</a><li>stp_curve_cache_curve_data()
-: <a class="el" href="curve-cache_8h.html#a4">curve-cache.h</a><li>stp_curve_cache_curve_invalidate()
-: <a class="el" href="curve-cache_8h.html#a6">curve-cache.h</a><li>stp_curve_cache_get_count()
-: <a class="el" href="curve-cache_8h.html#a9">curve-cache.h</a><li>stp_curve_cache_get_curve()
-: <a class="el" href="curve-cache_8h.html#a5">curve-cache.h</a><li>stp_curve_cache_get_double_data()
-: <a class="el" href="curve-cache_8h.html#a11">curve-cache.h</a><li>stp_curve_cache_get_ushort_data()
-: <a class="el" href="curve-cache_8h.html#a10">curve-cache.h</a><li>stp_curve_cache_set_curve()
-: <a class="el" href="curve-cache_8h.html#a7">curve-cache.h</a><li>stp_curve_cache_set_curve_copy()
-: <a class="el" href="curve-cache_8h.html#a8">curve-cache.h</a><li>stp_curve_compose()
-: <a class="el" href="group__curve.html#ga46">curve.h</a><li>STP_CURVE_COMPOSE_ADD
-: <a class="el" href="group__curve.html#gga49a5">curve.h</a><li>STP_CURVE_COMPOSE_EXPONENTIATE
-: <a class="el" href="group__curve.html#gga49a7">curve.h</a><li>STP_CURVE_COMPOSE_MULTIPLY
-: <a class="el" href="group__curve.html#gga49a6">curve.h</a><li>stp_curve_compose_t
-: <a class="el" href="group__curve.html#ga49">curve.h</a><li>stp_curve_copy()
-: <a class="el" href="group__curve.html#ga3">curve.h</a><li>stp_curve_count_points()
-: <a class="el" href="group__curve.html#ga10">curve.h</a><li>stp_curve_create()
-: <a class="el" href="group__curve.html#ga1">curve.h</a><li>stp_curve_create_copy()
-: <a class="el" href="group__curve.html#ga2">curve.h</a><li>stp_curve_create_from_file()
-: <a class="el" href="group__curve.html#ga44">curve.h</a><li>stp_curve_create_from_stream()
-: <a class="el" href="group__curve.html#ga43">curve.h</a><li>stp_curve_create_from_string()
-: <a class="el" href="group__curve.html#ga45">curve.h</a><li>stp_curve_create_from_xmltree()
-: <a class="el" href="xml_8h.html#a17">xml.h</a><li>stp_curve_destroy()
-: <a class="el" href="group__curve.html#ga4">curve.h</a><li>stp_curve_free_curve_cache()
-: <a class="el" href="curve-cache_8h.html#a3">curve-cache.h</a><li>stp_curve_get_bounds()
-: <a class="el" href="group__curve.html#ga6">curve.h</a><li>stp_curve_get_data()
-: <a class="el" href="group__curve.html#ga24">curve.h</a><li>stp_curve_get_data_points()
-: <a class="el" href="group__curve.html#ga25">curve.h</a><li>stp_curve_get_float_data()
-: <a class="el" href="group__curve.html#ga26">curve.h</a><li>stp_curve_get_gamma()
-: <a class="el" href="group__curve.html#ga35">curve.h</a><li>stp_curve_get_int_data()
-: <a class="el" href="group__curve.html#ga29">curve.h</a><li>stp_curve_get_interpolation_type()
-: <a class="el" href="group__curve.html#ga12">curve.h</a><li>stp_curve_get_long_data()
-: <a class="el" href="group__curve.html#ga27">curve.h</a><li>stp_curve_get_point()
-: <a class="el" href="group__curve.html#ga37">curve.h</a><li>stp_curve_get_range()
-: <a class="el" href="group__curve.html#ga9">curve.h</a><li>stp_curve_get_sequence()
-: <a class="el" href="group__curve.html#ga33">curve.h</a><li>stp_curve_get_short_data()
-: <a class="el" href="group__curve.html#ga31">curve.h</a><li>stp_curve_get_subrange()
-: <a class="el" href="group__curve.html#ga22">curve.h</a><li>stp_curve_get_uint_data()
-: <a class="el" href="group__curve.html#ga30">curve.h</a><li>stp_curve_get_ulong_data()
-: <a class="el" href="group__curve.html#ga28">curve.h</a><li>stp_curve_get_ushort_data()
-: <a class="el" href="group__curve.html#ga32">curve.h</a><li>stp_curve_get_wrap()
-: <a class="el" href="group__curve.html#ga7">curve.h</a><li>stp_curve_interpolate_value()
-: <a class="el" href="group__curve.html#ga38">curve.h</a><li>stp_curve_is_piecewise()
-: <a class="el" href="group__curve.html#ga8">curve.h</a><li>stp_curve_resample()
-: <a class="el" href="group__curve.html#ga39">curve.h</a><li>stp_curve_rescale()
-: <a class="el" href="group__curve.html#ga40">curve.h</a><li>stp_curve_set_bounds()
-: <a class="el" href="group__curve.html#ga5">curve.h</a><li>stp_curve_set_data()
-: <a class="el" href="group__curve.html#ga13">curve.h</a><li>stp_curve_set_data_points()
-: <a class="el" href="group__curve.html#ga14">curve.h</a><li>stp_curve_set_float_data()
-: <a class="el" href="group__curve.html#ga15">curve.h</a><li>stp_curve_set_gamma()
-: <a class="el" href="group__curve.html#ga34">curve.h</a><li>stp_curve_set_int_data()
-: <a class="el" href="group__curve.html#ga18">curve.h</a><li>stp_curve_set_interpolation_type()
-: <a class="el" href="group__curve.html#ga11">curve.h</a><li>stp_curve_set_long_data()
-: <a class="el" href="group__curve.html#ga16">curve.h</a><li>stp_curve_set_point()
-: <a class="el" href="group__curve.html#ga36">curve.h</a><li>stp_curve_set_short_data()
-: <a class="el" href="group__curve.html#ga20">curve.h</a><li>stp_curve_set_subrange()
-: <a class="el" href="group__curve.html#ga23">curve.h</a><li>stp_curve_set_uint_data()
-: <a class="el" href="group__curve.html#ga19">curve.h</a><li>stp_curve_set_ulong_data()
-: <a class="el" href="group__curve.html#ga17">curve.h</a><li>stp_curve_set_ushort_data()
-: <a class="el" href="group__curve.html#ga21">curve.h</a><li>stp_curve_t
-: <a class="el" href="group__curve.html#ga0">curve.h</a><li>STP_CURVE_TYPE_LINEAR
-: <a class="el" href="group__curve.html#gga47a1">curve.h</a><li>STP_CURVE_TYPE_SPLINE
-: <a class="el" href="group__curve.html#gga47a2">curve.h</a><li>stp_curve_type_t
-: <a class="el" href="group__curve.html#ga47">curve.h</a><li>STP_CURVE_WRAP_AROUND
-: <a class="el" href="group__curve.html#gga48a4">curve.h</a><li>stp_curve_wrap_mode_t
-: <a class="el" href="group__curve.html#ga48">curve.h</a><li>STP_CURVE_WRAP_NONE
-: <a class="el" href="group__curve.html#gga48a3">curve.h</a><li>stp_curve_write()
-: <a class="el" href="group__curve.html#ga41">curve.h</a><li>stp_curve_write_string()
-: <a class="el" href="group__curve.html#ga42">curve.h</a><li>STP_DBG_CANON
-: <a class="el" href="group__util.html#ga39">util.h</a><li>STP_DBG_COLORFUNC
-: <a class="el" href="group__util.html#ga34">util.h</a><li>STP_DBG_CURVE
-: <a class="el" href="group__util.html#ga52">util.h</a><li>STP_DBG_CURVE_ERRORS
-: <a class="el" href="group__util.html#ga53">util.h</a><li>STP_DBG_ESCP2
-: <a class="el" href="group__util.html#ga38">util.h</a><li>STP_DBG_INK
-: <a class="el" href="group__util.html#ga35">util.h</a><li>STP_DBG_LEXMARK
-: <a class="el" href="group__util.html#ga40">util.h</a><li>STP_DBG_LIST
-: <a class="el" href="group__util.html#ga44">util.h</a><li>STP_DBG_LUT
-: <a class="el" href="group__util.html#ga33">util.h</a><li>STP_DBG_MARK_FILE
-: <a class="el" href="group__util.html#ga43">util.h</a><li>STP_DBG_MODULE
-: <a class="el" href="group__util.html#ga45">util.h</a><li>STP_DBG_OLYMPUS
-: <a class="el" href="group__util.html#ga51">util.h</a><li>STP_DBG_PAPER
-: <a class="el" href="group__util.html#ga47">util.h</a><li>STP_DBG_PATH
-: <a class="el" href="group__util.html#ga46">util.h</a><li>STP_DBG_PCL
-: <a class="el" href="group__util.html#ga37">util.h</a><li>STP_DBG_PRINTERS
-: <a class="el" href="group__util.html#ga48">util.h</a><li>STP_DBG_PS
-: <a class="el" href="group__util.html#ga36">util.h</a><li>STP_DBG_ROWS
-: <a class="el" href="group__util.html#ga42">util.h</a><li>STP_DBG_VARS
-: <a class="el" href="group__util.html#ga50">util.h</a><li>STP_DBG_WEAVE_PARAMS
-: <a class="el" href="group__util.html#ga41">util.h</a><li>STP_DBG_XML
-: <a class="el" href="group__util.html#ga49">util.h</a><li>stp_default_media_size()
-: <a class="el" href="group__papersize.html#ga4">paper.h</a><li>stp_default_settings()
-: <a class="el" href="group__vars.html#ga124">vars.h</a><li>stp_deprintf()
-: <a class="el" href="group__util.html#ga21">util.h</a><li>stp_describe_output()
-: <a class="el" href="group__printer.html#ga25">printers.h</a><li>stp_describe_parameter()
-: <a class="el" href="group__vars.html#ga47">vars.h</a><li>stp_describe_resolution()
-: <a class="el" href="group__vars.html#ga122">vars.h</a><li>stp_destroy_component_data()
-: <a class="el" href="group__vars.html#ga126">vars.h</a><li>stp_dither()
-: <a class="el" href="dither_8h.html#a40">dither.h</a><li>stp_dither_add_channel()
-: <a class="el" href="dither_8h.html#a38">dither.h</a><li>stp_dither_describe_parameter()
-: <a class="el" href="dither_8h.html#a24">dither.h</a><li>stp_dither_get_channel()
-: <a class="el" href="dither_8h.html#a39">dither.h</a><li>stp_dither_get_first_position()
-: <a class="el" href="dither_8h.html#a33">dither.h</a><li>stp_dither_get_last_position()
-: <a class="el" href="dither_8h.html#a34">dither.h</a><li>stp_dither_init()
-: <a class="el" href="dither_8h.html#a25">dither.h</a><li>stp_dither_internal()
-: <a class="el" href="dither_8h.html#a41">dither.h</a><li>stp_dither_list_parameters()
-: <a class="el" href="dither_8h.html#a23">dither.h</a><li>stp_dither_matrix_clone()
-: <a class="el" href="dither_8h.html#a18">dither.h</a><li>stp_dither_matrix_copy()
-: <a class="el" href="dither_8h.html#a19">dither.h</a><li>stp_dither_matrix_destroy()
-: <a class="el" href="dither_8h.html#a17">dither.h</a><li>stp_dither_matrix_generic_t
-: <a class="el" href="dither_8h.html#a7">dither.h</a><li>stp_dither_matrix_impl_t
-: <a class="el" href="dither_8h.html#a8">dither.h</a><li>stp_dither_matrix_init()
-: <a class="el" href="dither_8h.html#a13">dither.h</a><li>stp_dither_matrix_init_from_dither_array()
-: <a class="el" href="dither_8h.html#a16">dither.h</a><li>stp_dither_matrix_init_short()
-: <a class="el" href="dither_8h.html#a14">dither.h</a><li>stp_dither_matrix_iterated_init()
-: <a class="el" href="dither_8h.html#a11">dither.h</a><li>stp_dither_matrix_normal_t
-: <a class="el" href="dither_8h.html#a6">dither.h</a><li>stp_dither_matrix_scale_exponentially()
-: <a class="el" href="dither_8h.html#a20">dither.h</a><li>stp_dither_matrix_set_row()
-: <a class="el" href="dither_8h.html#a21">dither.h</a><li>stp_dither_matrix_shear()
-: <a class="el" href="dither_8h.html#a12">dither.h</a><li>stp_dither_matrix_short_t
-: <a class="el" href="dither_8h.html#a5">dither.h</a><li>stp_dither_matrix_validate_array()
-: <a class="el" href="dither_8h.html#a15">dither.h</a><li>stp_dither_set_adaptive_limit()
-: <a class="el" href="dither_8h.html#a32">dither.h</a><li>stp_dither_set_ink_spread()
-: <a class="el" href="dither_8h.html#a31">dither.h</a><li>stp_dither_set_inks()
-: <a class="el" href="dither_8h.html#a37">dither.h</a><li>stp_dither_set_inks_full()
-: <a class="el" href="dither_8h.html#a36">dither.h</a><li>stp_dither_set_inks_simple()
-: <a class="el" href="dither_8h.html#a35">dither.h</a><li>stp_dither_set_iterated_matrix()
-: <a class="el" href="dither_8h.html#a26">dither.h</a><li>stp_dither_set_matrix()
-: <a class="el" href="dither_8h.html#a27">dither.h</a><li>stp_dither_set_matrix_from_dither_array()
-: <a class="el" href="dither_8h.html#a28">dither.h</a><li>stp_dither_set_randomizer()
-: <a class="el" href="dither_8h.html#a30">dither.h</a><li>stp_dither_set_transition()
-: <a class="el" href="dither_8h.html#a29">dither.h</a><li>stp_dotsize_t
-: <a class="el" href="dither_8h.html#a9">dither.h</a><li>stp_dprintf()
-: <a class="el" href="group__util.html#ga20">util.h</a><li>STP_ECOLOR_C
-: <a class="el" href="dither_8h.html#a1">dither.h</a><li>STP_ECOLOR_K
-: <a class="el" href="dither_8h.html#a0">dither.h</a><li>STP_ECOLOR_M
-: <a class="el" href="dither_8h.html#a2">dither.h</a><li>STP_ECOLOR_Y
-: <a class="el" href="dither_8h.html#a3">dither.h</a><li>stp_end_job()
-: <a class="el" href="group__printer.html#ga17">printers.h</a><li>stp_eprintf()
-: <a class="el" href="group__util.html#ga15">util.h</a><li>stp_erprintf()
-: <a class="el" href="group__util.html#ga16">util.h</a><li>stp_erputc()
-: <a class="el" href="group__util.html#ga14">util.h</a><li>stp_family_register()
-: <a class="el" href="group__printer.html#ga20">printers.h</a><li>stp_family_t
-: <a class="el" href="group__printer.html#ga1">printers.h</a><li>stp_family_unregister()
-: <a class="el" href="group__printer.html#ga21">printers.h</a><li>stp_fill_parameter_settings()
-: <a class="el" href="group__vars.html#ga132">vars.h</a><li>stp_fill_tiff
-: <a class="el" href="weave_8h.html#a7">weave.h</a><li>stp_fill_uncompressed
-: <a class="el" href="weave_8h.html#a8">weave.h</a><li>stp_fillfunc
-: <a class="el" href="weave_8h.html#a2">weave.h</a><li>stp_find_standard_dither_array()
-: <a class="el" href="dither_8h.html#a22">dither.h</a><li>stp_flush_all()
-: <a class="el" href="weave_8h.html#a18">weave.h</a><li>stp_flush_debug_messages()
-: <a class="el" href="group__util.html#ga23">util.h</a><li>stp_flushfunc
-: <a class="el" href="weave_8h.html#a3">weave.h</a><li>stp_fold()
-: <a class="el" href="bit-ops_8h.html#a0">bit-ops.h</a><li>stp_free()
-: <a class="el" href="group__util.html#ga27">util.h</a><li>stp_free_data_func_t
-: <a class="el" href="group__vars.html#ga5">vars.h</a><li>stp_get_array_parameter()
-: <a class="el" href="group__vars.html#ga80">vars.h</a><li>stp_get_array_parameter_active()
-: <a class="el" href="group__vars.html#ga116">vars.h</a><li>stp_get_boolean_parameter()
-: <a class="el" href="group__vars.html#ga78">vars.h</a><li>stp_get_boolean_parameter_active()
-: <a class="el" href="group__vars.html#ga114">vars.h</a><li>stp_get_color_by_colorfuncs()
-: <a class="el" href="group__color.html#ga10">color.h</a><li>stp_get_color_by_index()
-: <a class="el" href="group__color.html#ga9">color.h</a><li>stp_get_color_by_name()
-: <a class="el" href="group__color.html#ga8">color.h</a><li>stp_get_color_conversion()
-: <a class="el" href="group__vars.html#ga16">vars.h</a><li>stp_get_component_data()
-: <a class="el" href="group__vars.html#ga127">vars.h</a><li>stp_get_curve_parameter()
-: <a class="el" href="group__vars.html#ga79">vars.h</a><li>stp_get_curve_parameter_active()
-: <a class="el" href="group__vars.html#ga115">vars.h</a><li>stp_get_debug_level()
-: <a class="el" href="group__util.html#ga19">util.h</a><li>stp_get_dimension_parameter()
-: <a class="el" href="group__vars.html#ga77">vars.h</a><li>stp_get_dimension_parameter_active()
-: <a class="el" href="group__vars.html#ga113">vars.h</a><li>stp_get_driver()
-: <a class="el" href="group__vars.html#ga13">vars.h</a><li>stp_get_errdata()
-: <a class="el" href="group__vars.html#ga36">vars.h</a><li>stp_get_errfunc()
-: <a class="el" href="group__vars.html#ga32">vars.h</a><li>stp_get_file_parameter()
-: <a class="el" href="group__vars.html#ga74">vars.h</a><li>stp_get_file_parameter_active()
-: <a class="el" href="group__vars.html#ga110">vars.h</a><li>stp_get_float_parameter()
-: <a class="el" href="group__vars.html#ga75">vars.h</a><li>stp_get_float_parameter_active()
-: <a class="el" href="group__vars.html#ga111">vars.h</a><li>stp_get_height()
-: <a class="el" href="group__vars.html#ga24">vars.h</a><li>stp_get_imageable_area()
-: <a class="el" href="group__vars.html#ga119">vars.h</a><li>stp_get_int_parameter()
-: <a class="el" href="group__vars.html#ga76">vars.h</a><li>stp_get_int_parameter_active()
-: <a class="el" href="group__vars.html#ga112">vars.h</a><li>stp_get_left()
-: <a class="el" href="group__vars.html#ga18">vars.h</a><li>stp_get_lineactive_by_pass()
-: <a class="el" href="weave_8h.html#a21">weave.h</a><li>stp_get_linebases_by_pass()
-: <a class="el" href="weave_8h.html#a23">weave.h</a><li>stp_get_linecount_by_pass()
-: <a class="el" href="weave_8h.html#a22">weave.h</a><li>stp_get_lineoffsets_by_pass()
-: <a class="el" href="weave_8h.html#a20">weave.h</a><li>stp_get_maximum_imageable_area()
-: <a class="el" href="group__vars.html#ga120">vars.h</a><li>stp_get_media_size()
-: <a class="el" href="group__vars.html#ga118">vars.h</a><li>stp_get_model_id()
-: <a class="el" href="group__printer.html#ga18">printers.h</a><li>stp_get_outdata()
-: <a class="el" href="group__vars.html#ga34">vars.h</a><li>stp_get_outfunc()
-: <a class="el" href="group__vars.html#ga30">vars.h</a><li>stp_get_page_height()
-: <a class="el" href="group__vars.html#ga28">vars.h</a><li>stp_get_page_width()
-: <a class="el" href="group__vars.html#ga26">vars.h</a><li>stp_get_papersize_by_index()
-: <a class="el" href="group__papersize.html#ga3">paper.h</a><li>stp_get_papersize_by_name()
-: <a class="el" href="group__papersize.html#ga1">paper.h</a><li>stp_get_papersize_by_size()
-: <a class="el" href="group__papersize.html#ga2">paper.h</a><li>stp_get_parameter_list()
-: <a class="el" href="group__vars.html#ga38">vars.h</a><li>stp_get_pass_by_pass()
-: <a class="el" href="weave_8h.html#a24">weave.h</a><li>stp_get_printer()
-: <a class="el" href="group__printer.html#ga6">printers.h</a><li>stp_get_printer_by_driver()
-: <a class="el" href="group__printer.html#ga5">printers.h</a><li>stp_get_printer_by_index()
-: <a class="el" href="group__printer.html#ga3">printers.h</a><li>stp_get_printer_by_long_name()
-: <a class="el" href="group__printer.html#ga4">printers.h</a><li>stp_get_printer_index_by_driver()
-: <a class="el" href="group__printer.html#ga7">printers.h</a><li>stp_get_raw_parameter()
-: <a class="el" href="group__vars.html#ga81">vars.h</a><li>stp_get_raw_parameter_active()
-: <a class="el" href="group__vars.html#ga117">vars.h</a><li>stp_get_release_version()
-: <a class="el" href="group__util.html#ga32">util.h</a><li>stp_get_size_limit()
-: <a class="el" href="group__vars.html#ga121">vars.h</a><li>stp_get_string_parameter()
-: <a class="el" href="group__vars.html#ga73">vars.h</a><li>stp_get_string_parameter_active()
-: <a class="el" href="group__vars.html#ga109">vars.h</a><li>stp_get_top()
-: <a class="el" href="group__vars.html#ga20">vars.h</a><li>stp_get_verified()
-: <a class="el" href="group__vars.html#ga129">vars.h</a><li>stp_get_version()
-: <a class="el" href="group__util.html#ga31">util.h</a><li>stp_get_width()
-: <a class="el" href="group__vars.html#ga22">vars.h</a><li>stp_image_conclude()
-: <a class="el" href="group__image.html#ga7">image.h</a><li>stp_image_get_appname()
-: <a class="el" href="group__image.html#ga6">image.h</a><li>stp_image_get_row()
-: <a class="el" href="group__image.html#ga5">image.h</a><li>stp_image_height()
-: <a class="el" href="group__image.html#ga4">image.h</a><li>stp_image_init()
-: <a class="el" href="group__image.html#ga1">image.h</a><li>stp_image_reset()
-: <a class="el" href="group__image.html#ga2">image.h</a><li>STP_IMAGE_STATUS_ABORT
-: <a class="el" href="group__image.html#gga9a3">image.h</a><li>STP_IMAGE_STATUS_OK
-: <a class="el" href="group__image.html#gga9a2">image.h</a><li>stp_image_status_t
-: <a class="el" href="group__image.html#ga9">image.h</a><li>stp_image_t
-: <a class="el" href="group__image.html#ga0">image.h</a><li>stp_image_width()
-: <a class="el" href="group__image.html#ga3">image.h</a><li>stp_init()
-: <a class="el" href="group__util.html#ga0">util.h</a><li>stp_init_debug_messages()
-: <a class="el" href="group__util.html#ga22">util.h</a><li>stp_initialize_printer_defaults()
-: <a class="el" href="group__printer.html#ga22">printers.h</a><li>stp_initialize_weave()
-: <a class="el" href="weave_8h.html#a17">weave.h</a><li>stp_interface_age
-: <a class="el" href="group__version.html#ga5">gutenprint-version.h</a><li>STP_INTERFACE_AGE
-: <a class="el" href="group__version.html#ga12">gutenprint-version.h</a><li>stp_known_papersizes()
-: <a class="el" href="group__papersize.html#ga0">paper.h</a><li>stp_list_copy()
-: <a class="el" href="group__list.html#ga8">list.h</a><li>stp_list_create()
-: <a class="el" href="group__list.html#ga7">list.h</a><li>stp_list_destroy()
-: <a class="el" href="group__list.html#ga9">list.h</a><li>stp_list_get_copyfunc()
-: <a class="el" href="group__list.html#ga19">list.h</a><li>stp_list_get_end()
-: <a class="el" href="group__list.html#ga11">list.h</a><li>stp_list_get_freefunc()
-: <a class="el" href="group__list.html#ga17">list.h</a><li>stp_list_get_item_by_index()
-: <a class="el" href="group__list.html#ga12">list.h</a><li>stp_list_get_item_by_long_name()
-: <a class="el" href="group__list.html#ga14">list.h</a><li>stp_list_get_item_by_name()
-: <a class="el" href="group__list.html#ga13">list.h</a><li>stp_list_get_length()
-: <a class="el" href="group__list.html#ga15">list.h</a><li>stp_list_get_long_namefunc()
-: <a class="el" href="group__list.html#ga23">list.h</a><li>stp_list_get_namefunc()
-: <a class="el" href="group__list.html#ga21">list.h</a><li>stp_list_get_sortfunc()
-: <a class="el" href="group__list.html#ga25">list.h</a><li>stp_list_get_start()
-: <a class="el" href="group__list.html#ga10">list.h</a><li>stp_list_item_create()
-: <a class="el" href="group__list.html#ga26">list.h</a><li>stp_list_item_destroy()
-: <a class="el" href="group__list.html#ga27">list.h</a><li>stp_list_item_get_data()
-: <a class="el" href="group__list.html#ga30">list.h</a><li>stp_list_item_next()
-: <a class="el" href="group__list.html#ga29">list.h</a><li>stp_list_item_prev()
-: <a class="el" href="group__list.html#ga28">list.h</a><li>stp_list_item_set_data()
-: <a class="el" href="group__list.html#ga31">list.h</a><li>stp_list_item_t
-: <a class="el" href="group__list.html#ga0">list.h</a><li>stp_list_node_free_data()
-: <a class="el" href="group__list.html#ga6">list.h</a><li>stp_list_set_copyfunc()
-: <a class="el" href="group__list.html#ga18">list.h</a><li>stp_list_set_freefunc()
-: <a class="el" href="group__list.html#ga16">list.h</a><li>stp_list_set_long_namefunc()
-: <a class="el" href="group__list.html#ga22">list.h</a><li>stp_list_set_namefunc()
-: <a class="el" href="group__list.html#ga20">list.h</a><li>stp_list_set_sortfunc()
-: <a class="el" href="group__list.html#ga24">list.h</a><li>stp_list_t
-: <a class="el" href="group__list.html#ga1">list.h</a><li>STP_MAJOR_VERSION
-: <a class="el" href="group__version.html#ga7">gutenprint-version.h</a><li>stp_major_version
-: <a class="el" href="group__version.html#ga0">gutenprint-version.h</a><li>stp_malloc()
-: <a class="el" href="group__util.html#ga24">util.h</a><li>STP_MAX_WEAVE
-: <a class="el" href="weave_8h.html#a0">weave.h</a><li>stp_merge_printvars()
-: <a class="el" href="group__vars.html#ga37">vars.h</a><li>STP_MICRO_VERSION
-: <a class="el" href="group__version.html#ga9">gutenprint-version.h</a><li>stp_micro_version
-: <a class="el" href="group__version.html#ga2">gutenprint-version.h</a><li>STP_MINOR_VERSION
-: <a class="el" href="group__version.html#ga8">gutenprint-version.h</a><li>stp_minor_version
-: <a class="el" href="group__version.html#ga1">gutenprint-version.h</a><li>STP_MODULE
-: <a class="el" href="gutenprint-module_8h.html#a0">gutenprint-module.h</a><li>STP_MODULE_CLASS_COLOR
-: <a class="el" href="module_8h.html#a13a5">module.h</a><li>STP_MODULE_CLASS_DITHER
-: <a class="el" href="module_8h.html#a13a6">module.h</a><li>STP_MODULE_CLASS_FAMILY
-: <a class="el" href="module_8h.html#a13a4">module.h</a><li>STP_MODULE_CLASS_INVALID
-: <a class="el" href="module_8h.html#a13a2">module.h</a><li>STP_MODULE_CLASS_MISC
-: <a class="el" href="module_8h.html#a13a3">module.h</a><li>stp_module_class_t
-: <a class="el" href="module_8h.html#a13">module.h</a><li>stp_module_close()
-: <a class="el" href="module_8h.html#a11">module.h</a><li>stp_module_exit()
-: <a class="el" href="module_8h.html#a8">module.h</a><li>stp_module_get_class()
-: <a class="el" href="module_8h.html#a12">module.h</a><li>stp_module_init()
-: <a class="el" href="module_8h.html#a10">module.h</a><li>stp_module_load()
-: <a class="el" href="module_8h.html#a7">module.h</a><li>stp_module_open()
-: <a class="el" href="module_8h.html#a9">module.h</a><li>stp_module_t
-: <a class="el" href="module_8h.html#a1">module.h</a><li>stp_module_version_t
-: <a class="el" href="module_8h.html#a0">module.h</a><li>STP_MXML_ADD_AFTER
-: <a class="el" href="mxml_8h.html#a12">mxml.h</a><li>STP_MXML_ADD_BEFORE
-: <a class="el" href="mxml_8h.html#a11">mxml.h</a><li>STP_MXML_ADD_TO_PARENT
-: <a class="el" href="mxml_8h.html#a13">mxml.h</a><li>stp_mxml_attr_t
-: <a class="el" href="mxml_8h.html#a15">mxml.h</a><li>STP_MXML_DESCEND
-: <a class="el" href="mxml_8h.html#a4">mxml.h</a><li>STP_MXML_DESCEND_FIRST
-: <a class="el" href="mxml_8h.html#a6">mxml.h</a><li>STP_MXML_ELEMENT
-: <a class="el" href="mxml_8h.html#a43a20">mxml.h</a><li>stp_mxml_element_t
-: <a class="el" href="mxml_8h.html#a16">mxml.h</a><li>STP_MXML_INTEGER
-: <a class="el" href="mxml_8h.html#a43a21">mxml.h</a><li>STP_MXML_NO_CALLBACK
-: <a class="el" href="mxml_8h.html#a2">mxml.h</a><li>STP_MXML_NO_DESCEND
-: <a class="el" href="mxml_8h.html#a5">mxml.h</a><li>STP_MXML_NO_PARENT
-: <a class="el" href="mxml_8h.html#a3">mxml.h</a><li>stp_mxml_node_t
-: <a class="el" href="mxml_8h.html#a19">mxml.h</a><li>STP_MXML_OPAQUE
-: <a class="el" href="mxml_8h.html#a43a22">mxml.h</a><li>STP_MXML_REAL
-: <a class="el" href="mxml_8h.html#a43a23">mxml.h</a><li>STP_MXML_TAB
-: <a class="el" href="mxml_8h.html#a1">mxml.h</a><li>STP_MXML_TEXT
-: <a class="el" href="mxml_8h.html#a43a24">mxml.h</a><li>stp_mxml_text_t
-: <a class="el" href="mxml_8h.html#a17">mxml.h</a><li>stp_mxml_type_e
-: <a class="el" href="mxml_8h.html#a43">mxml.h</a><li>stp_mxml_type_t
-: <a class="el" href="mxml_8h.html#a14">mxml.h</a><li>stp_mxml_value_t
-: <a class="el" href="mxml_8h.html#a18">mxml.h</a><li>STP_MXML_WRAP
-: <a class="el" href="mxml_8h.html#a0">mxml.h</a><li>STP_MXML_WS_AFTER_CLOSE
-: <a class="el" href="mxml_8h.html#a10">mxml.h</a><li>STP_MXML_WS_AFTER_OPEN
-: <a class="el" href="mxml_8h.html#a8">mxml.h</a><li>STP_MXML_WS_BEFORE_CLOSE
-: <a class="el" href="mxml_8h.html#a9">mxml.h</a><li>STP_MXML_WS_BEFORE_OPEN
-: <a class="el" href="mxml_8h.html#a7">mxml.h</a><li>stp_mxmlAdd()
-: <a class="el" href="mxml_8h.html#a25">mxml.h</a><li>stp_mxmlDelete()
-: <a class="el" href="mxml_8h.html#a26">mxml.h</a><li>stp_mxmlElementGetAttr()
-: <a class="el" href="mxml_8h.html#a27">mxml.h</a><li>stp_mxmlElementSetAttr()
-: <a class="el" href="mxml_8h.html#a28">mxml.h</a><li>stp_mxmlFindElement()
-: <a class="el" href="mxml_8h.html#a29">mxml.h</a><li>stp_mxmlLoadFile()
-: <a class="el" href="mxml_8h.html#a30">mxml.h</a><li>stp_mxmlLoadString()
-: <a class="el" href="mxml_8h.html#a31">mxml.h</a><li>stp_mxmlNewElement()
-: <a class="el" href="mxml_8h.html#a32">mxml.h</a><li>stp_mxmlNewInteger()
-: <a class="el" href="mxml_8h.html#a33">mxml.h</a><li>stp_mxmlNewOpaque()
-: <a class="el" href="mxml_8h.html#a34">mxml.h</a><li>stp_mxmlNewReal()
-: <a class="el" href="mxml_8h.html#a35">mxml.h</a><li>stp_mxmlNewText()
-: <a class="el" href="mxml_8h.html#a36">mxml.h</a><li>stp_mxmlRemove()
-: <a class="el" href="mxml_8h.html#a37">mxml.h</a><li>stp_mxmlSaveAllocString()
-: <a class="el" href="mxml_8h.html#a38">mxml.h</a><li>stp_mxmlSaveFile()
-: <a class="el" href="mxml_8h.html#a39">mxml.h</a><li>stp_mxmlSaveString()
-: <a class="el" href="mxml_8h.html#a40">mxml.h</a><li>stp_mxmlWalkNext()
-: <a class="el" href="mxml_8h.html#a41">mxml.h</a><li>stp_mxmlWalkPrev()
-: <a class="el" href="mxml_8h.html#a42">mxml.h</a><li>STP_NCOLORS
-: <a class="el" href="dither_8h.html#a4">dither.h</a><li>stp_node_copyfunc
-: <a class="el" href="group__list.html#ga3">list.h</a><li>stp_node_freefunc
-: <a class="el" href="group__list.html#ga2">list.h</a><li>stp_node_namefunc
-: <a class="el" href="group__list.html#ga4">list.h</a><li>stp_node_sortfunc
-: <a class="el" href="group__list.html#ga5">list.h</a><li>stp_outfunc_t
-: <a class="el" href="group__vars.html#ga3">vars.h</a><li>stp_pack_tiff
-: <a class="el" href="weave_8h.html#a5">weave.h</a><li>stp_pack_uncompressed
-: <a class="el" href="weave_8h.html#a6">weave.h</a><li>stp_packfunc
-: <a class="el" href="weave_8h.html#a1">weave.h</a><li>stp_papersize_unit_t
-: <a class="el" href="group__papersize.html#ga5">paper.h</a><li>STP_PARAMETER_ACTIVE
-: <a class="el" href="group__vars.html#gga136a32">vars.h</a><li>stp_parameter_activity_t
-: <a class="el" href="group__vars.html#ga136">vars.h</a><li>STP_PARAMETER_CLASS_CORE
-: <a class="el" href="group__vars.html#gga134a19">vars.h</a><li>STP_PARAMETER_CLASS_FEATURE
-: <a class="el" href="group__vars.html#gga134a17">vars.h</a><li>STP_PARAMETER_CLASS_INVALID
-: <a class="el" href="group__vars.html#gga134a20">vars.h</a><li>STP_PARAMETER_CLASS_OUTPUT
-: <a class="el" href="group__vars.html#gga134a18">vars.h</a><li>stp_parameter_class_t
-: <a class="el" href="group__vars.html#ga134">vars.h</a><li>STP_PARAMETER_DEFAULTED
-: <a class="el" href="group__vars.html#gga136a31">vars.h</a><li>stp_parameter_description_destroy()
-: <a class="el" href="group__vars.html#ga48">vars.h</a><li>stp_parameter_find()
-: <a class="el" href="group__vars.html#ga40">vars.h</a><li>stp_parameter_find_in_settings()
-: <a class="el" href="group__vars.html#ga49">vars.h</a><li>STP_PARAMETER_INACTIVE
-: <a class="el" href="group__vars.html#gga136a30">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED
-: <a class="el" href="group__vars.html#gga135a22">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED1
-: <a class="el" href="group__vars.html#gga135a23">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED2
-: <a class="el" href="group__vars.html#gga135a24">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED3
-: <a class="el" href="group__vars.html#gga135a25">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED4
-: <a class="el" href="group__vars.html#gga135a26">vars.h</a><li>STP_PARAMETER_LEVEL_BASIC
-: <a class="el" href="group__vars.html#gga135a21">vars.h</a><li>STP_PARAMETER_LEVEL_EXTERNAL
-: <a class="el" href="group__vars.html#gga135a28">vars.h</a><li>STP_PARAMETER_LEVEL_INTERNAL
-: <a class="el" href="group__vars.html#gga135a27">vars.h</a><li>STP_PARAMETER_LEVEL_INVALID
-: <a class="el" href="group__vars.html#gga135a29">vars.h</a><li>stp_parameter_level_t
-: <a class="el" href="group__vars.html#ga135">vars.h</a><li>stp_parameter_list_add_param()
-: <a class="el" href="group__vars.html#ga44">vars.h</a><li>stp_parameter_list_append()
-: <a class="el" href="group__vars.html#ga46">vars.h</a><li>stp_parameter_list_copy()
-: <a class="el" href="group__vars.html#ga45">vars.h</a><li>stp_parameter_list_count()
-: <a class="el" href="group__vars.html#ga39">vars.h</a><li>stp_parameter_list_create()
-: <a class="el" href="group__vars.html#ga43">vars.h</a><li>stp_parameter_list_destroy()
-: <a class="el" href="group__vars.html#ga42">vars.h</a><li>stp_parameter_list_param()
-: <a class="el" href="group__vars.html#ga41">vars.h</a><li>stp_parameter_list_t
-: <a class="el" href="group__vars.html#ga1">vars.h</a><li>STP_PARAMETER_TYPE_ARRAY
-: <a class="el" href="group__vars.html#gga133a14">vars.h</a><li>STP_PARAMETER_TYPE_BOOLEAN
-: <a class="el" href="group__vars.html#gga133a9">vars.h</a><li>STP_PARAMETER_TYPE_CURVE
-: <a class="el" href="group__vars.html#gga133a11">vars.h</a><li>STP_PARAMETER_TYPE_DIMENSION
-: <a class="el" href="group__vars.html#gga133a15">vars.h</a><li>STP_PARAMETER_TYPE_DOUBLE
-: <a class="el" href="group__vars.html#gga133a10">vars.h</a><li>STP_PARAMETER_TYPE_FILE
-: <a class="el" href="group__vars.html#gga133a12">vars.h</a><li>STP_PARAMETER_TYPE_INT
-: <a class="el" href="group__vars.html#gga133a8">vars.h</a><li>STP_PARAMETER_TYPE_INVALID
-: <a class="el" href="group__vars.html#gga133a16">vars.h</a><li>STP_PARAMETER_TYPE_RAW
-: <a class="el" href="group__vars.html#gga133a13">vars.h</a><li>STP_PARAMETER_TYPE_STRING_LIST
-: <a class="el" href="group__vars.html#gga133a7">vars.h</a><li>stp_parameter_type_t
-: <a class="el" href="group__vars.html#ga133">vars.h</a><li>stp_parameter_verify_t
-: <a class="el" href="group__vars.html#ga137">vars.h</a><li>stp_path_search()
-: <a class="el" href="path_8h.html#a0">path.h</a><li>stp_path_split()
-: <a class="el" href="path_8h.html#a1">path.h</a><li>stp_print()
-: <a class="el" href="group__printer.html#ga15">printers.h</a><li>stp_printer_describe_parameter()
-: <a class="el" href="group__printer.html#ga24">printers.h</a><li>stp_printer_get_defaults()
-: <a class="el" href="group__printer.html#ga13">printers.h</a><li>stp_printer_get_driver()
-: <a class="el" href="group__printer.html#ga9">printers.h</a><li>stp_printer_get_family()
-: <a class="el" href="group__printer.html#ga10">printers.h</a><li>stp_printer_get_long_name()
-: <a class="el" href="group__printer.html#ga8">printers.h</a><li>stp_printer_get_manufacturer()
-: <a class="el" href="group__printer.html#ga11">printers.h</a><li>stp_printer_get_model()
-: <a class="el" href="group__printer.html#ga12">printers.h</a><li>stp_printer_list_parameters()
-: <a class="el" href="group__printer.html#ga23">printers.h</a><li>stp_printer_model_count()
-: <a class="el" href="group__printer.html#ga2">printers.h</a><li>stp_printer_t
-: <a class="el" href="group__printer.html#ga0">printers.h</a><li>stp_prune_inactive_options()
-: <a class="el" href="group__util.html#ga4">util.h</a><li>stp_put16_be()
-: <a class="el" href="group__util.html#ga9">util.h</a><li>stp_put16_le()
-: <a class="el" href="group__util.html#ga8">util.h</a><li>stp_put32_be()
-: <a class="el" href="group__util.html#ga11">util.h</a><li>stp_put32_le()
-: <a class="el" href="group__util.html#ga10">util.h</a><li>stp_putc()
-: <a class="el" href="group__util.html#ga7">util.h</a><li>stp_puts()
-: <a class="el" href="group__util.html#ga12">util.h</a><li>stp_read_and_compose_curves()
-: <a class="el" href="group__util.html#ga2">util.h</a><li>stp_realloc()
-: <a class="el" href="group__util.html#ga26">util.h</a><li>stp_register_xml_parser()
-: <a class="el" href="xml_8h.html#a1">xml.h</a><li>stp_register_xml_preload()
-: <a class="el" href="xml_8h.html#a3">xml.h</a><li>STP_SAFE_FREE
-: <a class="el" href="group__util.html#ga54">util.h</a><li>stp_scale_float_parameter()
-: <a class="el" href="group__vars.html#ga61">vars.h</a><li>stp_send_command()
-: <a class="el" href="group__util.html#ga13">util.h</a><li>stp_sequence_copy()
-: <a class="el" href="group__sequence.html#ga3">sequence.h</a><li>stp_sequence_create()
-: <a class="el" href="group__sequence.html#ga1">sequence.h</a><li>stp_sequence_create_copy()
-: <a class="el" href="group__sequence.html#ga4">sequence.h</a><li>stp_sequence_create_from_xmltree()
-: <a class="el" href="xml_8h.html#a15">xml.h</a><li>stp_sequence_destroy()
-: <a class="el" href="group__sequence.html#ga2">sequence.h</a><li>stp_sequence_get_bounds()
-: <a class="el" href="group__sequence.html#ga6">sequence.h</a><li>stp_sequence_get_data()
-: <a class="el" href="group__sequence.html#ga12">sequence.h</a><li>stp_sequence_get_float_data()
-: <a class="el" href="group__sequence.html#ga22">sequence.h</a><li>stp_sequence_get_int_data()
-: <a class="el" href="group__sequence.html#ga25">sequence.h</a><li>stp_sequence_get_long_data()
-: <a class="el" href="group__sequence.html#ga23">sequence.h</a><li>stp_sequence_get_point()
-: <a class="el" href="group__sequence.html#ga14">sequence.h</a><li>stp_sequence_get_range()
-: <a class="el" href="group__sequence.html#ga7">sequence.h</a><li>stp_sequence_get_short_data()
-: <a class="el" href="group__sequence.html#ga27">sequence.h</a><li>stp_sequence_get_size()
-: <a class="el" href="group__sequence.html#ga9">sequence.h</a><li>stp_sequence_get_uint_data()
-: <a class="el" href="group__sequence.html#ga26">sequence.h</a><li>stp_sequence_get_ulong_data()
-: <a class="el" href="group__sequence.html#ga24">sequence.h</a><li>stp_sequence_get_ushort_data()
-: <a class="el" href="group__sequence.html#ga28">sequence.h</a><li>stp_sequence_set_bounds()
-: <a class="el" href="group__sequence.html#ga5">sequence.h</a><li>stp_sequence_set_data()
-: <a class="el" href="group__sequence.html#ga10">sequence.h</a><li>stp_sequence_set_float_data()
-: <a class="el" href="group__sequence.html#ga15">sequence.h</a><li>stp_sequence_set_int_data()
-: <a class="el" href="group__sequence.html#ga18">sequence.h</a><li>stp_sequence_set_long_data()
-: <a class="el" href="group__sequence.html#ga16">sequence.h</a><li>stp_sequence_set_point()
-: <a class="el" href="group__sequence.html#ga13">sequence.h</a><li>stp_sequence_set_short_data()
-: <a class="el" href="group__sequence.html#ga20">sequence.h</a><li>stp_sequence_set_size()
-: <a class="el" href="group__sequence.html#ga8">sequence.h</a><li>stp_sequence_set_subrange()
-: <a class="el" href="group__sequence.html#ga11">sequence.h</a><li>stp_sequence_set_uint_data()
-: <a class="el" href="group__sequence.html#ga19">sequence.h</a><li>stp_sequence_set_ulong_data()
-: <a class="el" href="group__sequence.html#ga17">sequence.h</a><li>stp_sequence_set_ushort_data()
-: <a class="el" href="group__sequence.html#ga21">sequence.h</a><li>stp_sequence_t
-: <a class="el" href="group__sequence.html#ga0">sequence.h</a><li>stp_set_array_parameter()
-: <a class="el" href="group__vars.html#ga59">vars.h</a><li>stp_set_array_parameter_active()
-: <a class="el" href="group__vars.html#ga98">vars.h</a><li>stp_set_boolean_parameter()
-: <a class="el" href="group__vars.html#ga57">vars.h</a><li>stp_set_boolean_parameter_active()
-: <a class="el" href="group__vars.html#ga96">vars.h</a><li>stp_set_color_conversion()
-: <a class="el" href="group__vars.html#ga14">vars.h</a><li>stp_set_color_conversion_n()
-: <a class="el" href="group__vars.html#ga15">vars.h</a><li>stp_set_curve_parameter()
-: <a class="el" href="group__vars.html#ga58">vars.h</a><li>stp_set_curve_parameter_active()
-: <a class="el" href="group__vars.html#ga97">vars.h</a><li>stp_set_default_array_parameter()
-: <a class="el" href="group__vars.html#ga71">vars.h</a><li>stp_set_default_boolean_parameter()
-: <a class="el" href="group__vars.html#ga69">vars.h</a><li>stp_set_default_curve_parameter()
-: <a class="el" href="group__vars.html#ga70">vars.h</a><li>stp_set_default_dimension_parameter()
-: <a class="el" href="group__vars.html#ga68">vars.h</a><li>stp_set_default_file_parameter()
-: <a class="el" href="group__vars.html#ga64">vars.h</a><li>stp_set_default_file_parameter_n()
-: <a class="el" href="group__vars.html#ga65">vars.h</a><li>stp_set_default_float_parameter()
-: <a class="el" href="group__vars.html#ga66">vars.h</a><li>stp_set_default_int_parameter()
-: <a class="el" href="group__vars.html#ga67">vars.h</a><li>stp_set_default_raw_parameter()
-: <a class="el" href="group__vars.html#ga72">vars.h</a><li>stp_set_default_string_parameter()
-: <a class="el" href="group__vars.html#ga62">vars.h</a><li>stp_set_default_string_parameter_n()
-: <a class="el" href="group__vars.html#ga63">vars.h</a><li>stp_set_dimension_parameter()
-: <a class="el" href="group__vars.html#ga56">vars.h</a><li>stp_set_dimension_parameter_active()
-: <a class="el" href="group__vars.html#ga95">vars.h</a><li>stp_set_driver()
-: <a class="el" href="group__vars.html#ga11">vars.h</a><li>stp_set_driver_n()
-: <a class="el" href="group__vars.html#ga12">vars.h</a><li>stp_set_errdata()
-: <a class="el" href="group__vars.html#ga35">vars.h</a><li>stp_set_errfunc()
-: <a class="el" href="group__vars.html#ga31">vars.h</a><li>stp_set_file_parameter()
-: <a class="el" href="group__vars.html#ga52">vars.h</a><li>stp_set_file_parameter_active()
-: <a class="el" href="group__vars.html#ga92">vars.h</a><li>stp_set_file_parameter_n()
-: <a class="el" href="group__vars.html#ga53">vars.h</a><li>stp_set_float_parameter()
-: <a class="el" href="group__vars.html#ga54">vars.h</a><li>stp_set_float_parameter_active()
-: <a class="el" href="group__vars.html#ga93">vars.h</a><li>stp_set_height()
-: <a class="el" href="group__vars.html#ga23">vars.h</a><li>stp_set_int_parameter()
-: <a class="el" href="group__vars.html#ga55">vars.h</a><li>stp_set_int_parameter_active()
-: <a class="el" href="group__vars.html#ga94">vars.h</a><li>stp_set_left()
-: <a class="el" href="group__vars.html#ga17">vars.h</a><li>stp_set_outdata()
-: <a class="el" href="group__vars.html#ga33">vars.h</a><li>stp_set_outfunc()
-: <a class="el" href="group__vars.html#ga29">vars.h</a><li>stp_set_output_codeset()
-: <a class="el" href="group__util.html#ga1">util.h</a><li>stp_set_page_height()
-: <a class="el" href="group__vars.html#ga27">vars.h</a><li>stp_set_page_width()
-: <a class="el" href="group__vars.html#ga25">vars.h</a><li>stp_set_printer_defaults()
-: <a class="el" href="group__printer.html#ga14">printers.h</a><li>stp_set_raw_parameter()
-: <a class="el" href="group__vars.html#ga60">vars.h</a><li>stp_set_raw_parameter_active()
-: <a class="el" href="group__vars.html#ga99">vars.h</a><li>stp_set_string_parameter()
-: <a class="el" href="group__vars.html#ga50">vars.h</a><li>stp_set_string_parameter_active()
-: <a class="el" href="group__vars.html#ga91">vars.h</a><li>stp_set_string_parameter_n()
-: <a class="el" href="group__vars.html#ga51">vars.h</a><li>stp_set_top()
-: <a class="el" href="group__vars.html#ga19">vars.h</a><li>stp_set_verified()
-: <a class="el" href="group__vars.html#ga130">vars.h</a><li>stp_set_width()
-: <a class="el" href="group__vars.html#ga21">vars.h</a><li>stp_shade_t
-: <a class="el" href="dither_8h.html#a10">dither.h</a><li>stp_split_2()
-: <a class="el" href="bit-ops_8h.html#a1">bit-ops.h</a><li>stp_split_4()
-: <a class="el" href="bit-ops_8h.html#a2">bit-ops.h</a><li>stp_start_job()
-: <a class="el" href="group__printer.html#ga16">printers.h</a><li>stp_strdup()
-: <a class="el" href="group__util.html#ga30">util.h</a><li>stp_string_list_add_string()
-: <a class="el" href="string-list_8h.html#a7">string-list.h</a><li>stp_string_list_count()
-: <a class="el" href="string-list_8h.html#a5">string-list.h</a><li>stp_string_list_create()
-: <a class="el" href="string-list_8h.html#a1">string-list.h</a><li>stp_string_list_create_copy()
-: <a class="el" href="string-list_8h.html#a6">string-list.h</a><li>stp_string_list_create_from_params()
-: <a class="el" href="string-list_8h.html#a9">string-list.h</a><li>stp_string_list_destroy()
-: <a class="el" href="string-list_8h.html#a2">string-list.h</a><li>stp_string_list_find()
-: <a class="el" href="string-list_8h.html#a4">string-list.h</a><li>stp_string_list_is_present()
-: <a class="el" href="string-list_8h.html#a10">string-list.h</a><li>stp_string_list_param()
-: <a class="el" href="string-list_8h.html#a3">string-list.h</a><li>stp_string_list_remove_string()
-: <a class="el" href="string-list_8h.html#a8">string-list.h</a><li>stp_string_list_t
-: <a class="el" href="string-list_8h.html#a0">string-list.h</a><li>stp_strlen()
-: <a class="el" href="group__util.html#ga28">util.h</a><li>stp_strndup()
-: <a class="el" href="group__util.html#ga29">util.h</a><li>stp_unpack_16()
-: <a class="el" href="bit-ops_8h.html#a6">bit-ops.h</a><li>stp_unpack_2()
-: <a class="el" href="bit-ops_8h.html#a3">bit-ops.h</a><li>stp_unpack_4()
-: <a class="el" href="bit-ops_8h.html#a4">bit-ops.h</a><li>stp_unpack_8()
-: <a class="el" href="bit-ops_8h.html#a5">bit-ops.h</a><li>stp_unregister_xml_parser()
-: <a class="el" href="xml_8h.html#a2">xml.h</a><li>stp_unregister_xml_preload()
-: <a class="el" href="xml_8h.html#a4">xml.h</a><li>stp_vars_copy()
-: <a class="el" href="group__vars.html#ga8">vars.h</a><li>stp_vars_create()
-: <a class="el" href="group__vars.html#ga7">vars.h</a><li>stp_vars_create_copy()
-: <a class="el" href="group__vars.html#ga9">vars.h</a><li>stp_vars_destroy()
-: <a class="el" href="group__vars.html#ga10">vars.h</a><li>stp_vars_t
-: <a class="el" href="group__vars.html#ga0">vars.h</a><li>stp_verify()
-: <a class="el" href="group__vars.html#ga123">vars.h</a><li>stp_verify_parameter()
-: <a class="el" href="group__vars.html#ga128">vars.h</a><li>stp_verify_printer_params()
-: <a class="el" href="group__printer.html#ga19">printers.h</a><li>STP_WEAVE_ASCENDING
-: <a class="el" href="weave_8h.html#a26a12">weave.h</a><li>STP_WEAVE_ASCENDING_2X
-: <a class="el" href="weave_8h.html#a26a14">weave.h</a><li>STP_WEAVE_ASCENDING_3X
-: <a class="el" href="weave_8h.html#a26a16">weave.h</a><li>STP_WEAVE_DESCENDING
-: <a class="el" href="weave_8h.html#a26a13">weave.h</a><li>stp_weave_parameters_by_row()
-: <a class="el" href="weave_8h.html#a25">weave.h</a><li>STP_WEAVE_STAGGERED
-: <a class="el" href="weave_8h.html#a26a15">weave.h</a><li>stp_weave_strategy_t
-: <a class="el" href="weave_8h.html#a26">weave.h</a><li>STP_WEAVE_ZIGZAG
-: <a class="el" href="weave_8h.html#a26a11">weave.h</a><li>stp_write_weave()
-: <a class="el" href="weave_8h.html#a19">weave.h</a><li>stp_xml_exit()
-: <a class="el" href="xml_8h.html#a11">xml.h</a><li>stp_xml_get_node()
-: <a class="el" href="xml_8h.html#a12">xml.h</a><li>stp_xml_init()
-: <a class="el" href="xml_8h.html#a10">xml.h</a><li>stp_xml_init_defaults()
-: <a class="el" href="xml_8h.html#a5">xml.h</a><li>stp_xml_parse_file()
-: <a class="el" href="xml_8h.html#a6">xml.h</a><li>stp_xml_parse_file_named()
-: <a class="el" href="xml_8h.html#a21">xml.h</a><li>stp_xml_parse_func
-: <a class="el" href="xml_8h.html#a0">xml.h</a><li>stp_xml_preinit()
-: <a class="el" href="xml_8h.html#a14">xml.h</a><li>stp_xmldoc_create_generic()
-: <a class="el" href="xml_8h.html#a13">xml.h</a><li>stp_xmlstrtod()
-: <a class="el" href="xml_8h.html#a9">xml.h</a><li>stp_xmlstrtol()
-: <a class="el" href="xml_8h.html#a7">xml.h</a><li>stp_xmlstrtoul()
-: <a class="el" href="xml_8h.html#a8">xml.h</a><li>stp_xmltree_create_from_array()
-: <a class="el" href="xml_8h.html#a20">xml.h</a><li>stp_xmltree_create_from_curve()
-: <a class="el" href="xml_8h.html#a18">xml.h</a><li>stp_xmltree_create_from_sequence()
-: <a class="el" href="xml_8h.html#a16">xml.h</a><li>stp_zalloc()
-: <a class="el" href="group__util.html#ga25">util.h</a><li>stp_zfwrite()
-: <a class="el" href="group__util.html#ga6">util.h</a><li>stp_zprintf()
-: <a class="el" href="group__util.html#ga5">util.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__util.html#gd0c145dc5cebecab0bb4e3ac40fc8e4d">util.h</a>
+<li>stp_allocate_component_data()
+: <a class="el" href="group__vars.html#gfd4f81ca2ad497bd21f005344844f9c4">vars.h</a>
+<li>stp_array_copy()
+: <a class="el" href="group__array.html#gaa9bf798890e01b4bbce8cda45615021">array.h</a>
+<li>stp_array_create()
+: <a class="el" href="group__array.html#ga3d385d3e2f248b1c1ac88d5f103e9a2">array.h</a>
+<li>stp_array_create_copy()
+: <a class="el" href="group__array.html#gd0b50228ca40df79196197f9c21f4b56">array.h</a>
+<li>stp_array_create_from_xmltree()
+: <a class="el" href="xml_8h.html#ce5ac81af291e43504d5c0200276e543">xml.h</a>
+<li>stp_array_destroy()
+: <a class="el" href="group__array.html#gafb2573df35220ef9be3f6ba4b8c871b">array.h</a>
+<li>stp_array_get_data()
+: <a class="el" href="group__array.html#ge0d44ee80048189d244b16f231c54b80">array.h</a>
+<li>stp_array_get_point()
+: <a class="el" href="group__array.html#g9078af984a5e1ec80a6068bdb51c9a6d">array.h</a>
+<li>stp_array_get_sequence()
+: <a class="el" href="group__array.html#ge05ba5cfe8c03e2435348d6c5488d87e">array.h</a>
+<li>stp_array_get_size()
+: <a class="el" href="group__array.html#gfe61db801ab3b0326646178e536dd161">array.h</a>
+<li>stp_array_set_data()
+: <a class="el" href="group__array.html#gea0493f5bec9c5c185679adfde3edc9a">array.h</a>
+<li>stp_array_set_point()
+: <a class="el" href="group__array.html#gd6b95b2efd500007b098594826f4467f">array.h</a>
+<li>stp_array_set_size()
+: <a class="el" href="group__array.html#ge6fb91b246ef5abd388927cb9674503e">array.h</a>
+<li>stp_array_t
+: <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">array.h</a>
+<li>stp_asprintf()
+: <a class="el" href="group__util.html#g3f57c5298a5c6140ac56771dd62bd036">util.h</a>
+<li>STP_BINARY_AGE
+: <a class="el" href="group__version.html#g509ecd9be5329eef0f8d49e0b25f63da">gutenprint-version.h</a>
+<li>stp_binary_age
+: <a class="el" href="group__version.html#g44593f7714544c5886ab34521e05d0bd">gutenprint-version.h</a>
+<li>stp_catprintf()
+: <a class="el" href="group__util.html#gd4f33438f0103a143d90dc9c48d248eb">util.h</a>
+<li>stp_channel_add()
+: <a class="el" href="channel_8h.html#f03151796a167ec708b5412a31ddced5">channel.h</a>
+<li>stp_channel_convert()
+: <a class="el" href="channel_8h.html#4559ad54f7de2403438baab1c97789f7">channel.h</a>
+<li>stp_channel_get_black_channel()
+: <a class="el" href="channel_8h.html#8a3cf94dfe1461bd0c8fb7464d5c99a6">channel.h</a>
+<li>stp_channel_get_curve()
+: <a class="el" href="channel_8h.html#36feed643e8768ff93308980203a92be">channel.h</a>
+<li>stp_channel_get_cutoff_adjustment()
+: <a class="el" href="channel_8h.html#f903f5318c045567f6aa3b6f1496b5ba">channel.h</a>
+<li>stp_channel_get_density_adjustment()
+: <a class="el" href="channel_8h.html#43188fd2c70d894e1e050277c1e4da35">channel.h</a>
+<li>stp_channel_get_gcr_curve()
+: <a class="el" href="channel_8h.html#c5c6578307d574f53c8f9110053fe9c5">channel.h</a>
+<li>stp_channel_get_gloss_channel()
+: <a class="el" href="channel_8h.html#7771fa6878d414b4cd3b08743aadc3fc">channel.h</a>
+<li>stp_channel_get_gloss_limit()
+: <a class="el" href="channel_8h.html#9231b8d3be7ec55dc657da2e6a5c406e">channel.h</a>
+<li>stp_channel_get_ink_limit()
+: <a class="el" href="channel_8h.html#fe8ad41148d568cb1d662064ec721ac1">channel.h</a>
+<li>stp_channel_get_input()
+: <a class="el" href="channel_8h.html#c73acbaeb300c75912529c5064ea507a">channel.h</a>
+<li>stp_channel_get_output()
+: <a class="el" href="channel_8h.html#3ad58abee1208b328da69e49d230a54f">channel.h</a>
+<li>stp_channel_get_value()
+: <a class="el" href="channel_8h.html#748f1fc90c60e70016998953b1adcde2">channel.h</a>
+<li>stp_channel_initialize()
+: <a class="el" href="channel_8h.html#35b64c052b8dcfd4f1576b10d999e022">channel.h</a>
+<li>STP_CHANNEL_LIMIT
+: <a class="el" href="group__image.html#g0b7daa7e9e9b26fea847d71ca9de7c02">image.h</a>
+<li>stp_channel_reset()
+: <a class="el" href="channel_8h.html#90026b1db4586b08df148db41a676b50">channel.h</a>
+<li>stp_channel_reset_channel()
+: <a class="el" href="channel_8h.html#b4b4591b1709146874c0218bc0591255">channel.h</a>
+<li>stp_channel_set_black_channel()
+: <a class="el" href="channel_8h.html#1c1101b3f21368b26241a0db2877364e">channel.h</a>
+<li>stp_channel_set_curve()
+: <a class="el" href="channel_8h.html#9e2107aa3cc118db2b6540f939064fed">channel.h</a>
+<li>stp_channel_set_cutoff_adjustment()
+: <a class="el" href="channel_8h.html#59a4810ca297444fb16a5a1a1db319ed">channel.h</a>
+<li>stp_channel_set_density_adjustment()
+: <a class="el" href="channel_8h.html#e7bd4572fb2ac86694555d0b827a2db9">channel.h</a>
+<li>stp_channel_set_gcr_curve()
+: <a class="el" href="channel_8h.html#4f0863196d55416aa58ea9815eb33312">channel.h</a>
+<li>stp_channel_set_gloss_channel()
+: <a class="el" href="channel_8h.html#b09858181233a7777b2d49ca50a327c6">channel.h</a>
+<li>stp_channel_set_gloss_limit()
+: <a class="el" href="channel_8h.html#774df9fbabb8fcd9241976cc50c9501d">channel.h</a>
+<li>stp_channel_set_ink_limit()
+: <a class="el" href="channel_8h.html#68afca52a3f3c0c72c1ff0329ef245c7">channel.h</a>
+<li>stp_check_array_parameter()
+: <a class="el" href="group__vars.html#g5a629e6da1f5008f0db034191ad8b1d5">vars.h</a>
+<li>stp_check_boolean_parameter()
+: <a class="el" href="group__vars.html#g23b9c17426210460618c4f95c5f34229">vars.h</a>
+<li>stp_check_curve_parameter()
+: <a class="el" href="group__vars.html#g6c94a1df4388b142d00d5d30df904b47">vars.h</a>
+<li>stp_check_dimension_parameter()
+: <a class="el" href="group__vars.html#gc1f2b865c76da441b6c1bd9b5b93aa1f">vars.h</a>
+<li>stp_check_file_parameter()
+: <a class="el" href="group__vars.html#ga7db6701be5d05e545c79db905e4c7eb">vars.h</a>
+<li>stp_check_float_parameter()
+: <a class="el" href="group__vars.html#gb12bebb419eb1ae8f323aa931e324389">vars.h</a>
+<li>stp_check_int_parameter()
+: <a class="el" href="group__vars.html#g4fd7914c01e2e1b34797736dfd2c9b9c">vars.h</a>
+<li>stp_check_raw_parameter()
+: <a class="el" href="group__vars.html#g285f05c648724c80bf05af30f87120a3">vars.h</a>
+<li>stp_check_string_parameter()
+: <a class="el" href="group__vars.html#g8189b61073bfcd0244d5d6f2a2c8ba86">vars.h</a>
+<li>stp_check_version()
+: <a class="el" href="group__version.html#g05a93cb4ac52cc50875b5839c59bcafc">gutenprint-version.h</a>
+<li>STP_CHECK_VERSION
+: <a class="el" href="group__version.html#gf20320940416f43ed7735137296fa12b">gutenprint-version.h</a>
+<li>stp_clear_array_parameter()
+: <a class="el" href="group__vars.html#g7c67cef38cead5f519fd04ae09265b53">vars.h</a>
+<li>stp_clear_boolean_parameter()
+: <a class="el" href="group__vars.html#g42ebfed8dec2054799e4943a8ca84267">vars.h</a>
+<li>stp_clear_curve_parameter()
+: <a class="el" href="group__vars.html#gf52a0b0c3b0e0fee1fc46516b1bc0c4e">vars.h</a>
+<li>stp_clear_dimension_parameter()
+: <a class="el" href="group__vars.html#g514a21602ae7a8ebe8e5072a5a4b6f89">vars.h</a>
+<li>stp_clear_file_parameter()
+: <a class="el" href="group__vars.html#g4fad48e3e6453842559bd872650cb88f">vars.h</a>
+<li>stp_clear_float_parameter()
+: <a class="el" href="group__vars.html#g4eccbbe421f8b0c9342b17cef40b263d">vars.h</a>
+<li>stp_clear_int_parameter()
+: <a class="el" href="group__vars.html#g2107c08f37e31f45253f7d75a3773d46">vars.h</a>
+<li>stp_clear_raw_parameter()
+: <a class="el" href="group__vars.html#g11b79add82faf23b0e3c758f9530d95c">vars.h</a>
+<li>stp_clear_string_parameter()
+: <a class="el" href="group__vars.html#g9e98ef9a9b1b84a0c0580fe024e35490">vars.h</a>
+<li>stp_color_count()
+: <a class="el" href="group__color.html#g68c13c36d723e5604507bf33fe629f8b">color.h</a>
+<li>stp_color_describe_parameter()
+: <a class="el" href="group__color.html#g83bc80c9fd84d741099bc20285a1b655">color.h</a>
+<li>stp_color_get_long_name()
+: <a class="el" href="group__color.html#g612389b45f09358f6bad0e376c91b057">color.h</a>
+<li>stp_color_get_name()
+: <a class="el" href="group__color.html#g5a4a4da67cb5c3f1c0a2a9618e46ed50">color.h</a>
+<li>stp_color_get_row()
+: <a class="el" href="group__color.html#g0cf28c3c9638987df4b1740deadba0cb">color.h</a>
+<li>stp_color_init()
+: <a class="el" href="group__color.html#g23392fc53078d51fcd14d6d565d56423">color.h</a>
+<li>stp_color_list_parameters()
+: <a class="el" href="group__color.html#ga282220724877a57738b047140835141">color.h</a>
+<li>stp_color_register()
+: <a class="el" href="group__color.html#g47d6a8163ef21a6e700b1371228b851d">color.h</a>
+<li>stp_color_t
+: <a class="el" href="group__color.html#gd1408f9835b72f266ec7c7e1e1202a74">color.h</a>
+<li>stp_color_unregister()
+: <a class="el" href="group__color.html#g2b62ec8e0afe1b6297bc71466f8a334c">color.h</a>
+<li>stp_compute_linewidth_func
+: <a class="el" href="weave_8h.html#6e7058d252c95199e92f783d84775fa1">weave.h</a>
+<li>stp_compute_tiff_linewidth
+: <a class="el" href="weave_8h.html#9907d0fcce9e3c336fa7c6d66e1c91a5">weave.h</a>
+<li>stp_compute_uncompressed_linewidth
+: <a class="el" href="weave_8h.html#4046c403128b61705309b05700120e41">weave.h</a>
+<li>stp_const_parameter_list_t
+: <a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">vars.h</a>
+<li>stp_copy_data_func_t
+: <a class="el" href="group__vars.html#g4541229554178e84408cccd89f532cb0">vars.h</a>
+<li>stp_copy_options()
+: <a class="el" href="group__vars.html#gf7d2d5a9897c9ce77bb16f4a1addaa62">vars.h</a>
+<li>STP_CURRENT_INTERFACE
+: <a class="el" href="group__version.html#g1969d8a5a74a5c70a978f99aa68d9f4b">gutenprint-version.h</a>
+<li>stp_current_interface
+: <a class="el" href="group__version.html#gfc84e89ce8d6d3302270c56ebe01d5ef">gutenprint-version.h</a>
+<li>STP_CURVE_BOUNDS_CLIP
+: <a class="el" href="group__curve.html#gg86d146e483ca1902f973d574f542b85fec9e6673edac9d34e3aad376fa711aa5">curve.h</a>
+<li>STP_CURVE_BOUNDS_ERROR
+: <a class="el" href="group__curve.html#gg86d146e483ca1902f973d574f542b85fd699d675d5df223055388cd83d0b362b">curve.h</a>
+<li>STP_CURVE_BOUNDS_RESCALE
+: <a class="el" href="group__curve.html#gg86d146e483ca1902f973d574f542b85f118d303bf7bdf4f00bda71cc6eac49c3">curve.h</a>
+<li>stp_curve_bounds_t
+: <a class="el" href="group__curve.html#g86d146e483ca1902f973d574f542b85f">curve.h</a>
+<li>stp_curve_cache_copy()
+: <a class="el" href="curve-cache_8h.html#f5642e9d4e265b8d16db6075e1309a20">curve-cache.h</a>
+<li>stp_curve_cache_curve_data()
+: <a class="el" href="curve-cache_8h.html#f3e398d179e00c2e7d8b7c2e5dcbfd5c">curve-cache.h</a>
+<li>stp_curve_cache_curve_invalidate()
+: <a class="el" href="curve-cache_8h.html#8d9c7b9a9aca371b6d2e72dcfc367f88">curve-cache.h</a>
+<li>stp_curve_cache_get_count()
+: <a class="el" href="curve-cache_8h.html#aefb6ef535ba108e0fdba1db4b58bd34">curve-cache.h</a>
+<li>stp_curve_cache_get_curve()
+: <a class="el" href="curve-cache_8h.html#26161d0b2b6c8b97e0de2dc12619cc6c">curve-cache.h</a>
+<li>stp_curve_cache_get_double_data()
+: <a class="el" href="curve-cache_8h.html#45415b5aa0600b60b65880803aea84b4">curve-cache.h</a>
+<li>stp_curve_cache_get_ushort_data()
+: <a class="el" href="curve-cache_8h.html#204df5bd2ecc318cccf6e2541d8b4830">curve-cache.h</a>
+<li>stp_curve_cache_set_curve()
+: <a class="el" href="curve-cache_8h.html#8469e7bd7d80cfb01fc470a42e6ac805">curve-cache.h</a>
+<li>stp_curve_cache_set_curve_copy()
+: <a class="el" href="curve-cache_8h.html#cd8bbfbdb0b60d079b6615cc4a19ee56">curve-cache.h</a>
+<li>stp_curve_compose()
+: <a class="el" href="group__curve.html#g55c83a9139fc1b06b90e983d7c1ceff7">curve.h</a>
+<li>STP_CURVE_COMPOSE_ADD
+: <a class="el" href="group__curve.html#gg7eddbee28cb1f3c76a19408b86ea142ec38b0bf09e93edb67c3e5c53035295f3">curve.h</a>
+<li>STP_CURVE_COMPOSE_EXPONENTIATE
+: <a class="el" href="group__curve.html#gg7eddbee28cb1f3c76a19408b86ea142e8de151149fdfd4fcca78826e6352246a">curve.h</a>
+<li>STP_CURVE_COMPOSE_MULTIPLY
+: <a class="el" href="group__curve.html#gg7eddbee28cb1f3c76a19408b86ea142ed3bd2cdb63498d5d22686e79e2c0ed95">curve.h</a>
+<li>stp_curve_compose_t
+: <a class="el" href="group__curve.html#g7eddbee28cb1f3c76a19408b86ea142e">curve.h</a>
+<li>stp_curve_copy()
+: <a class="el" href="group__curve.html#gcd7861bf1c9d61ac4ec87844a15ab9d3">curve.h</a>
+<li>stp_curve_count_points()
+: <a class="el" href="group__curve.html#g766ff02b29b976372779f719076ad017">curve.h</a>
+<li>stp_curve_create()
+: <a class="el" href="group__curve.html#g6b3640f0e25bd9d38e46bdc1b2ee58a4">curve.h</a>
+<li>stp_curve_create_copy()
+: <a class="el" href="group__curve.html#g972ed591394396e0c66e928a0695b3bf">curve.h</a>
+<li>stp_curve_create_from_file()
+: <a class="el" href="group__curve.html#gd96d7d1cda5f037f7d6a9b651ebbbb46">curve.h</a>
+<li>stp_curve_create_from_stream()
+: <a class="el" href="group__curve.html#g478a24e44a3ce345f7207cf7ded12e37">curve.h</a>
+<li>stp_curve_create_from_string()
+: <a class="el" href="group__curve.html#gb8c0df217306a6e0597f058efbfaca82">curve.h</a>
+<li>stp_curve_create_from_xmltree()
+: <a class="el" href="xml_8h.html#112e57d9f022170ee00b0a66fea1770f">xml.h</a>
+<li>stp_curve_destroy()
+: <a class="el" href="group__curve.html#g4294b85e848fe421496469e2406ef380">curve.h</a>
+<li>stp_curve_free_curve_cache()
+: <a class="el" href="curve-cache_8h.html#80cb29d2d12707901ca9261df5f3cd1c">curve-cache.h</a>
+<li>stp_curve_get_bounds()
+: <a class="el" href="group__curve.html#g63c3386fbfd75da9fe985673bf7b1ca3">curve.h</a>
+<li>stp_curve_get_data()
+: <a class="el" href="group__curve.html#gb2208f56694e47e4300d10e057f59ee8">curve.h</a>
+<li>stp_curve_get_data_points()
+: <a class="el" href="group__curve.html#g79e0d6afa3573917c756af64b56a0d82">curve.h</a>
+<li>stp_curve_get_float_data()
+: <a class="el" href="group__curve.html#g251f105cb5f2b126ea02b7908f717c18">curve.h</a>
+<li>stp_curve_get_gamma()
+: <a class="el" href="group__curve.html#g0420a6cfa87aa96e5c9a56142aa0178d">curve.h</a>
+<li>stp_curve_get_int_data()
+: <a class="el" href="group__curve.html#g6de80e81b64262e0051441f697ae4de4">curve.h</a>
+<li>stp_curve_get_interpolation_type()
+: <a class="el" href="group__curve.html#g42c98a6a6d2512516738b6df9367510e">curve.h</a>
+<li>stp_curve_get_long_data()
+: <a class="el" href="group__curve.html#gf59bd38c9dfc7beb08a283dc9e400bf2">curve.h</a>
+<li>stp_curve_get_point()
+: <a class="el" href="group__curve.html#g569aae57147ed7681f23e0e60bd8af35">curve.h</a>
+<li>stp_curve_get_range()
+: <a class="el" href="group__curve.html#gcb8e51731b9385556747744a0d4f43fb">curve.h</a>
+<li>stp_curve_get_sequence()
+: <a class="el" href="group__curve.html#gde323594e84d4380c88ecf122a5a4da8">curve.h</a>
+<li>stp_curve_get_short_data()
+: <a class="el" href="group__curve.html#g87c5d1904efa58be8a21ab6b2c41d0b9">curve.h</a>
+<li>stp_curve_get_subrange()
+: <a class="el" href="group__curve.html#g5cbf7c4b6ad96ecb35fc06f46c0319f0">curve.h</a>
+<li>stp_curve_get_uint_data()
+: <a class="el" href="group__curve.html#g19b3160a57dc6959fe08c631c7206a8a">curve.h</a>
+<li>stp_curve_get_ulong_data()
+: <a class="el" href="group__curve.html#g24a862eda4cdbb626f51aeb7d8ae9a50">curve.h</a>
+<li>stp_curve_get_ushort_data()
+: <a class="el" href="group__curve.html#ga02125af6b9c192e34985851370391b8">curve.h</a>
+<li>stp_curve_get_wrap()
+: <a class="el" href="group__curve.html#g859020827897bac0f4671322ec027dc4">curve.h</a>
+<li>stp_curve_interpolate_value()
+: <a class="el" href="group__curve.html#gb33642ee6c49334f379a4dc185ecd355">curve.h</a>
+<li>stp_curve_is_piecewise()
+: <a class="el" href="group__curve.html#g29b022a3055afe0b48d1f2736ff2f4da">curve.h</a>
+<li>stp_curve_resample()
+: <a class="el" href="group__curve.html#g87298cf562468cbcf2c1f76a0ab80b62">curve.h</a>
+<li>stp_curve_rescale()
+: <a class="el" href="group__curve.html#gad611b3ddbd667ec204fa7b42f8d7546">curve.h</a>
+<li>stp_curve_set_bounds()
+: <a class="el" href="group__curve.html#ge32fb850963b8694d3739c0ed8475f75">curve.h</a>
+<li>stp_curve_set_data()
+: <a class="el" href="group__curve.html#g81bceb4cb991cef1cda2298cf7bb9f15">curve.h</a>
+<li>stp_curve_set_data_points()
+: <a class="el" href="group__curve.html#gce09cab4e6ae3d55f75aacae3689e8e6">curve.h</a>
+<li>stp_curve_set_float_data()
+: <a class="el" href="group__curve.html#gbd7a39289471607311141c7fc3bbb415">curve.h</a>
+<li>stp_curve_set_gamma()
+: <a class="el" href="group__curve.html#gcb8a2b9b21f97f32faacb99a6125e152">curve.h</a>
+<li>stp_curve_set_int_data()
+: <a class="el" href="group__curve.html#g31e76843f4d2f207701755b58766a670">curve.h</a>
+<li>stp_curve_set_interpolation_type()
+: <a class="el" href="group__curve.html#g82890cef78f5861a88c5789c33693423">curve.h</a>
+<li>stp_curve_set_long_data()
+: <a class="el" href="group__curve.html#ge6a435a21a5c4b5e582d42095a7b06fc">curve.h</a>
+<li>stp_curve_set_point()
+: <a class="el" href="group__curve.html#g2d3b8372bde3fce699a3b7bb3c9d8582">curve.h</a>
+<li>stp_curve_set_short_data()
+: <a class="el" href="group__curve.html#g2fa5222aab07e85f215e389734b6dbea">curve.h</a>
+<li>stp_curve_set_subrange()
+: <a class="el" href="group__curve.html#g73dfcc4c95734449965227e21deb3037">curve.h</a>
+<li>stp_curve_set_uint_data()
+: <a class="el" href="group__curve.html#g3ee80f8e4f33691a78b3ad8c3fd7c34f">curve.h</a>
+<li>stp_curve_set_ulong_data()
+: <a class="el" href="group__curve.html#g723173297f5b67af937205c7d74ac353">curve.h</a>
+<li>stp_curve_set_ushort_data()
+: <a class="el" href="group__curve.html#g0af395eefa7bfe0d19acc1acbaeefe48">curve.h</a>
+<li>stp_curve_t
+: <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">curve.h</a>
+<li>STP_CURVE_TYPE_LINEAR
+: <a class="el" href="group__curve.html#gg982f8191c84b049cc3ad3cee1558fc2346228ddaa2d52a85ccd79c4dc0f76ad3">curve.h</a>
+<li>STP_CURVE_TYPE_SPLINE
+: <a class="el" href="group__curve.html#gg982f8191c84b049cc3ad3cee1558fc23fb1ffdc3754f428d8e3a2124e014ff77">curve.h</a>
+<li>stp_curve_type_t
+: <a class="el" href="group__curve.html#g982f8191c84b049cc3ad3cee1558fc23">curve.h</a>
+<li>STP_CURVE_WRAP_AROUND
+: <a class="el" href="group__curve.html#gg3ae3af552b490b0ca8b02e442ac9547ac0361aebddfabfb263dc0205a61f6fbd">curve.h</a>
+<li>stp_curve_wrap_mode_t
+: <a class="el" href="group__curve.html#g3ae3af552b490b0ca8b02e442ac9547a">curve.h</a>
+<li>STP_CURVE_WRAP_NONE
+: <a class="el" href="group__curve.html#gg3ae3af552b490b0ca8b02e442ac9547ad840485ad7df768a06ee4be02d93b97a">curve.h</a>
+<li>stp_curve_write()
+: <a class="el" href="group__curve.html#gc12af55cf0eb2f76db967886f8996313">curve.h</a>
+<li>stp_curve_write_string()
+: <a class="el" href="group__curve.html#gf2f0da590278ff74af1eccb0aa0c7169">curve.h</a>
+<li>STP_DBG_CANON
+: <a class="el" href="group__util.html#g109cde96d907cbd28f0b631f07a3d696">util.h</a>
+<li>STP_DBG_COLORFUNC
+: <a class="el" href="group__util.html#g0beee5fa281098eab25e3f22570c0fdc">util.h</a>
+<li>STP_DBG_CURVE
+: <a class="el" href="group__util.html#g8f3e76af1b2564a5763e790a45215438">util.h</a>
+<li>STP_DBG_CURVE_ERRORS
+: <a class="el" href="group__util.html#gabbc2868668663cc28d6289d50e5f83d">util.h</a>
+<li>STP_DBG_ESCP2
+: <a class="el" href="group__util.html#gda7c4766db0c05ecb5ce435ddd81ecdd">util.h</a>
+<li>STP_DBG_INK
+: <a class="el" href="group__util.html#g1c6936662d2cbe95de396fe8af2f254d">util.h</a>
+<li>STP_DBG_LEXMARK
+: <a class="el" href="group__util.html#gc71c7cb5cdf49c881d944ef813a3733f">util.h</a>
+<li>STP_DBG_LIST
+: <a class="el" href="group__util.html#g3c5672b14a2e2ccdffca5b6277b1aac2">util.h</a>
+<li>STP_DBG_LUT
+: <a class="el" href="group__util.html#g4472d3ba849ed203d43005f04583decc">util.h</a>
+<li>STP_DBG_MARK_FILE
+: <a class="el" href="group__util.html#g01f4480bda8819f337b2be4c41e0ebe1">util.h</a>
+<li>STP_DBG_MODULE
+: <a class="el" href="group__util.html#g9ace1ab545abac936101248caf9a50c6">util.h</a>
+<li>STP_DBG_OLYMPUS
+: <a class="el" href="group__util.html#g574664feccffc4527df73e32c7e863bf">util.h</a>
+<li>STP_DBG_PAPER
+: <a class="el" href="group__util.html#gd5eeaeabba7a0a861ae0dc936057aabd">util.h</a>
+<li>STP_DBG_PATH
+: <a class="el" href="group__util.html#g6f8cdfb28d0d73e9579fb1751f540dc7">util.h</a>
+<li>STP_DBG_PCL
+: <a class="el" href="group__util.html#gf8162186c8118e5c3a8543bc0c410a78">util.h</a>
+<li>STP_DBG_PRINTERS
+: <a class="el" href="group__util.html#gdbfb451ebbd246d62bd52e0120fa232b">util.h</a>
+<li>STP_DBG_PS
+: <a class="el" href="group__util.html#g90d230dd93fa96d34b438e82ed3f9639">util.h</a>
+<li>STP_DBG_ROWS
+: <a class="el" href="group__util.html#g698ce0ddb2e4f0a8b6d7a77ad7a0fbf0">util.h</a>
+<li>STP_DBG_VARS
+: <a class="el" href="group__util.html#g4c481c5ea8d87ae6c0e556593ab2020e">util.h</a>
+<li>STP_DBG_WEAVE_PARAMS
+: <a class="el" href="group__util.html#g2af8b3f36dbda4cfd313b50ba2dae636">util.h</a>
+<li>STP_DBG_XML
+: <a class="el" href="group__util.html#gcf72e68aa70e333b06b0bb821218d967">util.h</a>
+<li>stp_default_media_size()
+: <a class="el" href="group__papersize.html#g33c0be56646361b1ce85a9d338336dd3">paper.h</a>
+<li>stp_default_settings()
+: <a class="el" href="group__vars.html#gf63982a6e44f8b62532346d9ceb3d91c">vars.h</a>
+<li>stp_deprintf()
+: <a class="el" href="group__util.html#g129f45d7df47fd58d8653538fd13a1f2">util.h</a>
+<li>stp_describe_output()
+: <a class="el" href="group__printer.html#g50b48bab8d6d1734c3a0f6622d65582e">printers.h</a>
+<li>stp_describe_parameter()
+: <a class="el" href="group__vars.html#g0b8991bd1a91e2cac7d0b355b1186c8e">vars.h</a>
+<li>stp_describe_resolution()
+: <a class="el" href="group__vars.html#g88715b31fcec18778f769ffbc1b55384">vars.h</a>
+<li>stp_destroy_component_data()
+: <a class="el" href="group__vars.html#g151b7d922a3e1e5e9d9f0ea8de6ab70a">vars.h</a>
+<li>stp_dither()
+: <a class="el" href="dither_8h.html#0a470a9c9daef26e90bdb890479a7f87">dither.h</a>
+<li>stp_dither_add_channel()
+: <a class="el" href="dither_8h.html#d70196f1a4510c43f3651bf1450be5fa">dither.h</a>
+<li>stp_dither_describe_parameter()
+: <a class="el" href="dither_8h.html#f1c4669d2bed56e2e1403a7d0f36f6ba">dither.h</a>
+<li>stp_dither_get_channel()
+: <a class="el" href="dither_8h.html#8866521ed5c139e2048e5548cc4fb43f">dither.h</a>
+<li>stp_dither_get_first_position()
+: <a class="el" href="dither_8h.html#fe180672fad52d306e737a333ea113fb">dither.h</a>
+<li>stp_dither_get_last_position()
+: <a class="el" href="dither_8h.html#ddc996112f61432ff66a10eb502d9a4d">dither.h</a>
+<li>stp_dither_init()
+: <a class="el" href="dither_8h.html#9835738585d6a9053eaeacdca25d0fe6">dither.h</a>
+<li>stp_dither_internal()
+: <a class="el" href="dither_8h.html#70a6b29366005ba76ee77e9f1aaae105">dither.h</a>
+<li>stp_dither_list_parameters()
+: <a class="el" href="dither_8h.html#27fa3e870e438b0c399472a908555630">dither.h</a>
+<li>stp_dither_matrix_clone()
+: <a class="el" href="dither_8h.html#d0dfe2800ed318431a0a54c1ed7d383b">dither.h</a>
+<li>stp_dither_matrix_copy()
+: <a class="el" href="dither_8h.html#3ea3c72ff26afef246873edc0bc542d3">dither.h</a>
+<li>stp_dither_matrix_destroy()
+: <a class="el" href="dither_8h.html#49ff7bd6b10cd34f9164b4414adbb87c">dither.h</a>
+<li>stp_dither_matrix_generic_t
+: <a class="el" href="dither_8h.html#9f5f63d4f792df1d7becccf3fb5c8fdd">dither.h</a>
+<li>stp_dither_matrix_impl_t
+: <a class="el" href="dither_8h.html#f823fed10cb9591c0e659033ec49f55f">dither.h</a>
+<li>stp_dither_matrix_init()
+: <a class="el" href="dither_8h.html#2c42ec7156263c024ea6f51ab3b17530">dither.h</a>
+<li>stp_dither_matrix_init_from_dither_array()
+: <a class="el" href="dither_8h.html#53b7ba7fd141db6ef43c68a6f500bda2">dither.h</a>
+<li>stp_dither_matrix_init_short()
+: <a class="el" href="dither_8h.html#588103d2a828a6c5f51577a917b09cdf">dither.h</a>
+<li>stp_dither_matrix_iterated_init()
+: <a class="el" href="dither_8h.html#36691189c1f859d82675f32f5046e674">dither.h</a>
+<li>stp_dither_matrix_normal_t
+: <a class="el" href="dither_8h.html#febf0484e151cf3cce4ef0b9911d0022">dither.h</a>
+<li>stp_dither_matrix_scale_exponentially()
+: <a class="el" href="dither_8h.html#a62e8e672a125150074ea9bddb474423">dither.h</a>
+<li>stp_dither_matrix_set_row()
+: <a class="el" href="dither_8h.html#a6ca0a88b0bef517cc1909fb7074e8ac">dither.h</a>
+<li>stp_dither_matrix_shear()
+: <a class="el" href="dither_8h.html#df8bb5a54d552846dcf4d1534d612b65">dither.h</a>
+<li>stp_dither_matrix_short_t
+: <a class="el" href="dither_8h.html#9a2c54a4730e2c9bb25cf95f6cd3e597">dither.h</a>
+<li>stp_dither_matrix_validate_array()
+: <a class="el" href="dither_8h.html#ad322d923e2d9c3141cc50863d627b25">dither.h</a>
+<li>stp_dither_set_adaptive_limit()
+: <a class="el" href="dither_8h.html#c6a4aa7bda3af1ae03d87f243311ebba">dither.h</a>
+<li>stp_dither_set_ink_spread()
+: <a class="el" href="dither_8h.html#b47439fc32e7f669f8cd6c41acdcf398">dither.h</a>
+<li>stp_dither_set_inks()
+: <a class="el" href="dither_8h.html#5b8786ffa17dcc1604521b1d1cc5a3a5">dither.h</a>
+<li>stp_dither_set_inks_full()
+: <a class="el" href="dither_8h.html#f5822743e380d0d51a397dcb3eb6247c">dither.h</a>
+<li>stp_dither_set_inks_simple()
+: <a class="el" href="dither_8h.html#4dd13ea23fe601571d864eabae4b0c40">dither.h</a>
+<li>stp_dither_set_iterated_matrix()
+: <a class="el" href="dither_8h.html#57aecb702251a2e18848b02109521aed">dither.h</a>
+<li>stp_dither_set_matrix()
+: <a class="el" href="dither_8h.html#a973f651768626a6eb7ab9ad4ce09b2c">dither.h</a>
+<li>stp_dither_set_matrix_from_dither_array()
+: <a class="el" href="dither_8h.html#3155913bdc63c0545786fc427ca2396a">dither.h</a>
+<li>stp_dither_set_randomizer()
+: <a class="el" href="dither_8h.html#560bcf46dfa233a01bdf6042e4680f54">dither.h</a>
+<li>stp_dither_set_transition()
+: <a class="el" href="dither_8h.html#6f4efd170562a43139f7d6a4b41ecaf3">dither.h</a>
+<li>stp_dotsize_t
+: <a class="el" href="dither_8h.html#7a74b9371fd47b48d961d2316e2126e4">dither.h</a>
+<li>stp_dprintf()
+: <a class="el" href="group__util.html#g511e0c4cac91c674797da98ab96b83e6">util.h</a>
+<li>STP_ECOLOR_C
+: <a class="el" href="dither_8h.html#fb855574a9dd1ce3c0ac8e353917cf40">dither.h</a>
+<li>STP_ECOLOR_K
+: <a class="el" href="dither_8h.html#9da4fbd724d498250c7129ccbb88c9a3">dither.h</a>
+<li>STP_ECOLOR_M
+: <a class="el" href="dither_8h.html#42c70bd6031d27d8ce2ab23133f7ed71">dither.h</a>
+<li>STP_ECOLOR_Y
+: <a class="el" href="dither_8h.html#ac7bfac809059b8c99338dfa9347cf85">dither.h</a>
+<li>stp_end_job()
+: <a class="el" href="group__printer.html#ge61d056dd504facc72ff56d7f16eb23c">printers.h</a>
+<li>stp_eprintf()
+: <a class="el" href="group__util.html#ge53707df5c9945f289c58bfbe08a8d88">util.h</a>
+<li>stp_erprintf()
+: <a class="el" href="group__util.html#g1df22de14e3275cb26ede10da66eebdf">util.h</a>
+<li>stp_erputc()
+: <a class="el" href="group__util.html#g15987fbd850e04f2520cb151e08908e1">util.h</a>
+<li>stp_family_register()
+: <a class="el" href="group__printer.html#g1c6d389f49a185ca24546107bd6f4993">printers.h</a>
+<li>stp_family_t
+: <a class="el" href="group__printer.html#g66a5e7cf2b1743a46bd78cb851e1d0a4">printers.h</a>
+<li>stp_family_unregister()
+: <a class="el" href="group__printer.html#g67e5c18254f7ad0b0fd77b4cc2265405">printers.h</a>
+<li>stp_fill_parameter_settings()
+: <a class="el" href="group__vars.html#g7f2c578ff7ae28a3db502476aa10137e">vars.h</a>
+<li>stp_fill_tiff
+: <a class="el" href="weave_8h.html#87a7e015e79b03ec26069ddf9ab64c50">weave.h</a>
+<li>stp_fill_uncompressed
+: <a class="el" href="weave_8h.html#581ae80f8594763f27620d3338407fef">weave.h</a>
+<li>stp_fillfunc
+: <a class="el" href="weave_8h.html#3bb2000973de2f8a9a2b50a1b5e18097">weave.h</a>
+<li>stp_find_standard_dither_array()
+: <a class="el" href="dither_8h.html#c523d1ba539398308a7ea83f4188d6ae">dither.h</a>
+<li>stp_flush_all()
+: <a class="el" href="weave_8h.html#b9694e4381a005efb70daea2429345a3">weave.h</a>
+<li>stp_flush_debug_messages()
+: <a class="el" href="group__util.html#gbe74390c1422e9746745da55692f47b8">util.h</a>
+<li>stp_flushfunc
+: <a class="el" href="weave_8h.html#d25d63c939f6ace90d029473ad33ce63">weave.h</a>
+<li>stp_fold()
+: <a class="el" href="bit-ops_8h.html#1a36a9f23f967528df8fffbd71b5e96c">bit-ops.h</a>
+<li>stp_fold_3bit()
+: <a class="el" href="bit-ops_8h.html#0ee5e547d025f7113f275dbb4614230c">bit-ops.h</a>
+<li>stp_fold_3bit_323()
+: <a class="el" href="bit-ops_8h.html#fe47834318158a214ca693f1433996f1">bit-ops.h</a>
+<li>stp_fold_4bit()
+: <a class="el" href="bit-ops_8h.html#62ac3ec2651afff5fbe6c63544a13c66">bit-ops.h</a>
+<li>stp_free()
+: <a class="el" href="group__util.html#g7d0c40c3157b2c5c630200352064874c">util.h</a>
+<li>stp_free_data_func_t
+: <a class="el" href="group__vars.html#g7974f89cff4cbb5b225d0c4fbb92e9bb">vars.h</a>
+<li>stp_get_array_parameter()
+: <a class="el" href="group__vars.html#gc50c216c2d5cd56a9704f48d4338b179">vars.h</a>
+<li>stp_get_array_parameter_active()
+: <a class="el" href="group__vars.html#gc9f85c3a8bf99e09150cbf4220e4b983">vars.h</a>
+<li>stp_get_boolean_parameter()
+: <a class="el" href="group__vars.html#g8a30b26fa842805384b6ad663cabaea2">vars.h</a>
+<li>stp_get_boolean_parameter_active()
+: <a class="el" href="group__vars.html#gb33cf5376adc63e826cd3dedae33e930">vars.h</a>
+<li>stp_get_color_by_colorfuncs()
+: <a class="el" href="group__color.html#g578f80b2bc3937df38ce7e803f5f472c">color.h</a>
+<li>stp_get_color_by_index()
+: <a class="el" href="group__color.html#g68ba525119da39ae854645ae649557d3">color.h</a>
+<li>stp_get_color_by_name()
+: <a class="el" href="group__color.html#g3b8f62108f3604480e7b89b253527f4a">color.h</a>
+<li>stp_get_color_conversion()
+: <a class="el" href="group__vars.html#g2bac9212773ecf603b7667bd0268c23e">vars.h</a>
+<li>stp_get_component_data()
+: <a class="el" href="group__vars.html#g1666dd1571bdb866a85d4318858893be">vars.h</a>
+<li>stp_get_curve_parameter()
+: <a class="el" href="group__vars.html#g553dec81dd8b3e5590d963ba72223557">vars.h</a>
+<li>stp_get_curve_parameter_active()
+: <a class="el" href="group__vars.html#ge36bf982c52215f11fe8e392b4b3d705">vars.h</a>
+<li>stp_get_debug_level()
+: <a class="el" href="group__util.html#geba8c24f265ee904c5876704b767841c">util.h</a>
+<li>stp_get_dimension_parameter()
+: <a class="el" href="group__vars.html#g3c8d1333086ca5a01a3439f94d9f94d3">vars.h</a>
+<li>stp_get_dimension_parameter_active()
+: <a class="el" href="group__vars.html#g45f9abd8ac6772ea850344c513f6c436">vars.h</a>
+<li>stp_get_driver()
+: <a class="el" href="group__vars.html#g20c45707399ef6fdf6ee8c8209b5c7c0">vars.h</a>
+<li>stp_get_errdata()
+: <a class="el" href="group__vars.html#gd08bdcd721d37f52993c1862e25ebaf7">vars.h</a>
+<li>stp_get_errfunc()
+: <a class="el" href="group__vars.html#g2f246d3af2be9e108abe423691e16049">vars.h</a>
+<li>stp_get_file_parameter()
+: <a class="el" href="group__vars.html#g2021992d89c92b10138fb012a9554a08">vars.h</a>
+<li>stp_get_file_parameter_active()
+: <a class="el" href="group__vars.html#g47e7a69ff8e23eed6188542c5c8bff4f">vars.h</a>
+<li>stp_get_float_parameter()
+: <a class="el" href="group__vars.html#g365412d9c176fd3ac9375ded3f22ddb3">vars.h</a>
+<li>stp_get_float_parameter_active()
+: <a class="el" href="group__vars.html#g4b8f9847f2eebfff53446a9bc235ab68">vars.h</a>
+<li>stp_get_height()
+: <a class="el" href="group__vars.html#g8731a92f5d3047e00ba33577821d5aec">vars.h</a>
+<li>stp_get_imageable_area()
+: <a class="el" href="group__vars.html#g67d1e68ed47e5b554f2021fca1f01978">vars.h</a>
+<li>stp_get_int_parameter()
+: <a class="el" href="group__vars.html#g7c0d95ba35aba0786bfc5f918efa79fc">vars.h</a>
+<li>stp_get_int_parameter_active()
+: <a class="el" href="group__vars.html#gb74fd69c4ef62af7b5ab33c6baf48b8b">vars.h</a>
+<li>stp_get_left()
+: <a class="el" href="group__vars.html#g5c02ee2422d86e4bcdcae613c70c9e1e">vars.h</a>
+<li>stp_get_lineactive_by_pass()
+: <a class="el" href="weave_8h.html#4c7e67ed92ac3427c94fb0e6a85bfce9">weave.h</a>
+<li>stp_get_linebases_by_pass()
+: <a class="el" href="weave_8h.html#1ec75a70b7dad8a5d0e4c963d67677c3">weave.h</a>
+<li>stp_get_linecount_by_pass()
+: <a class="el" href="weave_8h.html#5acdf7cc603254e68b0ae39e45ea52f3">weave.h</a>
+<li>stp_get_lineoffsets_by_pass()
+: <a class="el" href="weave_8h.html#986bb835225820c68d85041e797cf2a5">weave.h</a>
+<li>stp_get_maximum_imageable_area()
+: <a class="el" href="group__vars.html#gd17cadb7fd78bffb759f2213a1a90df6">vars.h</a>
+<li>stp_get_media_size()
+: <a class="el" href="group__vars.html#gc9e6d740ffc4cff5dc7d0bf106a3e7df">vars.h</a>
+<li>stp_get_model_id()
+: <a class="el" href="group__printer.html#g2057c5fcfc31d8b4cf7f3291cf3c0cf4">printers.h</a>
+<li>stp_get_outdata()
+: <a class="el" href="group__vars.html#g7042b05e0df5b32206d54397429bbac5">vars.h</a>
+<li>stp_get_outfunc()
+: <a class="el" href="group__vars.html#g7c6c7c547d0c973ac801362db5ca4879">vars.h</a>
+<li>stp_get_page_height()
+: <a class="el" href="group__vars.html#gc0c4928fa488bb95e73ba9b8aa932584">vars.h</a>
+<li>stp_get_page_width()
+: <a class="el" href="group__vars.html#gad2d305eed993707d22263b54578a39b">vars.h</a>
+<li>stp_get_papersize_by_index()
+: <a class="el" href="group__papersize.html#gb2e9f694a3b90aeaaa14d6af3b5fe75a">paper.h</a>
+<li>stp_get_papersize_by_name()
+: <a class="el" href="group__papersize.html#g60f3dee8f26cac05d8d6fcaff1e39630">paper.h</a>
+<li>stp_get_papersize_by_size()
+: <a class="el" href="group__papersize.html#g1484a5e75a2b2921bbe0c9e17deb0b77">paper.h</a>
+<li>stp_get_parameter_list()
+: <a class="el" href="group__vars.html#g12e8bb617e5c90da99d6d74519664634">vars.h</a>
+<li>stp_get_pass_by_pass()
+: <a class="el" href="weave_8h.html#5412630e5a7ba809b6ef84ab4e6c9f09">weave.h</a>
+<li>stp_get_printer()
+: <a class="el" href="group__printer.html#gc649c4b3d0a93f26f99deb4b081305c1">printers.h</a>
+<li>stp_get_printer_by_driver()
+: <a class="el" href="group__printer.html#ge45de9ef94fb609c2a54f1d80144552e">printers.h</a>
+<li>stp_get_printer_by_index()
+: <a class="el" href="group__printer.html#g440501ca226e0a9ac1335c7e52ee55a6">printers.h</a>
+<li>stp_get_printer_by_long_name()
+: <a class="el" href="group__printer.html#g6bd5abd876100c17fc9029659fed92f4">printers.h</a>
+<li>stp_get_printer_index_by_driver()
+: <a class="el" href="group__printer.html#g41094e69b71eb930e770bd2cf8bbf795">printers.h</a>
+<li>stp_get_raw_parameter()
+: <a class="el" href="group__vars.html#g9fff6c14a71f5f8ec28620ef64a92fd5">vars.h</a>
+<li>stp_get_raw_parameter_active()
+: <a class="el" href="group__vars.html#gb6e41a5edb7474ed7ac26e236e00c80c">vars.h</a>
+<li>stp_get_release_version()
+: <a class="el" href="group__util.html#g5ba7edc43ed094f32ae7d9158a362a7b">util.h</a>
+<li>stp_get_size_limit()
+: <a class="el" href="group__vars.html#g0c8ee62453baff3d2c00e0ccae67b049">vars.h</a>
+<li>stp_get_string_parameter()
+: <a class="el" href="group__vars.html#gb5b21e5606b8ca755c5eac7774260efa">vars.h</a>
+<li>stp_get_string_parameter_active()
+: <a class="el" href="group__vars.html#g0b7be7ba9f763be692dd833a434ed13d">vars.h</a>
+<li>stp_get_top()
+: <a class="el" href="group__vars.html#g292132b97b20a6d034e22f4146d36131">vars.h</a>
+<li>stp_get_verified()
+: <a class="el" href="group__vars.html#g6d04a3c444753f11004ad6259a91e853">vars.h</a>
+<li>stp_get_version()
+: <a class="el" href="group__util.html#g1f0797636484393574cb95e667819dc1">util.h</a>
+<li>stp_get_width()
+: <a class="el" href="group__vars.html#g1c54d99b94c69a67eb4ae0349a4720e7">vars.h</a>
+<li>stp_image_conclude()
+: <a class="el" href="group__image.html#g7598151354fbeb5f6a8b3f92d1e40ad7">image.h</a>
+<li>stp_image_get_appname()
+: <a class="el" href="group__image.html#g1643f6b9eb180e98f3c1c267950f18d2">image.h</a>
+<li>stp_image_get_row()
+: <a class="el" href="group__image.html#g01d72a16de9e98722859ca651561e8f5">image.h</a>
+<li>stp_image_height()
+: <a class="el" href="group__image.html#gf9dcdf718ad99df9eb71fc542d5b47e1">image.h</a>
+<li>stp_image_init()
+: <a class="el" href="group__image.html#gd257f72ac5272e94ff9314f8ecd24f1e">image.h</a>
+<li>stp_image_reset()
+: <a class="el" href="group__image.html#gf2fc433dba580b9ec8e69aebc2e65338">image.h</a>
+<li>STP_IMAGE_STATUS_ABORT
+: <a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8224b8ac15cf785b24b2f3f53b4fdc274">image.h</a>
+<li>STP_IMAGE_STATUS_OK
+: <a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8b5574da151b93391a337f29b2a7c96cf">image.h</a>
+<li>stp_image_status_t
+: <a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">image.h</a>
+<li>stp_image_t
+: <a class="el" href="group__image.html#gae0b5ef92b619849a51cb75d376a90fb">image.h</a>
+<li>stp_image_width()
+: <a class="el" href="group__image.html#gbe86b2ff9a3a0c0e98248990f9be5652">image.h</a>
+<li>stp_init()
+: <a class="el" href="group__util.html#g2ce0a2e8887fe5ff7f3eed1370d0d691">util.h</a>
+<li>stp_init_debug_messages()
+: <a class="el" href="group__util.html#g6d15e5b4e00f9d242166edb5332f8368">util.h</a>
+<li>stp_initialize_printer_defaults()
+: <a class="el" href="group__printer.html#g381f3a4f132a00d6d2e2a9b54f9ed675">printers.h</a>
+<li>stp_initialize_weave()
+: <a class="el" href="weave_8h.html#5b4fc76c83f5408182f90fb139c06b50">weave.h</a>
+<li>stp_interface_age
+: <a class="el" href="group__version.html#g1284e8ef76a4c864e85b7b698b91bf0c">gutenprint-version.h</a>
+<li>STP_INTERFACE_AGE
+: <a class="el" href="group__version.html#g6485cd073e75e01f9df68ecd67b14372">gutenprint-version.h</a>
+<li>stp_known_papersizes()
+: <a class="el" href="group__papersize.html#g84fd0bad33b134217f54fa8c1e6c8b99">paper.h</a>
+<li>stp_list_copy()
+: <a class="el" href="group__list.html#g0ba249dd06efbf5c0af8511ceab671e8">list.h</a>
+<li>stp_list_create()
+: <a class="el" href="group__list.html#g3cfea94cd07f50d7d9b4ce384d349fca">list.h</a>
+<li>stp_list_destroy()
+: <a class="el" href="group__list.html#ge23ef06175b27dd6772d4d4c098999b1">list.h</a>
+<li>stp_list_get_copyfunc()
+: <a class="el" href="group__list.html#g686e92ee802147171e5fc723d0079b8d">list.h</a>
+<li>stp_list_get_end()
+: <a class="el" href="group__list.html#ge939f15ee1a6e4c0aaad7a7be7f40b74">list.h</a>
+<li>stp_list_get_freefunc()
+: <a class="el" href="group__list.html#gbfc1ef258084a3e1ad959aa3d2f053f4">list.h</a>
+<li>stp_list_get_item_by_index()
+: <a class="el" href="group__list.html#gd377973e8b13d02c9c111d970f491993">list.h</a>
+<li>stp_list_get_item_by_long_name()
+: <a class="el" href="group__list.html#gcc9140df3f4311cd750ba10a1cbf37d1">list.h</a>
+<li>stp_list_get_item_by_name()
+: <a class="el" href="group__list.html#g729867c847dd8282f74806968c708f28">list.h</a>
+<li>stp_list_get_length()
+: <a class="el" href="group__list.html#ge22741060734c9cbc47656c5ea35c3f3">list.h</a>
+<li>stp_list_get_long_namefunc()
+: <a class="el" href="group__list.html#gb99b3ed6da1ea739eed3f2c04fbb7fa7">list.h</a>
+<li>stp_list_get_namefunc()
+: <a class="el" href="group__list.html#g50b1ab3c3b6b0ba7c0cf2128e2024369">list.h</a>
+<li>stp_list_get_sortfunc()
+: <a class="el" href="group__list.html#g4b32e315d3fd23eabeffcc8d931ea454">list.h</a>
+<li>stp_list_get_start()
+: <a class="el" href="group__list.html#gd185100e8d7969a473e9d42bc8084572">list.h</a>
+<li>stp_list_item_create()
+: <a class="el" href="group__list.html#ge726297a82e140672a018e135ffc6a0e">list.h</a>
+<li>stp_list_item_destroy()
+: <a class="el" href="group__list.html#g5e36d4f61e00cb3e4c4a759f5e7e9f4b">list.h</a>
+<li>stp_list_item_get_data()
+: <a class="el" href="group__list.html#gd6f6b303b40fa75f22a86391785178cb">list.h</a>
+<li>stp_list_item_next()
+: <a class="el" href="group__list.html#g81ab310caf6432ce1e492eaafdb6c0d7">list.h</a>
+<li>stp_list_item_prev()
+: <a class="el" href="group__list.html#gbaa2a241055402438a0cae6f40cf6a78">list.h</a>
+<li>stp_list_item_set_data()
+: <a class="el" href="group__list.html#gc1e34edcd47ffdc119cdcaf5ad38e1c4">list.h</a>
+<li>stp_list_item_t
+: <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">list.h</a>
+<li>stp_list_node_free_data()
+: <a class="el" href="group__list.html#g55fbb8f7a3920b783b02183c5ea57624">list.h</a>
+<li>stp_list_set_copyfunc()
+: <a class="el" href="group__list.html#g7e002ed25bbfbad236c1c619841f1ac6">list.h</a>
+<li>stp_list_set_freefunc()
+: <a class="el" href="group__list.html#ge3300d7971c393d119d6fd62e2b578ec">list.h</a>
+<li>stp_list_set_long_namefunc()
+: <a class="el" href="group__list.html#g5be91978431b0ed48ea7919807bdcb73">list.h</a>
+<li>stp_list_set_namefunc()
+: <a class="el" href="group__list.html#g889af512d87a00d696acc0b6b3fafe78">list.h</a>
+<li>stp_list_set_sortfunc()
+: <a class="el" href="group__list.html#gb1d2486542b858b44b299cfcdf7d8784">list.h</a>
+<li>stp_list_t
+: <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">list.h</a>
+<li>STP_MAJOR_VERSION
+: <a class="el" href="group__version.html#gdd0b07630653da8e46b91c2c1bafc2b9">gutenprint-version.h</a>
+<li>stp_major_version
+: <a class="el" href="group__version.html#g4d72666d9093df7a31e7cd448b7cfd1d">gutenprint-version.h</a>
+<li>stp_malloc()
+: <a class="el" href="group__util.html#g86a2976738a237df953655e733c75b3a">util.h</a>
+<li>STP_MAX_WEAVE
+: <a class="el" href="weave_8h.html#6e5fd9b98567e1fd3fde622fd42dec67">weave.h</a>
+<li>stp_merge_printvars()
+: <a class="el" href="group__vars.html#g086303d36b835d539e75f16187e99e8f">vars.h</a>
+<li>stp_micro_version
+: <a class="el" href="group__version.html#g2c7e65e276ce5af050b3ea9f859f1f89">gutenprint-version.h</a>
+<li>STP_MICRO_VERSION
+: <a class="el" href="group__version.html#gb860ee8cb0b05ea1385e01d130d7358e">gutenprint-version.h</a>
+<li>STP_MINOR_VERSION
+: <a class="el" href="group__version.html#g87507431ad6b7504b129eafad863cb1f">gutenprint-version.h</a>
+<li>stp_minor_version
+: <a class="el" href="group__version.html#g5efc986430f0d27f5d11236c4bc48079">gutenprint-version.h</a>
+<li>STP_MODULE
+: <a class="el" href="gutenprint-module_8h.html#38fcab54351f45a3968822e2747aff6b">gutenprint-module.h</a>
+<li>STP_MODULE_CLASS_COLOR
+: <a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a4200077e69aa7fcad42f21bf58d3d8edaa">module.h</a>
+<li>STP_MODULE_CLASS_DITHER
+: <a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42904bbf21de98c76882970ca29aee8841">module.h</a>
+<li>STP_MODULE_CLASS_FAMILY
+: <a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42b8bfa675fcede245786ec7eb9a220090">module.h</a>
+<li>STP_MODULE_CLASS_INVALID
+: <a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42dbc54c5b64945a0585177cbfe3cf8e8c">module.h</a>
+<li>STP_MODULE_CLASS_MISC
+: <a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42c250fc9ff4abf739d975edcbe4694030">module.h</a>
+<li>stp_module_class_t
+: <a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42">module.h</a>
+<li>stp_module_close()
+: <a class="el" href="module_8h.html#bef0168688427992adb80588beadcb62">module.h</a>
+<li>stp_module_exit()
+: <a class="el" href="module_8h.html#cdfae1da0f4df678750f59c9eb6123f4">module.h</a>
+<li>stp_module_get_class()
+: <a class="el" href="module_8h.html#5eee8809d0134f4e7540bc5552bccd7f">module.h</a>
+<li>stp_module_init()
+: <a class="el" href="module_8h.html#121493dc584ab4e64059e9594673a756">module.h</a>
+<li>stp_module_load()
+: <a class="el" href="module_8h.html#00007a419775e60142cefd98b1dd3f2c">module.h</a>
+<li>stp_module_open()
+: <a class="el" href="module_8h.html#38df0c9e639b108f785be84d087923e9">module.h</a>
+<li>stp_module_t
+: <a class="el" href="module_8h.html#e1e92953e8ffaa00cfbf7fc01e51f36d">module.h</a>
+<li>stp_module_version_t
+: <a class="el" href="module_8h.html#753a8450e5ac6b73134c12b89533f16e">module.h</a>
+<li>STP_MXML_ADD_AFTER
+: <a class="el" href="mxml_8h.html#a046bb0b67f278cb7ffdd0be5336b4f3">mxml.h</a>
+<li>STP_MXML_ADD_BEFORE
+: <a class="el" href="mxml_8h.html#1920c86773f4394ebd778b6e6b8f1aba">mxml.h</a>
+<li>STP_MXML_ADD_TO_PARENT
+: <a class="el" href="mxml_8h.html#5c364d2523fb6f7a133df3fdfd7f44d5">mxml.h</a>
+<li>stp_mxml_attr_t
+: <a class="el" href="mxml_8h.html#b271ad8c2bb8d7e6b4b453ffe5589564">mxml.h</a>
+<li>STP_MXML_DESCEND
+: <a class="el" href="mxml_8h.html#7c552ec507bb896f89f002de30a21378">mxml.h</a>
+<li>STP_MXML_DESCEND_FIRST
+: <a class="el" href="mxml_8h.html#bff818057f8c875f4152aa49ed5c046b">mxml.h</a>
+<li>STP_MXML_ELEMENT
+: <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba10846b9327c59bbfee28dd522a0c258e">mxml.h</a>
+<li>stp_mxml_element_t
+: <a class="el" href="mxml_8h.html#70e20b752807f49a56b56d80ee470b47">mxml.h</a>
+<li>STP_MXML_INTEGER
+: <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6baeb129c9841502a2f3d095751f4e21a79">mxml.h</a>
+<li>STP_MXML_NO_CALLBACK
+: <a class="el" href="mxml_8h.html#e7115822f446a7b9bde7ce872bd73d83">mxml.h</a>
+<li>STP_MXML_NO_DESCEND
+: <a class="el" href="mxml_8h.html#df7d31182924f15ecbeae9b6c0f35ca2">mxml.h</a>
+<li>STP_MXML_NO_PARENT
+: <a class="el" href="mxml_8h.html#4d9598080b3b0381f5c94518a885e867">mxml.h</a>
+<li>stp_mxml_node_t
+: <a class="el" href="mxml_8h.html#8fb80a78e3ac8d8aa9eb14c35326bd82">mxml.h</a>
+<li>STP_MXML_OPAQUE
+: <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba4ebe16a2dc2aac2531e09b56051eb47a">mxml.h</a>
+<li>STP_MXML_REAL
+: <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba9411f902a8e7e839252b7a440ef53790">mxml.h</a>
+<li>STP_MXML_TAB
+: <a class="el" href="mxml_8h.html#f14eeab60ef7298e7fbb04f9f80ec81f">mxml.h</a>
+<li>STP_MXML_TEXT
+: <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6baccc874638f0a0d375e1066d8c82c8be9">mxml.h</a>
+<li>stp_mxml_text_t
+: <a class="el" href="mxml_8h.html#b9c0236a2d70c3bcb210a9f6fadf00a3">mxml.h</a>
+<li>stp_mxml_type_e
+: <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba">mxml.h</a>
+<li>stp_mxml_type_t
+: <a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">mxml.h</a>
+<li>stp_mxml_value_t
+: <a class="el" href="mxml_8h.html#9a2e2ffccac3c73524e76f3e816d35bf">mxml.h</a>
+<li>STP_MXML_WRAP
+: <a class="el" href="mxml_8h.html#0958b60267481400b1037902e060027f">mxml.h</a>
+<li>STP_MXML_WS_AFTER_CLOSE
+: <a class="el" href="mxml_8h.html#010da4f7fffd4a3b3eec433031d466f9">mxml.h</a>
+<li>STP_MXML_WS_AFTER_OPEN
+: <a class="el" href="mxml_8h.html#4e7558f3b8bc4d9b3e39c57108b11cea">mxml.h</a>
+<li>STP_MXML_WS_BEFORE_CLOSE
+: <a class="el" href="mxml_8h.html#a8d71b9879129c853422282b2b728131">mxml.h</a>
+<li>STP_MXML_WS_BEFORE_OPEN
+: <a class="el" href="mxml_8h.html#60a753631e81e819a2dad91834b0a7f5">mxml.h</a>
+<li>stp_mxmlAdd()
+: <a class="el" href="mxml_8h.html#b1227e00e25c3b91220a93ff65a978be">mxml.h</a>
+<li>stp_mxmlDelete()
+: <a class="el" href="mxml_8h.html#72999dc22e850ea456b336f3e802be28">mxml.h</a>
+<li>stp_mxmlElementGetAttr()
+: <a class="el" href="mxml_8h.html#c60696919428e3b2e34ee8e2eb110962">mxml.h</a>
+<li>stp_mxmlElementSetAttr()
+: <a class="el" href="mxml_8h.html#6cac6d18e5cddb0847268c46a8d4dbfa">mxml.h</a>
+<li>stp_mxmlFindElement()
+: <a class="el" href="mxml_8h.html#65c27e9c331c88b3f010f040591cc401">mxml.h</a>
+<li>stp_mxmlLoadFile()
+: <a class="el" href="mxml_8h.html#88f8bf556fb254728ab23ce931ee9224">mxml.h</a>
+<li>stp_mxmlLoadString()
+: <a class="el" href="mxml_8h.html#4a2465973559fe7815386d0d59d9a8ee">mxml.h</a>
+<li>stp_mxmlNewElement()
+: <a class="el" href="mxml_8h.html#9430b1f2b1d6b6060d9e358309de3772">mxml.h</a>
+<li>stp_mxmlNewInteger()
+: <a class="el" href="mxml_8h.html#cefddfa295df71e8617b607d207980eb">mxml.h</a>
+<li>stp_mxmlNewOpaque()
+: <a class="el" href="mxml_8h.html#1897cb8faa2141879d45d9fec0463119">mxml.h</a>
+<li>stp_mxmlNewReal()
+: <a class="el" href="mxml_8h.html#1b4b2ee1a0c75a31981d70e35398d6dd">mxml.h</a>
+<li>stp_mxmlNewText()
+: <a class="el" href="mxml_8h.html#05bd9944cadbef034730a53ca47c9f6a">mxml.h</a>
+<li>stp_mxmlRemove()
+: <a class="el" href="mxml_8h.html#7e0322b42cbe0398de7bbe38c4b0a9e6">mxml.h</a>
+<li>stp_mxmlSaveAllocString()
+: <a class="el" href="mxml_8h.html#de7e653595e3ea46d9f3b5545d0a10ea">mxml.h</a>
+<li>stp_mxmlSaveFile()
+: <a class="el" href="mxml_8h.html#1038b1003e9a3fbd8396cdbe989a64c8">mxml.h</a>
+<li>stp_mxmlSaveString()
+: <a class="el" href="mxml_8h.html#054f6b6df45f2e0072a61c1a438d3ebe">mxml.h</a>
+<li>stp_mxmlWalkNext()
+: <a class="el" href="mxml_8h.html#f478d00f31cfae58314bd6f40531923b">mxml.h</a>
+<li>stp_mxmlWalkPrev()
+: <a class="el" href="mxml_8h.html#cc0525bdade1c9e0e83c154592fe815c">mxml.h</a>
+<li>STP_NCOLORS
+: <a class="el" href="dither_8h.html#bda31f8e7a9e473057644a5fe4a2339b">dither.h</a>
+<li>stp_node_copyfunc
+: <a class="el" href="group__list.html#g846d759413f07e91bed397f1fe3224d1">list.h</a>
+<li>stp_node_freefunc
+: <a class="el" href="group__list.html#g4102fc776ec5bbd84eb589cfba97dfc2">list.h</a>
+<li>stp_node_namefunc
+: <a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">list.h</a>
+<li>stp_node_sortfunc
+: <a class="el" href="group__list.html#gd12571e44981e7acd62137c83652121a">list.h</a>
+<li>stp_outfunc_t
+: <a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">vars.h</a>
+<li>stp_pack_tiff
+: <a class="el" href="weave_8h.html#525feabe0775e573007678b2da863b24">weave.h</a>
+<li>stp_pack_uncompressed
+: <a class="el" href="weave_8h.html#561a5fd614c279fdc9ea9c14c7a5b540">weave.h</a>
+<li>stp_packfunc
+: <a class="el" href="weave_8h.html#e8aea6782f8e438961332cb7cc18bcdc">weave.h</a>
+<li>stp_papersize_unit_t
+: <a class="el" href="group__papersize.html#g72e4619e373e38dc02dc452813b7b958">paper.h</a>
+<li>STP_PARAMETER_ACTIVE
+: <a class="el" href="group__vars.html#gg70ebf70dc8e6199d84fc91985c94bae9dbc7323a015e40652fd256e49c8d5b8c">vars.h</a>
+<li>stp_parameter_activity_t
+: <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">vars.h</a>
+<li>STP_PARAMETER_CLASS_CORE
+: <a class="el" href="group__vars.html#gg4eba7e712c0e17b76e472f26e202d7b8a05ce344ff3338e69638d69f9c120d01">vars.h</a>
+<li>STP_PARAMETER_CLASS_FEATURE
+: <a class="el" href="group__vars.html#gg4eba7e712c0e17b76e472f26e202d7b8a7ed8b66836057aa58b9a74811057b4a">vars.h</a>
+<li>STP_PARAMETER_CLASS_INVALID
+: <a class="el" href="group__vars.html#gg4eba7e712c0e17b76e472f26e202d7b82e17ce7ebc18801c11af7ea0a61e93ca">vars.h</a>
+<li>STP_PARAMETER_CLASS_OUTPUT
+: <a class="el" href="group__vars.html#gg4eba7e712c0e17b76e472f26e202d7b8ffc6ff4bfbf2873ce55dfc03776bb6d9">vars.h</a>
+<li>stp_parameter_class_t
+: <a class="el" href="group__vars.html#g4eba7e712c0e17b76e472f26e202d7b8">vars.h</a>
+<li>STP_PARAMETER_DEFAULTED
+: <a class="el" href="group__vars.html#gg70ebf70dc8e6199d84fc91985c94bae9410b7e080ef62fb8896f2f844b1c1e00">vars.h</a>
+<li>stp_parameter_description_destroy()
+: <a class="el" href="group__vars.html#gd598d95a82767e05c958ccd44534c51d">vars.h</a>
+<li>stp_parameter_find()
+: <a class="el" href="group__vars.html#gdcd8062af7b643c734f53c545694d258">vars.h</a>
+<li>stp_parameter_find_in_settings()
+: <a class="el" href="group__vars.html#g6ce39557b61706421232b5f1ac604b1b">vars.h</a>
+<li>STP_PARAMETER_INACTIVE
+: <a class="el" href="group__vars.html#gg70ebf70dc8e6199d84fc91985c94bae96517762c5800eac253f43eeacd96c22f">vars.h</a>
+<li>STP_PARAMETER_LEVEL_ADVANCED
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf29832073130e7060a3b901ea8dcb37d986d47e0">vars.h</a>
+<li>STP_PARAMETER_LEVEL_ADVANCED1
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf29832073d016c9587f698ee400bc7e66071f06c">vars.h</a>
+<li>STP_PARAMETER_LEVEL_ADVANCED2
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf298320759a909a8953b8724d57ce85e2b4306bf">vars.h</a>
+<li>STP_PARAMETER_LEVEL_ADVANCED3
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf29832071241066935e94def6ab6d524ed1fabae">vars.h</a>
+<li>STP_PARAMETER_LEVEL_ADVANCED4
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf29832076036d5761aa9710a66429c625c334a80">vars.h</a>
+<li>STP_PARAMETER_LEVEL_BASIC
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf2983207e9d7192607a6e1ec92dfed3f13a3a46f">vars.h</a>
+<li>STP_PARAMETER_LEVEL_EXTERNAL
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf2983207e478f67e409adabc8679d3801604861d">vars.h</a>
+<li>STP_PARAMETER_LEVEL_INTERNAL
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf2983207b2bc3be82f619147d9a45564fd53a4a0">vars.h</a>
+<li>STP_PARAMETER_LEVEL_INVALID
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf2983207b8bf539d78e56f06f463d00f7a3b56b3">vars.h</a>
+<li>stp_parameter_level_t
+: <a class="el" href="group__vars.html#gaa9c9265ffe70122bd33659cf2983207">vars.h</a>
+<li>stp_parameter_list_add_param()
+: <a class="el" href="group__vars.html#g8f4f06610d1f58bae9e70e632919c405">vars.h</a>
+<li>stp_parameter_list_append()
+: <a class="el" href="group__vars.html#g4b62bc6d0133704b3a2568b1654b6678">vars.h</a>
+<li>stp_parameter_list_copy()
+: <a class="el" href="group__vars.html#g92be87a573b883584e5a036743c1bb7d">vars.h</a>
+<li>stp_parameter_list_count()
+: <a class="el" href="group__vars.html#g7a94856ce75482a5edb6153fe8916a54">vars.h</a>
+<li>stp_parameter_list_create()
+: <a class="el" href="group__vars.html#g404bf7f1b3632178d559f6980478a312">vars.h</a>
+<li>stp_parameter_list_destroy()
+: <a class="el" href="group__vars.html#g3ffaadbe73187aa1f298c4eaa80ea82e">vars.h</a>
+<li>stp_parameter_list_param()
+: <a class="el" href="group__vars.html#g70d69ef7dec383004bf4570e57b76e18">vars.h</a>
+<li>stp_parameter_list_t
+: <a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">vars.h</a>
+<li>STP_PARAMETER_TYPE_ARRAY
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a918789c2b5cc718eafca6d1d0022cfe3f3">vars.h</a>
+<li>STP_PARAMETER_TYPE_BOOLEAN
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91f97ef629defc99977bd1cb35daabe0c1">vars.h</a>
+<li>STP_PARAMETER_TYPE_CURVE
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a910d283c33f755969ded0751bbfc5d1912">vars.h</a>
+<li>STP_PARAMETER_TYPE_DIMENSION
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91aa6f89008bf237c6f0aa2f0ee176e8b7">vars.h</a>
+<li>STP_PARAMETER_TYPE_DOUBLE
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91e0dc60c8435ce0b1355bd5a134395f0c">vars.h</a>
+<li>STP_PARAMETER_TYPE_FILE
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a918224a918efbef96fffaa90e31654f7ff">vars.h</a>
+<li>STP_PARAMETER_TYPE_INT
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91ae2cac85ef78157b53c7a79706dc0f70">vars.h</a>
+<li>STP_PARAMETER_TYPE_INVALID
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91d053047279b4c82034d26c4aa4c818d5">vars.h</a>
+<li>STP_PARAMETER_TYPE_RAW
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a9133bb02d9ae5b2169d2f75da7684b04e9">vars.h</a>
+<li>STP_PARAMETER_TYPE_STRING_LIST
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a917a6f3e019c8a92ddecd34c71013acde0">vars.h</a>
+<li>stp_parameter_type_t
+: <a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">vars.h</a>
+<li>stp_parameter_verify_t
+: <a class="el" href="group__vars.html#gc061852de3627383cd415cd80a979e02">vars.h</a>
+<li>stp_path_search()
+: <a class="el" href="path_8h.html#b1754e7b09717741f4bdc7a4b973d4a5">path.h</a>
+<li>stp_path_split()
+: <a class="el" href="path_8h.html#f08851d96a1197c5ce39f7dc812cef3f">path.h</a>
+<li>stp_print()
+: <a class="el" href="group__printer.html#g6065874cbb246875925e14d8801898cc">printers.h</a>
+<li>stp_printer_describe_parameter()
+: <a class="el" href="group__printer.html#g07bc634c85950526155b711aac42c6a0">printers.h</a>
+<li>stp_printer_get_defaults()
+: <a class="el" href="group__printer.html#g4f6859e0f21ed2062075d6b9f680a202">printers.h</a>
+<li>stp_printer_get_driver()
+: <a class="el" href="group__printer.html#gc345b8cf8cd78da98fdb4c6b2d9cf7ca">printers.h</a>
+<li>stp_printer_get_family()
+: <a class="el" href="group__printer.html#g487b74bf101a842f30b5941b8db4769a">printers.h</a>
+<li>stp_printer_get_long_name()
+: <a class="el" href="group__printer.html#g11804fb9b8d87ed1f2a3acbd39f5f85a">printers.h</a>
+<li>stp_printer_get_manufacturer()
+: <a class="el" href="group__printer.html#gb99dd05c42aed848d1567f2b346fb4f4">printers.h</a>
+<li>stp_printer_get_model()
+: <a class="el" href="group__printer.html#gae84d3fb263c4a171b7b63b6d93a940e">printers.h</a>
+<li>stp_printer_list_parameters()
+: <a class="el" href="group__printer.html#g09bf7aebf0385f7b5aac537a13b6e3ed">printers.h</a>
+<li>stp_printer_model_count()
+: <a class="el" href="group__printer.html#g6a76f8f76106eddd51af4b1593b4f3af">printers.h</a>
+<li>stp_printer_t
+: <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">printers.h</a>
+<li>stp_prune_inactive_options()
+: <a class="el" href="group__util.html#g13aa8afef5b0872704390adc6a01924e">util.h</a>
+<li>stp_put16_be()
+: <a class="el" href="group__util.html#g23b504253ceda208b9a4985e6de8a5f7">util.h</a>
+<li>stp_put16_le()
+: <a class="el" href="group__util.html#g1ffcb45ea3c37bb6b485addcaf945c99">util.h</a>
+<li>stp_put32_be()
+: <a class="el" href="group__util.html#g258b7b5f8808d0a3168f798e8bf72608">util.h</a>
+<li>stp_put32_le()
+: <a class="el" href="group__util.html#gadf69b8b3f713d2bd7ca3a5648da0c56">util.h</a>
+<li>stp_putc()
+: <a class="el" href="group__util.html#g39e4c5f6fa2a07dfca3090a50a8858f9">util.h</a>
+<li>stp_putraw()
+: <a class="el" href="group__util.html#g79dd0a6f5c63f4fbf8591d3c041a7720">util.h</a>
+<li>stp_puts()
+: <a class="el" href="group__util.html#gf6cf72e5e45f175ae8c332c0588832b9">util.h</a>
+<li>STP_RAW
+: <a class="el" href="group__vars.html#g9fc3819cba14f7f4c5654508a08a1adf">vars.h</a>
+<li>STP_RAW_STRING
+: <a class="el" href="group__vars.html#gd888c1f6a36f999ffebfffa7b74f28d2">vars.h</a>
+<li>stp_read_and_compose_curves()
+: <a class="el" href="group__util.html#gdbe8c167230b49bc10391d2c246e6dc0">util.h</a>
+<li>stp_realloc()
+: <a class="el" href="group__util.html#g2420936ab8b3492581f389deea44f58c">util.h</a>
+<li>stp_register_xml_parser()
+: <a class="el" href="xml_8h.html#9082cdb0bef669a2c1cd463874d56cb3">xml.h</a>
+<li>stp_register_xml_preload()
+: <a class="el" href="xml_8h.html#8ce0a404da56d87db34ee50562f3154d">xml.h</a>
+<li>STP_SAFE_FREE
+: <a class="el" href="group__util.html#ga5a86efbbd3e2eb391718d82a1d7ffcc">util.h</a>
+<li>stp_scale_float_parameter()
+: <a class="el" href="group__vars.html#g227ec3e75a78a5c3dd01c85dbc1e7004">vars.h</a>
+<li>stp_send_command()
+: <a class="el" href="group__util.html#gdb49b9cba9ddf4e506b6f530353ad93d">util.h</a>
+<li>stp_sequence_copy()
+: <a class="el" href="group__sequence.html#g28087c76e1106ca11c2d247956e3a3c3">sequence.h</a>
+<li>stp_sequence_create()
+: <a class="el" href="group__sequence.html#g9f0233f39d6a27c796bb283c80974618">sequence.h</a>
+<li>stp_sequence_create_copy()
+: <a class="el" href="group__sequence.html#gb03a34a03ffd4163f51126916d737df7">sequence.h</a>
+<li>stp_sequence_create_from_xmltree()
+: <a class="el" href="xml_8h.html#fa6f69121eb86b2aee998635b79d21ac">xml.h</a>
+<li>stp_sequence_destroy()
+: <a class="el" href="group__sequence.html#g3d571f155c1d00e7794b8299a41c5099">sequence.h</a>
+<li>stp_sequence_get_bounds()
+: <a class="el" href="group__sequence.html#g14ad64c63f45a2716ff8d9ceaf00697d">sequence.h</a>
+<li>stp_sequence_get_data()
+: <a class="el" href="group__sequence.html#g755c8a35e2e9e83a1dfac4f6138c4122">sequence.h</a>
+<li>stp_sequence_get_float_data()
+: <a class="el" href="group__sequence.html#gff096d5b027157151c65978b95d4e29e">sequence.h</a>
+<li>stp_sequence_get_int_data()
+: <a class="el" href="group__sequence.html#g01b0bc9e181a097aff3e97254dbfcb14">sequence.h</a>
+<li>stp_sequence_get_long_data()
+: <a class="el" href="group__sequence.html#g039d9054cfd0f7d5a892a7fec3f734f4">sequence.h</a>
+<li>stp_sequence_get_point()
+: <a class="el" href="group__sequence.html#ga79c5f747a80ab2ad9d09b09e0330cc7">sequence.h</a>
+<li>stp_sequence_get_range()
+: <a class="el" href="group__sequence.html#g999021f2caf1a9d0d6d133123031ce17">sequence.h</a>
+<li>stp_sequence_get_short_data()
+: <a class="el" href="group__sequence.html#g4d1cf137e4a77e9123e2afcdf7d63bec">sequence.h</a>
+<li>stp_sequence_get_size()
+: <a class="el" href="group__sequence.html#gfa512afc64116f673ae2061d04a5ef90">sequence.h</a>
+<li>stp_sequence_get_uint_data()
+: <a class="el" href="group__sequence.html#ge7189582ef9e4d638f909a2b1ee0c1b2">sequence.h</a>
+<li>stp_sequence_get_ulong_data()
+: <a class="el" href="group__sequence.html#g12f54f27144d490893f46dd1b0037b8b">sequence.h</a>
+<li>stp_sequence_get_ushort_data()
+: <a class="el" href="group__sequence.html#g20007077e1d8365a0eddaa922a5967c3">sequence.h</a>
+<li>stp_sequence_set_bounds()
+: <a class="el" href="group__sequence.html#g1720509809473bc33e6f11b277c78bf6">sequence.h</a>
+<li>stp_sequence_set_data()
+: <a class="el" href="group__sequence.html#g44bf5a48231675305718162559205fb6">sequence.h</a>
+<li>stp_sequence_set_float_data()
+: <a class="el" href="group__sequence.html#g35972a289b95891699ade61246882ab4">sequence.h</a>
+<li>stp_sequence_set_int_data()
+: <a class="el" href="group__sequence.html#g9d3e18b8e576b5c00531dac444397051">sequence.h</a>
+<li>stp_sequence_set_long_data()
+: <a class="el" href="group__sequence.html#gaa76cdc9094ee3c05c49a782fea64478">sequence.h</a>
+<li>stp_sequence_set_point()
+: <a class="el" href="group__sequence.html#g42c76060886da02cb4a7d843ffe6d21c">sequence.h</a>
+<li>stp_sequence_set_short_data()
+: <a class="el" href="group__sequence.html#g572ecad03d772a255481bb8b6d79106f">sequence.h</a>
+<li>stp_sequence_set_size()
+: <a class="el" href="group__sequence.html#ge0af31b854e61e0e047b3ba6dc6ec528">sequence.h</a>
+<li>stp_sequence_set_subrange()
+: <a class="el" href="group__sequence.html#g5bb962248581af2c3c54193442d9c82f">sequence.h</a>
+<li>stp_sequence_set_uint_data()
+: <a class="el" href="group__sequence.html#g497c32dec3d745a2602c5e97819de21d">sequence.h</a>
+<li>stp_sequence_set_ulong_data()
+: <a class="el" href="group__sequence.html#g3e274a2095f2e6986892384ee89e1255">sequence.h</a>
+<li>stp_sequence_set_ushort_data()
+: <a class="el" href="group__sequence.html#g317d484a67a2b775bee27f3dfe67fed4">sequence.h</a>
+<li>stp_sequence_t
+: <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">sequence.h</a>
+<li>stp_set_array_parameter()
+: <a class="el" href="group__vars.html#g88f25e09f9a4b76aca7ba8316cbf9c8b">vars.h</a>
+<li>stp_set_array_parameter_active()
+: <a class="el" href="group__vars.html#gb78f4273798c6e3e720afe01680cf752">vars.h</a>
+<li>stp_set_boolean_parameter()
+: <a class="el" href="group__vars.html#g2167971895eea887eaaa656ed075beff">vars.h</a>
+<li>stp_set_boolean_parameter_active()
+: <a class="el" href="group__vars.html#g9ad15a73dd8c755a8b80edbe335285ee">vars.h</a>
+<li>stp_set_color_conversion()
+: <a class="el" href="group__vars.html#g7eb2a1c4b892efd5507fcd4b7a434cea">vars.h</a>
+<li>stp_set_color_conversion_n()
+: <a class="el" href="group__vars.html#g5a842b31f0a572d8e64f1a5616e25a99">vars.h</a>
+<li>stp_set_curve_parameter()
+: <a class="el" href="group__vars.html#gfe5f1f6364b89437664b2bbc55288025">vars.h</a>
+<li>stp_set_curve_parameter_active()
+: <a class="el" href="group__vars.html#ge7f21b118a8dfb5607334a6141d5dc5c">vars.h</a>
+<li>stp_set_default_array_parameter()
+: <a class="el" href="group__vars.html#g63e7ff7b4c3e1d092f95c6234f21e39f">vars.h</a>
+<li>stp_set_default_boolean_parameter()
+: <a class="el" href="group__vars.html#g81d5f09980407b4310dada2a68fc4b09">vars.h</a>
+<li>stp_set_default_curve_parameter()
+: <a class="el" href="group__vars.html#gfe38044cc067b2c2afa3da469d1cb860">vars.h</a>
+<li>stp_set_default_dimension_parameter()
+: <a class="el" href="group__vars.html#gb6f1820cadd75a4311bfc49b01de447b">vars.h</a>
+<li>stp_set_default_file_parameter()
+: <a class="el" href="group__vars.html#gf5e225475c66f966f4ba8d8c88374186">vars.h</a>
+<li>stp_set_default_file_parameter_n()
+: <a class="el" href="group__vars.html#g217eece123630113cfcf8181d475fb53">vars.h</a>
+<li>stp_set_default_float_parameter()
+: <a class="el" href="group__vars.html#ge52dbb466422a18dec110220c45fe64e">vars.h</a>
+<li>stp_set_default_int_parameter()
+: <a class="el" href="group__vars.html#g3c0418772a82144f317dc973f01a8d55">vars.h</a>
+<li>stp_set_default_raw_parameter()
+: <a class="el" href="group__vars.html#g8159b3f5bea06a99711921f0201f5e0f">vars.h</a>
+<li>stp_set_default_string_parameter()
+: <a class="el" href="group__vars.html#gf299bd0827a4d86aca59fb0d9015a866">vars.h</a>
+<li>stp_set_default_string_parameter_n()
+: <a class="el" href="group__vars.html#ga5d6d8858b266517f5899196b062d00d">vars.h</a>
+<li>stp_set_dimension_parameter()
+: <a class="el" href="group__vars.html#g6ca7898c212230cdbdc70ada2efb1417">vars.h</a>
+<li>stp_set_dimension_parameter_active()
+: <a class="el" href="group__vars.html#g0f6e91baac5e78703b162e9d23c0a65c">vars.h</a>
+<li>stp_set_driver()
+: <a class="el" href="group__vars.html#gcf237afcbc26436ebedac5b11f469fdf">vars.h</a>
+<li>stp_set_driver_n()
+: <a class="el" href="group__vars.html#g188d298a8739b84fcb965f211fc7dc4e">vars.h</a>
+<li>stp_set_errdata()
+: <a class="el" href="group__vars.html#g8b30fbadf3475c59101af9d7d37c33b7">vars.h</a>
+<li>stp_set_errfunc()
+: <a class="el" href="group__vars.html#g82f6a7514840de82c9ed7edd30f16b5d">vars.h</a>
+<li>stp_set_file_parameter()
+: <a class="el" href="group__vars.html#g537f2ba6c74c9562b2f6883d7e36c59f">vars.h</a>
+<li>stp_set_file_parameter_active()
+: <a class="el" href="group__vars.html#gaecd310feb8bd9a2188a9b287656aa1a">vars.h</a>
+<li>stp_set_file_parameter_n()
+: <a class="el" href="group__vars.html#g6f7816adbce50ca9e2fdacad35282e6a">vars.h</a>
+<li>stp_set_float_parameter()
+: <a class="el" href="group__vars.html#gf3a3283247deaad7d1ac19818aa4b796">vars.h</a>
+<li>stp_set_float_parameter_active()
+: <a class="el" href="group__vars.html#g15a5458adea6ad4eecda3c990acbc6cb">vars.h</a>
+<li>stp_set_height()
+: <a class="el" href="group__vars.html#g8ce73c5efa41f005936d5f84c44c6667">vars.h</a>
+<li>stp_set_int_parameter()
+: <a class="el" href="group__vars.html#g70eded5d0df4677dd4b357b4b934f75a">vars.h</a>
+<li>stp_set_int_parameter_active()
+: <a class="el" href="group__vars.html#g7487203059e7ccd71c4673656b3042b1">vars.h</a>
+<li>stp_set_left()
+: <a class="el" href="group__vars.html#g3b0cc83e87247854ecafd46a6e446bcb">vars.h</a>
+<li>stp_set_outdata()
+: <a class="el" href="group__vars.html#gc2b3408200a9676e6c6063cc0ae2f4bd">vars.h</a>
+<li>stp_set_outfunc()
+: <a class="el" href="group__vars.html#g075ffc274f0d2d2b6edd8326de1d7142">vars.h</a>
+<li>stp_set_output_codeset()
+: <a class="el" href="group__util.html#g7fcc19f0abdc6513dfba7eaebeb16cb9">util.h</a>
+<li>stp_set_page_height()
+: <a class="el" href="group__vars.html#g83326bacb8b92149af1b70457b23bc8f">vars.h</a>
+<li>stp_set_page_width()
+: <a class="el" href="group__vars.html#g639be0da07c3e5b7dc6d68ac2aa999e9">vars.h</a>
+<li>stp_set_printer_defaults()
+: <a class="el" href="group__printer.html#gf5084888feed9878811ac491cb5313ee">printers.h</a>
+<li>stp_set_raw_parameter()
+: <a class="el" href="group__vars.html#g0155de75bf2aa95ab45a3319539cda56">vars.h</a>
+<li>stp_set_raw_parameter_active()
+: <a class="el" href="group__vars.html#g364fcdb2e57b8ca99867c94954cf14cd">vars.h</a>
+<li>stp_set_string_parameter()
+: <a class="el" href="group__vars.html#ga147483996fa118516ddb36fe3366aa9">vars.h</a>
+<li>stp_set_string_parameter_active()
+: <a class="el" href="group__vars.html#g6ed828e872f7678a89e1b065d377112e">vars.h</a>
+<li>stp_set_string_parameter_n()
+: <a class="el" href="group__vars.html#gfe6c8b3d86ca16239a63ce9d2ef57f48">vars.h</a>
+<li>stp_set_top()
+: <a class="el" href="group__vars.html#g557b5ad44d3b1da8392496681624ad8b">vars.h</a>
+<li>stp_set_verified()
+: <a class="el" href="group__vars.html#g1023ad18d2c97763137909b6191b0940">vars.h</a>
+<li>stp_set_width()
+: <a class="el" href="group__vars.html#g3a852ce7e42d7f8e0cef6c7d399e0491">vars.h</a>
+<li>stp_shade_t
+: <a class="el" href="dither_8h.html#5baefb325bf92b7ca10c2d057c04b835">dither.h</a>
+<li>stp_split_2()
+: <a class="el" href="bit-ops_8h.html#260a00a6551c9e27e56ea1fab9444d80">bit-ops.h</a>
+<li>stp_split_4()
+: <a class="el" href="bit-ops_8h.html#6d93a70fcc820df08fcf8d380b9743f5">bit-ops.h</a>
+<li>stp_start_job()
+: <a class="el" href="group__printer.html#g31ef7bcc34dda5d3fd46b2d04fcb0c64">printers.h</a>
+<li>stp_strdup()
+: <a class="el" href="group__util.html#g5c0731867697f555a94b2a1229804381">util.h</a>
+<li>stp_string_list_add_string()
+: <a class="el" href="string-list_8h.html#6aa3d7cf2dabfefb3e3162827d086d3d">string-list.h</a>
+<li>stp_string_list_count()
+: <a class="el" href="string-list_8h.html#9bed3cf935ed01fa9a0066c5e2a47ffb">string-list.h</a>
+<li>stp_string_list_create()
+: <a class="el" href="string-list_8h.html#b964b745d73a6d5e2e141f31941bea42">string-list.h</a>
+<li>stp_string_list_create_copy()
+: <a class="el" href="string-list_8h.html#6318f71fac5645c37e2d353f0881cc5b">string-list.h</a>
+<li>stp_string_list_create_from_params()
+: <a class="el" href="string-list_8h.html#4f78d1a53d017db20fe5b690d9362e7a">string-list.h</a>
+<li>stp_string_list_destroy()
+: <a class="el" href="string-list_8h.html#aa57feca43ce7cdf50af1dd8b4dd3a1b">string-list.h</a>
+<li>stp_string_list_find()
+: <a class="el" href="string-list_8h.html#0b5f5c20933a0f9c50259de3f16dc649">string-list.h</a>
+<li>stp_string_list_is_present()
+: <a class="el" href="string-list_8h.html#c776e9cd6ca5690b446cd6e4869978a1">string-list.h</a>
+<li>stp_string_list_param()
+: <a class="el" href="string-list_8h.html#e254c1408b96ab6cc373643f1b4d91d0">string-list.h</a>
+<li>stp_string_list_remove_string()
+: <a class="el" href="string-list_8h.html#087298f0cc92cc8864016a2f65a9c012">string-list.h</a>
+<li>stp_string_list_t
+: <a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">string-list.h</a>
+<li>stp_strlen()
+: <a class="el" href="group__util.html#g56b08d3e12750bdfae8b53263f97aba9">util.h</a>
+<li>stp_strndup()
+: <a class="el" href="group__util.html#gb026f7022963acd694a8b89e4decbde5">util.h</a>
+<li>stp_unpack_16()
+: <a class="el" href="bit-ops_8h.html#8ddfbe4f60566d4111b4c4d88a956d1b">bit-ops.h</a>
+<li>stp_unpack_2()
+: <a class="el" href="bit-ops_8h.html#e04e96586931b37257f4547eca77b116">bit-ops.h</a>
+<li>stp_unpack_4()
+: <a class="el" href="bit-ops_8h.html#c5bb5a178b5c6275e7e7c2f6b5064342">bit-ops.h</a>
+<li>stp_unpack_8()
+: <a class="el" href="bit-ops_8h.html#958196e6b7349e883a450e52cae83d93">bit-ops.h</a>
+<li>stp_unregister_xml_parser()
+: <a class="el" href="xml_8h.html#018dc99b4a78447b2e8cf66fec5a47b8">xml.h</a>
+<li>stp_unregister_xml_preload()
+: <a class="el" href="xml_8h.html#07bde9804f5e759aea971fea06e8cff7">xml.h</a>
+<li>stp_vars_copy()
+: <a class="el" href="group__vars.html#g88376207367adb4260ff14e5d9ec76e9">vars.h</a>
+<li>stp_vars_create()
+: <a class="el" href="group__vars.html#g5d641ab7093c9ba82cbd4cfbf904fabc">vars.h</a>
+<li>stp_vars_create_copy()
+: <a class="el" href="group__vars.html#gec00fba49ad08d20890e64773bcdbd48">vars.h</a>
+<li>stp_vars_destroy()
+: <a class="el" href="group__vars.html#gd3f1ff7a86c3cd1c9f9f62cfa8814437">vars.h</a>
+<li>stp_vars_t
+: <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">vars.h</a>
+<li>stp_verify()
+: <a class="el" href="group__vars.html#gb926417b2f601c78d85df44694cc6d38">vars.h</a>
+<li>stp_verify_parameter()
+: <a class="el" href="group__vars.html#gbfffe0d654de156874decdc0338216f4">vars.h</a>
+<li>stp_verify_printer_params()
+: <a class="el" href="group__printer.html#g5b5cb603c9432c03ea459b57a2039bdc">printers.h</a>
+<li>STP_WEAVE_ASCENDING
+: <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf385809919b5dcc799a9afed0063f052196fa8d6b">weave.h</a>
+<li>STP_WEAVE_ASCENDING_2X
+: <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf385809917bfa24511bcbc811272e385372c61936">weave.h</a>
+<li>STP_WEAVE_ASCENDING_3X
+: <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf38580991ecb24603379f9f3dd682bf692326a8e1">weave.h</a>
+<li>STP_WEAVE_DESCENDING
+: <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf38580991faf7b19bfde4be5241cb112835325797">weave.h</a>
+<li>stp_weave_parameters_by_row()
+: <a class="el" href="weave_8h.html#39d760951513fd171f9dc25b57daf229">weave.h</a>
+<li>STP_WEAVE_STAGGERED
+: <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf385809918e37ffcadb7b41a3276029206a80d5e6">weave.h</a>
+<li>stp_weave_strategy_t
+: <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf38580991">weave.h</a>
+<li>STP_WEAVE_ZIGZAG
+: <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf385809916077c1fbd3cc6c79a1ac5f23d31bd2b3">weave.h</a>
+<li>stp_write_weave()
+: <a class="el" href="weave_8h.html#ea7e0ed7877aa1e98b2ce9c210ad9ff4">weave.h</a>
+<li>stp_xml_exit()
+: <a class="el" href="xml_8h.html#b7b7abdceb4f1e6e6c6a607cd2eedead">xml.h</a>
+<li>stp_xml_get_node()
+: <a class="el" href="xml_8h.html#3f776c6582845b20c4f76b239d590ec6">xml.h</a>
+<li>stp_xml_init()
+: <a class="el" href="xml_8h.html#1a82a8dc830a6f7f81ec4e6f2344a5af">xml.h</a>
+<li>stp_xml_init_defaults()
+: <a class="el" href="xml_8h.html#3cfa9b65f1620621f0a0c6c7038fd316">xml.h</a>
+<li>stp_xml_parse_file()
+: <a class="el" href="xml_8h.html#c18d19df318ec2e3b4c850c68f07fe8f">xml.h</a>
+<li>stp_xml_parse_file_named()
+: <a class="el" href="xml_8h.html#c3ebefda15f3996388895a4408c3b030">xml.h</a>
+<li>stp_xml_parse_func
+: <a class="el" href="xml_8h.html#68816020e4f2e76d9b87379fe5b5edb2">xml.h</a>
+<li>stp_xml_preinit()
+: <a class="el" href="xml_8h.html#57035ed4be23f4527c9515198bf37a9d">xml.h</a>
+<li>stp_xmldoc_create_generic()
+: <a class="el" href="xml_8h.html#31f7bc9f5f2b2ce79dcfc87d7f4630f2">xml.h</a>
+<li>stp_xmlstrtod()
+: <a class="el" href="xml_8h.html#955626cb67a5067d67a116f8ab67007d">xml.h</a>
+<li>stp_xmlstrtol()
+: <a class="el" href="xml_8h.html#28f6df53b5a7623b654dff6ec26db8c7">xml.h</a>
+<li>stp_xmlstrtoul()
+: <a class="el" href="xml_8h.html#1c1ba2f2312544bda8b3ce2e919e4687">xml.h</a>
+<li>stp_xmltree_create_from_array()
+: <a class="el" href="xml_8h.html#e02d45dc8cae7bea5c4e378e121d6623">xml.h</a>
+<li>stp_xmltree_create_from_curve()
+: <a class="el" href="xml_8h.html#e8c5f8944f4921f772eb12e52c7fb95d">xml.h</a>
+<li>stp_xmltree_create_from_sequence()
+: <a class="el" href="xml_8h.html#d03ea12e2b0089daf469c6af120ef180">xml.h</a>
+<li>stp_zalloc()
+: <a class="el" href="group__util.html#gc8fd1a439fa2d8e1ff1a2b104cd0137b">util.h</a>
+<li>stp_zfwrite()
+: <a class="el" href="group__util.html#g183d8f36f187530f9d7acdb176be3409">util.h</a>
+<li>stp_zprintf()
+: <a class="el" href="group__util.html#gd7ffe058decb939af6a5c1ec1d0d77fa">util.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x74.html b/doc/gutenprint/html/globals_0x74.html
index a8649c0..2c57c36 100644
--- a/doc/gutenprint/html/globals_0x74.html
+++ b/doc/gutenprint/html/globals_0x74.html
@@ -1,21 +1,60 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"> | <a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="globals.html#index__">_</a> | <a class="qindex" href="globals_0x62.html#index_b">b</a> | <a class="qindex" href="globals_0x63.html#index_c">c</a> | <a class="qindex" href="globals_0x64.html#index_d">d</a> | <a class="qindex" href="globals_0x67.html#index_g">g</a> | <a class="qindex" href="globals_0x6e.html#index_n">n</a> | <a class="qindex" href="globals_0x70.html#index_p">p</a> | <a class="qindex" href="globals_0x73.html#index_s">s</a> | <a class="qindexHL" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html#index__"><span>_</span></a></li>
+    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li class="current"><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>textdomain
-: <a class="el" href="group__intl.html#ga0">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga0">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__intl__internal.html#g5f80e8482ab93869489531a8c7ce7006">gutenprint-intl-internal.h</a>
+, <a class="el" href="group__intl.html#g5f80e8482ab93869489531a8c7ce7006">gutenprint-intl.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_defs.html b/doc/gutenprint/html/globals_defs.html
index 78a4995..3ea8a27 100644
--- a/doc/gutenprint/html/globals_defs.html
+++ b/doc/gutenprint/html/globals_defs.html
@@ -1,95 +1,205 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindexHL" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="#index__">_</a> | <a class="qindex" href="#index_b">b</a> | <a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_d">d</a> | <a class="qindex" href="#index_g">g</a> | <a class="qindex" href="#index_n">n</a> | <a class="qindex" href="#index_s">s</a> | <a class="qindex" href="#index_t">t</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li class="current"><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index__"><span>_</span></a></li>
+    <li><a href="#index_b"><span>b</span></a></li>
+    <li><a href="#index_c"><span>c</span></a></li>
+    <li><a href="#index_d"><span>d</span></a></li>
+    <li><a href="#index_g"><span>g</span></a></li>
+    <li><a href="#index_n"><span>n</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+    <li><a href="#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
-
+&nbsp;
 <p>
 <h3><a class="anchor" name="index__">- _ -</a></h3><ul>
 <li>_
-: <a class="el" href="group__intl.html#ga5">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga5">gutenprint-intl-internal.h</a></ul>
+: <a class="el" href="group__intl__internal.html#g32a3cf3d9dd914f5aeeca5423c157934">gutenprint-intl-internal.h</a>
+, <a class="el" href="group__intl.html#g32a3cf3d9dd914f5aeeca5423c157934">gutenprint-intl.h</a>
+<li>__attribute__
+: <a class="el" href="util_8h.html#9d373a9b65ff25b2db84c07394e1c212">util.h</a>
+</ul>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>bindtextdomain
-: <a class="el" href="group__intl.html#ga4">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga4">gutenprint-intl-internal.h</a></ul>
+: <a class="el" href="group__intl__internal.html#gdd6dfc1077058ff26d79cdb18099d58a">gutenprint-intl-internal.h</a>
+, <a class="el" href="group__intl.html#gdd6dfc1077058ff26d79cdb18099d58a">gutenprint-intl.h</a>
+</ul>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>CURVE_CACHE_FAST_COUNT
-: <a class="el" href="curve-cache_8h.html#a2">curve-cache.h</a><li>CURVE_CACHE_FAST_DOUBLE
-: <a class="el" href="curve-cache_8h.html#a1">curve-cache.h</a><li>CURVE_CACHE_FAST_USHORT
-: <a class="el" href="curve-cache_8h.html#a0">curve-cache.h</a></ul>
+: <a class="el" href="curve-cache_8h.html#70b70d0328c61f17925402a4b1bb9a90">curve-cache.h</a>
+<li>CURVE_CACHE_FAST_DOUBLE
+: <a class="el" href="curve-cache_8h.html#f79c26492d6e6fd726498df18cae11fe">curve-cache.h</a>
+<li>CURVE_CACHE_FAST_USHORT
+: <a class="el" href="curve-cache_8h.html#4b278e86a2f914893307fb20cf218e7c">curve-cache.h</a>
+</ul>
 <h3><a class="anchor" name="index_d">- d -</a></h3><ul>
 <li>dcgettext
-: <a class="el" href="group__intl.html#ga3">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga3">gutenprint-intl-internal.h</a><li>dgettext
-: <a class="el" href="group__intl.html#ga2">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga2">gutenprint-intl-internal.h</a></ul>
+: <a class="el" href="group__intl__internal.html#g115dd6a6dd9d7a249f6374a7c06deef5">gutenprint-intl-internal.h</a>
+, <a class="el" href="group__intl.html#g115dd6a6dd9d7a249f6374a7c06deef5">gutenprint-intl.h</a>
+<li>dgettext
+: <a class="el" href="group__intl.html#gd24abc7110e1bdf384dc2ef2b63e5d07">gutenprint-intl.h</a>
+, <a class="el" href="group__intl__internal.html#gd24abc7110e1bdf384dc2ef2b63e5d07">gutenprint-intl-internal.h</a>
+</ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>gettext
-: <a class="el" href="group__intl.html#ga1">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga1">gutenprint-intl-internal.h</a></ul>
+: <a class="el" href="group__intl__internal.html#g83b8be0887dede025766d25e2bb884c6">gutenprint-intl-internal.h</a>
+, <a class="el" href="group__intl.html#g83b8be0887dede025766d25e2bb884c6">gutenprint-intl.h</a>
+</ul>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>N_
-: <a class="el" href="group__intl.html#ga6">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga6">gutenprint-intl-internal.h</a></ul>
+: <a class="el" href="group__intl__internal.html#g75278405e7f034d2b1af80bfd94675fe">gutenprint-intl-internal.h</a>
+, <a class="el" href="group__intl.html#g75278405e7f034d2b1af80bfd94675fe">gutenprint-intl.h</a>
+</ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>STP_BINARY_AGE
-: <a class="el" href="group__version.html#ga11">gutenprint-version.h</a><li>STP_CHANNEL_LIMIT
-: <a class="el" href="group__image.html#ga8">image.h</a><li>STP_CHECK_VERSION
-: <a class="el" href="group__version.html#ga13">gutenprint-version.h</a><li>STP_CURRENT_INTERFACE
-: <a class="el" href="group__version.html#ga10">gutenprint-version.h</a><li>STP_DBG_CANON
-: <a class="el" href="group__util.html#ga39">util.h</a><li>STP_DBG_COLORFUNC
-: <a class="el" href="group__util.html#ga34">util.h</a><li>STP_DBG_CURVE
-: <a class="el" href="group__util.html#ga52">util.h</a><li>STP_DBG_CURVE_ERRORS
-: <a class="el" href="group__util.html#ga53">util.h</a><li>STP_DBG_ESCP2
-: <a class="el" href="group__util.html#ga38">util.h</a><li>STP_DBG_INK
-: <a class="el" href="group__util.html#ga35">util.h</a><li>STP_DBG_LEXMARK
-: <a class="el" href="group__util.html#ga40">util.h</a><li>STP_DBG_LIST
-: <a class="el" href="group__util.html#ga44">util.h</a><li>STP_DBG_LUT
-: <a class="el" href="group__util.html#ga33">util.h</a><li>STP_DBG_MARK_FILE
-: <a class="el" href="group__util.html#ga43">util.h</a><li>STP_DBG_MODULE
-: <a class="el" href="group__util.html#ga45">util.h</a><li>STP_DBG_OLYMPUS
-: <a class="el" href="group__util.html#ga51">util.h</a><li>STP_DBG_PAPER
-: <a class="el" href="group__util.html#ga47">util.h</a><li>STP_DBG_PATH
-: <a class="el" href="group__util.html#ga46">util.h</a><li>STP_DBG_PCL
-: <a class="el" href="group__util.html#ga37">util.h</a><li>STP_DBG_PRINTERS
-: <a class="el" href="group__util.html#ga48">util.h</a><li>STP_DBG_PS
-: <a class="el" href="group__util.html#ga36">util.h</a><li>STP_DBG_ROWS
-: <a class="el" href="group__util.html#ga42">util.h</a><li>STP_DBG_VARS
-: <a class="el" href="group__util.html#ga50">util.h</a><li>STP_DBG_WEAVE_PARAMS
-: <a class="el" href="group__util.html#ga41">util.h</a><li>STP_DBG_XML
-: <a class="el" href="group__util.html#ga49">util.h</a><li>STP_ECOLOR_C
-: <a class="el" href="dither_8h.html#a1">dither.h</a><li>STP_ECOLOR_K
-: <a class="el" href="dither_8h.html#a0">dither.h</a><li>STP_ECOLOR_M
-: <a class="el" href="dither_8h.html#a2">dither.h</a><li>STP_ECOLOR_Y
-: <a class="el" href="dither_8h.html#a3">dither.h</a><li>STP_INTERFACE_AGE
-: <a class="el" href="group__version.html#ga12">gutenprint-version.h</a><li>STP_MAJOR_VERSION
-: <a class="el" href="group__version.html#ga7">gutenprint-version.h</a><li>STP_MAX_WEAVE
-: <a class="el" href="weave_8h.html#a0">weave.h</a><li>STP_MICRO_VERSION
-: <a class="el" href="group__version.html#ga9">gutenprint-version.h</a><li>STP_MINOR_VERSION
-: <a class="el" href="group__version.html#ga8">gutenprint-version.h</a><li>STP_MODULE
-: <a class="el" href="gutenprint-module_8h.html#a0">gutenprint-module.h</a><li>STP_MXML_ADD_AFTER
-: <a class="el" href="mxml_8h.html#a12">mxml.h</a><li>STP_MXML_ADD_BEFORE
-: <a class="el" href="mxml_8h.html#a11">mxml.h</a><li>STP_MXML_ADD_TO_PARENT
-: <a class="el" href="mxml_8h.html#a13">mxml.h</a><li>STP_MXML_DESCEND
-: <a class="el" href="mxml_8h.html#a4">mxml.h</a><li>STP_MXML_DESCEND_FIRST
-: <a class="el" href="mxml_8h.html#a6">mxml.h</a><li>STP_MXML_NO_CALLBACK
-: <a class="el" href="mxml_8h.html#a2">mxml.h</a><li>STP_MXML_NO_DESCEND
-: <a class="el" href="mxml_8h.html#a5">mxml.h</a><li>STP_MXML_NO_PARENT
-: <a class="el" href="mxml_8h.html#a3">mxml.h</a><li>STP_MXML_TAB
-: <a class="el" href="mxml_8h.html#a1">mxml.h</a><li>STP_MXML_WRAP
-: <a class="el" href="mxml_8h.html#a0">mxml.h</a><li>STP_MXML_WS_AFTER_CLOSE
-: <a class="el" href="mxml_8h.html#a10">mxml.h</a><li>STP_MXML_WS_AFTER_OPEN
-: <a class="el" href="mxml_8h.html#a8">mxml.h</a><li>STP_MXML_WS_BEFORE_CLOSE
-: <a class="el" href="mxml_8h.html#a9">mxml.h</a><li>STP_MXML_WS_BEFORE_OPEN
-: <a class="el" href="mxml_8h.html#a7">mxml.h</a><li>STP_NCOLORS
-: <a class="el" href="dither_8h.html#a4">dither.h</a><li>STP_SAFE_FREE
-: <a class="el" href="group__util.html#ga54">util.h</a></ul>
+: <a class="el" href="group__version.html#g509ecd9be5329eef0f8d49e0b25f63da">gutenprint-version.h</a>
+<li>STP_CHANNEL_LIMIT
+: <a class="el" href="group__image.html#g0b7daa7e9e9b26fea847d71ca9de7c02">image.h</a>
+<li>STP_CHECK_VERSION
+: <a class="el" href="group__version.html#gf20320940416f43ed7735137296fa12b">gutenprint-version.h</a>
+<li>STP_CURRENT_INTERFACE
+: <a class="el" href="group__version.html#g1969d8a5a74a5c70a978f99aa68d9f4b">gutenprint-version.h</a>
+<li>STP_DBG_CANON
+: <a class="el" href="group__util.html#g109cde96d907cbd28f0b631f07a3d696">util.h</a>
+<li>STP_DBG_COLORFUNC
+: <a class="el" href="group__util.html#g0beee5fa281098eab25e3f22570c0fdc">util.h</a>
+<li>STP_DBG_CURVE
+: <a class="el" href="group__util.html#g8f3e76af1b2564a5763e790a45215438">util.h</a>
+<li>STP_DBG_CURVE_ERRORS
+: <a class="el" href="group__util.html#gabbc2868668663cc28d6289d50e5f83d">util.h</a>
+<li>STP_DBG_ESCP2
+: <a class="el" href="group__util.html#gda7c4766db0c05ecb5ce435ddd81ecdd">util.h</a>
+<li>STP_DBG_INK
+: <a class="el" href="group__util.html#g1c6936662d2cbe95de396fe8af2f254d">util.h</a>
+<li>STP_DBG_LEXMARK
+: <a class="el" href="group__util.html#gc71c7cb5cdf49c881d944ef813a3733f">util.h</a>
+<li>STP_DBG_LIST
+: <a class="el" href="group__util.html#g3c5672b14a2e2ccdffca5b6277b1aac2">util.h</a>
+<li>STP_DBG_LUT
+: <a class="el" href="group__util.html#g4472d3ba849ed203d43005f04583decc">util.h</a>
+<li>STP_DBG_MARK_FILE
+: <a class="el" href="group__util.html#g01f4480bda8819f337b2be4c41e0ebe1">util.h</a>
+<li>STP_DBG_MODULE
+: <a class="el" href="group__util.html#g9ace1ab545abac936101248caf9a50c6">util.h</a>
+<li>STP_DBG_OLYMPUS
+: <a class="el" href="group__util.html#g574664feccffc4527df73e32c7e863bf">util.h</a>
+<li>STP_DBG_PAPER
+: <a class="el" href="group__util.html#gd5eeaeabba7a0a861ae0dc936057aabd">util.h</a>
+<li>STP_DBG_PATH
+: <a class="el" href="group__util.html#g6f8cdfb28d0d73e9579fb1751f540dc7">util.h</a>
+<li>STP_DBG_PCL
+: <a class="el" href="group__util.html#gf8162186c8118e5c3a8543bc0c410a78">util.h</a>
+<li>STP_DBG_PRINTERS
+: <a class="el" href="group__util.html#gdbfb451ebbd246d62bd52e0120fa232b">util.h</a>
+<li>STP_DBG_PS
+: <a class="el" href="group__util.html#g90d230dd93fa96d34b438e82ed3f9639">util.h</a>
+<li>STP_DBG_ROWS
+: <a class="el" href="group__util.html#g698ce0ddb2e4f0a8b6d7a77ad7a0fbf0">util.h</a>
+<li>STP_DBG_VARS
+: <a class="el" href="group__util.html#g4c481c5ea8d87ae6c0e556593ab2020e">util.h</a>
+<li>STP_DBG_WEAVE_PARAMS
+: <a class="el" href="group__util.html#g2af8b3f36dbda4cfd313b50ba2dae636">util.h</a>
+<li>STP_DBG_XML
+: <a class="el" href="group__util.html#gcf72e68aa70e333b06b0bb821218d967">util.h</a>
+<li>STP_ECOLOR_C
+: <a class="el" href="dither_8h.html#fb855574a9dd1ce3c0ac8e353917cf40">dither.h</a>
+<li>STP_ECOLOR_K
+: <a class="el" href="dither_8h.html#9da4fbd724d498250c7129ccbb88c9a3">dither.h</a>
+<li>STP_ECOLOR_M
+: <a class="el" href="dither_8h.html#42c70bd6031d27d8ce2ab23133f7ed71">dither.h</a>
+<li>STP_ECOLOR_Y
+: <a class="el" href="dither_8h.html#ac7bfac809059b8c99338dfa9347cf85">dither.h</a>
+<li>STP_INTERFACE_AGE
+: <a class="el" href="group__version.html#g6485cd073e75e01f9df68ecd67b14372">gutenprint-version.h</a>
+<li>STP_MAJOR_VERSION
+: <a class="el" href="group__version.html#gdd0b07630653da8e46b91c2c1bafc2b9">gutenprint-version.h</a>
+<li>STP_MAX_WEAVE
+: <a class="el" href="weave_8h.html#6e5fd9b98567e1fd3fde622fd42dec67">weave.h</a>
+<li>STP_MICRO_VERSION
+: <a class="el" href="group__version.html#gb860ee8cb0b05ea1385e01d130d7358e">gutenprint-version.h</a>
+<li>STP_MINOR_VERSION
+: <a class="el" href="group__version.html#g87507431ad6b7504b129eafad863cb1f">gutenprint-version.h</a>
+<li>STP_MODULE
+: <a class="el" href="gutenprint-module_8h.html#38fcab54351f45a3968822e2747aff6b">gutenprint-module.h</a>
+<li>STP_MXML_ADD_AFTER
+: <a class="el" href="mxml_8h.html#a046bb0b67f278cb7ffdd0be5336b4f3">mxml.h</a>
+<li>STP_MXML_ADD_BEFORE
+: <a class="el" href="mxml_8h.html#1920c86773f4394ebd778b6e6b8f1aba">mxml.h</a>
+<li>STP_MXML_ADD_TO_PARENT
+: <a class="el" href="mxml_8h.html#5c364d2523fb6f7a133df3fdfd7f44d5">mxml.h</a>
+<li>STP_MXML_DESCEND
+: <a class="el" href="mxml_8h.html#7c552ec507bb896f89f002de30a21378">mxml.h</a>
+<li>STP_MXML_DESCEND_FIRST
+: <a class="el" href="mxml_8h.html#bff818057f8c875f4152aa49ed5c046b">mxml.h</a>
+<li>STP_MXML_NO_CALLBACK
+: <a class="el" href="mxml_8h.html#e7115822f446a7b9bde7ce872bd73d83">mxml.h</a>
+<li>STP_MXML_NO_DESCEND
+: <a class="el" href="mxml_8h.html#df7d31182924f15ecbeae9b6c0f35ca2">mxml.h</a>
+<li>STP_MXML_NO_PARENT
+: <a class="el" href="mxml_8h.html#4d9598080b3b0381f5c94518a885e867">mxml.h</a>
+<li>STP_MXML_TAB
+: <a class="el" href="mxml_8h.html#f14eeab60ef7298e7fbb04f9f80ec81f">mxml.h</a>
+<li>STP_MXML_WRAP
+: <a class="el" href="mxml_8h.html#0958b60267481400b1037902e060027f">mxml.h</a>
+<li>STP_MXML_WS_AFTER_CLOSE
+: <a class="el" href="mxml_8h.html#010da4f7fffd4a3b3eec433031d466f9">mxml.h</a>
+<li>STP_MXML_WS_AFTER_OPEN
+: <a class="el" href="mxml_8h.html#4e7558f3b8bc4d9b3e39c57108b11cea">mxml.h</a>
+<li>STP_MXML_WS_BEFORE_CLOSE
+: <a class="el" href="mxml_8h.html#a8d71b9879129c853422282b2b728131">mxml.h</a>
+<li>STP_MXML_WS_BEFORE_OPEN
+: <a class="el" href="mxml_8h.html#60a753631e81e819a2dad91834b0a7f5">mxml.h</a>
+<li>STP_NCOLORS
+: <a class="el" href="dither_8h.html#bda31f8e7a9e473057644a5fe4a2339b">dither.h</a>
+<li>STP_RAW
+: <a class="el" href="group__vars.html#g9fc3819cba14f7f4c5654508a08a1adf">vars.h</a>
+<li>STP_RAW_STRING
+: <a class="el" href="group__vars.html#gd888c1f6a36f999ffebfffa7b74f28d2">vars.h</a>
+<li>STP_SAFE_FREE
+: <a class="el" href="group__util.html#ga5a86efbbd3e2eb391718d82a1d7ffcc">util.h</a>
+</ul>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>textdomain
-: <a class="el" href="group__intl.html#ga0">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga0">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__intl__internal.html#g5f80e8482ab93869489531a8c7ce7006">gutenprint-intl-internal.h</a>
+, <a class="el" href="group__intl.html#g5f80e8482ab93869489531a8c7ce7006">gutenprint-intl.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_enum.html b/doc/gutenprint/html/globals_enum.html
index 947255f..b318617 100644
--- a/doc/gutenprint/html/globals_enum.html
+++ b/doc/gutenprint/html/globals_enum.html
@@ -1,31 +1,70 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindexHL" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li class="current"><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+&nbsp;
 <p>
 <ul>
 <li>stp_curve_bounds_t
-: <a class="el" href="group__curve.html#ga50">curve.h</a><li>stp_curve_compose_t
-: <a class="el" href="group__curve.html#ga49">curve.h</a><li>stp_curve_type_t
-: <a class="el" href="group__curve.html#ga47">curve.h</a><li>stp_curve_wrap_mode_t
-: <a class="el" href="group__curve.html#ga48">curve.h</a><li>stp_image_status_t
-: <a class="el" href="group__image.html#ga9">image.h</a><li>stp_module_class_t
-: <a class="el" href="module_8h.html#a13">module.h</a><li>stp_mxml_type_e
-: <a class="el" href="mxml_8h.html#a43">mxml.h</a><li>stp_papersize_unit_t
-: <a class="el" href="group__papersize.html#ga5">paper.h</a><li>stp_parameter_activity_t
-: <a class="el" href="group__vars.html#ga136">vars.h</a><li>stp_parameter_class_t
-: <a class="el" href="group__vars.html#ga134">vars.h</a><li>stp_parameter_level_t
-: <a class="el" href="group__vars.html#ga135">vars.h</a><li>stp_parameter_type_t
-: <a class="el" href="group__vars.html#ga133">vars.h</a><li>stp_parameter_verify_t
-: <a class="el" href="group__vars.html#ga137">vars.h</a><li>stp_weave_strategy_t
-: <a class="el" href="weave_8h.html#a26">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__curve.html#g86d146e483ca1902f973d574f542b85f">curve.h</a>
+<li>stp_curve_compose_t
+: <a class="el" href="group__curve.html#g7eddbee28cb1f3c76a19408b86ea142e">curve.h</a>
+<li>stp_curve_type_t
+: <a class="el" href="group__curve.html#g982f8191c84b049cc3ad3cee1558fc23">curve.h</a>
+<li>stp_curve_wrap_mode_t
+: <a class="el" href="group__curve.html#g3ae3af552b490b0ca8b02e442ac9547a">curve.h</a>
+<li>stp_image_status_t
+: <a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">image.h</a>
+<li>stp_module_class_t
+: <a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42">module.h</a>
+<li>stp_mxml_type_e
+: <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba">mxml.h</a>
+<li>stp_papersize_unit_t
+: <a class="el" href="group__papersize.html#g72e4619e373e38dc02dc452813b7b958">paper.h</a>
+<li>stp_parameter_activity_t
+: <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">vars.h</a>
+<li>stp_parameter_class_t
+: <a class="el" href="group__vars.html#g4eba7e712c0e17b76e472f26e202d7b8">vars.h</a>
+<li>stp_parameter_level_t
+: <a class="el" href="group__vars.html#gaa9c9265ffe70122bd33659cf2983207">vars.h</a>
+<li>stp_parameter_type_t
+: <a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">vars.h</a>
+<li>stp_parameter_verify_t
+: <a class="el" href="group__vars.html#gc061852de3627383cd415cd80a979e02">vars.h</a>
+<li>stp_weave_strategy_t
+: <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf38580991">weave.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_eval.html b/doc/gutenprint/html/globals_eval.html
index 4afbdda..e937285 100644
--- a/doc/gutenprint/html/globals_eval.html
+++ b/doc/gutenprint/html/globals_eval.html
@@ -1,83 +1,174 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindexHL" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="#index_p">p</a> | <a class="qindex" href="#index_s">s</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li class="current"><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index_p"><span>p</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+  </ul>
+</div>
 
 <p>
-
+&nbsp;
 <p>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>PAPERSIZE_ENGLISH_EXTENDED
-: <a class="el" href="group__papersize.html#gga5a2">paper.h</a><li>PAPERSIZE_ENGLISH_STANDARD
-: <a class="el" href="group__papersize.html#gga5a0">paper.h</a><li>PAPERSIZE_METRIC_EXTENDED
-: <a class="el" href="group__papersize.html#gga5a3">paper.h</a><li>PAPERSIZE_METRIC_STANDARD
-: <a class="el" href="group__papersize.html#gga5a1">paper.h</a><li>PARAMETER_BAD
-: <a class="el" href="group__vars.html#gga137a33">vars.h</a><li>PARAMETER_INACTIVE
-: <a class="el" href="group__vars.html#gga137a35">vars.h</a><li>PARAMETER_OK
-: <a class="el" href="group__vars.html#gga137a34">vars.h</a></ul>
+: <a class="el" href="group__papersize.html#gg72e4619e373e38dc02dc452813b7b95800b7e9a18afc172872861b26dbcc8cb8">paper.h</a>
+<li>PAPERSIZE_ENGLISH_STANDARD
+: <a class="el" href="group__papersize.html#gg72e4619e373e38dc02dc452813b7b958db394159413ade42022509cd3280fef3">paper.h</a>
+<li>PAPERSIZE_METRIC_EXTENDED
+: <a class="el" href="group__papersize.html#gg72e4619e373e38dc02dc452813b7b95862e2906a87fa4bcf32913943fd5b225a">paper.h</a>
+<li>PAPERSIZE_METRIC_STANDARD
+: <a class="el" href="group__papersize.html#gg72e4619e373e38dc02dc452813b7b9586d5868bc6707f8801ce4d584428c2ae8">paper.h</a>
+<li>PARAMETER_BAD
+: <a class="el" href="group__vars.html#ggc061852de3627383cd415cd80a979e02326a171221148779ec7df761b3eee967">vars.h</a>
+<li>PARAMETER_INACTIVE
+: <a class="el" href="group__vars.html#ggc061852de3627383cd415cd80a979e025cb96da6c2e3ae7187e85a1ef6e41fc6">vars.h</a>
+<li>PARAMETER_OK
+: <a class="el" href="group__vars.html#ggc061852de3627383cd415cd80a979e022df363618282a9164433c0f212b18616">vars.h</a>
+</ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>STP_CURVE_BOUNDS_CLIP
-: <a class="el" href="group__curve.html#gga50a9">curve.h</a><li>STP_CURVE_BOUNDS_ERROR
-: <a class="el" href="group__curve.html#gga50a10">curve.h</a><li>STP_CURVE_BOUNDS_RESCALE
-: <a class="el" href="group__curve.html#gga50a8">curve.h</a><li>STP_CURVE_COMPOSE_ADD
-: <a class="el" href="group__curve.html#gga49a5">curve.h</a><li>STP_CURVE_COMPOSE_EXPONENTIATE
-: <a class="el" href="group__curve.html#gga49a7">curve.h</a><li>STP_CURVE_COMPOSE_MULTIPLY
-: <a class="el" href="group__curve.html#gga49a6">curve.h</a><li>STP_CURVE_TYPE_LINEAR
-: <a class="el" href="group__curve.html#gga47a1">curve.h</a><li>STP_CURVE_TYPE_SPLINE
-: <a class="el" href="group__curve.html#gga47a2">curve.h</a><li>STP_CURVE_WRAP_AROUND
-: <a class="el" href="group__curve.html#gga48a4">curve.h</a><li>STP_CURVE_WRAP_NONE
-: <a class="el" href="group__curve.html#gga48a3">curve.h</a><li>STP_IMAGE_STATUS_ABORT
-: <a class="el" href="group__image.html#gga9a3">image.h</a><li>STP_IMAGE_STATUS_OK
-: <a class="el" href="group__image.html#gga9a2">image.h</a><li>STP_MODULE_CLASS_COLOR
-: <a class="el" href="module_8h.html#a13a5">module.h</a><li>STP_MODULE_CLASS_DITHER
-: <a class="el" href="module_8h.html#a13a6">module.h</a><li>STP_MODULE_CLASS_FAMILY
-: <a class="el" href="module_8h.html#a13a4">module.h</a><li>STP_MODULE_CLASS_INVALID
-: <a class="el" href="module_8h.html#a13a2">module.h</a><li>STP_MODULE_CLASS_MISC
-: <a class="el" href="module_8h.html#a13a3">module.h</a><li>STP_MXML_ELEMENT
-: <a class="el" href="mxml_8h.html#a43a20">mxml.h</a><li>STP_MXML_INTEGER
-: <a class="el" href="mxml_8h.html#a43a21">mxml.h</a><li>STP_MXML_OPAQUE
-: <a class="el" href="mxml_8h.html#a43a22">mxml.h</a><li>STP_MXML_REAL
-: <a class="el" href="mxml_8h.html#a43a23">mxml.h</a><li>STP_MXML_TEXT
-: <a class="el" href="mxml_8h.html#a43a24">mxml.h</a><li>STP_PARAMETER_ACTIVE
-: <a class="el" href="group__vars.html#gga136a32">vars.h</a><li>STP_PARAMETER_CLASS_CORE
-: <a class="el" href="group__vars.html#gga134a19">vars.h</a><li>STP_PARAMETER_CLASS_FEATURE
-: <a class="el" href="group__vars.html#gga134a17">vars.h</a><li>STP_PARAMETER_CLASS_INVALID
-: <a class="el" href="group__vars.html#gga134a20">vars.h</a><li>STP_PARAMETER_CLASS_OUTPUT
-: <a class="el" href="group__vars.html#gga134a18">vars.h</a><li>STP_PARAMETER_DEFAULTED
-: <a class="el" href="group__vars.html#gga136a31">vars.h</a><li>STP_PARAMETER_INACTIVE
-: <a class="el" href="group__vars.html#gga136a30">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED
-: <a class="el" href="group__vars.html#gga135a22">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED1
-: <a class="el" href="group__vars.html#gga135a23">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED2
-: <a class="el" href="group__vars.html#gga135a24">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED3
-: <a class="el" href="group__vars.html#gga135a25">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED4
-: <a class="el" href="group__vars.html#gga135a26">vars.h</a><li>STP_PARAMETER_LEVEL_BASIC
-: <a class="el" href="group__vars.html#gga135a21">vars.h</a><li>STP_PARAMETER_LEVEL_EXTERNAL
-: <a class="el" href="group__vars.html#gga135a28">vars.h</a><li>STP_PARAMETER_LEVEL_INTERNAL
-: <a class="el" href="group__vars.html#gga135a27">vars.h</a><li>STP_PARAMETER_LEVEL_INVALID
-: <a class="el" href="group__vars.html#gga135a29">vars.h</a><li>STP_PARAMETER_TYPE_ARRAY
-: <a class="el" href="group__vars.html#gga133a14">vars.h</a><li>STP_PARAMETER_TYPE_BOOLEAN
-: <a class="el" href="group__vars.html#gga133a9">vars.h</a><li>STP_PARAMETER_TYPE_CURVE
-: <a class="el" href="group__vars.html#gga133a11">vars.h</a><li>STP_PARAMETER_TYPE_DIMENSION
-: <a class="el" href="group__vars.html#gga133a15">vars.h</a><li>STP_PARAMETER_TYPE_DOUBLE
-: <a class="el" href="group__vars.html#gga133a10">vars.h</a><li>STP_PARAMETER_TYPE_FILE
-: <a class="el" href="group__vars.html#gga133a12">vars.h</a><li>STP_PARAMETER_TYPE_INT
-: <a class="el" href="group__vars.html#gga133a8">vars.h</a><li>STP_PARAMETER_TYPE_INVALID
-: <a class="el" href="group__vars.html#gga133a16">vars.h</a><li>STP_PARAMETER_TYPE_RAW
-: <a class="el" href="group__vars.html#gga133a13">vars.h</a><li>STP_PARAMETER_TYPE_STRING_LIST
-: <a class="el" href="group__vars.html#gga133a7">vars.h</a><li>STP_WEAVE_ASCENDING
-: <a class="el" href="weave_8h.html#a26a12">weave.h</a><li>STP_WEAVE_ASCENDING_2X
-: <a class="el" href="weave_8h.html#a26a14">weave.h</a><li>STP_WEAVE_ASCENDING_3X
-: <a class="el" href="weave_8h.html#a26a16">weave.h</a><li>STP_WEAVE_DESCENDING
-: <a class="el" href="weave_8h.html#a26a13">weave.h</a><li>STP_WEAVE_STAGGERED
-: <a class="el" href="weave_8h.html#a26a15">weave.h</a><li>STP_WEAVE_ZIGZAG
-: <a class="el" href="weave_8h.html#a26a11">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__curve.html#gg86d146e483ca1902f973d574f542b85fec9e6673edac9d34e3aad376fa711aa5">curve.h</a>
+<li>STP_CURVE_BOUNDS_ERROR
+: <a class="el" href="group__curve.html#gg86d146e483ca1902f973d574f542b85fd699d675d5df223055388cd83d0b362b">curve.h</a>
+<li>STP_CURVE_BOUNDS_RESCALE
+: <a class="el" href="group__curve.html#gg86d146e483ca1902f973d574f542b85f118d303bf7bdf4f00bda71cc6eac49c3">curve.h</a>
+<li>STP_CURVE_COMPOSE_ADD
+: <a class="el" href="group__curve.html#gg7eddbee28cb1f3c76a19408b86ea142ec38b0bf09e93edb67c3e5c53035295f3">curve.h</a>
+<li>STP_CURVE_COMPOSE_EXPONENTIATE
+: <a class="el" href="group__curve.html#gg7eddbee28cb1f3c76a19408b86ea142e8de151149fdfd4fcca78826e6352246a">curve.h</a>
+<li>STP_CURVE_COMPOSE_MULTIPLY
+: <a class="el" href="group__curve.html#gg7eddbee28cb1f3c76a19408b86ea142ed3bd2cdb63498d5d22686e79e2c0ed95">curve.h</a>
+<li>STP_CURVE_TYPE_LINEAR
+: <a class="el" href="group__curve.html#gg982f8191c84b049cc3ad3cee1558fc2346228ddaa2d52a85ccd79c4dc0f76ad3">curve.h</a>
+<li>STP_CURVE_TYPE_SPLINE
+: <a class="el" href="group__curve.html#gg982f8191c84b049cc3ad3cee1558fc23fb1ffdc3754f428d8e3a2124e014ff77">curve.h</a>
+<li>STP_CURVE_WRAP_AROUND
+: <a class="el" href="group__curve.html#gg3ae3af552b490b0ca8b02e442ac9547ac0361aebddfabfb263dc0205a61f6fbd">curve.h</a>
+<li>STP_CURVE_WRAP_NONE
+: <a class="el" href="group__curve.html#gg3ae3af552b490b0ca8b02e442ac9547ad840485ad7df768a06ee4be02d93b97a">curve.h</a>
+<li>STP_IMAGE_STATUS_ABORT
+: <a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8224b8ac15cf785b24b2f3f53b4fdc274">image.h</a>
+<li>STP_IMAGE_STATUS_OK
+: <a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8b5574da151b93391a337f29b2a7c96cf">image.h</a>
+<li>STP_MODULE_CLASS_COLOR
+: <a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a4200077e69aa7fcad42f21bf58d3d8edaa">module.h</a>
+<li>STP_MODULE_CLASS_DITHER
+: <a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42904bbf21de98c76882970ca29aee8841">module.h</a>
+<li>STP_MODULE_CLASS_FAMILY
+: <a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42b8bfa675fcede245786ec7eb9a220090">module.h</a>
+<li>STP_MODULE_CLASS_INVALID
+: <a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42dbc54c5b64945a0585177cbfe3cf8e8c">module.h</a>
+<li>STP_MODULE_CLASS_MISC
+: <a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42c250fc9ff4abf739d975edcbe4694030">module.h</a>
+<li>STP_MXML_ELEMENT
+: <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba10846b9327c59bbfee28dd522a0c258e">mxml.h</a>
+<li>STP_MXML_INTEGER
+: <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6baeb129c9841502a2f3d095751f4e21a79">mxml.h</a>
+<li>STP_MXML_OPAQUE
+: <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba4ebe16a2dc2aac2531e09b56051eb47a">mxml.h</a>
+<li>STP_MXML_REAL
+: <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba9411f902a8e7e839252b7a440ef53790">mxml.h</a>
+<li>STP_MXML_TEXT
+: <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6baccc874638f0a0d375e1066d8c82c8be9">mxml.h</a>
+<li>STP_PARAMETER_ACTIVE
+: <a class="el" href="group__vars.html#gg70ebf70dc8e6199d84fc91985c94bae9dbc7323a015e40652fd256e49c8d5b8c">vars.h</a>
+<li>STP_PARAMETER_CLASS_CORE
+: <a class="el" href="group__vars.html#gg4eba7e712c0e17b76e472f26e202d7b8a05ce344ff3338e69638d69f9c120d01">vars.h</a>
+<li>STP_PARAMETER_CLASS_FEATURE
+: <a class="el" href="group__vars.html#gg4eba7e712c0e17b76e472f26e202d7b8a7ed8b66836057aa58b9a74811057b4a">vars.h</a>
+<li>STP_PARAMETER_CLASS_INVALID
+: <a class="el" href="group__vars.html#gg4eba7e712c0e17b76e472f26e202d7b82e17ce7ebc18801c11af7ea0a61e93ca">vars.h</a>
+<li>STP_PARAMETER_CLASS_OUTPUT
+: <a class="el" href="group__vars.html#gg4eba7e712c0e17b76e472f26e202d7b8ffc6ff4bfbf2873ce55dfc03776bb6d9">vars.h</a>
+<li>STP_PARAMETER_DEFAULTED
+: <a class="el" href="group__vars.html#gg70ebf70dc8e6199d84fc91985c94bae9410b7e080ef62fb8896f2f844b1c1e00">vars.h</a>
+<li>STP_PARAMETER_INACTIVE
+: <a class="el" href="group__vars.html#gg70ebf70dc8e6199d84fc91985c94bae96517762c5800eac253f43eeacd96c22f">vars.h</a>
+<li>STP_PARAMETER_LEVEL_ADVANCED
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf29832073130e7060a3b901ea8dcb37d986d47e0">vars.h</a>
+<li>STP_PARAMETER_LEVEL_ADVANCED1
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf29832073d016c9587f698ee400bc7e66071f06c">vars.h</a>
+<li>STP_PARAMETER_LEVEL_ADVANCED2
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf298320759a909a8953b8724d57ce85e2b4306bf">vars.h</a>
+<li>STP_PARAMETER_LEVEL_ADVANCED3
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf29832071241066935e94def6ab6d524ed1fabae">vars.h</a>
+<li>STP_PARAMETER_LEVEL_ADVANCED4
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf29832076036d5761aa9710a66429c625c334a80">vars.h</a>
+<li>STP_PARAMETER_LEVEL_BASIC
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf2983207e9d7192607a6e1ec92dfed3f13a3a46f">vars.h</a>
+<li>STP_PARAMETER_LEVEL_EXTERNAL
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf2983207e478f67e409adabc8679d3801604861d">vars.h</a>
+<li>STP_PARAMETER_LEVEL_INTERNAL
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf2983207b2bc3be82f619147d9a45564fd53a4a0">vars.h</a>
+<li>STP_PARAMETER_LEVEL_INVALID
+: <a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf2983207b8bf539d78e56f06f463d00f7a3b56b3">vars.h</a>
+<li>STP_PARAMETER_TYPE_ARRAY
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a918789c2b5cc718eafca6d1d0022cfe3f3">vars.h</a>
+<li>STP_PARAMETER_TYPE_BOOLEAN
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91f97ef629defc99977bd1cb35daabe0c1">vars.h</a>
+<li>STP_PARAMETER_TYPE_CURVE
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a910d283c33f755969ded0751bbfc5d1912">vars.h</a>
+<li>STP_PARAMETER_TYPE_DIMENSION
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91aa6f89008bf237c6f0aa2f0ee176e8b7">vars.h</a>
+<li>STP_PARAMETER_TYPE_DOUBLE
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91e0dc60c8435ce0b1355bd5a134395f0c">vars.h</a>
+<li>STP_PARAMETER_TYPE_FILE
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a918224a918efbef96fffaa90e31654f7ff">vars.h</a>
+<li>STP_PARAMETER_TYPE_INT
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91ae2cac85ef78157b53c7a79706dc0f70">vars.h</a>
+<li>STP_PARAMETER_TYPE_INVALID
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91d053047279b4c82034d26c4aa4c818d5">vars.h</a>
+<li>STP_PARAMETER_TYPE_RAW
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a9133bb02d9ae5b2169d2f75da7684b04e9">vars.h</a>
+<li>STP_PARAMETER_TYPE_STRING_LIST
+: <a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a917a6f3e019c8a92ddecd34c71013acde0">vars.h</a>
+<li>STP_WEAVE_ASCENDING
+: <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf385809919b5dcc799a9afed0063f052196fa8d6b">weave.h</a>
+<li>STP_WEAVE_ASCENDING_2X
+: <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf385809917bfa24511bcbc811272e385372c61936">weave.h</a>
+<li>STP_WEAVE_ASCENDING_3X
+: <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf38580991ecb24603379f9f3dd682bf692326a8e1">weave.h</a>
+<li>STP_WEAVE_DESCENDING
+: <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf38580991faf7b19bfde4be5241cb112835325797">weave.h</a>
+<li>STP_WEAVE_STAGGERED
+: <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf385809918e37ffcadb7b41a3276029206a80d5e6">weave.h</a>
+<li>STP_WEAVE_ZIGZAG
+: <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf385809916077c1fbd3cc6c79a1ac5f23d31bd2b3">weave.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_func.html b/doc/gutenprint/html/globals_func.html
index 3526f2b..b828863 100644
--- a/doc/gutenprint/html/globals_func.html
+++ b/doc/gutenprint/html/globals_func.html
@@ -1,477 +1,971 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindexHL" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindexHL" href="globals_func.html#index_s">s</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li class="current"><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="globals_func.html#index_s"><span>s</span></a></li>
+  </ul>
+</div>
 
 <p>
-
+&nbsp;
 <p>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>stp_abort()
-: <a class="el" href="group__util.html#ga3">util.h</a><li>stp_allocate_component_data()
-: <a class="el" href="group__vars.html#ga125">vars.h</a><li>stp_array_copy()
-: <a class="el" href="group__array.html#ga3">array.h</a><li>stp_array_create()
-: <a class="el" href="group__array.html#ga1">array.h</a><li>stp_array_create_copy()
-: <a class="el" href="group__array.html#ga4">array.h</a><li>stp_array_create_from_xmltree()
-: <a class="el" href="xml_8h.html#a19">xml.h</a><li>stp_array_destroy()
-: <a class="el" href="group__array.html#ga2">array.h</a><li>stp_array_get_data()
-: <a class="el" href="group__array.html#ga8">array.h</a><li>stp_array_get_point()
-: <a class="el" href="group__array.html#ga10">array.h</a><li>stp_array_get_sequence()
-: <a class="el" href="group__array.html#ga11">array.h</a><li>stp_array_get_size()
-: <a class="el" href="group__array.html#ga6">array.h</a><li>stp_array_set_data()
-: <a class="el" href="group__array.html#ga7">array.h</a><li>stp_array_set_point()
-: <a class="el" href="group__array.html#ga9">array.h</a><li>stp_array_set_size()
-: <a class="el" href="group__array.html#ga5">array.h</a><li>stp_asprintf()
-: <a class="el" href="group__util.html#ga17">util.h</a><li>stp_catprintf()
-: <a class="el" href="group__util.html#ga18">util.h</a><li>stp_channel_add()
-: <a class="el" href="channel_8h.html#a2">channel.h</a><li>stp_channel_convert()
-: <a class="el" href="channel_8h.html#a21">channel.h</a><li>stp_channel_get_black_channel()
-: <a class="el" href="channel_8h.html#a11">channel.h</a><li>stp_channel_get_curve()
-: <a class="el" href="channel_8h.html#a17">channel.h</a><li>stp_channel_get_cutoff_adjustment()
-: <a class="el" href="channel_8h.html#a9">channel.h</a><li>stp_channel_get_density_adjustment()
-: <a class="el" href="channel_8h.html#a5">channel.h</a><li>stp_channel_get_gcr_curve()
-: <a class="el" href="channel_8h.html#a19">channel.h</a><li>stp_channel_get_gloss_channel()
-: <a class="el" href="channel_8h.html#a13">channel.h</a><li>stp_channel_get_gloss_limit()
-: <a class="el" href="channel_8h.html#a15">channel.h</a><li>stp_channel_get_ink_limit()
-: <a class="el" href="channel_8h.html#a7">channel.h</a><li>stp_channel_get_input()
-: <a class="el" href="channel_8h.html#a22">channel.h</a><li>stp_channel_get_output()
-: <a class="el" href="channel_8h.html#a23">channel.h</a><li>stp_channel_get_value()
-: <a class="el" href="channel_8h.html#a3">channel.h</a><li>stp_channel_initialize()
-: <a class="el" href="channel_8h.html#a20">channel.h</a><li>stp_channel_reset()
-: <a class="el" href="channel_8h.html#a0">channel.h</a><li>stp_channel_reset_channel()
-: <a class="el" href="channel_8h.html#a1">channel.h</a><li>stp_channel_set_black_channel()
-: <a class="el" href="channel_8h.html#a10">channel.h</a><li>stp_channel_set_curve()
-: <a class="el" href="channel_8h.html#a16">channel.h</a><li>stp_channel_set_cutoff_adjustment()
-: <a class="el" href="channel_8h.html#a8">channel.h</a><li>stp_channel_set_density_adjustment()
-: <a class="el" href="channel_8h.html#a4">channel.h</a><li>stp_channel_set_gcr_curve()
-: <a class="el" href="channel_8h.html#a18">channel.h</a><li>stp_channel_set_gloss_channel()
-: <a class="el" href="channel_8h.html#a12">channel.h</a><li>stp_channel_set_gloss_limit()
-: <a class="el" href="channel_8h.html#a14">channel.h</a><li>stp_channel_set_ink_limit()
-: <a class="el" href="channel_8h.html#a6">channel.h</a><li>stp_check_array_parameter()
-: <a class="el" href="group__vars.html#ga107">vars.h</a><li>stp_check_boolean_parameter()
-: <a class="el" href="group__vars.html#ga105">vars.h</a><li>stp_check_curve_parameter()
-: <a class="el" href="group__vars.html#ga106">vars.h</a><li>stp_check_dimension_parameter()
-: <a class="el" href="group__vars.html#ga104">vars.h</a><li>stp_check_file_parameter()
-: <a class="el" href="group__vars.html#ga101">vars.h</a><li>stp_check_float_parameter()
-: <a class="el" href="group__vars.html#ga102">vars.h</a><li>stp_check_int_parameter()
-: <a class="el" href="group__vars.html#ga103">vars.h</a><li>stp_check_raw_parameter()
-: <a class="el" href="group__vars.html#ga108">vars.h</a><li>stp_check_string_parameter()
-: <a class="el" href="group__vars.html#ga100">vars.h</a><li>stp_check_version()
-: <a class="el" href="group__version.html#ga6">gutenprint-version.h</a><li>stp_clear_array_parameter()
-: <a class="el" href="group__vars.html#ga89">vars.h</a><li>stp_clear_boolean_parameter()
-: <a class="el" href="group__vars.html#ga87">vars.h</a><li>stp_clear_curve_parameter()
-: <a class="el" href="group__vars.html#ga88">vars.h</a><li>stp_clear_dimension_parameter()
-: <a class="el" href="group__vars.html#ga86">vars.h</a><li>stp_clear_file_parameter()
-: <a class="el" href="group__vars.html#ga83">vars.h</a><li>stp_clear_float_parameter()
-: <a class="el" href="group__vars.html#ga84">vars.h</a><li>stp_clear_int_parameter()
-: <a class="el" href="group__vars.html#ga85">vars.h</a><li>stp_clear_raw_parameter()
-: <a class="el" href="group__vars.html#ga90">vars.h</a><li>stp_clear_string_parameter()
-: <a class="el" href="group__vars.html#ga82">vars.h</a><li>stp_color_count()
-: <a class="el" href="group__color.html#ga7">color.h</a><li>stp_color_describe_parameter()
-: <a class="el" href="group__color.html#ga4">color.h</a><li>stp_color_get_long_name()
-: <a class="el" href="group__color.html#ga12">color.h</a><li>stp_color_get_name()
-: <a class="el" href="group__color.html#ga11">color.h</a><li>stp_color_get_row()
-: <a class="el" href="group__color.html#ga2">color.h</a><li>stp_color_init()
-: <a class="el" href="group__color.html#ga1">color.h</a><li>stp_color_list_parameters()
-: <a class="el" href="group__color.html#ga3">color.h</a><li>stp_color_register()
-: <a class="el" href="group__color.html#ga5">color.h</a><li>stp_color_unregister()
-: <a class="el" href="group__color.html#ga6">color.h</a><li>stp_copy_options()
-: <a class="el" href="group__vars.html#ga131">vars.h</a><li>stp_curve_cache_copy()
-: <a class="el" href="curve-cache_8h.html#a12">curve-cache.h</a><li>stp_curve_cache_curve_data()
-: <a class="el" href="curve-cache_8h.html#a4">curve-cache.h</a><li>stp_curve_cache_curve_invalidate()
-: <a class="el" href="curve-cache_8h.html#a6">curve-cache.h</a><li>stp_curve_cache_get_count()
-: <a class="el" href="curve-cache_8h.html#a9">curve-cache.h</a><li>stp_curve_cache_get_curve()
-: <a class="el" href="curve-cache_8h.html#a5">curve-cache.h</a><li>stp_curve_cache_get_double_data()
-: <a class="el" href="curve-cache_8h.html#a11">curve-cache.h</a><li>stp_curve_cache_get_ushort_data()
-: <a class="el" href="curve-cache_8h.html#a10">curve-cache.h</a><li>stp_curve_cache_set_curve()
-: <a class="el" href="curve-cache_8h.html#a7">curve-cache.h</a><li>stp_curve_cache_set_curve_copy()
-: <a class="el" href="curve-cache_8h.html#a8">curve-cache.h</a><li>stp_curve_compose()
-: <a class="el" href="group__curve.html#ga46">curve.h</a><li>stp_curve_copy()
-: <a class="el" href="group__curve.html#ga3">curve.h</a><li>stp_curve_count_points()
-: <a class="el" href="group__curve.html#ga10">curve.h</a><li>stp_curve_create()
-: <a class="el" href="group__curve.html#ga1">curve.h</a><li>stp_curve_create_copy()
-: <a class="el" href="group__curve.html#ga2">curve.h</a><li>stp_curve_create_from_file()
-: <a class="el" href="group__curve.html#ga44">curve.h</a><li>stp_curve_create_from_stream()
-: <a class="el" href="group__curve.html#ga43">curve.h</a><li>stp_curve_create_from_string()
-: <a class="el" href="group__curve.html#ga45">curve.h</a><li>stp_curve_create_from_xmltree()
-: <a class="el" href="xml_8h.html#a17">xml.h</a><li>stp_curve_destroy()
-: <a class="el" href="group__curve.html#ga4">curve.h</a><li>stp_curve_free_curve_cache()
-: <a class="el" href="curve-cache_8h.html#a3">curve-cache.h</a><li>stp_curve_get_bounds()
-: <a class="el" href="group__curve.html#ga6">curve.h</a><li>stp_curve_get_data()
-: <a class="el" href="group__curve.html#ga24">curve.h</a><li>stp_curve_get_data_points()
-: <a class="el" href="group__curve.html#ga25">curve.h</a><li>stp_curve_get_float_data()
-: <a class="el" href="group__curve.html#ga26">curve.h</a><li>stp_curve_get_gamma()
-: <a class="el" href="group__curve.html#ga35">curve.h</a><li>stp_curve_get_int_data()
-: <a class="el" href="group__curve.html#ga29">curve.h</a><li>stp_curve_get_interpolation_type()
-: <a class="el" href="group__curve.html#ga12">curve.h</a><li>stp_curve_get_long_data()
-: <a class="el" href="group__curve.html#ga27">curve.h</a><li>stp_curve_get_point()
-: <a class="el" href="group__curve.html#ga37">curve.h</a><li>stp_curve_get_range()
-: <a class="el" href="group__curve.html#ga9">curve.h</a><li>stp_curve_get_sequence()
-: <a class="el" href="group__curve.html#ga33">curve.h</a><li>stp_curve_get_short_data()
-: <a class="el" href="group__curve.html#ga31">curve.h</a><li>stp_curve_get_subrange()
-: <a class="el" href="group__curve.html#ga22">curve.h</a><li>stp_curve_get_uint_data()
-: <a class="el" href="group__curve.html#ga30">curve.h</a><li>stp_curve_get_ulong_data()
-: <a class="el" href="group__curve.html#ga28">curve.h</a><li>stp_curve_get_ushort_data()
-: <a class="el" href="group__curve.html#ga32">curve.h</a><li>stp_curve_get_wrap()
-: <a class="el" href="group__curve.html#ga7">curve.h</a><li>stp_curve_interpolate_value()
-: <a class="el" href="group__curve.html#ga38">curve.h</a><li>stp_curve_is_piecewise()
-: <a class="el" href="group__curve.html#ga8">curve.h</a><li>stp_curve_resample()
-: <a class="el" href="group__curve.html#ga39">curve.h</a><li>stp_curve_rescale()
-: <a class="el" href="group__curve.html#ga40">curve.h</a><li>stp_curve_set_bounds()
-: <a class="el" href="group__curve.html#ga5">curve.h</a><li>stp_curve_set_data()
-: <a class="el" href="group__curve.html#ga13">curve.h</a><li>stp_curve_set_data_points()
-: <a class="el" href="group__curve.html#ga14">curve.h</a><li>stp_curve_set_float_data()
-: <a class="el" href="group__curve.html#ga15">curve.h</a><li>stp_curve_set_gamma()
-: <a class="el" href="group__curve.html#ga34">curve.h</a><li>stp_curve_set_int_data()
-: <a class="el" href="group__curve.html#ga18">curve.h</a><li>stp_curve_set_interpolation_type()
-: <a class="el" href="group__curve.html#ga11">curve.h</a><li>stp_curve_set_long_data()
-: <a class="el" href="group__curve.html#ga16">curve.h</a><li>stp_curve_set_point()
-: <a class="el" href="group__curve.html#ga36">curve.h</a><li>stp_curve_set_short_data()
-: <a class="el" href="group__curve.html#ga20">curve.h</a><li>stp_curve_set_subrange()
-: <a class="el" href="group__curve.html#ga23">curve.h</a><li>stp_curve_set_uint_data()
-: <a class="el" href="group__curve.html#ga19">curve.h</a><li>stp_curve_set_ulong_data()
-: <a class="el" href="group__curve.html#ga17">curve.h</a><li>stp_curve_set_ushort_data()
-: <a class="el" href="group__curve.html#ga21">curve.h</a><li>stp_curve_write()
-: <a class="el" href="group__curve.html#ga41">curve.h</a><li>stp_curve_write_string()
-: <a class="el" href="group__curve.html#ga42">curve.h</a><li>stp_default_media_size()
-: <a class="el" href="group__papersize.html#ga4">paper.h</a><li>stp_default_settings()
-: <a class="el" href="group__vars.html#ga124">vars.h</a><li>stp_deprintf()
-: <a class="el" href="group__util.html#ga21">util.h</a><li>stp_describe_output()
-: <a class="el" href="group__printer.html#ga25">printers.h</a><li>stp_describe_parameter()
-: <a class="el" href="group__vars.html#ga47">vars.h</a><li>stp_describe_resolution()
-: <a class="el" href="group__vars.html#ga122">vars.h</a><li>stp_destroy_component_data()
-: <a class="el" href="group__vars.html#ga126">vars.h</a><li>stp_dither()
-: <a class="el" href="dither_8h.html#a40">dither.h</a><li>stp_dither_add_channel()
-: <a class="el" href="dither_8h.html#a38">dither.h</a><li>stp_dither_describe_parameter()
-: <a class="el" href="dither_8h.html#a24">dither.h</a><li>stp_dither_get_channel()
-: <a class="el" href="dither_8h.html#a39">dither.h</a><li>stp_dither_get_first_position()
-: <a class="el" href="dither_8h.html#a33">dither.h</a><li>stp_dither_get_last_position()
-: <a class="el" href="dither_8h.html#a34">dither.h</a><li>stp_dither_init()
-: <a class="el" href="dither_8h.html#a25">dither.h</a><li>stp_dither_internal()
-: <a class="el" href="dither_8h.html#a41">dither.h</a><li>stp_dither_list_parameters()
-: <a class="el" href="dither_8h.html#a23">dither.h</a><li>stp_dither_matrix_clone()
-: <a class="el" href="dither_8h.html#a18">dither.h</a><li>stp_dither_matrix_copy()
-: <a class="el" href="dither_8h.html#a19">dither.h</a><li>stp_dither_matrix_destroy()
-: <a class="el" href="dither_8h.html#a17">dither.h</a><li>stp_dither_matrix_init()
-: <a class="el" href="dither_8h.html#a13">dither.h</a><li>stp_dither_matrix_init_from_dither_array()
-: <a class="el" href="dither_8h.html#a16">dither.h</a><li>stp_dither_matrix_init_short()
-: <a class="el" href="dither_8h.html#a14">dither.h</a><li>stp_dither_matrix_iterated_init()
-: <a class="el" href="dither_8h.html#a11">dither.h</a><li>stp_dither_matrix_scale_exponentially()
-: <a class="el" href="dither_8h.html#a20">dither.h</a><li>stp_dither_matrix_set_row()
-: <a class="el" href="dither_8h.html#a21">dither.h</a><li>stp_dither_matrix_shear()
-: <a class="el" href="dither_8h.html#a12">dither.h</a><li>stp_dither_matrix_validate_array()
-: <a class="el" href="dither_8h.html#a15">dither.h</a><li>stp_dither_set_adaptive_limit()
-: <a class="el" href="dither_8h.html#a32">dither.h</a><li>stp_dither_set_ink_spread()
-: <a class="el" href="dither_8h.html#a31">dither.h</a><li>stp_dither_set_inks()
-: <a class="el" href="dither_8h.html#a37">dither.h</a><li>stp_dither_set_inks_full()
-: <a class="el" href="dither_8h.html#a36">dither.h</a><li>stp_dither_set_inks_simple()
-: <a class="el" href="dither_8h.html#a35">dither.h</a><li>stp_dither_set_iterated_matrix()
-: <a class="el" href="dither_8h.html#a26">dither.h</a><li>stp_dither_set_matrix()
-: <a class="el" href="dither_8h.html#a27">dither.h</a><li>stp_dither_set_matrix_from_dither_array()
-: <a class="el" href="dither_8h.html#a28">dither.h</a><li>stp_dither_set_randomizer()
-: <a class="el" href="dither_8h.html#a30">dither.h</a><li>stp_dither_set_transition()
-: <a class="el" href="dither_8h.html#a29">dither.h</a><li>stp_dprintf()
-: <a class="el" href="group__util.html#ga20">util.h</a><li>stp_end_job()
-: <a class="el" href="group__printer.html#ga17">printers.h</a><li>stp_eprintf()
-: <a class="el" href="group__util.html#ga15">util.h</a><li>stp_erprintf()
-: <a class="el" href="group__util.html#ga16">util.h</a><li>stp_erputc()
-: <a class="el" href="group__util.html#ga14">util.h</a><li>stp_family_register()
-: <a class="el" href="group__printer.html#ga20">printers.h</a><li>stp_family_unregister()
-: <a class="el" href="group__printer.html#ga21">printers.h</a><li>stp_fill_parameter_settings()
-: <a class="el" href="group__vars.html#ga132">vars.h</a><li>stp_find_standard_dither_array()
-: <a class="el" href="dither_8h.html#a22">dither.h</a><li>stp_flush_all()
-: <a class="el" href="weave_8h.html#a18">weave.h</a><li>stp_flush_debug_messages()
-: <a class="el" href="group__util.html#ga23">util.h</a><li>stp_fold()
-: <a class="el" href="bit-ops_8h.html#a0">bit-ops.h</a><li>stp_free()
-: <a class="el" href="group__util.html#ga27">util.h</a><li>stp_get_array_parameter()
-: <a class="el" href="group__vars.html#ga80">vars.h</a><li>stp_get_array_parameter_active()
-: <a class="el" href="group__vars.html#ga116">vars.h</a><li>stp_get_boolean_parameter()
-: <a class="el" href="group__vars.html#ga78">vars.h</a><li>stp_get_boolean_parameter_active()
-: <a class="el" href="group__vars.html#ga114">vars.h</a><li>stp_get_color_by_colorfuncs()
-: <a class="el" href="group__color.html#ga10">color.h</a><li>stp_get_color_by_index()
-: <a class="el" href="group__color.html#ga9">color.h</a><li>stp_get_color_by_name()
-: <a class="el" href="group__color.html#ga8">color.h</a><li>stp_get_color_conversion()
-: <a class="el" href="group__vars.html#ga16">vars.h</a><li>stp_get_component_data()
-: <a class="el" href="group__vars.html#ga127">vars.h</a><li>stp_get_curve_parameter()
-: <a class="el" href="group__vars.html#ga79">vars.h</a><li>stp_get_curve_parameter_active()
-: <a class="el" href="group__vars.html#ga115">vars.h</a><li>stp_get_debug_level()
-: <a class="el" href="group__util.html#ga19">util.h</a><li>stp_get_dimension_parameter()
-: <a class="el" href="group__vars.html#ga77">vars.h</a><li>stp_get_dimension_parameter_active()
-: <a class="el" href="group__vars.html#ga113">vars.h</a><li>stp_get_driver()
-: <a class="el" href="group__vars.html#ga13">vars.h</a><li>stp_get_errdata()
-: <a class="el" href="group__vars.html#ga36">vars.h</a><li>stp_get_errfunc()
-: <a class="el" href="group__vars.html#ga32">vars.h</a><li>stp_get_file_parameter()
-: <a class="el" href="group__vars.html#ga74">vars.h</a><li>stp_get_file_parameter_active()
-: <a class="el" href="group__vars.html#ga110">vars.h</a><li>stp_get_float_parameter()
-: <a class="el" href="group__vars.html#ga75">vars.h</a><li>stp_get_float_parameter_active()
-: <a class="el" href="group__vars.html#ga111">vars.h</a><li>stp_get_height()
-: <a class="el" href="group__vars.html#ga24">vars.h</a><li>stp_get_imageable_area()
-: <a class="el" href="group__vars.html#ga119">vars.h</a><li>stp_get_int_parameter()
-: <a class="el" href="group__vars.html#ga76">vars.h</a><li>stp_get_int_parameter_active()
-: <a class="el" href="group__vars.html#ga112">vars.h</a><li>stp_get_left()
-: <a class="el" href="group__vars.html#ga18">vars.h</a><li>stp_get_lineactive_by_pass()
-: <a class="el" href="weave_8h.html#a21">weave.h</a><li>stp_get_linebases_by_pass()
-: <a class="el" href="weave_8h.html#a23">weave.h</a><li>stp_get_linecount_by_pass()
-: <a class="el" href="weave_8h.html#a22">weave.h</a><li>stp_get_lineoffsets_by_pass()
-: <a class="el" href="weave_8h.html#a20">weave.h</a><li>stp_get_maximum_imageable_area()
-: <a class="el" href="group__vars.html#ga120">vars.h</a><li>stp_get_media_size()
-: <a class="el" href="group__vars.html#ga118">vars.h</a><li>stp_get_model_id()
-: <a class="el" href="group__printer.html#ga18">printers.h</a><li>stp_get_outdata()
-: <a class="el" href="group__vars.html#ga34">vars.h</a><li>stp_get_outfunc()
-: <a class="el" href="group__vars.html#ga30">vars.h</a><li>stp_get_page_height()
-: <a class="el" href="group__vars.html#ga28">vars.h</a><li>stp_get_page_width()
-: <a class="el" href="group__vars.html#ga26">vars.h</a><li>stp_get_papersize_by_index()
-: <a class="el" href="group__papersize.html#ga3">paper.h</a><li>stp_get_papersize_by_name()
-: <a class="el" href="group__papersize.html#ga1">paper.h</a><li>stp_get_papersize_by_size()
-: <a class="el" href="group__papersize.html#ga2">paper.h</a><li>stp_get_parameter_list()
-: <a class="el" href="group__vars.html#ga38">vars.h</a><li>stp_get_pass_by_pass()
-: <a class="el" href="weave_8h.html#a24">weave.h</a><li>stp_get_printer()
-: <a class="el" href="group__printer.html#ga6">printers.h</a><li>stp_get_printer_by_driver()
-: <a class="el" href="group__printer.html#ga5">printers.h</a><li>stp_get_printer_by_index()
-: <a class="el" href="group__printer.html#ga3">printers.h</a><li>stp_get_printer_by_long_name()
-: <a class="el" href="group__printer.html#ga4">printers.h</a><li>stp_get_printer_index_by_driver()
-: <a class="el" href="group__printer.html#ga7">printers.h</a><li>stp_get_raw_parameter()
-: <a class="el" href="group__vars.html#ga81">vars.h</a><li>stp_get_raw_parameter_active()
-: <a class="el" href="group__vars.html#ga117">vars.h</a><li>stp_get_release_version()
-: <a class="el" href="group__util.html#ga32">util.h</a><li>stp_get_size_limit()
-: <a class="el" href="group__vars.html#ga121">vars.h</a><li>stp_get_string_parameter()
-: <a class="el" href="group__vars.html#ga73">vars.h</a><li>stp_get_string_parameter_active()
-: <a class="el" href="group__vars.html#ga109">vars.h</a><li>stp_get_top()
-: <a class="el" href="group__vars.html#ga20">vars.h</a><li>stp_get_verified()
-: <a class="el" href="group__vars.html#ga129">vars.h</a><li>stp_get_version()
-: <a class="el" href="group__util.html#ga31">util.h</a><li>stp_get_width()
-: <a class="el" href="group__vars.html#ga22">vars.h</a><li>stp_image_conclude()
-: <a class="el" href="group__image.html#ga7">image.h</a><li>stp_image_get_appname()
-: <a class="el" href="group__image.html#ga6">image.h</a><li>stp_image_get_row()
-: <a class="el" href="group__image.html#ga5">image.h</a><li>stp_image_height()
-: <a class="el" href="group__image.html#ga4">image.h</a><li>stp_image_init()
-: <a class="el" href="group__image.html#ga1">image.h</a><li>stp_image_reset()
-: <a class="el" href="group__image.html#ga2">image.h</a><li>stp_image_width()
-: <a class="el" href="group__image.html#ga3">image.h</a><li>stp_init()
-: <a class="el" href="group__util.html#ga0">util.h</a><li>stp_init_debug_messages()
-: <a class="el" href="group__util.html#ga22">util.h</a><li>stp_initialize_printer_defaults()
-: <a class="el" href="group__printer.html#ga22">printers.h</a><li>stp_initialize_weave()
-: <a class="el" href="weave_8h.html#a17">weave.h</a><li>stp_known_papersizes()
-: <a class="el" href="group__papersize.html#ga0">paper.h</a><li>stp_list_copy()
-: <a class="el" href="group__list.html#ga8">list.h</a><li>stp_list_create()
-: <a class="el" href="group__list.html#ga7">list.h</a><li>stp_list_destroy()
-: <a class="el" href="group__list.html#ga9">list.h</a><li>stp_list_get_copyfunc()
-: <a class="el" href="group__list.html#ga19">list.h</a><li>stp_list_get_end()
-: <a class="el" href="group__list.html#ga11">list.h</a><li>stp_list_get_freefunc()
-: <a class="el" href="group__list.html#ga17">list.h</a><li>stp_list_get_item_by_index()
-: <a class="el" href="group__list.html#ga12">list.h</a><li>stp_list_get_item_by_long_name()
-: <a class="el" href="group__list.html#ga14">list.h</a><li>stp_list_get_item_by_name()
-: <a class="el" href="group__list.html#ga13">list.h</a><li>stp_list_get_length()
-: <a class="el" href="group__list.html#ga15">list.h</a><li>stp_list_get_long_namefunc()
-: <a class="el" href="group__list.html#ga23">list.h</a><li>stp_list_get_namefunc()
-: <a class="el" href="group__list.html#ga21">list.h</a><li>stp_list_get_sortfunc()
-: <a class="el" href="group__list.html#ga25">list.h</a><li>stp_list_get_start()
-: <a class="el" href="group__list.html#ga10">list.h</a><li>stp_list_item_create()
-: <a class="el" href="group__list.html#ga26">list.h</a><li>stp_list_item_destroy()
-: <a class="el" href="group__list.html#ga27">list.h</a><li>stp_list_item_get_data()
-: <a class="el" href="group__list.html#ga30">list.h</a><li>stp_list_item_next()
-: <a class="el" href="group__list.html#ga29">list.h</a><li>stp_list_item_prev()
-: <a class="el" href="group__list.html#ga28">list.h</a><li>stp_list_item_set_data()
-: <a class="el" href="group__list.html#ga31">list.h</a><li>stp_list_node_free_data()
-: <a class="el" href="group__list.html#ga6">list.h</a><li>stp_list_set_copyfunc()
-: <a class="el" href="group__list.html#ga18">list.h</a><li>stp_list_set_freefunc()
-: <a class="el" href="group__list.html#ga16">list.h</a><li>stp_list_set_long_namefunc()
-: <a class="el" href="group__list.html#ga22">list.h</a><li>stp_list_set_namefunc()
-: <a class="el" href="group__list.html#ga20">list.h</a><li>stp_list_set_sortfunc()
-: <a class="el" href="group__list.html#ga24">list.h</a><li>stp_malloc()
-: <a class="el" href="group__util.html#ga24">util.h</a><li>stp_merge_printvars()
-: <a class="el" href="group__vars.html#ga37">vars.h</a><li>stp_module_close()
-: <a class="el" href="module_8h.html#a11">module.h</a><li>stp_module_exit()
-: <a class="el" href="module_8h.html#a8">module.h</a><li>stp_module_get_class()
-: <a class="el" href="module_8h.html#a12">module.h</a><li>stp_module_init()
-: <a class="el" href="module_8h.html#a10">module.h</a><li>stp_module_load()
-: <a class="el" href="module_8h.html#a7">module.h</a><li>stp_module_open()
-: <a class="el" href="module_8h.html#a9">module.h</a><li>stp_mxmlAdd()
-: <a class="el" href="mxml_8h.html#a25">mxml.h</a><li>stp_mxmlDelete()
-: <a class="el" href="mxml_8h.html#a26">mxml.h</a><li>stp_mxmlElementGetAttr()
-: <a class="el" href="mxml_8h.html#a27">mxml.h</a><li>stp_mxmlElementSetAttr()
-: <a class="el" href="mxml_8h.html#a28">mxml.h</a><li>stp_mxmlFindElement()
-: <a class="el" href="mxml_8h.html#a29">mxml.h</a><li>stp_mxmlLoadFile()
-: <a class="el" href="mxml_8h.html#a30">mxml.h</a><li>stp_mxmlLoadString()
-: <a class="el" href="mxml_8h.html#a31">mxml.h</a><li>stp_mxmlNewElement()
-: <a class="el" href="mxml_8h.html#a32">mxml.h</a><li>stp_mxmlNewInteger()
-: <a class="el" href="mxml_8h.html#a33">mxml.h</a><li>stp_mxmlNewOpaque()
-: <a class="el" href="mxml_8h.html#a34">mxml.h</a><li>stp_mxmlNewReal()
-: <a class="el" href="mxml_8h.html#a35">mxml.h</a><li>stp_mxmlNewText()
-: <a class="el" href="mxml_8h.html#a36">mxml.h</a><li>stp_mxmlRemove()
-: <a class="el" href="mxml_8h.html#a37">mxml.h</a><li>stp_mxmlSaveAllocString()
-: <a class="el" href="mxml_8h.html#a38">mxml.h</a><li>stp_mxmlSaveFile()
-: <a class="el" href="mxml_8h.html#a39">mxml.h</a><li>stp_mxmlSaveString()
-: <a class="el" href="mxml_8h.html#a40">mxml.h</a><li>stp_mxmlWalkNext()
-: <a class="el" href="mxml_8h.html#a41">mxml.h</a><li>stp_mxmlWalkPrev()
-: <a class="el" href="mxml_8h.html#a42">mxml.h</a><li>stp_parameter_description_destroy()
-: <a class="el" href="group__vars.html#ga48">vars.h</a><li>stp_parameter_find()
-: <a class="el" href="group__vars.html#ga40">vars.h</a><li>stp_parameter_find_in_settings()
-: <a class="el" href="group__vars.html#ga49">vars.h</a><li>stp_parameter_list_add_param()
-: <a class="el" href="group__vars.html#ga44">vars.h</a><li>stp_parameter_list_append()
-: <a class="el" href="group__vars.html#ga46">vars.h</a><li>stp_parameter_list_copy()
-: <a class="el" href="group__vars.html#ga45">vars.h</a><li>stp_parameter_list_count()
-: <a class="el" href="group__vars.html#ga39">vars.h</a><li>stp_parameter_list_create()
-: <a class="el" href="group__vars.html#ga43">vars.h</a><li>stp_parameter_list_destroy()
-: <a class="el" href="group__vars.html#ga42">vars.h</a><li>stp_parameter_list_param()
-: <a class="el" href="group__vars.html#ga41">vars.h</a><li>stp_path_search()
-: <a class="el" href="path_8h.html#a0">path.h</a><li>stp_path_split()
-: <a class="el" href="path_8h.html#a1">path.h</a><li>stp_print()
-: <a class="el" href="group__printer.html#ga15">printers.h</a><li>stp_printer_describe_parameter()
-: <a class="el" href="group__printer.html#ga24">printers.h</a><li>stp_printer_get_defaults()
-: <a class="el" href="group__printer.html#ga13">printers.h</a><li>stp_printer_get_driver()
-: <a class="el" href="group__printer.html#ga9">printers.h</a><li>stp_printer_get_family()
-: <a class="el" href="group__printer.html#ga10">printers.h</a><li>stp_printer_get_long_name()
-: <a class="el" href="group__printer.html#ga8">printers.h</a><li>stp_printer_get_manufacturer()
-: <a class="el" href="group__printer.html#ga11">printers.h</a><li>stp_printer_get_model()
-: <a class="el" href="group__printer.html#ga12">printers.h</a><li>stp_printer_list_parameters()
-: <a class="el" href="group__printer.html#ga23">printers.h</a><li>stp_printer_model_count()
-: <a class="el" href="group__printer.html#ga2">printers.h</a><li>stp_prune_inactive_options()
-: <a class="el" href="group__util.html#ga4">util.h</a><li>stp_put16_be()
-: <a class="el" href="group__util.html#ga9">util.h</a><li>stp_put16_le()
-: <a class="el" href="group__util.html#ga8">util.h</a><li>stp_put32_be()
-: <a class="el" href="group__util.html#ga11">util.h</a><li>stp_put32_le()
-: <a class="el" href="group__util.html#ga10">util.h</a><li>stp_putc()
-: <a class="el" href="group__util.html#ga7">util.h</a><li>stp_puts()
-: <a class="el" href="group__util.html#ga12">util.h</a><li>stp_read_and_compose_curves()
-: <a class="el" href="group__util.html#ga2">util.h</a><li>stp_realloc()
-: <a class="el" href="group__util.html#ga26">util.h</a><li>stp_register_xml_parser()
-: <a class="el" href="xml_8h.html#a1">xml.h</a><li>stp_register_xml_preload()
-: <a class="el" href="xml_8h.html#a3">xml.h</a><li>stp_scale_float_parameter()
-: <a class="el" href="group__vars.html#ga61">vars.h</a><li>stp_send_command()
-: <a class="el" href="group__util.html#ga13">util.h</a><li>stp_sequence_copy()
-: <a class="el" href="group__sequence.html#ga3">sequence.h</a><li>stp_sequence_create()
-: <a class="el" href="group__sequence.html#ga1">sequence.h</a><li>stp_sequence_create_copy()
-: <a class="el" href="group__sequence.html#ga4">sequence.h</a><li>stp_sequence_create_from_xmltree()
-: <a class="el" href="xml_8h.html#a15">xml.h</a><li>stp_sequence_destroy()
-: <a class="el" href="group__sequence.html#ga2">sequence.h</a><li>stp_sequence_get_bounds()
-: <a class="el" href="group__sequence.html#ga6">sequence.h</a><li>stp_sequence_get_data()
-: <a class="el" href="group__sequence.html#ga12">sequence.h</a><li>stp_sequence_get_float_data()
-: <a class="el" href="group__sequence.html#ga22">sequence.h</a><li>stp_sequence_get_int_data()
-: <a class="el" href="group__sequence.html#ga25">sequence.h</a><li>stp_sequence_get_long_data()
-: <a class="el" href="group__sequence.html#ga23">sequence.h</a><li>stp_sequence_get_point()
-: <a class="el" href="group__sequence.html#ga14">sequence.h</a><li>stp_sequence_get_range()
-: <a class="el" href="group__sequence.html#ga7">sequence.h</a><li>stp_sequence_get_short_data()
-: <a class="el" href="group__sequence.html#ga27">sequence.h</a><li>stp_sequence_get_size()
-: <a class="el" href="group__sequence.html#ga9">sequence.h</a><li>stp_sequence_get_uint_data()
-: <a class="el" href="group__sequence.html#ga26">sequence.h</a><li>stp_sequence_get_ulong_data()
-: <a class="el" href="group__sequence.html#ga24">sequence.h</a><li>stp_sequence_get_ushort_data()
-: <a class="el" href="group__sequence.html#ga28">sequence.h</a><li>stp_sequence_set_bounds()
-: <a class="el" href="group__sequence.html#ga5">sequence.h</a><li>stp_sequence_set_data()
-: <a class="el" href="group__sequence.html#ga10">sequence.h</a><li>stp_sequence_set_float_data()
-: <a class="el" href="group__sequence.html#ga15">sequence.h</a><li>stp_sequence_set_int_data()
-: <a class="el" href="group__sequence.html#ga18">sequence.h</a><li>stp_sequence_set_long_data()
-: <a class="el" href="group__sequence.html#ga16">sequence.h</a><li>stp_sequence_set_point()
-: <a class="el" href="group__sequence.html#ga13">sequence.h</a><li>stp_sequence_set_short_data()
-: <a class="el" href="group__sequence.html#ga20">sequence.h</a><li>stp_sequence_set_size()
-: <a class="el" href="group__sequence.html#ga8">sequence.h</a><li>stp_sequence_set_subrange()
-: <a class="el" href="group__sequence.html#ga11">sequence.h</a><li>stp_sequence_set_uint_data()
-: <a class="el" href="group__sequence.html#ga19">sequence.h</a><li>stp_sequence_set_ulong_data()
-: <a class="el" href="group__sequence.html#ga17">sequence.h</a><li>stp_sequence_set_ushort_data()
-: <a class="el" href="group__sequence.html#ga21">sequence.h</a><li>stp_set_array_parameter()
-: <a class="el" href="group__vars.html#ga59">vars.h</a><li>stp_set_array_parameter_active()
-: <a class="el" href="group__vars.html#ga98">vars.h</a><li>stp_set_boolean_parameter()
-: <a class="el" href="group__vars.html#ga57">vars.h</a><li>stp_set_boolean_parameter_active()
-: <a class="el" href="group__vars.html#ga96">vars.h</a><li>stp_set_color_conversion()
-: <a class="el" href="group__vars.html#ga14">vars.h</a><li>stp_set_color_conversion_n()
-: <a class="el" href="group__vars.html#ga15">vars.h</a><li>stp_set_curve_parameter()
-: <a class="el" href="group__vars.html#ga58">vars.h</a><li>stp_set_curve_parameter_active()
-: <a class="el" href="group__vars.html#ga97">vars.h</a><li>stp_set_default_array_parameter()
-: <a class="el" href="group__vars.html#ga71">vars.h</a><li>stp_set_default_boolean_parameter()
-: <a class="el" href="group__vars.html#ga69">vars.h</a><li>stp_set_default_curve_parameter()
-: <a class="el" href="group__vars.html#ga70">vars.h</a><li>stp_set_default_dimension_parameter()
-: <a class="el" href="group__vars.html#ga68">vars.h</a><li>stp_set_default_file_parameter()
-: <a class="el" href="group__vars.html#ga64">vars.h</a><li>stp_set_default_file_parameter_n()
-: <a class="el" href="group__vars.html#ga65">vars.h</a><li>stp_set_default_float_parameter()
-: <a class="el" href="group__vars.html#ga66">vars.h</a><li>stp_set_default_int_parameter()
-: <a class="el" href="group__vars.html#ga67">vars.h</a><li>stp_set_default_raw_parameter()
-: <a class="el" href="group__vars.html#ga72">vars.h</a><li>stp_set_default_string_parameter()
-: <a class="el" href="group__vars.html#ga62">vars.h</a><li>stp_set_default_string_parameter_n()
-: <a class="el" href="group__vars.html#ga63">vars.h</a><li>stp_set_dimension_parameter()
-: <a class="el" href="group__vars.html#ga56">vars.h</a><li>stp_set_dimension_parameter_active()
-: <a class="el" href="group__vars.html#ga95">vars.h</a><li>stp_set_driver()
-: <a class="el" href="group__vars.html#ga11">vars.h</a><li>stp_set_driver_n()
-: <a class="el" href="group__vars.html#ga12">vars.h</a><li>stp_set_errdata()
-: <a class="el" href="group__vars.html#ga35">vars.h</a><li>stp_set_errfunc()
-: <a class="el" href="group__vars.html#ga31">vars.h</a><li>stp_set_file_parameter()
-: <a class="el" href="group__vars.html#ga52">vars.h</a><li>stp_set_file_parameter_active()
-: <a class="el" href="group__vars.html#ga92">vars.h</a><li>stp_set_file_parameter_n()
-: <a class="el" href="group__vars.html#ga53">vars.h</a><li>stp_set_float_parameter()
-: <a class="el" href="group__vars.html#ga54">vars.h</a><li>stp_set_float_parameter_active()
-: <a class="el" href="group__vars.html#ga93">vars.h</a><li>stp_set_height()
-: <a class="el" href="group__vars.html#ga23">vars.h</a><li>stp_set_int_parameter()
-: <a class="el" href="group__vars.html#ga55">vars.h</a><li>stp_set_int_parameter_active()
-: <a class="el" href="group__vars.html#ga94">vars.h</a><li>stp_set_left()
-: <a class="el" href="group__vars.html#ga17">vars.h</a><li>stp_set_outdata()
-: <a class="el" href="group__vars.html#ga33">vars.h</a><li>stp_set_outfunc()
-: <a class="el" href="group__vars.html#ga29">vars.h</a><li>stp_set_output_codeset()
-: <a class="el" href="group__util.html#ga1">util.h</a><li>stp_set_page_height()
-: <a class="el" href="group__vars.html#ga27">vars.h</a><li>stp_set_page_width()
-: <a class="el" href="group__vars.html#ga25">vars.h</a><li>stp_set_printer_defaults()
-: <a class="el" href="group__printer.html#ga14">printers.h</a><li>stp_set_raw_parameter()
-: <a class="el" href="group__vars.html#ga60">vars.h</a><li>stp_set_raw_parameter_active()
-: <a class="el" href="group__vars.html#ga99">vars.h</a><li>stp_set_string_parameter()
-: <a class="el" href="group__vars.html#ga50">vars.h</a><li>stp_set_string_parameter_active()
-: <a class="el" href="group__vars.html#ga91">vars.h</a><li>stp_set_string_parameter_n()
-: <a class="el" href="group__vars.html#ga51">vars.h</a><li>stp_set_top()
-: <a class="el" href="group__vars.html#ga19">vars.h</a><li>stp_set_verified()
-: <a class="el" href="group__vars.html#ga130">vars.h</a><li>stp_set_width()
-: <a class="el" href="group__vars.html#ga21">vars.h</a><li>stp_split_2()
-: <a class="el" href="bit-ops_8h.html#a1">bit-ops.h</a><li>stp_split_4()
-: <a class="el" href="bit-ops_8h.html#a2">bit-ops.h</a><li>stp_start_job()
-: <a class="el" href="group__printer.html#ga16">printers.h</a><li>stp_strdup()
-: <a class="el" href="group__util.html#ga30">util.h</a><li>stp_string_list_add_string()
-: <a class="el" href="string-list_8h.html#a7">string-list.h</a><li>stp_string_list_count()
-: <a class="el" href="string-list_8h.html#a5">string-list.h</a><li>stp_string_list_create()
-: <a class="el" href="string-list_8h.html#a1">string-list.h</a><li>stp_string_list_create_copy()
-: <a class="el" href="string-list_8h.html#a6">string-list.h</a><li>stp_string_list_create_from_params()
-: <a class="el" href="string-list_8h.html#a9">string-list.h</a><li>stp_string_list_destroy()
-: <a class="el" href="string-list_8h.html#a2">string-list.h</a><li>stp_string_list_find()
-: <a class="el" href="string-list_8h.html#a4">string-list.h</a><li>stp_string_list_is_present()
-: <a class="el" href="string-list_8h.html#a10">string-list.h</a><li>stp_string_list_param()
-: <a class="el" href="string-list_8h.html#a3">string-list.h</a><li>stp_string_list_remove_string()
-: <a class="el" href="string-list_8h.html#a8">string-list.h</a><li>stp_strlen()
-: <a class="el" href="group__util.html#ga28">util.h</a><li>stp_strndup()
-: <a class="el" href="group__util.html#ga29">util.h</a><li>stp_unpack_16()
-: <a class="el" href="bit-ops_8h.html#a6">bit-ops.h</a><li>stp_unpack_2()
-: <a class="el" href="bit-ops_8h.html#a3">bit-ops.h</a><li>stp_unpack_4()
-: <a class="el" href="bit-ops_8h.html#a4">bit-ops.h</a><li>stp_unpack_8()
-: <a class="el" href="bit-ops_8h.html#a5">bit-ops.h</a><li>stp_unregister_xml_parser()
-: <a class="el" href="xml_8h.html#a2">xml.h</a><li>stp_unregister_xml_preload()
-: <a class="el" href="xml_8h.html#a4">xml.h</a><li>stp_vars_copy()
-: <a class="el" href="group__vars.html#ga8">vars.h</a><li>stp_vars_create()
-: <a class="el" href="group__vars.html#ga7">vars.h</a><li>stp_vars_create_copy()
-: <a class="el" href="group__vars.html#ga9">vars.h</a><li>stp_vars_destroy()
-: <a class="el" href="group__vars.html#ga10">vars.h</a><li>stp_verify()
-: <a class="el" href="group__vars.html#ga123">vars.h</a><li>stp_verify_parameter()
-: <a class="el" href="group__vars.html#ga128">vars.h</a><li>stp_verify_printer_params()
-: <a class="el" href="group__printer.html#ga19">printers.h</a><li>stp_weave_parameters_by_row()
-: <a class="el" href="weave_8h.html#a25">weave.h</a><li>stp_write_weave()
-: <a class="el" href="weave_8h.html#a19">weave.h</a><li>stp_xml_exit()
-: <a class="el" href="xml_8h.html#a11">xml.h</a><li>stp_xml_get_node()
-: <a class="el" href="xml_8h.html#a12">xml.h</a><li>stp_xml_init()
-: <a class="el" href="xml_8h.html#a10">xml.h</a><li>stp_xml_init_defaults()
-: <a class="el" href="xml_8h.html#a5">xml.h</a><li>stp_xml_parse_file()
-: <a class="el" href="xml_8h.html#a6">xml.h</a><li>stp_xml_parse_file_named()
-: <a class="el" href="xml_8h.html#a21">xml.h</a><li>stp_xml_preinit()
-: <a class="el" href="xml_8h.html#a14">xml.h</a><li>stp_xmldoc_create_generic()
-: <a class="el" href="xml_8h.html#a13">xml.h</a><li>stp_xmlstrtod()
-: <a class="el" href="xml_8h.html#a9">xml.h</a><li>stp_xmlstrtol()
-: <a class="el" href="xml_8h.html#a7">xml.h</a><li>stp_xmlstrtoul()
-: <a class="el" href="xml_8h.html#a8">xml.h</a><li>stp_xmltree_create_from_array()
-: <a class="el" href="xml_8h.html#a20">xml.h</a><li>stp_xmltree_create_from_curve()
-: <a class="el" href="xml_8h.html#a18">xml.h</a><li>stp_xmltree_create_from_sequence()
-: <a class="el" href="xml_8h.html#a16">xml.h</a><li>stp_zalloc()
-: <a class="el" href="group__util.html#ga25">util.h</a><li>stp_zfwrite()
-: <a class="el" href="group__util.html#ga6">util.h</a><li>stp_zprintf()
-: <a class="el" href="group__util.html#ga5">util.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__util.html#gd0c145dc5cebecab0bb4e3ac40fc8e4d">util.h</a>
+<li>stp_allocate_component_data()
+: <a class="el" href="group__vars.html#gfd4f81ca2ad497bd21f005344844f9c4">vars.h</a>
+<li>stp_array_copy()
+: <a class="el" href="group__array.html#gaa9bf798890e01b4bbce8cda45615021">array.h</a>
+<li>stp_array_create()
+: <a class="el" href="group__array.html#ga3d385d3e2f248b1c1ac88d5f103e9a2">array.h</a>
+<li>stp_array_create_copy()
+: <a class="el" href="group__array.html#gd0b50228ca40df79196197f9c21f4b56">array.h</a>
+<li>stp_array_create_from_xmltree()
+: <a class="el" href="xml_8h.html#ce5ac81af291e43504d5c0200276e543">xml.h</a>
+<li>stp_array_destroy()
+: <a class="el" href="group__array.html#gafb2573df35220ef9be3f6ba4b8c871b">array.h</a>
+<li>stp_array_get_data()
+: <a class="el" href="group__array.html#ge0d44ee80048189d244b16f231c54b80">array.h</a>
+<li>stp_array_get_point()
+: <a class="el" href="group__array.html#g9078af984a5e1ec80a6068bdb51c9a6d">array.h</a>
+<li>stp_array_get_sequence()
+: <a class="el" href="group__array.html#ge05ba5cfe8c03e2435348d6c5488d87e">array.h</a>
+<li>stp_array_get_size()
+: <a class="el" href="group__array.html#gfe61db801ab3b0326646178e536dd161">array.h</a>
+<li>stp_array_set_data()
+: <a class="el" href="group__array.html#gea0493f5bec9c5c185679adfde3edc9a">array.h</a>
+<li>stp_array_set_point()
+: <a class="el" href="group__array.html#gd6b95b2efd500007b098594826f4467f">array.h</a>
+<li>stp_array_set_size()
+: <a class="el" href="group__array.html#ge6fb91b246ef5abd388927cb9674503e">array.h</a>
+<li>stp_asprintf()
+: <a class="el" href="group__util.html#g3f57c5298a5c6140ac56771dd62bd036">util.h</a>
+<li>stp_catprintf()
+: <a class="el" href="group__util.html#gd4f33438f0103a143d90dc9c48d248eb">util.h</a>
+<li>stp_channel_add()
+: <a class="el" href="channel_8h.html#f03151796a167ec708b5412a31ddced5">channel.h</a>
+<li>stp_channel_convert()
+: <a class="el" href="channel_8h.html#4559ad54f7de2403438baab1c97789f7">channel.h</a>
+<li>stp_channel_get_black_channel()
+: <a class="el" href="channel_8h.html#8a3cf94dfe1461bd0c8fb7464d5c99a6">channel.h</a>
+<li>stp_channel_get_curve()
+: <a class="el" href="channel_8h.html#36feed643e8768ff93308980203a92be">channel.h</a>
+<li>stp_channel_get_cutoff_adjustment()
+: <a class="el" href="channel_8h.html#f903f5318c045567f6aa3b6f1496b5ba">channel.h</a>
+<li>stp_channel_get_density_adjustment()
+: <a class="el" href="channel_8h.html#43188fd2c70d894e1e050277c1e4da35">channel.h</a>
+<li>stp_channel_get_gcr_curve()
+: <a class="el" href="channel_8h.html#c5c6578307d574f53c8f9110053fe9c5">channel.h</a>
+<li>stp_channel_get_gloss_channel()
+: <a class="el" href="channel_8h.html#7771fa6878d414b4cd3b08743aadc3fc">channel.h</a>
+<li>stp_channel_get_gloss_limit()
+: <a class="el" href="channel_8h.html#9231b8d3be7ec55dc657da2e6a5c406e">channel.h</a>
+<li>stp_channel_get_ink_limit()
+: <a class="el" href="channel_8h.html#fe8ad41148d568cb1d662064ec721ac1">channel.h</a>
+<li>stp_channel_get_input()
+: <a class="el" href="channel_8h.html#c73acbaeb300c75912529c5064ea507a">channel.h</a>
+<li>stp_channel_get_output()
+: <a class="el" href="channel_8h.html#3ad58abee1208b328da69e49d230a54f">channel.h</a>
+<li>stp_channel_get_value()
+: <a class="el" href="channel_8h.html#748f1fc90c60e70016998953b1adcde2">channel.h</a>
+<li>stp_channel_initialize()
+: <a class="el" href="channel_8h.html#35b64c052b8dcfd4f1576b10d999e022">channel.h</a>
+<li>stp_channel_reset()
+: <a class="el" href="channel_8h.html#90026b1db4586b08df148db41a676b50">channel.h</a>
+<li>stp_channel_reset_channel()
+: <a class="el" href="channel_8h.html#b4b4591b1709146874c0218bc0591255">channel.h</a>
+<li>stp_channel_set_black_channel()
+: <a class="el" href="channel_8h.html#1c1101b3f21368b26241a0db2877364e">channel.h</a>
+<li>stp_channel_set_curve()
+: <a class="el" href="channel_8h.html#9e2107aa3cc118db2b6540f939064fed">channel.h</a>
+<li>stp_channel_set_cutoff_adjustment()
+: <a class="el" href="channel_8h.html#59a4810ca297444fb16a5a1a1db319ed">channel.h</a>
+<li>stp_channel_set_density_adjustment()
+: <a class="el" href="channel_8h.html#e7bd4572fb2ac86694555d0b827a2db9">channel.h</a>
+<li>stp_channel_set_gcr_curve()
+: <a class="el" href="channel_8h.html#4f0863196d55416aa58ea9815eb33312">channel.h</a>
+<li>stp_channel_set_gloss_channel()
+: <a class="el" href="channel_8h.html#b09858181233a7777b2d49ca50a327c6">channel.h</a>
+<li>stp_channel_set_gloss_limit()
+: <a class="el" href="channel_8h.html#774df9fbabb8fcd9241976cc50c9501d">channel.h</a>
+<li>stp_channel_set_ink_limit()
+: <a class="el" href="channel_8h.html#68afca52a3f3c0c72c1ff0329ef245c7">channel.h</a>
+<li>stp_check_array_parameter()
+: <a class="el" href="group__vars.html#g5a629e6da1f5008f0db034191ad8b1d5">vars.h</a>
+<li>stp_check_boolean_parameter()
+: <a class="el" href="group__vars.html#g23b9c17426210460618c4f95c5f34229">vars.h</a>
+<li>stp_check_curve_parameter()
+: <a class="el" href="group__vars.html#g6c94a1df4388b142d00d5d30df904b47">vars.h</a>
+<li>stp_check_dimension_parameter()
+: <a class="el" href="group__vars.html#gc1f2b865c76da441b6c1bd9b5b93aa1f">vars.h</a>
+<li>stp_check_file_parameter()
+: <a class="el" href="group__vars.html#ga7db6701be5d05e545c79db905e4c7eb">vars.h</a>
+<li>stp_check_float_parameter()
+: <a class="el" href="group__vars.html#gb12bebb419eb1ae8f323aa931e324389">vars.h</a>
+<li>stp_check_int_parameter()
+: <a class="el" href="group__vars.html#g4fd7914c01e2e1b34797736dfd2c9b9c">vars.h</a>
+<li>stp_check_raw_parameter()
+: <a class="el" href="group__vars.html#g285f05c648724c80bf05af30f87120a3">vars.h</a>
+<li>stp_check_string_parameter()
+: <a class="el" href="group__vars.html#g8189b61073bfcd0244d5d6f2a2c8ba86">vars.h</a>
+<li>stp_check_version()
+: <a class="el" href="group__version.html#g05a93cb4ac52cc50875b5839c59bcafc">gutenprint-version.h</a>
+<li>stp_clear_array_parameter()
+: <a class="el" href="group__vars.html#g7c67cef38cead5f519fd04ae09265b53">vars.h</a>
+<li>stp_clear_boolean_parameter()
+: <a class="el" href="group__vars.html#g42ebfed8dec2054799e4943a8ca84267">vars.h</a>
+<li>stp_clear_curve_parameter()
+: <a class="el" href="group__vars.html#gf52a0b0c3b0e0fee1fc46516b1bc0c4e">vars.h</a>
+<li>stp_clear_dimension_parameter()
+: <a class="el" href="group__vars.html#g514a21602ae7a8ebe8e5072a5a4b6f89">vars.h</a>
+<li>stp_clear_file_parameter()
+: <a class="el" href="group__vars.html#g4fad48e3e6453842559bd872650cb88f">vars.h</a>
+<li>stp_clear_float_parameter()
+: <a class="el" href="group__vars.html#g4eccbbe421f8b0c9342b17cef40b263d">vars.h</a>
+<li>stp_clear_int_parameter()
+: <a class="el" href="group__vars.html#g2107c08f37e31f45253f7d75a3773d46">vars.h</a>
+<li>stp_clear_raw_parameter()
+: <a class="el" href="group__vars.html#g11b79add82faf23b0e3c758f9530d95c">vars.h</a>
+<li>stp_clear_string_parameter()
+: <a class="el" href="group__vars.html#g9e98ef9a9b1b84a0c0580fe024e35490">vars.h</a>
+<li>stp_color_count()
+: <a class="el" href="group__color.html#g68c13c36d723e5604507bf33fe629f8b">color.h</a>
+<li>stp_color_describe_parameter()
+: <a class="el" href="group__color.html#g83bc80c9fd84d741099bc20285a1b655">color.h</a>
+<li>stp_color_get_long_name()
+: <a class="el" href="group__color.html#g612389b45f09358f6bad0e376c91b057">color.h</a>
+<li>stp_color_get_name()
+: <a class="el" href="group__color.html#g5a4a4da67cb5c3f1c0a2a9618e46ed50">color.h</a>
+<li>stp_color_get_row()
+: <a class="el" href="group__color.html#g0cf28c3c9638987df4b1740deadba0cb">color.h</a>
+<li>stp_color_init()
+: <a class="el" href="group__color.html#g23392fc53078d51fcd14d6d565d56423">color.h</a>
+<li>stp_color_list_parameters()
+: <a class="el" href="group__color.html#ga282220724877a57738b047140835141">color.h</a>
+<li>stp_color_register()
+: <a class="el" href="group__color.html#g47d6a8163ef21a6e700b1371228b851d">color.h</a>
+<li>stp_color_unregister()
+: <a class="el" href="group__color.html#g2b62ec8e0afe1b6297bc71466f8a334c">color.h</a>
+<li>stp_copy_options()
+: <a class="el" href="group__vars.html#gf7d2d5a9897c9ce77bb16f4a1addaa62">vars.h</a>
+<li>stp_curve_cache_copy()
+: <a class="el" href="curve-cache_8h.html#f5642e9d4e265b8d16db6075e1309a20">curve-cache.h</a>
+<li>stp_curve_cache_curve_data()
+: <a class="el" href="curve-cache_8h.html#f3e398d179e00c2e7d8b7c2e5dcbfd5c">curve-cache.h</a>
+<li>stp_curve_cache_curve_invalidate()
+: <a class="el" href="curve-cache_8h.html#8d9c7b9a9aca371b6d2e72dcfc367f88">curve-cache.h</a>
+<li>stp_curve_cache_get_count()
+: <a class="el" href="curve-cache_8h.html#aefb6ef535ba108e0fdba1db4b58bd34">curve-cache.h</a>
+<li>stp_curve_cache_get_curve()
+: <a class="el" href="curve-cache_8h.html#26161d0b2b6c8b97e0de2dc12619cc6c">curve-cache.h</a>
+<li>stp_curve_cache_get_double_data()
+: <a class="el" href="curve-cache_8h.html#45415b5aa0600b60b65880803aea84b4">curve-cache.h</a>
+<li>stp_curve_cache_get_ushort_data()
+: <a class="el" href="curve-cache_8h.html#204df5bd2ecc318cccf6e2541d8b4830">curve-cache.h</a>
+<li>stp_curve_cache_set_curve()
+: <a class="el" href="curve-cache_8h.html#8469e7bd7d80cfb01fc470a42e6ac805">curve-cache.h</a>
+<li>stp_curve_cache_set_curve_copy()
+: <a class="el" href="curve-cache_8h.html#cd8bbfbdb0b60d079b6615cc4a19ee56">curve-cache.h</a>
+<li>stp_curve_compose()
+: <a class="el" href="group__curve.html#g55c83a9139fc1b06b90e983d7c1ceff7">curve.h</a>
+<li>stp_curve_copy()
+: <a class="el" href="group__curve.html#gcd7861bf1c9d61ac4ec87844a15ab9d3">curve.h</a>
+<li>stp_curve_count_points()
+: <a class="el" href="group__curve.html#g766ff02b29b976372779f719076ad017">curve.h</a>
+<li>stp_curve_create()
+: <a class="el" href="group__curve.html#g6b3640f0e25bd9d38e46bdc1b2ee58a4">curve.h</a>
+<li>stp_curve_create_copy()
+: <a class="el" href="group__curve.html#g972ed591394396e0c66e928a0695b3bf">curve.h</a>
+<li>stp_curve_create_from_file()
+: <a class="el" href="group__curve.html#gd96d7d1cda5f037f7d6a9b651ebbbb46">curve.h</a>
+<li>stp_curve_create_from_stream()
+: <a class="el" href="group__curve.html#g478a24e44a3ce345f7207cf7ded12e37">curve.h</a>
+<li>stp_curve_create_from_string()
+: <a class="el" href="group__curve.html#gb8c0df217306a6e0597f058efbfaca82">curve.h</a>
+<li>stp_curve_create_from_xmltree()
+: <a class="el" href="xml_8h.html#112e57d9f022170ee00b0a66fea1770f">xml.h</a>
+<li>stp_curve_destroy()
+: <a class="el" href="group__curve.html#g4294b85e848fe421496469e2406ef380">curve.h</a>
+<li>stp_curve_free_curve_cache()
+: <a class="el" href="curve-cache_8h.html#80cb29d2d12707901ca9261df5f3cd1c">curve-cache.h</a>
+<li>stp_curve_get_bounds()
+: <a class="el" href="group__curve.html#g63c3386fbfd75da9fe985673bf7b1ca3">curve.h</a>
+<li>stp_curve_get_data()
+: <a class="el" href="group__curve.html#gb2208f56694e47e4300d10e057f59ee8">curve.h</a>
+<li>stp_curve_get_data_points()
+: <a class="el" href="group__curve.html#g79e0d6afa3573917c756af64b56a0d82">curve.h</a>
+<li>stp_curve_get_float_data()
+: <a class="el" href="group__curve.html#g251f105cb5f2b126ea02b7908f717c18">curve.h</a>
+<li>stp_curve_get_gamma()
+: <a class="el" href="group__curve.html#g0420a6cfa87aa96e5c9a56142aa0178d">curve.h</a>
+<li>stp_curve_get_int_data()
+: <a class="el" href="group__curve.html#g6de80e81b64262e0051441f697ae4de4">curve.h</a>
+<li>stp_curve_get_interpolation_type()
+: <a class="el" href="group__curve.html#g42c98a6a6d2512516738b6df9367510e">curve.h</a>
+<li>stp_curve_get_long_data()
+: <a class="el" href="group__curve.html#gf59bd38c9dfc7beb08a283dc9e400bf2">curve.h</a>
+<li>stp_curve_get_point()
+: <a class="el" href="group__curve.html#g569aae57147ed7681f23e0e60bd8af35">curve.h</a>
+<li>stp_curve_get_range()
+: <a class="el" href="group__curve.html#gcb8e51731b9385556747744a0d4f43fb">curve.h</a>
+<li>stp_curve_get_sequence()
+: <a class="el" href="group__curve.html#gde323594e84d4380c88ecf122a5a4da8">curve.h</a>
+<li>stp_curve_get_short_data()
+: <a class="el" href="group__curve.html#g87c5d1904efa58be8a21ab6b2c41d0b9">curve.h</a>
+<li>stp_curve_get_subrange()
+: <a class="el" href="group__curve.html#g5cbf7c4b6ad96ecb35fc06f46c0319f0">curve.h</a>
+<li>stp_curve_get_uint_data()
+: <a class="el" href="group__curve.html#g19b3160a57dc6959fe08c631c7206a8a">curve.h</a>
+<li>stp_curve_get_ulong_data()
+: <a class="el" href="group__curve.html#g24a862eda4cdbb626f51aeb7d8ae9a50">curve.h</a>
+<li>stp_curve_get_ushort_data()
+: <a class="el" href="group__curve.html#ga02125af6b9c192e34985851370391b8">curve.h</a>
+<li>stp_curve_get_wrap()
+: <a class="el" href="group__curve.html#g859020827897bac0f4671322ec027dc4">curve.h</a>
+<li>stp_curve_interpolate_value()
+: <a class="el" href="group__curve.html#gb33642ee6c49334f379a4dc185ecd355">curve.h</a>
+<li>stp_curve_is_piecewise()
+: <a class="el" href="group__curve.html#g29b022a3055afe0b48d1f2736ff2f4da">curve.h</a>
+<li>stp_curve_resample()
+: <a class="el" href="group__curve.html#g87298cf562468cbcf2c1f76a0ab80b62">curve.h</a>
+<li>stp_curve_rescale()
+: <a class="el" href="group__curve.html#gad611b3ddbd667ec204fa7b42f8d7546">curve.h</a>
+<li>stp_curve_set_bounds()
+: <a class="el" href="group__curve.html#ge32fb850963b8694d3739c0ed8475f75">curve.h</a>
+<li>stp_curve_set_data()
+: <a class="el" href="group__curve.html#g81bceb4cb991cef1cda2298cf7bb9f15">curve.h</a>
+<li>stp_curve_set_data_points()
+: <a class="el" href="group__curve.html#gce09cab4e6ae3d55f75aacae3689e8e6">curve.h</a>
+<li>stp_curve_set_float_data()
+: <a class="el" href="group__curve.html#gbd7a39289471607311141c7fc3bbb415">curve.h</a>
+<li>stp_curve_set_gamma()
+: <a class="el" href="group__curve.html#gcb8a2b9b21f97f32faacb99a6125e152">curve.h</a>
+<li>stp_curve_set_int_data()
+: <a class="el" href="group__curve.html#g31e76843f4d2f207701755b58766a670">curve.h</a>
+<li>stp_curve_set_interpolation_type()
+: <a class="el" href="group__curve.html#g82890cef78f5861a88c5789c33693423">curve.h</a>
+<li>stp_curve_set_long_data()
+: <a class="el" href="group__curve.html#ge6a435a21a5c4b5e582d42095a7b06fc">curve.h</a>
+<li>stp_curve_set_point()
+: <a class="el" href="group__curve.html#g2d3b8372bde3fce699a3b7bb3c9d8582">curve.h</a>
+<li>stp_curve_set_short_data()
+: <a class="el" href="group__curve.html#g2fa5222aab07e85f215e389734b6dbea">curve.h</a>
+<li>stp_curve_set_subrange()
+: <a class="el" href="group__curve.html#g73dfcc4c95734449965227e21deb3037">curve.h</a>
+<li>stp_curve_set_uint_data()
+: <a class="el" href="group__curve.html#g3ee80f8e4f33691a78b3ad8c3fd7c34f">curve.h</a>
+<li>stp_curve_set_ulong_data()
+: <a class="el" href="group__curve.html#g723173297f5b67af937205c7d74ac353">curve.h</a>
+<li>stp_curve_set_ushort_data()
+: <a class="el" href="group__curve.html#g0af395eefa7bfe0d19acc1acbaeefe48">curve.h</a>
+<li>stp_curve_write()
+: <a class="el" href="group__curve.html#gc12af55cf0eb2f76db967886f8996313">curve.h</a>
+<li>stp_curve_write_string()
+: <a class="el" href="group__curve.html#gf2f0da590278ff74af1eccb0aa0c7169">curve.h</a>
+<li>stp_default_media_size()
+: <a class="el" href="group__papersize.html#g33c0be56646361b1ce85a9d338336dd3">paper.h</a>
+<li>stp_default_settings()
+: <a class="el" href="group__vars.html#gf63982a6e44f8b62532346d9ceb3d91c">vars.h</a>
+<li>stp_deprintf()
+: <a class="el" href="group__util.html#g129f45d7df47fd58d8653538fd13a1f2">util.h</a>
+<li>stp_describe_output()
+: <a class="el" href="group__printer.html#g50b48bab8d6d1734c3a0f6622d65582e">printers.h</a>
+<li>stp_describe_parameter()
+: <a class="el" href="group__vars.html#g0b8991bd1a91e2cac7d0b355b1186c8e">vars.h</a>
+<li>stp_describe_resolution()
+: <a class="el" href="group__vars.html#g88715b31fcec18778f769ffbc1b55384">vars.h</a>
+<li>stp_destroy_component_data()
+: <a class="el" href="group__vars.html#g151b7d922a3e1e5e9d9f0ea8de6ab70a">vars.h</a>
+<li>stp_dither()
+: <a class="el" href="dither_8h.html#0a470a9c9daef26e90bdb890479a7f87">dither.h</a>
+<li>stp_dither_add_channel()
+: <a class="el" href="dither_8h.html#d70196f1a4510c43f3651bf1450be5fa">dither.h</a>
+<li>stp_dither_describe_parameter()
+: <a class="el" href="dither_8h.html#f1c4669d2bed56e2e1403a7d0f36f6ba">dither.h</a>
+<li>stp_dither_get_channel()
+: <a class="el" href="dither_8h.html#8866521ed5c139e2048e5548cc4fb43f">dither.h</a>
+<li>stp_dither_get_first_position()
+: <a class="el" href="dither_8h.html#fe180672fad52d306e737a333ea113fb">dither.h</a>
+<li>stp_dither_get_last_position()
+: <a class="el" href="dither_8h.html#ddc996112f61432ff66a10eb502d9a4d">dither.h</a>
+<li>stp_dither_init()
+: <a class="el" href="dither_8h.html#9835738585d6a9053eaeacdca25d0fe6">dither.h</a>
+<li>stp_dither_internal()
+: <a class="el" href="dither_8h.html#70a6b29366005ba76ee77e9f1aaae105">dither.h</a>
+<li>stp_dither_list_parameters()
+: <a class="el" href="dither_8h.html#27fa3e870e438b0c399472a908555630">dither.h</a>
+<li>stp_dither_matrix_clone()
+: <a class="el" href="dither_8h.html#d0dfe2800ed318431a0a54c1ed7d383b">dither.h</a>
+<li>stp_dither_matrix_copy()
+: <a class="el" href="dither_8h.html#3ea3c72ff26afef246873edc0bc542d3">dither.h</a>
+<li>stp_dither_matrix_destroy()
+: <a class="el" href="dither_8h.html#49ff7bd6b10cd34f9164b4414adbb87c">dither.h</a>
+<li>stp_dither_matrix_init()
+: <a class="el" href="dither_8h.html#2c42ec7156263c024ea6f51ab3b17530">dither.h</a>
+<li>stp_dither_matrix_init_from_dither_array()
+: <a class="el" href="dither_8h.html#53b7ba7fd141db6ef43c68a6f500bda2">dither.h</a>
+<li>stp_dither_matrix_init_short()
+: <a class="el" href="dither_8h.html#588103d2a828a6c5f51577a917b09cdf">dither.h</a>
+<li>stp_dither_matrix_iterated_init()
+: <a class="el" href="dither_8h.html#36691189c1f859d82675f32f5046e674">dither.h</a>
+<li>stp_dither_matrix_scale_exponentially()
+: <a class="el" href="dither_8h.html#a62e8e672a125150074ea9bddb474423">dither.h</a>
+<li>stp_dither_matrix_set_row()
+: <a class="el" href="dither_8h.html#a6ca0a88b0bef517cc1909fb7074e8ac">dither.h</a>
+<li>stp_dither_matrix_shear()
+: <a class="el" href="dither_8h.html#df8bb5a54d552846dcf4d1534d612b65">dither.h</a>
+<li>stp_dither_matrix_validate_array()
+: <a class="el" href="dither_8h.html#ad322d923e2d9c3141cc50863d627b25">dither.h</a>
+<li>stp_dither_set_adaptive_limit()
+: <a class="el" href="dither_8h.html#c6a4aa7bda3af1ae03d87f243311ebba">dither.h</a>
+<li>stp_dither_set_ink_spread()
+: <a class="el" href="dither_8h.html#b47439fc32e7f669f8cd6c41acdcf398">dither.h</a>
+<li>stp_dither_set_inks()
+: <a class="el" href="dither_8h.html#5b8786ffa17dcc1604521b1d1cc5a3a5">dither.h</a>
+<li>stp_dither_set_inks_full()
+: <a class="el" href="dither_8h.html#f5822743e380d0d51a397dcb3eb6247c">dither.h</a>
+<li>stp_dither_set_inks_simple()
+: <a class="el" href="dither_8h.html#4dd13ea23fe601571d864eabae4b0c40">dither.h</a>
+<li>stp_dither_set_iterated_matrix()
+: <a class="el" href="dither_8h.html#57aecb702251a2e18848b02109521aed">dither.h</a>
+<li>stp_dither_set_matrix()
+: <a class="el" href="dither_8h.html#a973f651768626a6eb7ab9ad4ce09b2c">dither.h</a>
+<li>stp_dither_set_matrix_from_dither_array()
+: <a class="el" href="dither_8h.html#3155913bdc63c0545786fc427ca2396a">dither.h</a>
+<li>stp_dither_set_randomizer()
+: <a class="el" href="dither_8h.html#560bcf46dfa233a01bdf6042e4680f54">dither.h</a>
+<li>stp_dither_set_transition()
+: <a class="el" href="dither_8h.html#6f4efd170562a43139f7d6a4b41ecaf3">dither.h</a>
+<li>stp_dprintf()
+: <a class="el" href="group__util.html#g511e0c4cac91c674797da98ab96b83e6">util.h</a>
+<li>stp_end_job()
+: <a class="el" href="group__printer.html#ge61d056dd504facc72ff56d7f16eb23c">printers.h</a>
+<li>stp_eprintf()
+: <a class="el" href="group__util.html#ge53707df5c9945f289c58bfbe08a8d88">util.h</a>
+<li>stp_erprintf()
+: <a class="el" href="group__util.html#g1df22de14e3275cb26ede10da66eebdf">util.h</a>
+<li>stp_erputc()
+: <a class="el" href="group__util.html#g15987fbd850e04f2520cb151e08908e1">util.h</a>
+<li>stp_family_register()
+: <a class="el" href="group__printer.html#g1c6d389f49a185ca24546107bd6f4993">printers.h</a>
+<li>stp_family_unregister()
+: <a class="el" href="group__printer.html#g67e5c18254f7ad0b0fd77b4cc2265405">printers.h</a>
+<li>stp_fill_parameter_settings()
+: <a class="el" href="group__vars.html#g7f2c578ff7ae28a3db502476aa10137e">vars.h</a>
+<li>stp_find_standard_dither_array()
+: <a class="el" href="dither_8h.html#c523d1ba539398308a7ea83f4188d6ae">dither.h</a>
+<li>stp_flush_all()
+: <a class="el" href="weave_8h.html#b9694e4381a005efb70daea2429345a3">weave.h</a>
+<li>stp_flush_debug_messages()
+: <a class="el" href="group__util.html#gbe74390c1422e9746745da55692f47b8">util.h</a>
+<li>stp_fold()
+: <a class="el" href="bit-ops_8h.html#1a36a9f23f967528df8fffbd71b5e96c">bit-ops.h</a>
+<li>stp_fold_3bit()
+: <a class="el" href="bit-ops_8h.html#0ee5e547d025f7113f275dbb4614230c">bit-ops.h</a>
+<li>stp_fold_3bit_323()
+: <a class="el" href="bit-ops_8h.html#fe47834318158a214ca693f1433996f1">bit-ops.h</a>
+<li>stp_fold_4bit()
+: <a class="el" href="bit-ops_8h.html#62ac3ec2651afff5fbe6c63544a13c66">bit-ops.h</a>
+<li>stp_free()
+: <a class="el" href="group__util.html#g7d0c40c3157b2c5c630200352064874c">util.h</a>
+<li>stp_get_array_parameter()
+: <a class="el" href="group__vars.html#gc50c216c2d5cd56a9704f48d4338b179">vars.h</a>
+<li>stp_get_array_parameter_active()
+: <a class="el" href="group__vars.html#gc9f85c3a8bf99e09150cbf4220e4b983">vars.h</a>
+<li>stp_get_boolean_parameter()
+: <a class="el" href="group__vars.html#g8a30b26fa842805384b6ad663cabaea2">vars.h</a>
+<li>stp_get_boolean_parameter_active()
+: <a class="el" href="group__vars.html#gb33cf5376adc63e826cd3dedae33e930">vars.h</a>
+<li>stp_get_color_by_colorfuncs()
+: <a class="el" href="group__color.html#g578f80b2bc3937df38ce7e803f5f472c">color.h</a>
+<li>stp_get_color_by_index()
+: <a class="el" href="group__color.html#g68ba525119da39ae854645ae649557d3">color.h</a>
+<li>stp_get_color_by_name()
+: <a class="el" href="group__color.html#g3b8f62108f3604480e7b89b253527f4a">color.h</a>
+<li>stp_get_color_conversion()
+: <a class="el" href="group__vars.html#g2bac9212773ecf603b7667bd0268c23e">vars.h</a>
+<li>stp_get_component_data()
+: <a class="el" href="group__vars.html#g1666dd1571bdb866a85d4318858893be">vars.h</a>
+<li>stp_get_curve_parameter()
+: <a class="el" href="group__vars.html#g553dec81dd8b3e5590d963ba72223557">vars.h</a>
+<li>stp_get_curve_parameter_active()
+: <a class="el" href="group__vars.html#ge36bf982c52215f11fe8e392b4b3d705">vars.h</a>
+<li>stp_get_debug_level()
+: <a class="el" href="group__util.html#geba8c24f265ee904c5876704b767841c">util.h</a>
+<li>stp_get_dimension_parameter()
+: <a class="el" href="group__vars.html#g3c8d1333086ca5a01a3439f94d9f94d3">vars.h</a>
+<li>stp_get_dimension_parameter_active()
+: <a class="el" href="group__vars.html#g45f9abd8ac6772ea850344c513f6c436">vars.h</a>
+<li>stp_get_driver()
+: <a class="el" href="group__vars.html#g20c45707399ef6fdf6ee8c8209b5c7c0">vars.h</a>
+<li>stp_get_errdata()
+: <a class="el" href="group__vars.html#gd08bdcd721d37f52993c1862e25ebaf7">vars.h</a>
+<li>stp_get_errfunc()
+: <a class="el" href="group__vars.html#g2f246d3af2be9e108abe423691e16049">vars.h</a>
+<li>stp_get_file_parameter()
+: <a class="el" href="group__vars.html#g2021992d89c92b10138fb012a9554a08">vars.h</a>
+<li>stp_get_file_parameter_active()
+: <a class="el" href="group__vars.html#g47e7a69ff8e23eed6188542c5c8bff4f">vars.h</a>
+<li>stp_get_float_parameter()
+: <a class="el" href="group__vars.html#g365412d9c176fd3ac9375ded3f22ddb3">vars.h</a>
+<li>stp_get_float_parameter_active()
+: <a class="el" href="group__vars.html#g4b8f9847f2eebfff53446a9bc235ab68">vars.h</a>
+<li>stp_get_height()
+: <a class="el" href="group__vars.html#g8731a92f5d3047e00ba33577821d5aec">vars.h</a>
+<li>stp_get_imageable_area()
+: <a class="el" href="group__vars.html#g67d1e68ed47e5b554f2021fca1f01978">vars.h</a>
+<li>stp_get_int_parameter()
+: <a class="el" href="group__vars.html#g7c0d95ba35aba0786bfc5f918efa79fc">vars.h</a>
+<li>stp_get_int_parameter_active()
+: <a class="el" href="group__vars.html#gb74fd69c4ef62af7b5ab33c6baf48b8b">vars.h</a>
+<li>stp_get_left()
+: <a class="el" href="group__vars.html#g5c02ee2422d86e4bcdcae613c70c9e1e">vars.h</a>
+<li>stp_get_lineactive_by_pass()
+: <a class="el" href="weave_8h.html#4c7e67ed92ac3427c94fb0e6a85bfce9">weave.h</a>
+<li>stp_get_linebases_by_pass()
+: <a class="el" href="weave_8h.html#1ec75a70b7dad8a5d0e4c963d67677c3">weave.h</a>
+<li>stp_get_linecount_by_pass()
+: <a class="el" href="weave_8h.html#5acdf7cc603254e68b0ae39e45ea52f3">weave.h</a>
+<li>stp_get_lineoffsets_by_pass()
+: <a class="el" href="weave_8h.html#986bb835225820c68d85041e797cf2a5">weave.h</a>
+<li>stp_get_maximum_imageable_area()
+: <a class="el" href="group__vars.html#gd17cadb7fd78bffb759f2213a1a90df6">vars.h</a>
+<li>stp_get_media_size()
+: <a class="el" href="group__vars.html#gc9e6d740ffc4cff5dc7d0bf106a3e7df">vars.h</a>
+<li>stp_get_model_id()
+: <a class="el" href="group__printer.html#g2057c5fcfc31d8b4cf7f3291cf3c0cf4">printers.h</a>
+<li>stp_get_outdata()
+: <a class="el" href="group__vars.html#g7042b05e0df5b32206d54397429bbac5">vars.h</a>
+<li>stp_get_outfunc()
+: <a class="el" href="group__vars.html#g7c6c7c547d0c973ac801362db5ca4879">vars.h</a>
+<li>stp_get_page_height()
+: <a class="el" href="group__vars.html#gc0c4928fa488bb95e73ba9b8aa932584">vars.h</a>
+<li>stp_get_page_width()
+: <a class="el" href="group__vars.html#gad2d305eed993707d22263b54578a39b">vars.h</a>
+<li>stp_get_papersize_by_index()
+: <a class="el" href="group__papersize.html#gb2e9f694a3b90aeaaa14d6af3b5fe75a">paper.h</a>
+<li>stp_get_papersize_by_name()
+: <a class="el" href="group__papersize.html#g60f3dee8f26cac05d8d6fcaff1e39630">paper.h</a>
+<li>stp_get_papersize_by_size()
+: <a class="el" href="group__papersize.html#g1484a5e75a2b2921bbe0c9e17deb0b77">paper.h</a>
+<li>stp_get_parameter_list()
+: <a class="el" href="group__vars.html#g12e8bb617e5c90da99d6d74519664634">vars.h</a>
+<li>stp_get_pass_by_pass()
+: <a class="el" href="weave_8h.html#5412630e5a7ba809b6ef84ab4e6c9f09">weave.h</a>
+<li>stp_get_printer()
+: <a class="el" href="group__printer.html#gc649c4b3d0a93f26f99deb4b081305c1">printers.h</a>
+<li>stp_get_printer_by_driver()
+: <a class="el" href="group__printer.html#ge45de9ef94fb609c2a54f1d80144552e">printers.h</a>
+<li>stp_get_printer_by_index()
+: <a class="el" href="group__printer.html#g440501ca226e0a9ac1335c7e52ee55a6">printers.h</a>
+<li>stp_get_printer_by_long_name()
+: <a class="el" href="group__printer.html#g6bd5abd876100c17fc9029659fed92f4">printers.h</a>
+<li>stp_get_printer_index_by_driver()
+: <a class="el" href="group__printer.html#g41094e69b71eb930e770bd2cf8bbf795">printers.h</a>
+<li>stp_get_raw_parameter()
+: <a class="el" href="group__vars.html#g9fff6c14a71f5f8ec28620ef64a92fd5">vars.h</a>
+<li>stp_get_raw_parameter_active()
+: <a class="el" href="group__vars.html#gb6e41a5edb7474ed7ac26e236e00c80c">vars.h</a>
+<li>stp_get_release_version()
+: <a class="el" href="group__util.html#g5ba7edc43ed094f32ae7d9158a362a7b">util.h</a>
+<li>stp_get_size_limit()
+: <a class="el" href="group__vars.html#g0c8ee62453baff3d2c00e0ccae67b049">vars.h</a>
+<li>stp_get_string_parameter()
+: <a class="el" href="group__vars.html#gb5b21e5606b8ca755c5eac7774260efa">vars.h</a>
+<li>stp_get_string_parameter_active()
+: <a class="el" href="group__vars.html#g0b7be7ba9f763be692dd833a434ed13d">vars.h</a>
+<li>stp_get_top()
+: <a class="el" href="group__vars.html#g292132b97b20a6d034e22f4146d36131">vars.h</a>
+<li>stp_get_verified()
+: <a class="el" href="group__vars.html#g6d04a3c444753f11004ad6259a91e853">vars.h</a>
+<li>stp_get_version()
+: <a class="el" href="group__util.html#g1f0797636484393574cb95e667819dc1">util.h</a>
+<li>stp_get_width()
+: <a class="el" href="group__vars.html#g1c54d99b94c69a67eb4ae0349a4720e7">vars.h</a>
+<li>stp_image_conclude()
+: <a class="el" href="group__image.html#g7598151354fbeb5f6a8b3f92d1e40ad7">image.h</a>
+<li>stp_image_get_appname()
+: <a class="el" href="group__image.html#g1643f6b9eb180e98f3c1c267950f18d2">image.h</a>
+<li>stp_image_get_row()
+: <a class="el" href="group__image.html#g01d72a16de9e98722859ca651561e8f5">image.h</a>
+<li>stp_image_height()
+: <a class="el" href="group__image.html#gf9dcdf718ad99df9eb71fc542d5b47e1">image.h</a>
+<li>stp_image_init()
+: <a class="el" href="group__image.html#gd257f72ac5272e94ff9314f8ecd24f1e">image.h</a>
+<li>stp_image_reset()
+: <a class="el" href="group__image.html#gf2fc433dba580b9ec8e69aebc2e65338">image.h</a>
+<li>stp_image_width()
+: <a class="el" href="group__image.html#gbe86b2ff9a3a0c0e98248990f9be5652">image.h</a>
+<li>stp_init()
+: <a class="el" href="group__util.html#g2ce0a2e8887fe5ff7f3eed1370d0d691">util.h</a>
+<li>stp_init_debug_messages()
+: <a class="el" href="group__util.html#g6d15e5b4e00f9d242166edb5332f8368">util.h</a>
+<li>stp_initialize_printer_defaults()
+: <a class="el" href="group__printer.html#g381f3a4f132a00d6d2e2a9b54f9ed675">printers.h</a>
+<li>stp_initialize_weave()
+: <a class="el" href="weave_8h.html#5b4fc76c83f5408182f90fb139c06b50">weave.h</a>
+<li>stp_known_papersizes()
+: <a class="el" href="group__papersize.html#g84fd0bad33b134217f54fa8c1e6c8b99">paper.h</a>
+<li>stp_list_copy()
+: <a class="el" href="group__list.html#g0ba249dd06efbf5c0af8511ceab671e8">list.h</a>
+<li>stp_list_create()
+: <a class="el" href="group__list.html#g3cfea94cd07f50d7d9b4ce384d349fca">list.h</a>
+<li>stp_list_destroy()
+: <a class="el" href="group__list.html#ge23ef06175b27dd6772d4d4c098999b1">list.h</a>
+<li>stp_list_get_copyfunc()
+: <a class="el" href="group__list.html#g686e92ee802147171e5fc723d0079b8d">list.h</a>
+<li>stp_list_get_end()
+: <a class="el" href="group__list.html#ge939f15ee1a6e4c0aaad7a7be7f40b74">list.h</a>
+<li>stp_list_get_freefunc()
+: <a class="el" href="group__list.html#gbfc1ef258084a3e1ad959aa3d2f053f4">list.h</a>
+<li>stp_list_get_item_by_index()
+: <a class="el" href="group__list.html#gd377973e8b13d02c9c111d970f491993">list.h</a>
+<li>stp_list_get_item_by_long_name()
+: <a class="el" href="group__list.html#gcc9140df3f4311cd750ba10a1cbf37d1">list.h</a>
+<li>stp_list_get_item_by_name()
+: <a class="el" href="group__list.html#g729867c847dd8282f74806968c708f28">list.h</a>
+<li>stp_list_get_length()
+: <a class="el" href="group__list.html#ge22741060734c9cbc47656c5ea35c3f3">list.h</a>
+<li>stp_list_get_long_namefunc()
+: <a class="el" href="group__list.html#gb99b3ed6da1ea739eed3f2c04fbb7fa7">list.h</a>
+<li>stp_list_get_namefunc()
+: <a class="el" href="group__list.html#g50b1ab3c3b6b0ba7c0cf2128e2024369">list.h</a>
+<li>stp_list_get_sortfunc()
+: <a class="el" href="group__list.html#g4b32e315d3fd23eabeffcc8d931ea454">list.h</a>
+<li>stp_list_get_start()
+: <a class="el" href="group__list.html#gd185100e8d7969a473e9d42bc8084572">list.h</a>
+<li>stp_list_item_create()
+: <a class="el" href="group__list.html#ge726297a82e140672a018e135ffc6a0e">list.h</a>
+<li>stp_list_item_destroy()
+: <a class="el" href="group__list.html#g5e36d4f61e00cb3e4c4a759f5e7e9f4b">list.h</a>
+<li>stp_list_item_get_data()
+: <a class="el" href="group__list.html#gd6f6b303b40fa75f22a86391785178cb">list.h</a>
+<li>stp_list_item_next()
+: <a class="el" href="group__list.html#g81ab310caf6432ce1e492eaafdb6c0d7">list.h</a>
+<li>stp_list_item_prev()
+: <a class="el" href="group__list.html#gbaa2a241055402438a0cae6f40cf6a78">list.h</a>
+<li>stp_list_item_set_data()
+: <a class="el" href="group__list.html#gc1e34edcd47ffdc119cdcaf5ad38e1c4">list.h</a>
+<li>stp_list_node_free_data()
+: <a class="el" href="group__list.html#g55fbb8f7a3920b783b02183c5ea57624">list.h</a>
+<li>stp_list_set_copyfunc()
+: <a class="el" href="group__list.html#g7e002ed25bbfbad236c1c619841f1ac6">list.h</a>
+<li>stp_list_set_freefunc()
+: <a class="el" href="group__list.html#ge3300d7971c393d119d6fd62e2b578ec">list.h</a>
+<li>stp_list_set_long_namefunc()
+: <a class="el" href="group__list.html#g5be91978431b0ed48ea7919807bdcb73">list.h</a>
+<li>stp_list_set_namefunc()
+: <a class="el" href="group__list.html#g889af512d87a00d696acc0b6b3fafe78">list.h</a>
+<li>stp_list_set_sortfunc()
+: <a class="el" href="group__list.html#gb1d2486542b858b44b299cfcdf7d8784">list.h</a>
+<li>stp_malloc()
+: <a class="el" href="group__util.html#g86a2976738a237df953655e733c75b3a">util.h</a>
+<li>stp_merge_printvars()
+: <a class="el" href="group__vars.html#g086303d36b835d539e75f16187e99e8f">vars.h</a>
+<li>stp_module_close()
+: <a class="el" href="module_8h.html#bef0168688427992adb80588beadcb62">module.h</a>
+<li>stp_module_exit()
+: <a class="el" href="module_8h.html#cdfae1da0f4df678750f59c9eb6123f4">module.h</a>
+<li>stp_module_get_class()
+: <a class="el" href="module_8h.html#5eee8809d0134f4e7540bc5552bccd7f">module.h</a>
+<li>stp_module_init()
+: <a class="el" href="module_8h.html#121493dc584ab4e64059e9594673a756">module.h</a>
+<li>stp_module_load()
+: <a class="el" href="module_8h.html#00007a419775e60142cefd98b1dd3f2c">module.h</a>
+<li>stp_module_open()
+: <a class="el" href="module_8h.html#38df0c9e639b108f785be84d087923e9">module.h</a>
+<li>stp_mxmlAdd()
+: <a class="el" href="mxml_8h.html#b1227e00e25c3b91220a93ff65a978be">mxml.h</a>
+<li>stp_mxmlDelete()
+: <a class="el" href="mxml_8h.html#72999dc22e850ea456b336f3e802be28">mxml.h</a>
+<li>stp_mxmlElementGetAttr()
+: <a class="el" href="mxml_8h.html#c60696919428e3b2e34ee8e2eb110962">mxml.h</a>
+<li>stp_mxmlElementSetAttr()
+: <a class="el" href="mxml_8h.html#6cac6d18e5cddb0847268c46a8d4dbfa">mxml.h</a>
+<li>stp_mxmlFindElement()
+: <a class="el" href="mxml_8h.html#65c27e9c331c88b3f010f040591cc401">mxml.h</a>
+<li>stp_mxmlLoadFile()
+: <a class="el" href="mxml_8h.html#88f8bf556fb254728ab23ce931ee9224">mxml.h</a>
+<li>stp_mxmlLoadString()
+: <a class="el" href="mxml_8h.html#4a2465973559fe7815386d0d59d9a8ee">mxml.h</a>
+<li>stp_mxmlNewElement()
+: <a class="el" href="mxml_8h.html#9430b1f2b1d6b6060d9e358309de3772">mxml.h</a>
+<li>stp_mxmlNewInteger()
+: <a class="el" href="mxml_8h.html#cefddfa295df71e8617b607d207980eb">mxml.h</a>
+<li>stp_mxmlNewOpaque()
+: <a class="el" href="mxml_8h.html#1897cb8faa2141879d45d9fec0463119">mxml.h</a>
+<li>stp_mxmlNewReal()
+: <a class="el" href="mxml_8h.html#1b4b2ee1a0c75a31981d70e35398d6dd">mxml.h</a>
+<li>stp_mxmlNewText()
+: <a class="el" href="mxml_8h.html#05bd9944cadbef034730a53ca47c9f6a">mxml.h</a>
+<li>stp_mxmlRemove()
+: <a class="el" href="mxml_8h.html#7e0322b42cbe0398de7bbe38c4b0a9e6">mxml.h</a>
+<li>stp_mxmlSaveAllocString()
+: <a class="el" href="mxml_8h.html#de7e653595e3ea46d9f3b5545d0a10ea">mxml.h</a>
+<li>stp_mxmlSaveFile()
+: <a class="el" href="mxml_8h.html#1038b1003e9a3fbd8396cdbe989a64c8">mxml.h</a>
+<li>stp_mxmlSaveString()
+: <a class="el" href="mxml_8h.html#054f6b6df45f2e0072a61c1a438d3ebe">mxml.h</a>
+<li>stp_mxmlWalkNext()
+: <a class="el" href="mxml_8h.html#f478d00f31cfae58314bd6f40531923b">mxml.h</a>
+<li>stp_mxmlWalkPrev()
+: <a class="el" href="mxml_8h.html#cc0525bdade1c9e0e83c154592fe815c">mxml.h</a>
+<li>stp_parameter_description_destroy()
+: <a class="el" href="group__vars.html#gd598d95a82767e05c958ccd44534c51d">vars.h</a>
+<li>stp_parameter_find()
+: <a class="el" href="group__vars.html#gdcd8062af7b643c734f53c545694d258">vars.h</a>
+<li>stp_parameter_find_in_settings()
+: <a class="el" href="group__vars.html#g6ce39557b61706421232b5f1ac604b1b">vars.h</a>
+<li>stp_parameter_list_add_param()
+: <a class="el" href="group__vars.html#g8f4f06610d1f58bae9e70e632919c405">vars.h</a>
+<li>stp_parameter_list_append()
+: <a class="el" href="group__vars.html#g4b62bc6d0133704b3a2568b1654b6678">vars.h</a>
+<li>stp_parameter_list_copy()
+: <a class="el" href="group__vars.html#g92be87a573b883584e5a036743c1bb7d">vars.h</a>
+<li>stp_parameter_list_count()
+: <a class="el" href="group__vars.html#g7a94856ce75482a5edb6153fe8916a54">vars.h</a>
+<li>stp_parameter_list_create()
+: <a class="el" href="group__vars.html#g404bf7f1b3632178d559f6980478a312">vars.h</a>
+<li>stp_parameter_list_destroy()
+: <a class="el" href="group__vars.html#g3ffaadbe73187aa1f298c4eaa80ea82e">vars.h</a>
+<li>stp_parameter_list_param()
+: <a class="el" href="group__vars.html#g70d69ef7dec383004bf4570e57b76e18">vars.h</a>
+<li>stp_path_search()
+: <a class="el" href="path_8h.html#b1754e7b09717741f4bdc7a4b973d4a5">path.h</a>
+<li>stp_path_split()
+: <a class="el" href="path_8h.html#f08851d96a1197c5ce39f7dc812cef3f">path.h</a>
+<li>stp_print()
+: <a class="el" href="group__printer.html#g6065874cbb246875925e14d8801898cc">printers.h</a>
+<li>stp_printer_describe_parameter()
+: <a class="el" href="group__printer.html#g07bc634c85950526155b711aac42c6a0">printers.h</a>
+<li>stp_printer_get_defaults()
+: <a class="el" href="group__printer.html#g4f6859e0f21ed2062075d6b9f680a202">printers.h</a>
+<li>stp_printer_get_driver()
+: <a class="el" href="group__printer.html#gc345b8cf8cd78da98fdb4c6b2d9cf7ca">printers.h</a>
+<li>stp_printer_get_family()
+: <a class="el" href="group__printer.html#g487b74bf101a842f30b5941b8db4769a">printers.h</a>
+<li>stp_printer_get_long_name()
+: <a class="el" href="group__printer.html#g11804fb9b8d87ed1f2a3acbd39f5f85a">printers.h</a>
+<li>stp_printer_get_manufacturer()
+: <a class="el" href="group__printer.html#gb99dd05c42aed848d1567f2b346fb4f4">printers.h</a>
+<li>stp_printer_get_model()
+: <a class="el" href="group__printer.html#gae84d3fb263c4a171b7b63b6d93a940e">printers.h</a>
+<li>stp_printer_list_parameters()
+: <a class="el" href="group__printer.html#g09bf7aebf0385f7b5aac537a13b6e3ed">printers.h</a>
+<li>stp_printer_model_count()
+: <a class="el" href="group__printer.html#g6a76f8f76106eddd51af4b1593b4f3af">printers.h</a>
+<li>stp_prune_inactive_options()
+: <a class="el" href="group__util.html#g13aa8afef5b0872704390adc6a01924e">util.h</a>
+<li>stp_put16_be()
+: <a class="el" href="group__util.html#g23b504253ceda208b9a4985e6de8a5f7">util.h</a>
+<li>stp_put16_le()
+: <a class="el" href="group__util.html#g1ffcb45ea3c37bb6b485addcaf945c99">util.h</a>
+<li>stp_put32_be()
+: <a class="el" href="group__util.html#g258b7b5f8808d0a3168f798e8bf72608">util.h</a>
+<li>stp_put32_le()
+: <a class="el" href="group__util.html#gadf69b8b3f713d2bd7ca3a5648da0c56">util.h</a>
+<li>stp_putc()
+: <a class="el" href="group__util.html#g39e4c5f6fa2a07dfca3090a50a8858f9">util.h</a>
+<li>stp_putraw()
+: <a class="el" href="group__util.html#g79dd0a6f5c63f4fbf8591d3c041a7720">util.h</a>
+<li>stp_puts()
+: <a class="el" href="group__util.html#gf6cf72e5e45f175ae8c332c0588832b9">util.h</a>
+<li>stp_read_and_compose_curves()
+: <a class="el" href="group__util.html#gdbe8c167230b49bc10391d2c246e6dc0">util.h</a>
+<li>stp_realloc()
+: <a class="el" href="group__util.html#g2420936ab8b3492581f389deea44f58c">util.h</a>
+<li>stp_register_xml_parser()
+: <a class="el" href="xml_8h.html#9082cdb0bef669a2c1cd463874d56cb3">xml.h</a>
+<li>stp_register_xml_preload()
+: <a class="el" href="xml_8h.html#8ce0a404da56d87db34ee50562f3154d">xml.h</a>
+<li>stp_scale_float_parameter()
+: <a class="el" href="group__vars.html#g227ec3e75a78a5c3dd01c85dbc1e7004">vars.h</a>
+<li>stp_send_command()
+: <a class="el" href="group__util.html#gdb49b9cba9ddf4e506b6f530353ad93d">util.h</a>
+<li>stp_sequence_copy()
+: <a class="el" href="group__sequence.html#g28087c76e1106ca11c2d247956e3a3c3">sequence.h</a>
+<li>stp_sequence_create()
+: <a class="el" href="group__sequence.html#g9f0233f39d6a27c796bb283c80974618">sequence.h</a>
+<li>stp_sequence_create_copy()
+: <a class="el" href="group__sequence.html#gb03a34a03ffd4163f51126916d737df7">sequence.h</a>
+<li>stp_sequence_create_from_xmltree()
+: <a class="el" href="xml_8h.html#fa6f69121eb86b2aee998635b79d21ac">xml.h</a>
+<li>stp_sequence_destroy()
+: <a class="el" href="group__sequence.html#g3d571f155c1d00e7794b8299a41c5099">sequence.h</a>
+<li>stp_sequence_get_bounds()
+: <a class="el" href="group__sequence.html#g14ad64c63f45a2716ff8d9ceaf00697d">sequence.h</a>
+<li>stp_sequence_get_data()
+: <a class="el" href="group__sequence.html#g755c8a35e2e9e83a1dfac4f6138c4122">sequence.h</a>
+<li>stp_sequence_get_float_data()
+: <a class="el" href="group__sequence.html#gff096d5b027157151c65978b95d4e29e">sequence.h</a>
+<li>stp_sequence_get_int_data()
+: <a class="el" href="group__sequence.html#g01b0bc9e181a097aff3e97254dbfcb14">sequence.h</a>
+<li>stp_sequence_get_long_data()
+: <a class="el" href="group__sequence.html#g039d9054cfd0f7d5a892a7fec3f734f4">sequence.h</a>
+<li>stp_sequence_get_point()
+: <a class="el" href="group__sequence.html#ga79c5f747a80ab2ad9d09b09e0330cc7">sequence.h</a>
+<li>stp_sequence_get_range()
+: <a class="el" href="group__sequence.html#g999021f2caf1a9d0d6d133123031ce17">sequence.h</a>
+<li>stp_sequence_get_short_data()
+: <a class="el" href="group__sequence.html#g4d1cf137e4a77e9123e2afcdf7d63bec">sequence.h</a>
+<li>stp_sequence_get_size()
+: <a class="el" href="group__sequence.html#gfa512afc64116f673ae2061d04a5ef90">sequence.h</a>
+<li>stp_sequence_get_uint_data()
+: <a class="el" href="group__sequence.html#ge7189582ef9e4d638f909a2b1ee0c1b2">sequence.h</a>
+<li>stp_sequence_get_ulong_data()
+: <a class="el" href="group__sequence.html#g12f54f27144d490893f46dd1b0037b8b">sequence.h</a>
+<li>stp_sequence_get_ushort_data()
+: <a class="el" href="group__sequence.html#g20007077e1d8365a0eddaa922a5967c3">sequence.h</a>
+<li>stp_sequence_set_bounds()
+: <a class="el" href="group__sequence.html#g1720509809473bc33e6f11b277c78bf6">sequence.h</a>
+<li>stp_sequence_set_data()
+: <a class="el" href="group__sequence.html#g44bf5a48231675305718162559205fb6">sequence.h</a>
+<li>stp_sequence_set_float_data()
+: <a class="el" href="group__sequence.html#g35972a289b95891699ade61246882ab4">sequence.h</a>
+<li>stp_sequence_set_int_data()
+: <a class="el" href="group__sequence.html#g9d3e18b8e576b5c00531dac444397051">sequence.h</a>
+<li>stp_sequence_set_long_data()
+: <a class="el" href="group__sequence.html#gaa76cdc9094ee3c05c49a782fea64478">sequence.h</a>
+<li>stp_sequence_set_point()
+: <a class="el" href="group__sequence.html#g42c76060886da02cb4a7d843ffe6d21c">sequence.h</a>
+<li>stp_sequence_set_short_data()
+: <a class="el" href="group__sequence.html#g572ecad03d772a255481bb8b6d79106f">sequence.h</a>
+<li>stp_sequence_set_size()
+: <a class="el" href="group__sequence.html#ge0af31b854e61e0e047b3ba6dc6ec528">sequence.h</a>
+<li>stp_sequence_set_subrange()
+: <a class="el" href="group__sequence.html#g5bb962248581af2c3c54193442d9c82f">sequence.h</a>
+<li>stp_sequence_set_uint_data()
+: <a class="el" href="group__sequence.html#g497c32dec3d745a2602c5e97819de21d">sequence.h</a>
+<li>stp_sequence_set_ulong_data()
+: <a class="el" href="group__sequence.html#g3e274a2095f2e6986892384ee89e1255">sequence.h</a>
+<li>stp_sequence_set_ushort_data()
+: <a class="el" href="group__sequence.html#g317d484a67a2b775bee27f3dfe67fed4">sequence.h</a>
+<li>stp_set_array_parameter()
+: <a class="el" href="group__vars.html#g88f25e09f9a4b76aca7ba8316cbf9c8b">vars.h</a>
+<li>stp_set_array_parameter_active()
+: <a class="el" href="group__vars.html#gb78f4273798c6e3e720afe01680cf752">vars.h</a>
+<li>stp_set_boolean_parameter()
+: <a class="el" href="group__vars.html#g2167971895eea887eaaa656ed075beff">vars.h</a>
+<li>stp_set_boolean_parameter_active()
+: <a class="el" href="group__vars.html#g9ad15a73dd8c755a8b80edbe335285ee">vars.h</a>
+<li>stp_set_color_conversion()
+: <a class="el" href="group__vars.html#g7eb2a1c4b892efd5507fcd4b7a434cea">vars.h</a>
+<li>stp_set_color_conversion_n()
+: <a class="el" href="group__vars.html#g5a842b31f0a572d8e64f1a5616e25a99">vars.h</a>
+<li>stp_set_curve_parameter()
+: <a class="el" href="group__vars.html#gfe5f1f6364b89437664b2bbc55288025">vars.h</a>
+<li>stp_set_curve_parameter_active()
+: <a class="el" href="group__vars.html#ge7f21b118a8dfb5607334a6141d5dc5c">vars.h</a>
+<li>stp_set_default_array_parameter()
+: <a class="el" href="group__vars.html#g63e7ff7b4c3e1d092f95c6234f21e39f">vars.h</a>
+<li>stp_set_default_boolean_parameter()
+: <a class="el" href="group__vars.html#g81d5f09980407b4310dada2a68fc4b09">vars.h</a>
+<li>stp_set_default_curve_parameter()
+: <a class="el" href="group__vars.html#gfe38044cc067b2c2afa3da469d1cb860">vars.h</a>
+<li>stp_set_default_dimension_parameter()
+: <a class="el" href="group__vars.html#gb6f1820cadd75a4311bfc49b01de447b">vars.h</a>
+<li>stp_set_default_file_parameter()
+: <a class="el" href="group__vars.html#gf5e225475c66f966f4ba8d8c88374186">vars.h</a>
+<li>stp_set_default_file_parameter_n()
+: <a class="el" href="group__vars.html#g217eece123630113cfcf8181d475fb53">vars.h</a>
+<li>stp_set_default_float_parameter()
+: <a class="el" href="group__vars.html#ge52dbb466422a18dec110220c45fe64e">vars.h</a>
+<li>stp_set_default_int_parameter()
+: <a class="el" href="group__vars.html#g3c0418772a82144f317dc973f01a8d55">vars.h</a>
+<li>stp_set_default_raw_parameter()
+: <a class="el" href="group__vars.html#g8159b3f5bea06a99711921f0201f5e0f">vars.h</a>
+<li>stp_set_default_string_parameter()
+: <a class="el" href="group__vars.html#gf299bd0827a4d86aca59fb0d9015a866">vars.h</a>
+<li>stp_set_default_string_parameter_n()
+: <a class="el" href="group__vars.html#ga5d6d8858b266517f5899196b062d00d">vars.h</a>
+<li>stp_set_dimension_parameter()
+: <a class="el" href="group__vars.html#g6ca7898c212230cdbdc70ada2efb1417">vars.h</a>
+<li>stp_set_dimension_parameter_active()
+: <a class="el" href="group__vars.html#g0f6e91baac5e78703b162e9d23c0a65c">vars.h</a>
+<li>stp_set_driver()
+: <a class="el" href="group__vars.html#gcf237afcbc26436ebedac5b11f469fdf">vars.h</a>
+<li>stp_set_driver_n()
+: <a class="el" href="group__vars.html#g188d298a8739b84fcb965f211fc7dc4e">vars.h</a>
+<li>stp_set_errdata()
+: <a class="el" href="group__vars.html#g8b30fbadf3475c59101af9d7d37c33b7">vars.h</a>
+<li>stp_set_errfunc()
+: <a class="el" href="group__vars.html#g82f6a7514840de82c9ed7edd30f16b5d">vars.h</a>
+<li>stp_set_file_parameter()
+: <a class="el" href="group__vars.html#g537f2ba6c74c9562b2f6883d7e36c59f">vars.h</a>
+<li>stp_set_file_parameter_active()
+: <a class="el" href="group__vars.html#gaecd310feb8bd9a2188a9b287656aa1a">vars.h</a>
+<li>stp_set_file_parameter_n()
+: <a class="el" href="group__vars.html#g6f7816adbce50ca9e2fdacad35282e6a">vars.h</a>
+<li>stp_set_float_parameter()
+: <a class="el" href="group__vars.html#gf3a3283247deaad7d1ac19818aa4b796">vars.h</a>
+<li>stp_set_float_parameter_active()
+: <a class="el" href="group__vars.html#g15a5458adea6ad4eecda3c990acbc6cb">vars.h</a>
+<li>stp_set_height()
+: <a class="el" href="group__vars.html#g8ce73c5efa41f005936d5f84c44c6667">vars.h</a>
+<li>stp_set_int_parameter()
+: <a class="el" href="group__vars.html#g70eded5d0df4677dd4b357b4b934f75a">vars.h</a>
+<li>stp_set_int_parameter_active()
+: <a class="el" href="group__vars.html#g7487203059e7ccd71c4673656b3042b1">vars.h</a>
+<li>stp_set_left()
+: <a class="el" href="group__vars.html#g3b0cc83e87247854ecafd46a6e446bcb">vars.h</a>
+<li>stp_set_outdata()
+: <a class="el" href="group__vars.html#gc2b3408200a9676e6c6063cc0ae2f4bd">vars.h</a>
+<li>stp_set_outfunc()
+: <a class="el" href="group__vars.html#g075ffc274f0d2d2b6edd8326de1d7142">vars.h</a>
+<li>stp_set_output_codeset()
+: <a class="el" href="group__util.html#g7fcc19f0abdc6513dfba7eaebeb16cb9">util.h</a>
+<li>stp_set_page_height()
+: <a class="el" href="group__vars.html#g83326bacb8b92149af1b70457b23bc8f">vars.h</a>
+<li>stp_set_page_width()
+: <a class="el" href="group__vars.html#g639be0da07c3e5b7dc6d68ac2aa999e9">vars.h</a>
+<li>stp_set_printer_defaults()
+: <a class="el" href="group__printer.html#gf5084888feed9878811ac491cb5313ee">printers.h</a>
+<li>stp_set_raw_parameter()
+: <a class="el" href="group__vars.html#g0155de75bf2aa95ab45a3319539cda56">vars.h</a>
+<li>stp_set_raw_parameter_active()
+: <a class="el" href="group__vars.html#g364fcdb2e57b8ca99867c94954cf14cd">vars.h</a>
+<li>stp_set_string_parameter()
+: <a class="el" href="group__vars.html#ga147483996fa118516ddb36fe3366aa9">vars.h</a>
+<li>stp_set_string_parameter_active()
+: <a class="el" href="group__vars.html#g6ed828e872f7678a89e1b065d377112e">vars.h</a>
+<li>stp_set_string_parameter_n()
+: <a class="el" href="group__vars.html#gfe6c8b3d86ca16239a63ce9d2ef57f48">vars.h</a>
+<li>stp_set_top()
+: <a class="el" href="group__vars.html#g557b5ad44d3b1da8392496681624ad8b">vars.h</a>
+<li>stp_set_verified()
+: <a class="el" href="group__vars.html#g1023ad18d2c97763137909b6191b0940">vars.h</a>
+<li>stp_set_width()
+: <a class="el" href="group__vars.html#g3a852ce7e42d7f8e0cef6c7d399e0491">vars.h</a>
+<li>stp_split_2()
+: <a class="el" href="bit-ops_8h.html#260a00a6551c9e27e56ea1fab9444d80">bit-ops.h</a>
+<li>stp_split_4()
+: <a class="el" href="bit-ops_8h.html#6d93a70fcc820df08fcf8d380b9743f5">bit-ops.h</a>
+<li>stp_start_job()
+: <a class="el" href="group__printer.html#g31ef7bcc34dda5d3fd46b2d04fcb0c64">printers.h</a>
+<li>stp_strdup()
+: <a class="el" href="group__util.html#g5c0731867697f555a94b2a1229804381">util.h</a>
+<li>stp_string_list_add_string()
+: <a class="el" href="string-list_8h.html#6aa3d7cf2dabfefb3e3162827d086d3d">string-list.h</a>
+<li>stp_string_list_count()
+: <a class="el" href="string-list_8h.html#9bed3cf935ed01fa9a0066c5e2a47ffb">string-list.h</a>
+<li>stp_string_list_create()
+: <a class="el" href="string-list_8h.html#b964b745d73a6d5e2e141f31941bea42">string-list.h</a>
+<li>stp_string_list_create_copy()
+: <a class="el" href="string-list_8h.html#6318f71fac5645c37e2d353f0881cc5b">string-list.h</a>
+<li>stp_string_list_create_from_params()
+: <a class="el" href="string-list_8h.html#4f78d1a53d017db20fe5b690d9362e7a">string-list.h</a>
+<li>stp_string_list_destroy()
+: <a class="el" href="string-list_8h.html#aa57feca43ce7cdf50af1dd8b4dd3a1b">string-list.h</a>
+<li>stp_string_list_find()
+: <a class="el" href="string-list_8h.html#0b5f5c20933a0f9c50259de3f16dc649">string-list.h</a>
+<li>stp_string_list_is_present()
+: <a class="el" href="string-list_8h.html#c776e9cd6ca5690b446cd6e4869978a1">string-list.h</a>
+<li>stp_string_list_param()
+: <a class="el" href="string-list_8h.html#e254c1408b96ab6cc373643f1b4d91d0">string-list.h</a>
+<li>stp_string_list_remove_string()
+: <a class="el" href="string-list_8h.html#087298f0cc92cc8864016a2f65a9c012">string-list.h</a>
+<li>stp_strlen()
+: <a class="el" href="group__util.html#g56b08d3e12750bdfae8b53263f97aba9">util.h</a>
+<li>stp_strndup()
+: <a class="el" href="group__util.html#gb026f7022963acd694a8b89e4decbde5">util.h</a>
+<li>stp_unpack_16()
+: <a class="el" href="bit-ops_8h.html#8ddfbe4f60566d4111b4c4d88a956d1b">bit-ops.h</a>
+<li>stp_unpack_2()
+: <a class="el" href="bit-ops_8h.html#e04e96586931b37257f4547eca77b116">bit-ops.h</a>
+<li>stp_unpack_4()
+: <a class="el" href="bit-ops_8h.html#c5bb5a178b5c6275e7e7c2f6b5064342">bit-ops.h</a>
+<li>stp_unpack_8()
+: <a class="el" href="bit-ops_8h.html#958196e6b7349e883a450e52cae83d93">bit-ops.h</a>
+<li>stp_unregister_xml_parser()
+: <a class="el" href="xml_8h.html#018dc99b4a78447b2e8cf66fec5a47b8">xml.h</a>
+<li>stp_unregister_xml_preload()
+: <a class="el" href="xml_8h.html#07bde9804f5e759aea971fea06e8cff7">xml.h</a>
+<li>stp_vars_copy()
+: <a class="el" href="group__vars.html#g88376207367adb4260ff14e5d9ec76e9">vars.h</a>
+<li>stp_vars_create()
+: <a class="el" href="group__vars.html#g5d641ab7093c9ba82cbd4cfbf904fabc">vars.h</a>
+<li>stp_vars_create_copy()
+: <a class="el" href="group__vars.html#gec00fba49ad08d20890e64773bcdbd48">vars.h</a>
+<li>stp_vars_destroy()
+: <a class="el" href="group__vars.html#gd3f1ff7a86c3cd1c9f9f62cfa8814437">vars.h</a>
+<li>stp_verify()
+: <a class="el" href="group__vars.html#gb926417b2f601c78d85df44694cc6d38">vars.h</a>
+<li>stp_verify_parameter()
+: <a class="el" href="group__vars.html#gbfffe0d654de156874decdc0338216f4">vars.h</a>
+<li>stp_verify_printer_params()
+: <a class="el" href="group__printer.html#g5b5cb603c9432c03ea459b57a2039bdc">printers.h</a>
+<li>stp_weave_parameters_by_row()
+: <a class="el" href="weave_8h.html#39d760951513fd171f9dc25b57daf229">weave.h</a>
+<li>stp_write_weave()
+: <a class="el" href="weave_8h.html#ea7e0ed7877aa1e98b2ce9c210ad9ff4">weave.h</a>
+<li>stp_xml_exit()
+: <a class="el" href="xml_8h.html#b7b7abdceb4f1e6e6c6a607cd2eedead">xml.h</a>
+<li>stp_xml_get_node()
+: <a class="el" href="xml_8h.html#3f776c6582845b20c4f76b239d590ec6">xml.h</a>
+<li>stp_xml_init()
+: <a class="el" href="xml_8h.html#1a82a8dc830a6f7f81ec4e6f2344a5af">xml.h</a>
+<li>stp_xml_init_defaults()
+: <a class="el" href="xml_8h.html#3cfa9b65f1620621f0a0c6c7038fd316">xml.h</a>
+<li>stp_xml_parse_file()
+: <a class="el" href="xml_8h.html#c18d19df318ec2e3b4c850c68f07fe8f">xml.h</a>
+<li>stp_xml_parse_file_named()
+: <a class="el" href="xml_8h.html#c3ebefda15f3996388895a4408c3b030">xml.h</a>
+<li>stp_xml_preinit()
+: <a class="el" href="xml_8h.html#57035ed4be23f4527c9515198bf37a9d">xml.h</a>
+<li>stp_xmldoc_create_generic()
+: <a class="el" href="xml_8h.html#31f7bc9f5f2b2ce79dcfc87d7f4630f2">xml.h</a>
+<li>stp_xmlstrtod()
+: <a class="el" href="xml_8h.html#955626cb67a5067d67a116f8ab67007d">xml.h</a>
+<li>stp_xmlstrtol()
+: <a class="el" href="xml_8h.html#28f6df53b5a7623b654dff6ec26db8c7">xml.h</a>
+<li>stp_xmlstrtoul()
+: <a class="el" href="xml_8h.html#1c1ba2f2312544bda8b3ce2e919e4687">xml.h</a>
+<li>stp_xmltree_create_from_array()
+: <a class="el" href="xml_8h.html#e02d45dc8cae7bea5c4e378e121d6623">xml.h</a>
+<li>stp_xmltree_create_from_curve()
+: <a class="el" href="xml_8h.html#e8c5f8944f4921f772eb12e52c7fb95d">xml.h</a>
+<li>stp_xmltree_create_from_sequence()
+: <a class="el" href="xml_8h.html#d03ea12e2b0089daf469c6af120ef180">xml.h</a>
+<li>stp_zalloc()
+: <a class="el" href="group__util.html#gc8fd1a439fa2d8e1ff1a2b104cd0137b">util.h</a>
+<li>stp_zfwrite()
+: <a class="el" href="group__util.html#g183d8f36f187530f9d7acdb176be3409">util.h</a>
+<li>stp_zprintf()
+: <a class="el" href="group__util.html#gd7ffe058decb939af6a5c1ec1d0d77fa">util.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_type.html b/doc/gutenprint/html/globals_type.html
index c309542..3d5d42c 100644
--- a/doc/gutenprint/html/globals_type.html
+++ b/doc/gutenprint/html/globals_type.html
@@ -1,62 +1,132 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindexHL" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_s">s</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li class="current"><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index_c"><span>c</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+  </ul>
+</div>
 
 <p>
-
+&nbsp;
 <p>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>compdata_t
-: <a class="el" href="group__vars.html#ga6">vars.h</a></ul>
+: <a class="el" href="group__vars.html#g4d45b95baae036143e14adfc0014f562">vars.h</a>
+</ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>stp_array_t
-: <a class="el" href="group__array.html#ga0">array.h</a><li>stp_color_t
-: <a class="el" href="group__color.html#ga0">color.h</a><li>stp_compute_linewidth_func
-: <a class="el" href="weave_8h.html#a4">weave.h</a><li>stp_const_parameter_list_t
-: <a class="el" href="group__vars.html#ga2">vars.h</a><li>stp_copy_data_func_t
-: <a class="el" href="group__vars.html#ga4">vars.h</a><li>stp_curve_t
-: <a class="el" href="group__curve.html#ga0">curve.h</a><li>stp_dither_matrix_generic_t
-: <a class="el" href="dither_8h.html#a7">dither.h</a><li>stp_dither_matrix_impl_t
-: <a class="el" href="dither_8h.html#a8">dither.h</a><li>stp_dither_matrix_normal_t
-: <a class="el" href="dither_8h.html#a6">dither.h</a><li>stp_dither_matrix_short_t
-: <a class="el" href="dither_8h.html#a5">dither.h</a><li>stp_dotsize_t
-: <a class="el" href="dither_8h.html#a9">dither.h</a><li>stp_family_t
-: <a class="el" href="group__printer.html#ga1">printers.h</a><li>stp_fillfunc
-: <a class="el" href="weave_8h.html#a2">weave.h</a><li>stp_flushfunc
-: <a class="el" href="weave_8h.html#a3">weave.h</a><li>stp_free_data_func_t
-: <a class="el" href="group__vars.html#ga5">vars.h</a><li>stp_image_t
-: <a class="el" href="group__image.html#ga0">image.h</a><li>stp_list_item_t
-: <a class="el" href="group__list.html#ga0">list.h</a><li>stp_list_t
-: <a class="el" href="group__list.html#ga1">list.h</a><li>stp_module_t
-: <a class="el" href="module_8h.html#a1">module.h</a><li>stp_module_version_t
-: <a class="el" href="module_8h.html#a0">module.h</a><li>stp_mxml_attr_t
-: <a class="el" href="mxml_8h.html#a15">mxml.h</a><li>stp_mxml_element_t
-: <a class="el" href="mxml_8h.html#a16">mxml.h</a><li>stp_mxml_node_t
-: <a class="el" href="mxml_8h.html#a19">mxml.h</a><li>stp_mxml_text_t
-: <a class="el" href="mxml_8h.html#a17">mxml.h</a><li>stp_mxml_type_t
-: <a class="el" href="mxml_8h.html#a14">mxml.h</a><li>stp_mxml_value_t
-: <a class="el" href="mxml_8h.html#a18">mxml.h</a><li>stp_node_copyfunc
-: <a class="el" href="group__list.html#ga3">list.h</a><li>stp_node_freefunc
-: <a class="el" href="group__list.html#ga2">list.h</a><li>stp_node_namefunc
-: <a class="el" href="group__list.html#ga4">list.h</a><li>stp_node_sortfunc
-: <a class="el" href="group__list.html#ga5">list.h</a><li>stp_outfunc_t
-: <a class="el" href="group__vars.html#ga3">vars.h</a><li>stp_packfunc
-: <a class="el" href="weave_8h.html#a1">weave.h</a><li>stp_parameter_list_t
-: <a class="el" href="group__vars.html#ga1">vars.h</a><li>stp_printer_t
-: <a class="el" href="group__printer.html#ga0">printers.h</a><li>stp_sequence_t
-: <a class="el" href="group__sequence.html#ga0">sequence.h</a><li>stp_shade_t
-: <a class="el" href="dither_8h.html#a10">dither.h</a><li>stp_string_list_t
-: <a class="el" href="string-list_8h.html#a0">string-list.h</a><li>stp_vars_t
-: <a class="el" href="group__vars.html#ga0">vars.h</a><li>stp_xml_parse_func
-: <a class="el" href="xml_8h.html#a0">xml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">array.h</a>
+<li>stp_color_t
+: <a class="el" href="group__color.html#gd1408f9835b72f266ec7c7e1e1202a74">color.h</a>
+<li>stp_compute_linewidth_func
+: <a class="el" href="weave_8h.html#6e7058d252c95199e92f783d84775fa1">weave.h</a>
+<li>stp_const_parameter_list_t
+: <a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">vars.h</a>
+<li>stp_copy_data_func_t
+: <a class="el" href="group__vars.html#g4541229554178e84408cccd89f532cb0">vars.h</a>
+<li>stp_curve_t
+: <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">curve.h</a>
+<li>stp_dither_matrix_generic_t
+: <a class="el" href="dither_8h.html#9f5f63d4f792df1d7becccf3fb5c8fdd">dither.h</a>
+<li>stp_dither_matrix_impl_t
+: <a class="el" href="dither_8h.html#f823fed10cb9591c0e659033ec49f55f">dither.h</a>
+<li>stp_dither_matrix_normal_t
+: <a class="el" href="dither_8h.html#febf0484e151cf3cce4ef0b9911d0022">dither.h</a>
+<li>stp_dither_matrix_short_t
+: <a class="el" href="dither_8h.html#9a2c54a4730e2c9bb25cf95f6cd3e597">dither.h</a>
+<li>stp_dotsize_t
+: <a class="el" href="dither_8h.html#7a74b9371fd47b48d961d2316e2126e4">dither.h</a>
+<li>stp_family_t
+: <a class="el" href="group__printer.html#g66a5e7cf2b1743a46bd78cb851e1d0a4">printers.h</a>
+<li>stp_fillfunc
+: <a class="el" href="weave_8h.html#3bb2000973de2f8a9a2b50a1b5e18097">weave.h</a>
+<li>stp_flushfunc
+: <a class="el" href="weave_8h.html#d25d63c939f6ace90d029473ad33ce63">weave.h</a>
+<li>stp_free_data_func_t
+: <a class="el" href="group__vars.html#g7974f89cff4cbb5b225d0c4fbb92e9bb">vars.h</a>
+<li>stp_image_t
+: <a class="el" href="group__image.html#gae0b5ef92b619849a51cb75d376a90fb">image.h</a>
+<li>stp_list_item_t
+: <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">list.h</a>
+<li>stp_list_t
+: <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">list.h</a>
+<li>stp_module_t
+: <a class="el" href="module_8h.html#e1e92953e8ffaa00cfbf7fc01e51f36d">module.h</a>
+<li>stp_module_version_t
+: <a class="el" href="module_8h.html#753a8450e5ac6b73134c12b89533f16e">module.h</a>
+<li>stp_mxml_attr_t
+: <a class="el" href="mxml_8h.html#b271ad8c2bb8d7e6b4b453ffe5589564">mxml.h</a>
+<li>stp_mxml_element_t
+: <a class="el" href="mxml_8h.html#70e20b752807f49a56b56d80ee470b47">mxml.h</a>
+<li>stp_mxml_node_t
+: <a class="el" href="mxml_8h.html#8fb80a78e3ac8d8aa9eb14c35326bd82">mxml.h</a>
+<li>stp_mxml_text_t
+: <a class="el" href="mxml_8h.html#b9c0236a2d70c3bcb210a9f6fadf00a3">mxml.h</a>
+<li>stp_mxml_type_t
+: <a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">mxml.h</a>
+<li>stp_mxml_value_t
+: <a class="el" href="mxml_8h.html#9a2e2ffccac3c73524e76f3e816d35bf">mxml.h</a>
+<li>stp_node_copyfunc
+: <a class="el" href="group__list.html#g846d759413f07e91bed397f1fe3224d1">list.h</a>
+<li>stp_node_freefunc
+: <a class="el" href="group__list.html#g4102fc776ec5bbd84eb589cfba97dfc2">list.h</a>
+<li>stp_node_namefunc
+: <a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">list.h</a>
+<li>stp_node_sortfunc
+: <a class="el" href="group__list.html#gd12571e44981e7acd62137c83652121a">list.h</a>
+<li>stp_outfunc_t
+: <a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">vars.h</a>
+<li>stp_packfunc
+: <a class="el" href="weave_8h.html#e8aea6782f8e438961332cb7cc18bcdc">weave.h</a>
+<li>stp_parameter_list_t
+: <a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">vars.h</a>
+<li>stp_printer_t
+: <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">printers.h</a>
+<li>stp_sequence_t
+: <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">sequence.h</a>
+<li>stp_shade_t
+: <a class="el" href="dither_8h.html#5baefb325bf92b7ca10c2d057c04b835">dither.h</a>
+<li>stp_string_list_t
+: <a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">string-list.h</a>
+<li>stp_vars_t
+: <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">vars.h</a>
+<li>stp_xml_parse_func
+: <a class="el" href="xml_8h.html#68816020e4f2e76d9b87379fe5b5edb2">xml.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_vars.html b/doc/gutenprint/html/globals_vars.html
index fe095f5..d957a83 100644
--- a/doc/gutenprint/html/globals_vars.html
+++ b/doc/gutenprint/html/globals_vars.html
@@ -1,29 +1,66 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindexHL" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li class="current"><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+&nbsp;
 <p>
 <ul>
 <li>stp_binary_age
-: <a class="el" href="group__version.html#ga4">gutenprint-version.h</a><li>stp_compute_tiff_linewidth
-: <a class="el" href="weave_8h.html#a9">weave.h</a><li>stp_compute_uncompressed_linewidth
-: <a class="el" href="weave_8h.html#a10">weave.h</a><li>stp_current_interface
-: <a class="el" href="group__version.html#ga3">gutenprint-version.h</a><li>stp_fill_tiff
-: <a class="el" href="weave_8h.html#a7">weave.h</a><li>stp_fill_uncompressed
-: <a class="el" href="weave_8h.html#a8">weave.h</a><li>stp_interface_age
-: <a class="el" href="group__version.html#ga5">gutenprint-version.h</a><li>stp_major_version
-: <a class="el" href="group__version.html#ga0">gutenprint-version.h</a><li>stp_micro_version
-: <a class="el" href="group__version.html#ga2">gutenprint-version.h</a><li>stp_minor_version
-: <a class="el" href="group__version.html#ga1">gutenprint-version.h</a><li>stp_pack_tiff
-: <a class="el" href="weave_8h.html#a5">weave.h</a><li>stp_pack_uncompressed
-: <a class="el" href="weave_8h.html#a6">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__version.html#g44593f7714544c5886ab34521e05d0bd">gutenprint-version.h</a>
+<li>stp_compute_tiff_linewidth
+: <a class="el" href="weave_8h.html#9907d0fcce9e3c336fa7c6d66e1c91a5">weave.h</a>
+<li>stp_compute_uncompressed_linewidth
+: <a class="el" href="weave_8h.html#4046c403128b61705309b05700120e41">weave.h</a>
+<li>stp_current_interface
+: <a class="el" href="group__version.html#gfc84e89ce8d6d3302270c56ebe01d5ef">gutenprint-version.h</a>
+<li>stp_fill_tiff
+: <a class="el" href="weave_8h.html#87a7e015e79b03ec26069ddf9ab64c50">weave.h</a>
+<li>stp_fill_uncompressed
+: <a class="el" href="weave_8h.html#581ae80f8594763f27620d3338407fef">weave.h</a>
+<li>stp_interface_age
+: <a class="el" href="group__version.html#g1284e8ef76a4c864e85b7b698b91bf0c">gutenprint-version.h</a>
+<li>stp_major_version
+: <a class="el" href="group__version.html#g4d72666d9093df7a31e7cd448b7cfd1d">gutenprint-version.h</a>
+<li>stp_micro_version
+: <a class="el" href="group__version.html#g2c7e65e276ce5af050b3ea9f859f1f89">gutenprint-version.h</a>
+<li>stp_minor_version
+: <a class="el" href="group__version.html#g5efc986430f0d27f5d11236c4bc48079">gutenprint-version.h</a>
+<li>stp_pack_tiff
+: <a class="el" href="weave_8h.html#525feabe0775e573007678b2da863b24">weave.h</a>
+<li>stp_pack_uncompressed
+: <a class="el" href="weave_8h.html#561a5fd614c279fdc9ea9c14c7a5b540">weave.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__array.html b/doc/gutenprint/html/group__array.html
index 252b81e..095fba2 100644
--- a/doc/gutenprint/html/group__array.html
+++ b/doc/gutenprint/html/group__array.html
@@ -1,159 +1,144 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: array</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1>array</h1>The array is a simple "two-dimensional array of numbers" data structure.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_array&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga0">stp_array_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_array&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The array opaque data type.  <a href="#ga0"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The array opaque data type.  <a href="#g26a474575a39c1c36ad520b95aa813b0"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga1">stp_array_create</a> (int x_size, int y_size)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga3d385d3e2f248b1c1ac88d5f103e9a2">stp_array_create</a> (int x_size, int y_size)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new array.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga2">stp_array_destroy</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *array)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new array.  <a href="#ga3d385d3e2f248b1c1ac88d5f103e9a2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gafb2573df35220ef9be3f6ba4b8c871b">stp_array_destroy</a> (<a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy an array.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga3">stp_array_copy</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *dest, const <a class="el" href="group__array.html#ga0">stp_array_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy an array.  <a href="#gafb2573df35220ef9be3f6ba4b8c871b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaa9bf798890e01b4bbce8cda45615021">stp_array_copy</a> (<a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *dest, const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an array.  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga4">stp_array_create_copy</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an array.  <a href="#gaa9bf798890e01b4bbce8cda45615021"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gd0b50228ca40df79196197f9c21f4b56">stp_array_create_copy</a> (const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an array.  <a href="#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga5">stp_array_set_size</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int x_size, int y_size)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an array.  <a href="#gd0b50228ca40df79196197f9c21f4b56"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ge6fb91b246ef5abd388927cb9674503e">stp_array_set_size</a> (<a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x_size, int y_size)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resize an array.  <a href="#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga6">stp_array_get_size</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int *x_size, int *y_size)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resize an array.  <a href="#ge6fb91b246ef5abd388927cb9674503e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gfe61db801ab3b0326646178e536dd161">stp_array_get_size</a> (const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int *x_size, int *y_size)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the size of an array.  <a href="#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga7">stp_array_set_data</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *array, const double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the size of an array.  <a href="#gfe61db801ab3b0326646178e536dd161"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gea0493f5bec9c5c185679adfde3edc9a">stp_array_set_data</a> (<a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, const double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in an array.  <a href="#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga8">stp_array_get_data</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array, size_t *size, const double **data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in an array.  <a href="#gea0493f5bec9c5c185679adfde3edc9a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ge0d44ee80048189d244b16f231c54b80">stp_array_get_data</a> (const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, size_t *size, const double **data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in an array.  <a href="#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga9">stp_array_set_point</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int x, int y, double data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in an array.  <a href="#ge0d44ee80048189d244b16f231c54b80"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gd6b95b2efd500007b098594826f4467f">stp_array_set_point</a> (<a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x, int y, double data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data at a single point in the array.  <a href="#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga10">stp_array_get_point</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int x, int y, double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data at a single point in the array.  <a href="#gd6b95b2efd500007b098594826f4467f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g9078af984a5e1ec80a6068bdb51c9a6d">stp_array_get_point</a> (const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x, int y, double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data at a single point in the array.  <a href="#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga11">stp_array_get_sequence</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data at a single point in the array.  <a href="#g9078af984a5e1ec80a6068bdb51c9a6d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ge05ba5cfe8c03e2435348d6c5488d87e">stp_array_get_sequence</a> (const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t.  <a href="#ga11"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t.  <a href="#ge05ba5cfe8c03e2435348d6c5488d87e"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The array is a simple "two-dimensional array of numbers" data structure. 
 <p>
-array "inherits" from the sequence data structure (implemented via containment).<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="array.h::stp_array_t" ref="ga0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+array "inherits" from the sequence data structure (implemented via containment). <hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="g26a474575a39c1c36ad520b95aa813b0"></a><!-- doxytag: member="array.h::stp_array_t" ref="g26a474575a39c1c36ad520b95aa813b0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_array <a class="el" href="group__array.html#ga0">stp_array_t</a>          </td>
+          <td class="memname">typedef struct stp_array <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 The array opaque data type. 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="array.h::stp_array_copy" ref="ga3" args="(stp_array_t *dest, const stp_array_t *source)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="gaa9bf798890e01b4bbce8cda45615021"></a><!-- doxytag: member="array.h::stp_array_copy" ref="gaa9bf798890e01b4bbce8cda45615021" args="(stp_array_t *dest, const stp_array_t *source)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_array_copy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dest</em>, </td>
+          <td class="memname">void stp_array_copy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>dest</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>source</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>source</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Copy an array. 
 <p>
-Both dest and source must be valid arrays previously created with <a class="el" href="group__array.html#ga1">stp_array_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+Both dest and source must be valid arrays previously created with <a class="el" href="group__array.html#ga3d385d3e2f248b1c1ac88d5f103e9a2" title="Create a new array.">stp_array_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>dest</em>&nbsp;</td><td>the destination array. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source array.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source array. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="array.h::stp_array_create" ref="ga1" args="(int x_size, int y_size)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ga3d385d3e2f248b1c1ac88d5f103e9a2"></a><!-- doxytag: member="array.h::stp_array_create" ref="ga3d385d3e2f248b1c1ac88d5f103e9a2" args="(int x_size, int y_size)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a>* stp_array_create           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x_size</em>, </td>
+          <td class="memname"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a>* stp_array_create           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x_size</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y_size</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y_size</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Create a new array. 
@@ -164,119 +149,95 @@ The total size of the array will be (x_size * y_size). <dl compact><dt><b>Parame
     <tr><td valign="top"></td><td valign="top"><em>y_size</em>&nbsp;</td><td>the number of "rows". </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created array.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="array.h::stp_array_create_copy" ref="ga4" args="(const stp_array_t *array)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a>* stp_array_create_copy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>array</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the newly created array. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gd0b50228ca40df79196197f9c21f4b56"></a><!-- doxytag: member="array.h::stp_array_create_copy" ref="gd0b50228ca40df79196197f9c21f4b56" args="(const stp_array_t *array)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a>* stp_array_create_copy           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>array</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Copy and allocate an array. 
 <p>
-dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with <a class="el" href="group__array.html#ga1">stp_array_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with <a class="el" href="group__array.html#ga3d385d3e2f248b1c1ac88d5f103e9a2" title="Create a new array.">stp_array_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>array</em>&nbsp;</td><td>the source array. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the new copy of the array.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="array.h::stp_array_destroy" ref="ga2" args="(stp_array_t *array)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_array_destroy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>array</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the new copy of the array. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gafb2573df35220ef9be3f6ba4b8c871b"></a><!-- doxytag: member="array.h::stp_array_destroy" ref="gafb2573df35220ef9be3f6ba4b8c871b" args="(stp_array_t *array)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_array_destroy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>array</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Destroy an array. 
 <p>
 It is an error to destroy the array more than once. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>array</em>&nbsp;</td><td>the array to destroy.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>array</em>&nbsp;</td><td>the array to destroy. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="array.h::stp_array_get_data" ref="ga8" args="(const stp_array_t *array, size_t *size, const double **data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ge0d44ee80048189d244b16f231c54b80"></a><!-- doxytag: member="array.h::stp_array_get_data" ref="ge0d44ee80048189d244b16f231c54b80" args="(const stp_array_t *array, size_t *size, const double **data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_array_get_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>array</em>, </td>
+          <td class="memname">void stp_array_get_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>array</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>size</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>size</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const double **&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const double **&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the data in an array. 
@@ -285,60 +246,52 @@ Get the data in an array.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>array</em>&nbsp;</td><td>the array to get the data from. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>size</em>&nbsp;</td><td>the number of elements in the array (x_size * y_size) are stored in the size_t pointed to. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first element of an array of doubles is stored in a pointer to double*. <div class="fragment"><pre class="fragment"> <a class="code" href="group__array.html#ga0">stp_array_t</a> *array;
- size_t size;
+    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first element of an array of doubles is stored in a pointer to double*. <div class="fragment"><pre class="fragment"> <a class="code" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0" title="The array opaque data type.">stp_array_t</a> *array;
+ <span class="keywordtype">size_t</span> size;
  <span class="keywordtype">double</span> *data;
- <a class="code" href="group__array.html#ga8">stp_array_get_data</a>(array, &amp;size, &amp;data);
-</pre></div></td></tr>
+ <a class="code" href="group__array.html#ge0d44ee80048189d244b16f231c54b80" title="Get the data in an array.">stp_array_get_data</a>(array, &amp;size, &amp;data);
+</pre></div> </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="array.h::stp_array_get_point" ref="ga10" args="(const stp_array_t *array, int x, int y, double *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g9078af984a5e1ec80a6068bdb51c9a6d"></a><!-- doxytag: member="array.h::stp_array_get_point" ref="g9078af984a5e1ec80a6068bdb51c9a6d" args="(const stp_array_t *array, int x, int y, double *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_array_get_point           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>array</em>, </td>
+          <td class="memname">int stp_array_get_point           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>array</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the data at a single point in the array. 
@@ -351,33 +304,25 @@ Get the data at a single point in the array.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>the datum is stored in the double pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="array.h::stp_array_get_sequence" ref="ga11" args="(const stp_array_t *array)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a>* stp_array_get_sequence           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>array</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="ge05ba5cfe8c03e2435348d6c5488d87e"></a><!-- doxytag: member="array.h::stp_array_get_sequence" ref="ge05ba5cfe8c03e2435348d6c5488d87e" args="(const stp_array_t *array)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a>* stp_array_get_sequence           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>array</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the underlying stp_sequence_t. 
@@ -387,48 +332,40 @@ Get the underlying stp_sequence_t.
     <tr><td valign="top"></td><td valign="top"><em>array</em>&nbsp;</td><td>the array to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the (constant) stp_sequence_t.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="array.h::stp_array_get_size" ref="ga6" args="(const stp_array_t *array, int *x_size, int *y_size)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the (constant) stp_sequence_t. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gfe61db801ab3b0326646178e536dd161"></a><!-- doxytag: member="array.h::stp_array_get_size" ref="gfe61db801ab3b0326646178e536dd161" args="(const stp_array_t *array, int *x_size, int *y_size)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_array_get_size           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>array</em>, </td>
+          <td class="memname">void stp_array_get_size           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>array</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>x_size</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>x_size</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>y_size</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>y_size</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the size of an array. 
@@ -437,44 +374,36 @@ The current x and y sizes are stored in the integers pointed to by x_size and y_
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>array</em>&nbsp;</td><td>the array to get the size of. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>x_size</em>&nbsp;</td><td>a pointer to an integer to store the x size in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>y_size</em>&nbsp;</td><td>a pointer to an integer to store the y size in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>y_size</em>&nbsp;</td><td>a pointer to an integer to store the y size in. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="array.h::stp_array_set_data" ref="ga7" args="(stp_array_t *array, const double *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gea0493f5bec9c5c185679adfde3edc9a"></a><!-- doxytag: member="array.h::stp_array_set_data" ref="gea0493f5bec9c5c185679adfde3edc9a" args="(stp_array_t *array, const double *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_array_set_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>array</em>, </td>
+          <td class="memname">void stp_array_set_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>array</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const double *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data in an array. 
@@ -482,56 +411,48 @@ Set the data in an array.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>array</em>&nbsp;</td><td>the array to set. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of an array containing the data to set. This array must be at least as long as (x_size * y_size).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of an array containing the data to set. This array must be at least as long as (x_size * y_size). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="array.h::stp_array_set_point" ref="ga9" args="(stp_array_t *array, int x, int y, double data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gd6b95b2efd500007b098594826f4467f"></a><!-- doxytag: member="array.h::stp_array_set_point" ref="gd6b95b2efd500007b098594826f4467f" args="(stp_array_t *array, int x, int y, double data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_array_set_point           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>array</em>, </td>
+          <td class="memname">int stp_array_set_point           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>array</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data at a single point in the array. 
@@ -544,48 +465,40 @@ Set the data at a single point in the array.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>the datum to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="array.h::stp_array_set_size" ref="ga5" args="(stp_array_t *array, int x_size, int y_size)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="ge6fb91b246ef5abd388927cb9674503e"></a><!-- doxytag: member="array.h::stp_array_set_size" ref="ge6fb91b246ef5abd388927cb9674503e" args="(stp_array_t *array, int x_size, int y_size)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_array_set_size           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>array</em>, </td>
+          <td class="memname">void stp_array_set_size           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>array</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>x_size</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>x_size</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>y_size</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>y_size</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Resize an array. 
@@ -594,14 +507,14 @@ Resizing an array will destroy all data stored in the array. <dl compact><dt><b>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>array</em>&nbsp;</td><td>the array to resize. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>x_size</em>&nbsp;</td><td>the new number of "columns". </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>y_size</em>&nbsp;</td><td>the new number of "rows".</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>y_size</em>&nbsp;</td><td>the new number of "rows". </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__color.html b/doc/gutenprint/html/group__color.html
index 014ddac..e826ea7 100644
--- a/doc/gutenprint/html/group__color.html
+++ b/doc/gutenprint/html/group__color.html
@@ -1,10 +1,19 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: color</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1>color</h1>The color data type is responsible for providing colour conversion features.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -14,164 +23,132 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html">stp_color</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__color.html">stp_color</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga0">stp_color_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__color.html">stp_color</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gd1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga1">stp_color_init</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g23392fc53078d51fcd14d6d565d56423">stp_color_init</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga2">stp_color_get_row</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g0cf28c3c9638987df4b1740deadba0cb">stp_color_get_row</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga3">stp_color_list_parameters</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga282220724877a57738b047140835141">stp_color_list_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga4">stp_color_describe_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g83bc80c9fd84d741099bc20285a1b655">stp_color_describe_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga5">stp_color_register</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g47d6a8163ef21a6e700b1371228b851d">stp_color_register</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga6">stp_color_unregister</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g2b62ec8e0afe1b6297bc71466f8a334c">stp_color_unregister</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga7">stp_color_count</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g68c13c36d723e5604507bf33fe629f8b">stp_color_count</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available color modules.  <a href="#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga8">stp_get_color_by_name</a> (const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available color modules.  <a href="#g68c13c36d723e5604507bf33fe629f8b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g3b8f62108f3604480e7b89b253527f4a">stp_get_color_by_name</a> (const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its name.  <a href="#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga9">stp_get_color_by_index</a> (int idx)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its name.  <a href="#g3b8f62108f3604480e7b89b253527f4a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g68ba525119da39ae854645ae649557d3">stp_get_color_by_index</a> (int idx)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its index number.  <a href="#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga10">stp_get_color_by_colorfuncs</a> (<a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *colorfuncs)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its index number.  <a href="#g68ba525119da39ae854645ae649557d3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g578f80b2bc3937df38ce7e803f5f472c">stp_get_color_by_colorfuncs</a> (<a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *colorfuncs)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga11">stp_color_get_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g5a4a4da67cb5c3f1c0a2a9618e46ed50">stp_color_get_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the short (untranslated) name of a color module.  <a href="#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga12">stp_color_get_long_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the short (untranslated) name of a color module.  <a href="#g5a4a4da67cb5c3f1c0a2a9618e46ed50"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g612389b45f09358f6bad0e376c91b057">stp_color_get_long_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the long (translated) name of a color module.  <a href="#ga12"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the long (translated) name of a color module.  <a href="#g612389b45f09358f6bad0e376c91b057"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The color data type is responsible for providing colour conversion features. 
 <p>
-Color modules provide the actual functionality, so different colour management modules may provide the application with different services (for example, colour profiles).<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="color.h::stp_color_t" ref="ga0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Color modules provide the actual functionality, so different colour management modules may provide the application with different services (for example, colour profiles). <hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="gd1408f9835b72f266ec7c7e1e1202a74"></a><!-- doxytag: member="color.h::stp_color_t" ref="gd1408f9835b72f266ec7c7e1e1202a74" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="structstp__color.html">stp_color</a>  <a class="el" href="structstp__color.html">stp_color_t</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="structstp__color.html">stp_color</a>  <a class="el" href="structstp__color.html">stp_color_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="color.h::stp_color_count" ref="ga7" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="g68c13c36d723e5604507bf33fe629f8b"></a><!-- doxytag: member="color.h::stp_color_count" ref="g68c13c36d723e5604507bf33fe629f8b" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_color_count           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int stp_color_count           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the number of available color modules. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the number of color modules.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="color.h::stp_color_describe_parameter" ref="ga4" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the number of color modules. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g83bc80c9fd84d741099bc20285a1b655"></a><!-- doxytag: member="color.h::stp_color_describe_parameter" ref="g83bc80c9fd84d741099bc20285a1b655" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_color_describe_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_color_describe_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>description</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>description</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="color.h::stp_color_get_long_name" ref="ga12" args="(const stp_color_t *c)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g612389b45f09358f6bad0e376c91b057"></a><!-- doxytag: member="color.h::stp_color_get_long_name" ref="g612389b45f09358f6bad0e376c91b057" args="(const stp_color_t *c)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* stp_color_get_long_name           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>c</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">const char* stp_color_get_long_name           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>c</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the long (translated) name of a color module. 
@@ -181,33 +158,25 @@ Get the long (translated) name of a color module.
     <tr><td valign="top"></td><td valign="top"><em>c</em>&nbsp;</td><td>the color module to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the long name.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="color.h::stp_color_get_name" ref="ga11" args="(const stp_color_t *c)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the long name. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g5a4a4da67cb5c3f1c0a2a9618e46ed50"></a><!-- doxytag: member="color.h::stp_color_get_name" ref="g5a4a4da67cb5c3f1c0a2a9618e46ed50" args="(const stp_color_t *c)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* stp_color_get_name           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>c</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">const char* stp_color_get_name           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>c</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the short (untranslated) name of a color module. 
@@ -217,237 +186,181 @@ Get the short (untranslated) name of a color module.
     <tr><td valign="top"></td><td valign="top"><em>c</em>&nbsp;</td><td>the color module to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the short name.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="color.h::stp_color_get_row" ref="ga2" args="(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the short name. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g0cf28c3c9638987df4b1740deadba0cb"></a><!-- doxytag: member="color.h::stp_color_get_row" ref="g0cf28c3c9638987df4b1740deadba0cb" args="(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_color_get_row           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_color_get_row           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>image</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>image</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>row</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>row</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned *&nbsp;</td>
-          <td class="mdname" nowrap> <em>zero_mask</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned *&nbsp;</td>
+          <td class="paramname"> <em>zero_mask</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="color.h::stp_color_init" ref="ga1" args="(stp_vars_t *v, stp_image_t *image, size_t steps)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g23392fc53078d51fcd14d6d565d56423"></a><!-- doxytag: member="color.h::stp_color_init" ref="g23392fc53078d51fcd14d6d565d56423" args="(stp_vars_t *v, stp_image_t *image, size_t steps)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_color_init           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_color_init           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>image</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>image</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>steps</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>steps</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="color.h::stp_color_list_parameters" ref="ga3" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ga282220724877a57738b047140835141"></a><!-- doxytag: member="color.h::stp_color_list_parameters" ref="ga282220724877a57738b047140835141" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> stp_color_list_parameters           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> stp_color_list_parameters           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="color.h::stp_color_register" ref="ga5" args="(const stp_color_t *color)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g47d6a8163ef21a6e700b1371228b851d"></a><!-- doxytag: member="color.h::stp_color_register" ref="g47d6a8163ef21a6e700b1371228b851d" args="(const stp_color_t *color)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_color_register           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>color</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int stp_color_register           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>color</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="color.h::stp_color_unregister" ref="ga6" args="(const stp_color_t *color)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g2b62ec8e0afe1b6297bc71466f8a334c"></a><!-- doxytag: member="color.h::stp_color_unregister" ref="g2b62ec8e0afe1b6297bc71466f8a334c" args="(const stp_color_t *color)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_color_unregister           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>color</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int stp_color_unregister           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>color</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="color.h::stp_get_color_by_colorfuncs" ref="ga10" args="(stp_colorfuncs_t *colorfuncs)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g578f80b2bc3937df38ce7e803f5f472c"></a><!-- doxytag: member="color.h::stp_get_color_by_colorfuncs" ref="g578f80b2bc3937df38ce7e803f5f472c" args="(stp_colorfuncs_t *colorfuncs)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a>* stp_get_color_by_colorfuncs           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>colorfuncs</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">const <a class="el" href="structstp__color.html">stp_color_t</a>* stp_get_color_by_colorfuncs           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>colorfuncs</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="color.h::stp_get_color_by_index" ref="ga9" args="(int idx)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g68ba525119da39ae854645ae649557d3"></a><!-- doxytag: member="color.h::stp_get_color_by_index" ref="g68ba525119da39ae854645ae649557d3" args="(int idx)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a>* stp_get_color_by_index           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>idx</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">const <a class="el" href="structstp__color.html">stp_color_t</a>* stp_get_color_by_index           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a color module by its index number. 
@@ -457,33 +370,25 @@ Get a color module by its index number.
     <tr><td valign="top"></td><td valign="top"><em>idx</em>&nbsp;</td><td>the index number. This must not be greater than (total number of papers - 1). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the color module, or NULL on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="color.h::stp_get_color_by_name" ref="ga8" args="(const char *name)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the color module, or NULL on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g3b8f62108f3604480e7b89b253527f4a"></a><!-- doxytag: member="color.h::stp_get_color_by_name" ref="g3b8f62108f3604480e7b89b253527f4a" args="(const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a>* stp_get_color_by_name           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>name</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">const <a class="el" href="structstp__color.html">stp_color_t</a>* stp_get_color_by_name           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a color module by its name. 
@@ -493,12 +398,12 @@ Get a color module by its name.
     <tr><td valign="top"></td><td valign="top"><em>name</em>&nbsp;</td><td>the short unique name. number of papers - 1). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the color module, or NULL on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the color module, or NULL on failure. </dd></dl>
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__curve.html b/doc/gutenprint/html/group__curve.html
index f97133e..faa725c 100644
--- a/doc/gutenprint/html/group__curve.html
+++ b/doc/gutenprint/html/group__curve.html
@@ -1,10 +1,19 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: curve</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1>curve</h1>The curve type models a linear, spline or gamma curve.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -13,388 +22,358 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Point (x,y) for piecewise curve.  <a href="structstp__curve__point__t.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_curve&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga0">stp_curve_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_curve&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The curve opaque data type.  <a href="#ga0"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The curve opaque data type.  <a href="#g375a2b23705fb0698ae1d823243c8524"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga47">stp_curve_type_t</a> { <a class="el" href="group__curve.html#gga47a1">STP_CURVE_TYPE_LINEAR</a>, 
-<a class="el" href="group__curve.html#gga47a2">STP_CURVE_TYPE_SPLINE</a>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a> { <a class="el" href="group__curve.html#gg982f8191c84b049cc3ad3cee1558fc2346228ddaa2d52a85ccd79c4dc0f76ad3">STP_CURVE_TYPE_LINEAR</a>, 
+<a class="el" href="group__curve.html#gg982f8191c84b049cc3ad3cee1558fc23fb1ffdc3754f428d8e3a2124e014ff77">STP_CURVE_TYPE_SPLINE</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Curve types.  <a href="group__curve.html#ga47">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a> { <a class="el" href="group__curve.html#gga48a3">STP_CURVE_WRAP_NONE</a>, 
-<a class="el" href="group__curve.html#gga48a4">STP_CURVE_WRAP_AROUND</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Curve types.  <a href="group__curve.html#g982f8191c84b049cc3ad3cee1558fc23">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a> { <a class="el" href="group__curve.html#gg3ae3af552b490b0ca8b02e442ac9547ad840485ad7df768a06ee4be02d93b97a">STP_CURVE_WRAP_NONE</a>, 
+<a class="el" href="group__curve.html#gg3ae3af552b490b0ca8b02e442ac9547ac0361aebddfabfb263dc0205a61f6fbd">STP_CURVE_WRAP_AROUND</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Wrapping mode.  <a href="group__curve.html#ga48">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a> { <a class="el" href="group__curve.html#gga49a5">STP_CURVE_COMPOSE_ADD</a>, 
-<a class="el" href="group__curve.html#gga49a6">STP_CURVE_COMPOSE_MULTIPLY</a>, 
-<a class="el" href="group__curve.html#gga49a7">STP_CURVE_COMPOSE_EXPONENTIATE</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Wrapping mode.  <a href="group__curve.html#g3ae3af552b490b0ca8b02e442ac9547a">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> { <a class="el" href="group__curve.html#gg7eddbee28cb1f3c76a19408b86ea142ec38b0bf09e93edb67c3e5c53035295f3">STP_CURVE_COMPOSE_ADD</a>, 
+<a class="el" href="group__curve.html#gg7eddbee28cb1f3c76a19408b86ea142ed3bd2cdb63498d5d22686e79e2c0ed95">STP_CURVE_COMPOSE_MULTIPLY</a>, 
+<a class="el" href="group__curve.html#gg7eddbee28cb1f3c76a19408b86ea142e8de151149fdfd4fcca78826e6352246a">STP_CURVE_COMPOSE_EXPONENTIATE</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Composition types.  <a href="group__curve.html#ga49">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga50">stp_curve_bounds_t</a> { <a class="el" href="group__curve.html#gga50a8">STP_CURVE_BOUNDS_RESCALE</a>, 
-<a class="el" href="group__curve.html#gga50a9">STP_CURVE_BOUNDS_CLIP</a>, 
-<a class="el" href="group__curve.html#gga50a10">STP_CURVE_BOUNDS_ERROR</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Composition types.  <a href="group__curve.html#g7eddbee28cb1f3c76a19408b86ea142e">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g86d146e483ca1902f973d574f542b85f">stp_curve_bounds_t</a> { <a class="el" href="group__curve.html#gg86d146e483ca1902f973d574f542b85f118d303bf7bdf4f00bda71cc6eac49c3">STP_CURVE_BOUNDS_RESCALE</a>, 
+<a class="el" href="group__curve.html#gg86d146e483ca1902f973d574f542b85fec9e6673edac9d34e3aad376fa711aa5">STP_CURVE_BOUNDS_CLIP</a>, 
+<a class="el" href="group__curve.html#gg86d146e483ca1902f973d574f542b85fd699d675d5df223055388cd83d0b362b">STP_CURVE_BOUNDS_ERROR</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Behaviour when curve exceeds bounds.  <a href="group__curve.html#ga50">More...</a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Behaviour when curve exceeds bounds.  <a href="group__curve.html#g86d146e483ca1902f973d574f542b85f">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga1">stp_curve_create</a> (<a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a> wrap)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g6b3640f0e25bd9d38e46bdc1b2ee58a4">stp_curve_create</a> (<a class="el" href="group__curve.html#g3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a> wrap)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new curve.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga2">stp_curve_create_copy</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new curve.  <a href="#g6b3640f0e25bd9d38e46bdc1b2ee58a4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g972ed591394396e0c66e928a0695b3bf">stp_curve_create_copy</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an curve.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga3">stp_curve_copy</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *dest, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an curve.  <a href="#g972ed591394396e0c66e928a0695b3bf"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gcd7861bf1c9d61ac4ec87844a15ab9d3">stp_curve_copy</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *dest, const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an curve.  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga4">stp_curve_destroy</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an curve.  <a href="#gcd7861bf1c9d61ac4ec87844a15ab9d3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g4294b85e848fe421496469e2406ef380">stp_curve_destroy</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy an curve.  <a href="#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga5">stp_curve_set_bounds</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double low, double high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy an curve.  <a href="#g4294b85e848fe421496469e2406ef380"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ge32fb850963b8694d3739c0ed8475f75">stp_curve_set_bounds</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double low, double high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the lower and upper bounds on a curve.  <a href="#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga6">stp_curve_get_bounds</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the lower and upper bounds on a curve.  <a href="#ge32fb850963b8694d3739c0ed8475f75"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g63c3386fbfd75da9fe985673bf7b1ca3">stp_curve_get_bounds</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the lower and upper bounds on a curve.  <a href="#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga7">stp_curve_get_wrap</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the lower and upper bounds on a curve.  <a href="#g63c3386fbfd75da9fe985673bf7b1ca3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g859020827897bac0f4671322ec027dc4">stp_curve_get_wrap</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the wrapping mode.  <a href="#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga8">stp_curve_is_piecewise</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the wrapping mode.  <a href="#g859020827897bac0f4671322ec027dc4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g29b022a3055afe0b48d1f2736ff2f4da">stp_curve_is_piecewise</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Determine whether the curve is piecewise.  <a href="#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga9">stp_curve_get_range</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Determine whether the curve is piecewise.  <a href="#g29b022a3055afe0b48d1f2736ff2f4da"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gcb8e51731b9385556747744a0d4f43fb">stp_curve_get_range</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga10">stp_curve_count_points</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g766ff02b29b976372779f719076ad017">stp_curve_count_points</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of allocated points in the curve.  <a href="#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga11">stp_curve_set_interpolation_type</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, <a class="el" href="group__curve.html#ga47">stp_curve_type_t</a> itype)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of allocated points in the curve.  <a href="#g766ff02b29b976372779f719076ad017"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g82890cef78f5861a88c5789c33693423">stp_curve_set_interpolation_type</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, <a class="el" href="group__curve.html#g982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a> itype)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the curve interpolation type.  <a href="#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga47">stp_curve_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga12">stp_curve_get_interpolation_type</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the curve interpolation type.  <a href="#g82890cef78f5861a88c5789c33693423"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g42c98a6a6d2512516738b6df9367510e">stp_curve_get_interpolation_type</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the curve interpolation type.  <a href="#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga13">stp_curve_set_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the curve interpolation type.  <a href="#g42c98a6a6d2512516738b6df9367510e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g81bceb4cb991cef1cda2298cf7bb9f15">stp_curve_set_data</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set all data points of the curve.  <a href="#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga14">stp_curve_set_data_points</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set all data points of the curve.  <a href="#g81bceb4cb991cef1cda2298cf7bb9f15"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gce09cab4e6ae3d55f75aacae3689e8e6">stp_curve_set_data_points</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set all data points of the curve.  <a href="#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga15">stp_curve_set_float_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const float *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set all data points of the curve.  <a href="#gce09cab4e6ae3d55f75aacae3689e8e6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gbd7a39289471607311141c7fc3bbb415">stp_curve_set_float_data</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const float *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from float values.  <a href="#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga16">stp_curve_set_long_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const long *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from float values.  <a href="#gbd7a39289471607311141c7fc3bbb415"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ge6a435a21a5c4b5e582d42095a7b06fc">stp_curve_set_long_data</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const long *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from long values.  <a href="#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga17">stp_curve_set_ulong_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const unsigned long *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from long values.  <a href="#ge6a435a21a5c4b5e582d42095a7b06fc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g723173297f5b67af937205c7d74ac353">stp_curve_set_ulong_data</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned long *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned long values.  <a href="#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga18">stp_curve_set_int_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const int *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned long values.  <a href="#g723173297f5b67af937205c7d74ac353"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g31e76843f4d2f207701755b58766a670">stp_curve_set_int_data</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const int *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from integer values.  <a href="#ga18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga19">stp_curve_set_uint_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const unsigned int *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from integer values.  <a href="#g31e76843f4d2f207701755b58766a670"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g3ee80f8e4f33691a78b3ad8c3fd7c34f">stp_curve_set_uint_data</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned int *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned integer values.  <a href="#ga19"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga20">stp_curve_set_short_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const short *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned integer values.  <a href="#g3ee80f8e4f33691a78b3ad8c3fd7c34f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g2fa5222aab07e85f215e389734b6dbea">stp_curve_set_short_data</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const short *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from short values.  <a href="#ga20"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga21">stp_curve_set_ushort_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const unsigned short *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from short values.  <a href="#g2fa5222aab07e85f215e389734b6dbea"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g0af395eefa7bfe0d19acc1acbaeefe48">stp_curve_set_ushort_data</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned short *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned short values.  <a href="#ga21"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga22">stp_curve_get_subrange</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t start, size_t count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned short values.  <a href="#g0af395eefa7bfe0d19acc1acbaeefe48"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g5cbf7c4b6ad96ecb35fc06f46c0319f0">stp_curve_get_subrange</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t start, size_t count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a curve containing a subrange of data.  <a href="#ga22"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga23">stp_curve_set_subrange</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *range, size_t start)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a curve containing a subrange of data.  <a href="#g5cbf7c4b6ad96ecb35fc06f46c0319f0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g73dfcc4c95734449965227e21deb3037">stp_curve_set_subrange</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *range, size_t start)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const double *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga24">stp_curve_get_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const double *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gb2208f56694e47e4300d10e057f59ee8">stp_curve_get_data</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a pointer to the curve's raw data.  <a href="#ga24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga25">stp_curve_get_data_points</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a pointer to the curve's raw data.  <a href="#gb2208f56694e47e4300d10e057f59ee8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g79e0d6afa3573917c756af64b56a0d82">stp_curve_get_data_points</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a pointer to the curve's raw data as points.  <a href="#ga25"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const float *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga26">stp_curve_get_float_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a pointer to the curve's raw data as points.  <a href="#g79e0d6afa3573917c756af64b56a0d82"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const float *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g251f105cb5f2b126ea02b7908f717c18">stp_curve_get_float_data</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as floats.  <a href="#ga26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga27">stp_curve_get_long_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as floats.  <a href="#g251f105cb5f2b126ea02b7908f717c18"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gf59bd38c9dfc7beb08a283dc9e400bf2">stp_curve_get_long_data</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as longs.  <a href="#ga27"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga28">stp_curve_get_ulong_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as longs.  <a href="#gf59bd38c9dfc7beb08a283dc9e400bf2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g24a862eda4cdbb626f51aeb7d8ae9a50">stp_curve_get_ulong_data</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned longs.  <a href="#ga28"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga29">stp_curve_get_int_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned longs.  <a href="#g24a862eda4cdbb626f51aeb7d8ae9a50"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g6de80e81b64262e0051441f697ae4de4">stp_curve_get_int_data</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as integers.  <a href="#ga29"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga30">stp_curve_get_uint_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as integers.  <a href="#g6de80e81b64262e0051441f697ae4de4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g19b3160a57dc6959fe08c631c7206a8a">stp_curve_get_uint_data</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned integers.  <a href="#ga30"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga31">stp_curve_get_short_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned integers.  <a href="#g19b3160a57dc6959fe08c631c7206a8a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g87c5d1904efa58be8a21ab6b2c41d0b9">stp_curve_get_short_data</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as shorts.  <a href="#ga31"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga32">stp_curve_get_ushort_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as shorts.  <a href="#g87c5d1904efa58be8a21ab6b2c41d0b9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga02125af6b9c192e34985851370391b8">stp_curve_get_ushort_data</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned shorts.  <a href="#ga32"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga33">stp_curve_get_sequence</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned shorts.  <a href="#ga02125af6b9c192e34985851370391b8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gde323594e84d4380c88ecf122a5a4da8">stp_curve_get_sequence</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t data structure which stp_curve_t is derived from.  <a href="#ga33"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga34">stp_curve_set_gamma</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double f_gamma)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t data structure which stp_curve_t is derived from.  <a href="#gde323594e84d4380c88ecf122a5a4da8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gcb8a2b9b21f97f32faacb99a6125e152">stp_curve_set_gamma</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double f_gamma)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the gamma of a curve.  <a href="#ga34"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga35">stp_curve_get_gamma</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the gamma of a curve.  <a href="#gcb8a2b9b21f97f32faacb99a6125e152"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g0420a6cfa87aa96e5c9a56142aa0178d">stp_curve_get_gamma</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the gamma value of the curve.  <a href="#ga35"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga36">stp_curve_set_point</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t where, double data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the gamma value of the curve.  <a href="#g0420a6cfa87aa96e5c9a56142aa0178d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g2d3b8372bde3fce699a3b7bb3c9d8582">stp_curve_set_point</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t where, double data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a point along the curve.  <a href="#ga36"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga37">stp_curve_get_point</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t where, double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a point along the curve.  <a href="#g2d3b8372bde3fce699a3b7bb3c9d8582"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g569aae57147ed7681f23e0e60bd8af35">stp_curve_get_point</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t where, double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a point along the curve.  <a href="#ga37"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga38">stp_curve_interpolate_value</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double where, double *result)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a point along the curve.  <a href="#g569aae57147ed7681f23e0e60bd8af35"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gb33642ee6c49334f379a4dc185ecd355">stp_curve_interpolate_value</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double where, double *result)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Interpolate a point along the curve.  <a href="#ga38"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga39">stp_curve_resample</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t points)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Interpolate a point along the curve.  <a href="#gb33642ee6c49334f379a4dc185ecd355"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g87298cf562468cbcf2c1f76a0ab80b62">stp_curve_resample</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t points)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resample a curve (change the number of points).  <a href="#ga39"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga40">stp_curve_rescale</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double scale, <a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a> mode, <a class="el" href="group__curve.html#ga50">stp_curve_bounds_t</a> bounds_mode)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resample a curve (change the number of points).  <a href="#g87298cf562468cbcf2c1f76a0ab80b62"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gad611b3ddbd667ec204fa7b42f8d7546">stp_curve_rescale</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double scale, <a class="el" href="group__curve.html#g7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> mode, <a class="el" href="group__curve.html#g86d146e483ca1902f973d574f542b85f">stp_curve_bounds_t</a> bounds_mode)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Rescale a curve (multiply all points by a scaling constant).  <a href="#ga40"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga41">stp_curve_write</a> (FILE *file, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Rescale a curve (multiply all points by a scaling constant).  <a href="#gad611b3ddbd667ec204fa7b42f8d7546"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gc12af55cf0eb2f76db967886f8996313">stp_curve_write</a> (FILE *file, const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Write a curve to a file.  <a href="#ga41"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga42">stp_curve_write_string</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Write a curve to a file.  <a href="#gc12af55cf0eb2f76db967886f8996313"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gf2f0da590278ff74af1eccb0aa0c7169">stp_curve_write_string</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Write a curve to a string.  <a href="#ga42"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga43">stp_curve_create_from_stream</a> (FILE *fp)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Write a curve to a string.  <a href="#gf2f0da590278ff74af1eccb0aa0c7169"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g478a24e44a3ce345f7207cf7ded12e37">stp_curve_create_from_stream</a> (FILE *fp)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a stream.  <a href="#ga43"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga44">stp_curve_create_from_file</a> (const char *file)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a stream.  <a href="#g478a24e44a3ce345f7207cf7ded12e37"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gd96d7d1cda5f037f7d6a9b651ebbbb46">stp_curve_create_from_file</a> (const char *file)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a stream.  <a href="#ga44"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga45">stp_curve_create_from_string</a> (const char *string)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a stream.  <a href="#gd96d7d1cda5f037f7d6a9b651ebbbb46"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gb8c0df217306a6e0597f058efbfaca82">stp_curve_create_from_string</a> (const char *string)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a string.  <a href="#ga45"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga46">stp_curve_compose</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> **retval, <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *a, <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *b, <a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a> mode, int points)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a string.  <a href="#gb8c0df217306a6e0597f058efbfaca82"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g55c83a9139fc1b06b90e983d7c1ceff7">stp_curve_compose</a> (<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> **retval, <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *a, <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *b, <a class="el" href="group__curve.html#g7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> mode, int points)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compose two curves, creating a third curve.  <a href="#ga46"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compose two curves, creating a third curve.  <a href="#g55c83a9139fc1b06b90e983d7c1ceff7"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The curve type models a linear, spline or gamma curve. 
 <p>
 curve "inherits" from the sequence data structure (implemented via containment), since the curve data is represented internally as a sequence of numbers, for linear and spline curves. Linear Piecewise Curves (LPCs) should be implemented in the future which represent a curve in a more compact format.<p>
-Various operations are supported, including interpolation and composition.<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="curve.h::stp_curve_t" ref="ga0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Various operations are supported, including interpolation and composition. <hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="g375a2b23705fb0698ae1d823243c8524"></a><!-- doxytag: member="curve.h::stp_curve_t" ref="g375a2b23705fb0698ae1d823243c8524" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_curve <a class="el" href="group__curve.html#ga0">stp_curve_t</a>          </td>
+          <td class="memname">typedef struct stp_curve <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 The curve opaque data type. 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="ga50"></a><!-- doxytag: member="curve.h::stp_curve_bounds_t" ref="ga50" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="g86d146e483ca1902f973d574f542b85f"></a><!-- doxytag: member="curve.h::stp_curve_bounds_t" ref="g86d146e483ca1902f973d574f542b85f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__curve.html#ga50">stp_curve_bounds_t</a>          </td>
+          <td class="memname">enum <a class="el" href="group__curve.html#g86d146e483ca1902f973d574f542b85f">stp_curve_bounds_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Behaviour when curve exceeds bounds. 
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga50a8"></a><!-- doxytag: member="STP_CURVE_BOUNDS_RESCALE" ref="gga50a8" args="" -->STP_CURVE_BOUNDS_RESCALE</em>&nbsp;</td><td>
-Rescale the bounds. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga50a9"></a><!-- doxytag: member="STP_CURVE_BOUNDS_CLIP" ref="gga50a9" args="" -->STP_CURVE_BOUNDS_CLIP</em>&nbsp;</td><td>
-Clip the curve to the existing bounds. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga50a10"></a><!-- doxytag: member="STP_CURVE_BOUNDS_ERROR" ref="gga50a10" args="" -->STP_CURVE_BOUNDS_ERROR</em>&nbsp;</td><td>
-Error if bounds are violated. </td></tr>
+<tr><td valign="top"><em><a class="anchor" name="gg86d146e483ca1902f973d574f542b85f118d303bf7bdf4f00bda71cc6eac49c3"></a><!-- doxytag: member="STP_CURVE_BOUNDS_RESCALE" ref="gg86d146e483ca1902f973d574f542b85f118d303bf7bdf4f00bda71cc6eac49c3" args="" -->STP_CURVE_BOUNDS_RESCALE</em>&nbsp;</td><td>
+Rescale the bounds. 
+<p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" name="gg86d146e483ca1902f973d574f542b85fec9e6673edac9d34e3aad376fa711aa5"></a><!-- doxytag: member="STP_CURVE_BOUNDS_CLIP" ref="gg86d146e483ca1902f973d574f542b85fec9e6673edac9d34e3aad376fa711aa5" args="" -->STP_CURVE_BOUNDS_CLIP</em>&nbsp;</td><td>
+Clip the curve to the existing bounds. 
+<p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" name="gg86d146e483ca1902f973d574f542b85fd699d675d5df223055388cd83d0b362b"></a><!-- doxytag: member="STP_CURVE_BOUNDS_ERROR" ref="gg86d146e483ca1902f973d574f542b85fd699d675d5df223055388cd83d0b362b" args="" -->STP_CURVE_BOUNDS_ERROR</em>&nbsp;</td><td>
+Error if bounds are violated. 
+<p>
+</td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga49"></a><!-- doxytag: member="curve.h::stp_curve_compose_t" ref="ga49" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g7eddbee28cb1f3c76a19408b86ea142e"></a><!-- doxytag: member="curve.h::stp_curve_compose_t" ref="g7eddbee28cb1f3c76a19408b86ea142e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a>          </td>
+          <td class="memname">enum <a class="el" href="group__curve.html#g7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Composition types. 
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga49a5"></a><!-- doxytag: member="STP_CURVE_COMPOSE_ADD" ref="gga49a5" args="" -->STP_CURVE_COMPOSE_ADD</em>&nbsp;</td><td>
-Add composition. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga49a6"></a><!-- doxytag: member="STP_CURVE_COMPOSE_MULTIPLY" ref="gga49a6" args="" -->STP_CURVE_COMPOSE_MULTIPLY</em>&nbsp;</td><td>
-Multiply composition. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga49a7"></a><!-- doxytag: member="STP_CURVE_COMPOSE_EXPONENTIATE" ref="gga49a7" args="" -->STP_CURVE_COMPOSE_EXPONENTIATE</em>&nbsp;</td><td>
-Exponentiate composition. </td></tr>
+<tr><td valign="top"><em><a class="anchor" name="gg7eddbee28cb1f3c76a19408b86ea142ec38b0bf09e93edb67c3e5c53035295f3"></a><!-- doxytag: member="STP_CURVE_COMPOSE_ADD" ref="gg7eddbee28cb1f3c76a19408b86ea142ec38b0bf09e93edb67c3e5c53035295f3" args="" -->STP_CURVE_COMPOSE_ADD</em>&nbsp;</td><td>
+Add composition. 
+<p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" name="gg7eddbee28cb1f3c76a19408b86ea142ed3bd2cdb63498d5d22686e79e2c0ed95"></a><!-- doxytag: member="STP_CURVE_COMPOSE_MULTIPLY" ref="gg7eddbee28cb1f3c76a19408b86ea142ed3bd2cdb63498d5d22686e79e2c0ed95" args="" -->STP_CURVE_COMPOSE_MULTIPLY</em>&nbsp;</td><td>
+Multiply composition. 
+<p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" name="gg7eddbee28cb1f3c76a19408b86ea142e8de151149fdfd4fcca78826e6352246a"></a><!-- doxytag: member="STP_CURVE_COMPOSE_EXPONENTIATE" ref="gg7eddbee28cb1f3c76a19408b86ea142e8de151149fdfd4fcca78826e6352246a" args="" -->STP_CURVE_COMPOSE_EXPONENTIATE</em>&nbsp;</td><td>
+Exponentiate composition. 
+<p>
+</td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga47"></a><!-- doxytag: member="curve.h::stp_curve_type_t" ref="ga47" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g982f8191c84b049cc3ad3cee1558fc23"></a><!-- doxytag: member="curve.h::stp_curve_type_t" ref="g982f8191c84b049cc3ad3cee1558fc23" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__curve.html#ga47">stp_curve_type_t</a>          </td>
+          <td class="memname">enum <a class="el" href="group__curve.html#g982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Curve types. 
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga47a1"></a><!-- doxytag: member="STP_CURVE_TYPE_LINEAR" ref="gga47a1" args="" -->STP_CURVE_TYPE_LINEAR</em>&nbsp;</td><td>
-Linear interpolation. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga47a2"></a><!-- doxytag: member="STP_CURVE_TYPE_SPLINE" ref="gga47a2" args="" -->STP_CURVE_TYPE_SPLINE</em>&nbsp;</td><td>
-Spline interpolation. </td></tr>
+<tr><td valign="top"><em><a class="anchor" name="gg982f8191c84b049cc3ad3cee1558fc2346228ddaa2d52a85ccd79c4dc0f76ad3"></a><!-- doxytag: member="STP_CURVE_TYPE_LINEAR" ref="gg982f8191c84b049cc3ad3cee1558fc2346228ddaa2d52a85ccd79c4dc0f76ad3" args="" -->STP_CURVE_TYPE_LINEAR</em>&nbsp;</td><td>
+Linear interpolation. 
+<p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" name="gg982f8191c84b049cc3ad3cee1558fc23fb1ffdc3754f428d8e3a2124e014ff77"></a><!-- doxytag: member="STP_CURVE_TYPE_SPLINE" ref="gg982f8191c84b049cc3ad3cee1558fc23fb1ffdc3754f428d8e3a2124e014ff77" args="" -->STP_CURVE_TYPE_SPLINE</em>&nbsp;</td><td>
+Spline interpolation. 
+<p>
+</td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga48"></a><!-- doxytag: member="curve.h::stp_curve_wrap_mode_t" ref="ga48" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g3ae3af552b490b0ca8b02e442ac9547a"></a><!-- doxytag: member="curve.h::stp_curve_wrap_mode_t" ref="g3ae3af552b490b0ca8b02e442ac9547a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a>          </td>
+          <td class="memname">enum <a class="el" href="group__curve.html#g3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Wrapping mode. 
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga48a3"></a><!-- doxytag: member="STP_CURVE_WRAP_NONE" ref="gga48a3" args="" -->STP_CURVE_WRAP_NONE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg3ae3af552b490b0ca8b02e442ac9547ad840485ad7df768a06ee4be02d93b97a"></a><!-- doxytag: member="STP_CURVE_WRAP_NONE" ref="gg3ae3af552b490b0ca8b02e442ac9547ad840485ad7df768a06ee4be02d93b97a" args="" -->STP_CURVE_WRAP_NONE</em>&nbsp;</td><td>
 The curve does not wrap. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga48a4"></a><!-- doxytag: member="STP_CURVE_WRAP_AROUND" ref="gga48a4" args="" -->STP_CURVE_WRAP_AROUND</em>&nbsp;</td><td>
-The curve wraps to its starting point. </td></tr>
+<tr><td valign="top"><em><a class="anchor" name="gg3ae3af552b490b0ca8b02e442ac9547ac0361aebddfabfb263dc0205a61f6fbd"></a><!-- doxytag: member="STP_CURVE_WRAP_AROUND" ref="gg3ae3af552b490b0ca8b02e442ac9547ac0361aebddfabfb263dc0205a61f6fbd" args="" -->STP_CURVE_WRAP_AROUND</em>&nbsp;</td><td>
+The curve wraps to its starting point. 
+<p>
+</td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga46"></a><!-- doxytag: member="curve.h::stp_curve_compose" ref="ga46" args="(stp_curve_t **retval, stp_curve_t *a, stp_curve_t *b, stp_curve_compose_t mode, int points)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="g55c83a9139fc1b06b90e983d7c1ceff7"></a><!-- doxytag: member="curve.h::stp_curve_compose" ref="g55c83a9139fc1b06b90e983d7c1ceff7" args="(stp_curve_t **retval, stp_curve_t *a, stp_curve_t *b, stp_curve_compose_t mode, int points)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_compose           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> **&nbsp;</td>
-          <td class="mdname" nowrap> <em>retval</em>, </td>
+          <td class="memname">int stp_curve_compose           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> **&nbsp;</td>
+          <td class="paramname"> <em>retval</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>a</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>a</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>b</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>b</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>mode</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a>&nbsp;</td>
+          <td class="paramname"> <em>mode</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>points</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>points</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Compose two curves, creating a third curve. 
@@ -408,78 +387,62 @@ Only add and multiply composition is currently supported. If both curves are gam
     <tr><td valign="top"></td><td valign="top"><em>points</em>&nbsp;</td><td>the number of points in the output curve (must not exceed 1048576). It must be at least two, unless the curve is a gamma curve and the operation chosen is multiplication or division. If -1, the resulting number of points will be the least common multiplier of the number of points in the input and output curves (but will not exceed 1048576). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>FALSE if element-wise composition fails.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="curve.h::stp_curve_copy" ref="ga3" args="(stp_curve_t *dest, const stp_curve_t *source)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>FALSE if element-wise composition fails. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gcd7861bf1c9d61ac4ec87844a15ab9d3"></a><!-- doxytag: member="curve.h::stp_curve_copy" ref="gcd7861bf1c9d61ac4ec87844a15ab9d3" args="(stp_curve_t *dest, const stp_curve_t *source)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_curve_copy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dest</em>, </td>
+          <td class="memname">void stp_curve_copy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>dest</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>source</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>source</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Copy an curve. 
 <p>
-Both dest and source must be valid curves previously created with <a class="el" href="group__curve.html#ga1">stp_curve_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+Both dest and source must be valid curves previously created with <a class="el" href="group__curve.html#g6b3640f0e25bd9d38e46bdc1b2ee58a4" title="Create a new curve.">stp_curve_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>dest</em>&nbsp;</td><td>the destination curve. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source curve.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source curve. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="curve.h::stp_curve_count_points" ref="ga10" args="(const stp_curve_t *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">size_t stp_curve_count_points           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="g766ff02b29b976372779f719076ad017"></a><!-- doxytag: member="curve.h::stp_curve_count_points" ref="g766ff02b29b976372779f719076ad017" args="(const stp_curve_t *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">size_t stp_curve_count_points           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the number of allocated points in the curve. 
@@ -489,33 +452,25 @@ Get the number of allocated points in the curve.
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the number of points.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="curve.h::stp_curve_create" ref="ga1" args="(stp_curve_wrap_mode_t wrap)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_curve_create           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a>&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>wrap</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the number of points. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g6b3640f0e25bd9d38e46bdc1b2ee58a4"></a><!-- doxytag: member="curve.h::stp_curve_create" ref="g6b3640f0e25bd9d38e46bdc1b2ee58a4" args="(stp_curve_wrap_mode_t wrap)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* stp_curve_create           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a>&nbsp;</td>
+          <td class="paramname"> <em>wrap</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Create a new curve. 
@@ -526,230 +481,182 @@ A wrapped curve has the same value at x=0 and x=1. The wrap mode of a curve cann
     <tr><td valign="top"></td><td valign="top"><em>wrap</em>&nbsp;</td><td>the wrap mode of the curve. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created curve.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="curve.h::stp_curve_create_copy" ref="ga2" args="(const stp_curve_t *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_curve_create_copy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the newly created curve. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g972ed591394396e0c66e928a0695b3bf"></a><!-- doxytag: member="curve.h::stp_curve_create_copy" ref="g972ed591394396e0c66e928a0695b3bf" args="(const stp_curve_t *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* stp_curve_create_copy           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Copy and allocate an curve. 
 <p>
-dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with <a class="el" href="group__curve.html#ga1">stp_curve_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with <a class="el" href="group__curve.html#g6b3640f0e25bd9d38e46bdc1b2ee58a4" title="Create a new curve.">stp_curve_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the source curve. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the new copy of the curve.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga44"></a><!-- doxytag: member="curve.h::stp_curve_create_from_file" ref="ga44" args="(const char *file)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_curve_create_from_file           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>file</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the new copy of the curve. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gd96d7d1cda5f037f7d6a9b651ebbbb46"></a><!-- doxytag: member="curve.h::stp_curve_create_from_file" ref="gd96d7d1cda5f037f7d6a9b651ebbbb46" args="(const char *file)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* stp_curve_create_from_file           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>file</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Create a curve from a stream. 
 <p>
-<dl compact><dt><b>Warning:</b></dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
+<dl class="warning" compact><dt><b>Warning:</b></dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>file</em>&nbsp;</td><td>the file to read. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created curve, or NULL if an error occured.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga43"></a><!-- doxytag: member="curve.h::stp_curve_create_from_stream" ref="ga43" args="(FILE *fp)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_curve_create_from_stream           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">FILE *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>fp</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the newly created curve, or NULL if an error occured. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g478a24e44a3ce345f7207cf7ded12e37"></a><!-- doxytag: member="curve.h::stp_curve_create_from_stream" ref="g478a24e44a3ce345f7207cf7ded12e37" args="(FILE *fp)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* stp_curve_create_from_stream           </td>
+          <td>(</td>
+          <td class="paramtype">FILE *&nbsp;</td>
+          <td class="paramname"> <em>fp</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Create a curve from a stream. 
 <p>
-<dl compact><dt><b>Warning:</b></dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
+<dl class="warning" compact><dt><b>Warning:</b></dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>fp</em>&nbsp;</td><td>the stream to read. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created curve, or NULL if an error occured.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga45"></a><!-- doxytag: member="curve.h::stp_curve_create_from_string" ref="ga45" args="(const char *string)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_curve_create_from_string           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>string</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the newly created curve, or NULL if an error occured. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gb8c0df217306a6e0597f058efbfaca82"></a><!-- doxytag: member="curve.h::stp_curve_create_from_string" ref="gb8c0df217306a6e0597f058efbfaca82" args="(const char *string)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* stp_curve_create_from_string           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>string</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Create a curve from a string. 
 <p>
-<dl compact><dt><b>Warning:</b></dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
+<dl class="warning" compact><dt><b>Warning:</b></dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>string</em>&nbsp;</td><td>the string to read. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created curve, or NULL if an error occured.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="curve.h::stp_curve_destroy" ref="ga4" args="(stp_curve_t *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_curve_destroy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the newly created curve, or NULL if an error occured. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g4294b85e848fe421496469e2406ef380"></a><!-- doxytag: member="curve.h::stp_curve_destroy" ref="g4294b85e848fe421496469e2406ef380" args="(stp_curve_t *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_curve_destroy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Destroy an curve. 
 <p>
 It is an error to destroy the curve more than once. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to destroy.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to destroy. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="curve.h::stp_curve_get_bounds" ref="ga6" args="(const stp_curve_t *curve, double *low, double *high)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g63c3386fbfd75da9fe985673bf7b1ca3"></a><!-- doxytag: member="curve.h::stp_curve_get_bounds" ref="g63c3386fbfd75da9fe985673bf7b1ca3" args="(const stp_curve_t *curve, double *low, double *high)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_curve_get_bounds           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">void stp_curve_get_bounds           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>low</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double *&nbsp;</td>
+          <td class="paramname"> <em>low</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>high</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double *&nbsp;</td>
+          <td class="paramname"> <em>high</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the lower and upper bounds on a curve. 
@@ -758,44 +665,36 @@ Get the lower and upper bounds on a curve.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>low</em>&nbsp;</td><td>a pointer to a double to store the lower bound in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>high</em>&nbsp;</td><td>a pointer to a double to store the upper bound in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>high</em>&nbsp;</td><td>a pointer to a double to store the upper bound in. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga24"></a><!-- doxytag: member="curve.h::stp_curve_get_data" ref="ga24" args="(const stp_curve_t *curve, size_t *count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gb2208f56694e47e4300d10e057f59ee8"></a><!-- doxytag: member="curve.h::stp_curve_get_data" ref="gb2208f56694e47e4300d10e057f59ee8" args="(const stp_curve_t *curve, size_t *count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const double* stp_curve_get_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">const double* stp_curve_get_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a pointer to the curve's raw data. 
@@ -806,42 +705,34 @@ Get a pointer to the curve's raw data.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This call also returns NULL if the curve is a piecewise curve.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga25"></a><!-- doxytag: member="curve.h::stp_curve_get_data_points" ref="ga25" args="(const stp_curve_t *curve, size_t *count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This call also returns NULL if the curve is a piecewise curve. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g79e0d6afa3573917c756af64b56a0d82"></a><!-- doxytag: member="curve.h::stp_curve_get_data_points" ref="g79e0d6afa3573917c756af64b56a0d82" args="(const stp_curve_t *curve, size_t *count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a>* stp_curve_get_data_points           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a>* stp_curve_get_data_points           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a pointer to the curve's raw data as points. 
@@ -852,42 +743,34 @@ Get a pointer to the curve's raw data as points.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This call also returns NULL if the curve is a dense (equally-spaced) curve.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga26"></a><!-- doxytag: member="curve.h::stp_curve_get_float_data" ref="ga26" args="(const stp_curve_t *curve, size_t *count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This call also returns NULL if the curve is a dense (equally-spaced) curve. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g251f105cb5f2b126ea02b7908f717c18"></a><!-- doxytag: member="curve.h::stp_curve_get_float_data" ref="g251f105cb5f2b126ea02b7908f717c18" args="(const stp_curve_t *curve, size_t *count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const float* stp_curve_get_float_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">const float* stp_curve_get_float_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get pointer to the curve's raw data as floats. 
@@ -898,73 +781,57 @@ Get pointer to the curve's raw data as floats.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga35"></a><!-- doxytag: member="curve.h::stp_curve_get_gamma" ref="ga35" args="(const stp_curve_t *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">double stp_curve_get_gamma           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g0420a6cfa87aa96e5c9a56142aa0178d"></a><!-- doxytag: member="curve.h::stp_curve_get_gamma" ref="g0420a6cfa87aa96e5c9a56142aa0178d" args="(const stp_curve_t *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">double stp_curve_get_gamma           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the gamma value of the curve. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the gamma value. A value of 0 indicates that the curve does not have a valid gamma value.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga29"></a><!-- doxytag: member="curve.h::stp_curve_get_int_data" ref="ga29" args="(const stp_curve_t *curve, size_t *count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the gamma value. A value of 0 indicates that the curve does not have a valid gamma value. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g6de80e81b64262e0051441f697ae4de4"></a><!-- doxytag: member="curve.h::stp_curve_get_int_data" ref="g6de80e81b64262e0051441f697ae4de4" args="(const stp_curve_t *curve, size_t *count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const int* stp_curve_get_int_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">const int* stp_curve_get_int_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get pointer to the curve's raw data as integers. 
@@ -975,33 +842,25 @@ Get pointer to the curve's raw data as integers.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="curve.h::stp_curve_get_interpolation_type" ref="ga12" args="(const stp_curve_t *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga47">stp_curve_type_t</a> stp_curve_get_interpolation_type           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g42c98a6a6d2512516738b6df9367510e"></a><!-- doxytag: member="curve.h::stp_curve_get_interpolation_type" ref="g42c98a6a6d2512516738b6df9367510e" args="(const stp_curve_t *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__curve.html#g982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a> stp_curve_get_interpolation_type           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the curve interpolation type. 
@@ -1011,42 +870,34 @@ Get the curve interpolation type.
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the interpolation type.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga27"></a><!-- doxytag: member="curve.h::stp_curve_get_long_data" ref="ga27" args="(const stp_curve_t *curve, size_t *count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the interpolation type. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gf59bd38c9dfc7beb08a283dc9e400bf2"></a><!-- doxytag: member="curve.h::stp_curve_get_long_data" ref="gf59bd38c9dfc7beb08a283dc9e400bf2" args="(const stp_curve_t *curve, size_t *count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const long* stp_curve_get_long_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">const long* stp_curve_get_long_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get pointer to the curve's raw data as longs. 
@@ -1057,48 +908,40 @@ Get pointer to the curve's raw data as longs.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga37"></a><!-- doxytag: member="curve.h::stp_curve_get_point" ref="ga37" args="(const stp_curve_t *curve, size_t where, double *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g569aae57147ed7681f23e0e60bd8af35"></a><!-- doxytag: member="curve.h::stp_curve_get_point" ref="g569aae57147ed7681f23e0e60bd8af35" args="(const stp_curve_t *curve, size_t where, double *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_get_point           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_get_point           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>where</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>where</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a point along the curve. 
@@ -1110,76 +953,60 @@ Get a point along the curve.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to a double to store the value of where in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>FALSE if where is outside of the number of valid points. This also returns NULL if the curve is a piecewise curve.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="curve.h::stp_curve_get_range" ref="ga9" args="(const stp_curve_t *curve, double *low, double *high)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>FALSE if where is outside of the number of valid points. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gcb8e51731b9385556747744a0d4f43fb"></a><!-- doxytag: member="curve.h::stp_curve_get_range" ref="gcb8e51731b9385556747744a0d4f43fb" args="(const stp_curve_t *curve, double *low, double *high)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_curve_get_range           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">void stp_curve_get_range           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>low</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double *&nbsp;</td>
+          <td class="paramname"> <em>low</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>high</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double *&nbsp;</td>
+          <td class="paramname"> <em>high</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga33"></a><!-- doxytag: member="curve.h::stp_curve_get_sequence" ref="ga33" args="(const stp_curve_t *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a>* stp_curve_get_sequence           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="gde323594e84d4380c88ecf122a5a4da8"></a><!-- doxytag: member="curve.h::stp_curve_get_sequence" ref="gde323594e84d4380c88ecf122a5a4da8" args="(const stp_curve_t *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a>* stp_curve_get_sequence           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the underlying stp_sequence_t data structure which stp_curve_t is derived from. 
@@ -1189,42 +1016,34 @@ This can be used for fast access to the raw data. <dl compact><dt><b>Parameters:
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the stp_sequence_t. If the curve is a piecewise curve, the sequence returned is NULL;</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga31"></a><!-- doxytag: member="curve.h::stp_curve_get_short_data" ref="ga31" args="(const stp_curve_t *curve, size_t *count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the stp_sequence_t. If the curve is a piecewise curve, the sequence returned is NULL; </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g87c5d1904efa58be8a21ab6b2c41d0b9"></a><!-- doxytag: member="curve.h::stp_curve_get_short_data" ref="g87c5d1904efa58be8a21ab6b2c41d0b9" args="(const stp_curve_t *curve, size_t *count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const short* stp_curve_get_short_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">const short* stp_curve_get_short_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get pointer to the curve's raw data as shorts. 
@@ -1235,48 +1054,40 @@ Get pointer to the curve's raw data as shorts.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga22"></a><!-- doxytag: member="curve.h::stp_curve_get_subrange" ref="ga22" args="(const stp_curve_t *curve, size_t start, size_t count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g5cbf7c4b6ad96ecb35fc06f46c0319f0"></a><!-- doxytag: member="curve.h::stp_curve_get_subrange" ref="g5cbf7c4b6ad96ecb35fc06f46c0319f0" args="(const stp_curve_t *curve, size_t start, size_t count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_curve_get_subrange           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* stp_curve_get_subrange           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>start</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>start</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a curve containing a subrange of data. 
@@ -1288,42 +1099,34 @@ If the start or count is invalid, the returned curve will compare equal to NULL
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>the number of point starting at start. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a curve containing the subrange. The returned curve is non-wrapping.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga30"></a><!-- doxytag: member="curve.h::stp_curve_get_uint_data" ref="ga30" args="(const stp_curve_t *curve, size_t *count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a curve containing the subrange. The returned curve is non-wrapping. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g19b3160a57dc6959fe08c631c7206a8a"></a><!-- doxytag: member="curve.h::stp_curve_get_uint_data" ref="g19b3160a57dc6959fe08c631c7206a8a" args="(const stp_curve_t *curve, size_t *count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned int* stp_curve_get_uint_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">const unsigned int* stp_curve_get_uint_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get pointer to the curve's raw data as unsigned integers. 
@@ -1334,42 +1137,34 @@ Get pointer to the curve's raw data as unsigned integers.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga28"></a><!-- doxytag: member="curve.h::stp_curve_get_ulong_data" ref="ga28" args="(const stp_curve_t *curve, size_t *count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g24a862eda4cdbb626f51aeb7d8ae9a50"></a><!-- doxytag: member="curve.h::stp_curve_get_ulong_data" ref="g24a862eda4cdbb626f51aeb7d8ae9a50" args="(const stp_curve_t *curve, size_t *count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned long* stp_curve_get_ulong_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">const unsigned long* stp_curve_get_ulong_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get pointer to the curve's raw data as unsigned longs. 
@@ -1380,42 +1175,34 @@ Get pointer to the curve's raw data as unsigned longs.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga32"></a><!-- doxytag: member="curve.h::stp_curve_get_ushort_data" ref="ga32" args="(const stp_curve_t *curve, size_t *count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="ga02125af6b9c192e34985851370391b8"></a><!-- doxytag: member="curve.h::stp_curve_get_ushort_data" ref="ga02125af6b9c192e34985851370391b8" args="(const stp_curve_t *curve, size_t *count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned short* stp_curve_get_ushort_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">const unsigned short* stp_curve_get_ushort_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get pointer to the curve's raw data as unsigned shorts. 
@@ -1426,33 +1213,25 @@ Get pointer to the curve's raw data as unsigned shorts.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="curve.h::stp_curve_get_wrap" ref="ga7" args="(const stp_curve_t *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a> stp_curve_get_wrap           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g859020827897bac0f4671322ec027dc4"></a><!-- doxytag: member="curve.h::stp_curve_get_wrap" ref="g859020827897bac0f4671322ec027dc4" args="(const stp_curve_t *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__curve.html#g3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a> stp_curve_get_wrap           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the wrapping mode. 
@@ -1462,48 +1241,40 @@ Get the wrapping mode.
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the wrapping mode.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga38"></a><!-- doxytag: member="curve.h::stp_curve_interpolate_value" ref="ga38" args="(const stp_curve_t *curve, double where, double *result)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the wrapping mode. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gb33642ee6c49334f379a4dc185ecd355"></a><!-- doxytag: member="curve.h::stp_curve_interpolate_value" ref="gb33642ee6c49334f379a4dc185ecd355" args="(const stp_curve_t *curve, double where, double *result)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_interpolate_value           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_interpolate_value           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>where</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>where</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>result</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double *&nbsp;</td>
+          <td class="paramname"> <em>result</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Interpolate a point along the curve. 
@@ -1515,33 +1286,25 @@ Interpolate a point along the curve.
     <tr><td valign="top"></td><td valign="top"><em>result</em>&nbsp;</td><td>a pointer to double to store the value of where in. If interpolation would produce a value outside of the allowed range (as could happen with spline interpolation), the value is clipped to the range. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>FALSE if 'where' is less than 0 or greater than the number of points, an error is returned. Also returns FALSE if the curve is a piecewise curve.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="curve.h::stp_curve_is_piecewise" ref="ga8" args="(const stp_curve_t *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_curve_is_piecewise           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>FALSE if 'where' is less than 0 or greater than the number of points, an error is returned. Also returns FALSE if the curve is a piecewise curve. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g29b022a3055afe0b48d1f2736ff2f4da"></a><!-- doxytag: member="curve.h::stp_curve_is_piecewise" ref="g29b022a3055afe0b48d1f2736ff2f4da" args="(const stp_curve_t *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_curve_is_piecewise           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Determine whether the curve is piecewise. 
@@ -1551,42 +1314,34 @@ Determine whether the curve is piecewise.
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>whether the curve is piecewise</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga39"></a><!-- doxytag: member="curve.h::stp_curve_resample" ref="ga39" args="(stp_curve_t *curve, size_t points)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>whether the curve is piecewise </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g87298cf562468cbcf2c1f76a0ab80b62"></a><!-- doxytag: member="curve.h::stp_curve_resample" ref="g87298cf562468cbcf2c1f76a0ab80b62" args="(stp_curve_t *curve, size_t points)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_resample           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_resample           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>points</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>points</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Resample a curve (change the number of points). 
@@ -1597,54 +1352,46 @@ This does not destroy the gamma value of a curve. Points are interpolated as req
     <tr><td valign="top"></td><td valign="top"><em>points</em>&nbsp;</td><td>the number of points. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>FALSE if the number of points is invalid (less than two, except that zero points is permitted for a gamma curve).</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga40"></a><!-- doxytag: member="curve.h::stp_curve_rescale" ref="ga40" args="(stp_curve_t *curve, double scale, stp_curve_compose_t mode, stp_curve_bounds_t bounds_mode)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>FALSE if the number of points is invalid (less than two, except that zero points is permitted for a gamma curve). </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gad611b3ddbd667ec204fa7b42f8d7546"></a><!-- doxytag: member="curve.h::stp_curve_rescale" ref="gad611b3ddbd667ec204fa7b42f8d7546" args="(stp_curve_t *curve, double scale, stp_curve_compose_t mode, stp_curve_bounds_t bounds_mode)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_rescale           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_rescale           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>scale</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>scale</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>mode</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a>&nbsp;</td>
+          <td class="paramname"> <em>mode</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__curve.html#ga50">stp_curve_bounds_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>bounds_mode</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g86d146e483ca1902f973d574f542b85f">stp_curve_bounds_t</a>&nbsp;</td>
+          <td class="paramname"> <em>bounds_mode</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Rescale a curve (multiply all points by a scaling constant). 
@@ -1657,48 +1404,40 @@ This also rescales the bounds. Note that this currently destroys the gamma prope
     <tr><td valign="top"></td><td valign="top"><em>bounds_mode</em>&nbsp;</td><td>the bounds exceeding mode. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>FALSE if this would exceed floating point limits</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="curve.h::stp_curve_set_bounds" ref="ga5" args="(stp_curve_t *curve, double low, double high)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>FALSE if this would exceed floating point limits </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="ge32fb850963b8694d3739c0ed8475f75"></a><!-- doxytag: member="curve.h::stp_curve_set_bounds" ref="ge32fb850963b8694d3739c0ed8475f75" args="(stp_curve_t *curve, double low, double high)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_set_bounds           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_set_bounds           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>low</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>low</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>high</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>high</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the lower and upper bounds on a curve. 
@@ -1710,48 +1449,40 @@ To change the bounds adjusting data as required, use stp_curve_rescale instead.
     <tr><td valign="top"></td><td valign="top"><em>high</em>&nbsp;</td><td>the upper bound. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>FALSE if any existing points on the curve are outside the bounds.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga13"></a><!-- doxytag: member="curve.h::stp_curve_set_data" ref="ga13" args="(stp_curve_t *curve, size_t count, const double *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>FALSE if any existing points on the curve are outside the bounds. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g81bceb4cb991cef1cda2298cf7bb9f15"></a><!-- doxytag: member="curve.h::stp_curve_set_data" ref="g81bceb4cb991cef1cda2298cf7bb9f15" args="(stp_curve_t *curve, size_t count, const double *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_set_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_set_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const double *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set all data points of the curve. 
@@ -1763,48 +1494,40 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of doubles (must be at least count in size). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga14"></a><!-- doxytag: member="curve.h::stp_curve_set_data_points" ref="ga14" args="(stp_curve_t *curve, size_t count, const stp_curve_point_t *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gce09cab4e6ae3d55f75aacae3689e8e6"></a><!-- doxytag: member="curve.h::stp_curve_set_data_points" ref="gce09cab4e6ae3d55f75aacae3689e8e6" args="(stp_curve_t *curve, size_t count, const stp_curve_point_t *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_set_data_points           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_set_data_points           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set all data points of the curve. 
@@ -1816,48 +1539,40 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of points (must be at least count in size). The first point must have X=0, and each point must have an X value at least .000001 greater than the previous point. If the curve is not a wraparound curve, the last point must have X=1. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga15"></a><!-- doxytag: member="curve.h::stp_curve_set_float_data" ref="ga15" args="(stp_curve_t *curve, size_t count, const float *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gbd7a39289471607311141c7fc3bbb415"></a><!-- doxytag: member="curve.h::stp_curve_set_float_data" ref="gbd7a39289471607311141c7fc3bbb415" args="(stp_curve_t *curve, size_t count, const float *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_set_float_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_set_float_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const float *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const float *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data points in a curve from float values. 
@@ -1869,42 +1584,34 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of floats (must be at least count in size). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga34"></a><!-- doxytag: member="curve.h::stp_curve_set_gamma" ref="ga34" args="(stp_curve_t *curve, double f_gamma)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gcb8a2b9b21f97f32faacb99a6125e152"></a><!-- doxytag: member="curve.h::stp_curve_set_gamma" ref="gcb8a2b9b21f97f32faacb99a6125e152" args="(stp_curve_t *curve, double f_gamma)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_set_gamma           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_set_gamma           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>f_gamma</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>f_gamma</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the gamma of a curve. 
@@ -1915,48 +1622,40 @@ This replaces all existing points along the curve. The bounds are set to 0..1. I
     <tr><td valign="top"></td><td valign="top"><em>f_gamma</em>&nbsp;</td><td>the gamma value to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>FALSE if the gamma value is illegal (0, infinity, or NaN), or if the curve wraps around.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga18"></a><!-- doxytag: member="curve.h::stp_curve_set_int_data" ref="ga18" args="(stp_curve_t *curve, size_t count, const int *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>FALSE if the gamma value is illegal (0, infinity, or NaN), or if the curve wraps around. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g31e76843f4d2f207701755b58766a670"></a><!-- doxytag: member="curve.h::stp_curve_set_int_data" ref="g31e76843f4d2f207701755b58766a670" args="(stp_curve_t *curve, size_t count, const int *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_set_int_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_set_int_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const int *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data points in a curve from integer values. 
@@ -1968,42 +1667,34 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of integers (must be at least count in size). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="curve.h::stp_curve_set_interpolation_type" ref="ga11" args="(stp_curve_t *curve, stp_curve_type_t itype)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g82890cef78f5861a88c5789c33693423"></a><!-- doxytag: member="curve.h::stp_curve_set_interpolation_type" ref="g82890cef78f5861a88c5789c33693423" args="(stp_curve_t *curve, stp_curve_type_t itype)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_set_interpolation_type           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_set_interpolation_type           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__curve.html#ga47">stp_curve_type_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>itype</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a>&nbsp;</td>
+          <td class="paramname"> <em>itype</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the curve interpolation type. 
@@ -2014,48 +1705,40 @@ Set the curve interpolation type.
     <tr><td valign="top"></td><td valign="top"><em>itype</em>&nbsp;</td><td>the interpolation type. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, or 0 if itype is invalid.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga16"></a><!-- doxytag: member="curve.h::stp_curve_set_long_data" ref="ga16" args="(stp_curve_t *curve, size_t count, const long *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, or 0 if itype is invalid. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="ge6a435a21a5c4b5e582d42095a7b06fc"></a><!-- doxytag: member="curve.h::stp_curve_set_long_data" ref="ge6a435a21a5c4b5e582d42095a7b06fc" args="(stp_curve_t *curve, size_t count, const long *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_set_long_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_set_long_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const long *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const long *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data points in a curve from long values. 
@@ -2067,48 +1750,40 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of longs (must be at least count in size). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga36"></a><!-- doxytag: member="curve.h::stp_curve_set_point" ref="ga36" args="(stp_curve_t *curve, size_t where, double data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g2d3b8372bde3fce699a3b7bb3c9d8582"></a><!-- doxytag: member="curve.h::stp_curve_set_point" ref="g2d3b8372bde3fce699a3b7bb3c9d8582" args="(stp_curve_t *curve, size_t where, double data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_set_point           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_set_point           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>where</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>where</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a point along the curve. 
@@ -2120,48 +1795,40 @@ This call destroys any gamma value assigned to the curve. <dl compact><dt><b>Par
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>the value to set where to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>FALSE if data is outside the valid bounds or if where is outside the number of valid points. This also returns NULL if the curve is a piecewise curve.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga20"></a><!-- doxytag: member="curve.h::stp_curve_set_short_data" ref="ga20" args="(stp_curve_t *curve, size_t count, const short *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>FALSE if data is outside the valid bounds or if where is outside the number of valid points. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g2fa5222aab07e85f215e389734b6dbea"></a><!-- doxytag: member="curve.h::stp_curve_set_short_data" ref="g2fa5222aab07e85f215e389734b6dbea" args="(stp_curve_t *curve, size_t count, const short *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_set_short_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_set_short_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const short *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const short *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data points in a curve from short values. 
@@ -2173,91 +1840,75 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of shorts (must be at least count in size). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga23"></a><!-- doxytag: member="curve.h::stp_curve_set_subrange" ref="ga23" args="(stp_curve_t *curve, const stp_curve_t *range, size_t start)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g73dfcc4c95734449965227e21deb3037"></a><!-- doxytag: member="curve.h::stp_curve_set_subrange" ref="g73dfcc4c95734449965227e21deb3037" args="(stp_curve_t *curve, const stp_curve_t *range, size_t start)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_set_subrange           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_set_subrange           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>range</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>range</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>start</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>start</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga19"></a><!-- doxytag: member="curve.h::stp_curve_set_uint_data" ref="ga19" args="(stp_curve_t *curve, size_t count, const unsigned int *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g3ee80f8e4f33691a78b3ad8c3fd7c34f"></a><!-- doxytag: member="curve.h::stp_curve_set_uint_data" ref="g3ee80f8e4f33691a78b3ad8c3fd7c34f" args="(stp_curve_t *curve, size_t count, const unsigned int *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_set_uint_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_set_uint_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned int *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data points in a curve from unsigned integer values. 
@@ -2269,48 +1920,40 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of unsigned integers (must be at least count in size). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga17"></a><!-- doxytag: member="curve.h::stp_curve_set_ulong_data" ref="ga17" args="(stp_curve_t *curve, size_t count, const unsigned long *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g723173297f5b67af937205c7d74ac353"></a><!-- doxytag: member="curve.h::stp_curve_set_ulong_data" ref="g723173297f5b67af937205c7d74ac353" args="(stp_curve_t *curve, size_t count, const unsigned long *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_set_ulong_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_set_ulong_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned long *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned long *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data points in a curve from unsigned long values. 
@@ -2322,48 +1965,40 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of unsigned longs (must be at least count in size). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga21"></a><!-- doxytag: member="curve.h::stp_curve_set_ushort_data" ref="ga21" args="(stp_curve_t *curve, size_t count, const unsigned short *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g0af395eefa7bfe0d19acc1acbaeefe48"></a><!-- doxytag: member="curve.h::stp_curve_set_ushort_data" ref="g0af395eefa7bfe0d19acc1acbaeefe48" args="(stp_curve_t *curve, size_t count, const unsigned short *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_set_ushort_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">int stp_curve_set_ushort_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned short *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned short *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data points in a curve from unsigned short values. 
@@ -2375,96 +2010,80 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of unsigned shorts (must be at least count in size). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga41"></a><!-- doxytag: member="curve.h::stp_curve_write" ref="ga41" args="(FILE *file, const stp_curve_t *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gc12af55cf0eb2f76db967886f8996313"></a><!-- doxytag: member="curve.h::stp_curve_write" ref="gc12af55cf0eb2f76db967886f8996313" args="(FILE *file, const stp_curve_t *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_curve_write           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">FILE *&nbsp;</td>
-          <td class="mdname" nowrap> <em>file</em>, </td>
+          <td class="memname">int stp_curve_write           </td>
+          <td>(</td>
+          <td class="paramtype">FILE *&nbsp;</td>
+          <td class="paramname"> <em>file</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Write a curve to a file. 
 <p>
-The printable representation is guaranteed to contain only 7-bit printable ASCII characters, and is null-terminated. The curve will not contain any space, newline, single quote, or comma characters. Furthermore, a printed curve will be read back correctly in all locales. These calls are not guaranteed to provide more than 6 decimal places of precision or +/-0.5e-6 accuracy, whichever is less. <dl compact><dt><b>Warning:</b></dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
+The printable representation is guaranteed to contain only 7-bit printable ASCII characters, and is null-terminated. The curve will not contain any space, newline, single quote, or comma characters. Furthermore, a printed curve will be read back correctly in all locales. These calls are not guaranteed to provide more than 6 decimal places of precision or +/-0.5e-6 accuracy, whichever is less. <dl class="warning" compact><dt><b>Warning:</b></dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>file</em>&nbsp;</td><td>the file to write. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga42"></a><!-- doxytag: member="curve.h::stp_curve_write_string" ref="ga42" args="(const stp_curve_t *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">char* stp_curve_write_string           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gf2f0da590278ff74af1eccb0aa0c7169"></a><!-- doxytag: member="curve.h::stp_curve_write_string" ref="gf2f0da590278ff74af1eccb0aa0c7169" args="(const stp_curve_t *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* stp_curve_write_string           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Write a curve to a string. 
 <p>
-The printable representation is guaranteed to contain only 7-bit printable ASCII characters, and is null-terminated. The curve will not contain any space, newline, or comma characters. Furthermore, a printed curve will be read back correctly in all locales. These calls are not guaranteed to provide more than 6 decimal places of precision or +/-0.5e-6 accuracy, whichever is less. <dl compact><dt><b>Warning:</b></dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
+The printable representation is guaranteed to contain only 7-bit printable ASCII characters, and is null-terminated. The curve will not contain any space, newline, or comma characters. Furthermore, a printed curve will be read back correctly in all locales. These calls are not guaranteed to provide more than 6 decimal places of precision or +/-0.5e-6 accuracy, whichever is less. <dl class="warning" compact><dt><b>Warning:</b></dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to a string. This is allocated on the heap, and it is the caller's responsibility to free it.</dd></dl>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to a string. This is allocated on the heap, and it is the caller's responsibility to free it. </dd></dl>
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__image.html b/doc/gutenprint/html/group__image.html
index 08883eb..2753d6a 100644
--- a/doc/gutenprint/html/group__image.html
+++ b/doc/gutenprint/html/group__image.html
@@ -1,10 +1,19 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: image</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1>image</h1>The image type is an abstract data type for interfacing with the image creation program.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -13,341 +22,261 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="structstp__image.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga8">STP_CHANNEL_LIMIT</a>&nbsp;&nbsp;&nbsp;(32)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g0b7daa7e9e9b26fea847d71ca9de7c02">STP_CHANNEL_LIMIT</a>&nbsp;&nbsp;&nbsp;(32)</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__image.html">stp_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga0">stp_image_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__image.html">stp_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="#ga0"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="#gae0b5ef92b619849a51cb75d376a90fb"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga9">stp_image_status_t</a> { <a class="el" href="group__image.html#gga9a2">STP_IMAGE_STATUS_OK</a>, 
-<a class="el" href="group__image.html#gga9a3">STP_IMAGE_STATUS_ABORT</a>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a> { <a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8b5574da151b93391a337f29b2a7c96cf">STP_IMAGE_STATUS_OK</a>, 
+<a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8224b8ac15cf785b24b2f3f53b4fdc274">STP_IMAGE_STATUS_ABORT</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Image status.  <a href="group__image.html#ga9">More...</a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Image status.  <a href="group__image.html#g58672e1989d582c14328048b207657c8">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga1">stp_image_init</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gd257f72ac5272e94ff9314f8ecd24f1e">stp_image_init</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga2">stp_image_reset</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gf2fc433dba580b9ec8e69aebc2e65338">stp_image_reset</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga3">stp_image_width</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gbe86b2ff9a3a0c0e98248990f9be5652">stp_image_width</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga4">stp_image_height</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gf9dcdf718ad99df9eb71fc542d5b47e1">stp_image_height</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#ga9">stp_image_status_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga5">stp_image_get_row</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image, unsigned char *data, size_t limit, int row)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g01d72a16de9e98722859ca651561e8f5">stp_image_get_row</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image, unsigned char *data, size_t limit, int row)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga6">stp_image_get_appname</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g1643f6b9eb180e98f3c1c267950f18d2">stp_image_get_appname</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga7">stp_image_conclude</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g7598151354fbeb5f6a8b3f92d1e40ad7">stp_image_conclude</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The image type is an abstract data type for interfacing with the image creation program. 
 <p>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="image.h::STP_CHANNEL_LIMIT" ref="ga8" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="g0b7daa7e9e9b26fea847d71ca9de7c02"></a><!-- doxytag: member="image.h::STP_CHANNEL_LIMIT" ref="g0b7daa7e9e9b26fea847d71ca9de7c02" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_CHANNEL_LIMIT&nbsp;&nbsp;&nbsp;(32)          </td>
+          <td class="memname">#define STP_CHANNEL_LIMIT&nbsp;&nbsp;&nbsp;(32)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-The maximum number of channels.     </td>
-  </tr>
-</table>
+The maximum number of channels. 
+</div>
+</div><p>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="image.h::stp_image_t" ref="ga0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="gae0b5ef92b619849a51cb75d376a90fb"></a><!-- doxytag: member="image.h::stp_image_t" ref="gae0b5ef92b619849a51cb75d376a90fb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="structstp__image.html">stp_image</a>  <a class="el" href="structstp__image.html">stp_image_t</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="structstp__image.html">stp_image</a>  <a class="el" href="structstp__image.html">stp_image_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 The image type is an abstract data type for interfacing with the image creation program. 
 <p>
-It provides callbacks to functions defined within the client application which are called while printing the image.    </td>
-  </tr>
-</table>
+It provides callbacks to functions defined within the client application which are called while printing the image. 
+</div>
+</div><p>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="image.h::stp_image_status_t" ref="ga9" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="g58672e1989d582c14328048b207657c8"></a><!-- doxytag: member="image.h::stp_image_status_t" ref="g58672e1989d582c14328048b207657c8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__image.html#ga9">stp_image_status_t</a>          </td>
+          <td class="memname">enum <a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Image status. 
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga9a2"></a><!-- doxytag: member="STP_IMAGE_STATUS_OK" ref="gga9a2" args="" -->STP_IMAGE_STATUS_OK</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg58672e1989d582c14328048b207657c8b5574da151b93391a337f29b2a7c96cf"></a><!-- doxytag: member="STP_IMAGE_STATUS_OK" ref="gg58672e1989d582c14328048b207657c8b5574da151b93391a337f29b2a7c96cf" args="" -->STP_IMAGE_STATUS_OK</em>&nbsp;</td><td>
 Everything is OK. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga9a3"></a><!-- doxytag: member="STP_IMAGE_STATUS_ABORT" ref="gga9a3" args="" -->STP_IMAGE_STATUS_ABORT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg58672e1989d582c14328048b207657c8224b8ac15cf785b24b2f3f53b4fdc274"></a><!-- doxytag: member="STP_IMAGE_STATUS_ABORT" ref="gg58672e1989d582c14328048b207657c8224b8ac15cf785b24b2f3f53b4fdc274" args="" -->STP_IMAGE_STATUS_ABORT</em>&nbsp;</td><td>
 An error occured, or the job was aborted. </td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="image.h::stp_image_conclude" ref="ga7" args="(stp_image_t *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="g7598151354fbeb5f6a8b3f92d1e40ad7"></a><!-- doxytag: member="image.h::stp_image_conclude" ref="g7598151354fbeb5f6a8b3f92d1e40ad7" args="(stp_image_t *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_image_conclude           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>image</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void stp_image_conclude           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>image</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="image.h::stp_image_get_appname" ref="ga6" args="(stp_image_t *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g1643f6b9eb180e98f3c1c267950f18d2"></a><!-- doxytag: member="image.h::stp_image_get_appname" ref="g1643f6b9eb180e98f3c1c267950f18d2" args="(stp_image_t *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* stp_image_get_appname           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>image</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">const char* stp_image_get_appname           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>image</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="image.h::stp_image_get_row" ref="ga5" args="(stp_image_t *image, unsigned char *data, size_t limit, int row)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g01d72a16de9e98722859ca651561e8f5"></a><!-- doxytag: member="image.h::stp_image_get_row" ref="g01d72a16de9e98722859ca651561e8f5" args="(stp_image_t *image, unsigned char *data, size_t limit, int row)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__image.html#ga9">stp_image_status_t</a> stp_image_get_row           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>image</em>, </td>
+          <td class="memname"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a> stp_image_get_row           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>image</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>data</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>limit</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>limit</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>row</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>row</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="image.h::stp_image_height" ref="ga4" args="(stp_image_t *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gf9dcdf718ad99df9eb71fc542d5b47e1"></a><!-- doxytag: member="image.h::stp_image_height" ref="gf9dcdf718ad99df9eb71fc542d5b47e1" args="(stp_image_t *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_image_height           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>image</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int stp_image_height           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>image</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="image.h::stp_image_init" ref="ga1" args="(stp_image_t *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gd257f72ac5272e94ff9314f8ecd24f1e"></a><!-- doxytag: member="image.h::stp_image_init" ref="gd257f72ac5272e94ff9314f8ecd24f1e" args="(stp_image_t *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_image_init           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>image</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void stp_image_init           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>image</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="image.h::stp_image_reset" ref="ga2" args="(stp_image_t *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gf2fc433dba580b9ec8e69aebc2e65338"></a><!-- doxytag: member="image.h::stp_image_reset" ref="gf2fc433dba580b9ec8e69aebc2e65338" args="(stp_image_t *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_image_reset           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>image</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void stp_image_reset           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>image</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="image.h::stp_image_width" ref="ga3" args="(stp_image_t *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gbe86b2ff9a3a0c0e98248990f9be5652"></a><!-- doxytag: member="image.h::stp_image_width" ref="gbe86b2ff9a3a0c0e98248990f9be5652" args="(stp_image_t *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_image_width           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>image</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int stp_image_width           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>image</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__intl.html b/doc/gutenprint/html/group__intl.html
index 86a6370..0441695 100644
--- a/doc/gutenprint/html/group__intl.html
+++ b/doc/gutenprint/html/group__intl.html
@@ -1,243 +1,196 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: intl</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1>intl</h1>Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga0">textdomain</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#g5f80e8482ab93869489531a8c7ce7006">textdomain</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga1">gettext</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#g83b8be0887dede025766d25e2bb884c6">gettext</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga2">dgettext</a>(Domain, Message)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gd24abc7110e1bdf384dc2ef2b63e5d07">dgettext</a>(Domain, Message)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga3">dcgettext</a>(Domain, Message, Type)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#g115dd6a6dd9d7a249f6374a7c06deef5">dcgettext</a>(Domain, Message, Type)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga4">bindtextdomain</a>(Domain, Directory)&nbsp;&nbsp;&nbsp;(Domain)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gdd6dfc1077058ff26d79cdb18099d58a">bindtextdomain</a>(Domain, Directory)&nbsp;&nbsp;&nbsp;(Domain)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga5">_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#g32a3cf3d9dd914f5aeeca5423c157934">_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga6">N_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#g75278405e7f034d2b1af80bfd94675fe">N_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language. 
 <p>
-The macros defined in this header are convenience wrappers around the gettext functions provided by libintl library (or directly by libc on GNU systems).<hr><h2>Define Documentation</h2>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="gutenprint-intl.h::_" ref="ga5" args="(String)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+The macros defined in this header are convenience wrappers around the gettext functions provided by libintl library (or directly by libc on GNU systems). <hr><h2>Define Documentation</h2>
+<a class="anchor" name="g32a3cf3d9dd914f5aeeca5423c157934"></a><!-- doxytag: member="gutenprint-intl.h::_" ref="g32a3cf3d9dd914f5aeeca5423c157934" args="(String)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define _          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">String&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(String)</td>
+          <td class="memname">#define _          </td>
+          <td>(</td>
+          <td class="paramtype">String&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(String)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="gutenprint-intl.h::bindtextdomain" ref="ga4" args="(Domain, Directory)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gdd6dfc1077058ff26d79cdb18099d58a"></a><!-- doxytag: member="gutenprint-intl.h::bindtextdomain" ref="gdd6dfc1077058ff26d79cdb18099d58a" args="(Domain, Directory)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define bindtextdomain          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Domain,         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>Directory&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(Domain)</td>
+          <td class="memname">#define bindtextdomain          </td>
+          <td>(</td>
+          <td class="paramtype">Domain,         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">Directory&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(Domain)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="gutenprint-intl.h::dcgettext" ref="ga3" args="(Domain, Message, Type)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g115dd6a6dd9d7a249f6374a7c06deef5"></a><!-- doxytag: member="gutenprint-intl.h::dcgettext" ref="g115dd6a6dd9d7a249f6374a7c06deef5" args="(Domain, Message, Type)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define dcgettext          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Domain,         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>Message,         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>Type&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(Message)</td>
+          <td class="memname">#define dcgettext          </td>
+          <td>(</td>
+          <td class="paramtype">Domain,         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">Message,         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">Type&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(Message)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="gutenprint-intl.h::dgettext" ref="ga2" args="(Domain, Message)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gd24abc7110e1bdf384dc2ef2b63e5d07"></a><!-- doxytag: member="gutenprint-intl.h::dgettext" ref="gd24abc7110e1bdf384dc2ef2b63e5d07" args="(Domain, Message)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define dgettext          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Domain,         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>Message&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(Message)</td>
+          <td class="memname">#define dgettext          </td>
+          <td>(</td>
+          <td class="paramtype">Domain,         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">Message&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(Message)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="gutenprint-intl.h::gettext" ref="ga1" args="(String)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g83b8be0887dede025766d25e2bb884c6"></a><!-- doxytag: member="gutenprint-intl.h::gettext" ref="g83b8be0887dede025766d25e2bb884c6" args="(String)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define gettext          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">String&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(String)</td>
+          <td class="memname">#define gettext          </td>
+          <td>(</td>
+          <td class="paramtype">String&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(String)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="gutenprint-intl.h::N_" ref="ga6" args="(String)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g75278405e7f034d2b1af80bfd94675fe"></a><!-- doxytag: member="gutenprint-intl.h::N_" ref="g75278405e7f034d2b1af80bfd94675fe" args="(String)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define N_          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">String&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(String)</td>
+          <td class="memname">#define N_          </td>
+          <td>(</td>
+          <td class="paramtype">String&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(String)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="gutenprint-intl.h::textdomain" ref="ga0" args="(String)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g5f80e8482ab93869489531a8c7ce7006"></a><!-- doxytag: member="gutenprint-intl.h::textdomain" ref="g5f80e8482ab93869489531a8c7ce7006" args="(String)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define textdomain          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">String&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(String)</td>
+          <td class="memname">#define textdomain          </td>
+          <td>(</td>
+          <td class="paramtype">String&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(String)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__intl__internal.html b/doc/gutenprint/html/group__intl__internal.html
index 32e2e8e..744de3e 100644
--- a/doc/gutenprint/html/group__intl__internal.html
+++ b/doc/gutenprint/html/group__intl__internal.html
@@ -1,243 +1,196 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: intl-internal</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1>intl-internal</h1>Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga0">textdomain</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#g5f80e8482ab93869489531a8c7ce7006">textdomain</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga1">gettext</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#g83b8be0887dede025766d25e2bb884c6">gettext</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga2">dgettext</a>(Domain, Message)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gd24abc7110e1bdf384dc2ef2b63e5d07">dgettext</a>(Domain, Message)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga3">dcgettext</a>(Domain, Message, Type)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#g115dd6a6dd9d7a249f6374a7c06deef5">dcgettext</a>(Domain, Message, Type)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga4">bindtextdomain</a>(Domain, Directory)&nbsp;&nbsp;&nbsp;(Domain)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gdd6dfc1077058ff26d79cdb18099d58a">bindtextdomain</a>(Domain, Directory)&nbsp;&nbsp;&nbsp;(Domain)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga5">_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#g32a3cf3d9dd914f5aeeca5423c157934">_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga6">N_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#g75278405e7f034d2b1af80bfd94675fe">N_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language. 
 <p>
-The macros defined in this header are convenience wrappers around the gettext functions provided by libintl library (or directly by libc on GNU systems). They differ from the normal intl functions in that the textdomain is fixed, for use by functions internal to Gimp-Print. This header should not be included by source files outside the gimp-print source tree.<hr><h2>Define Documentation</h2>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="gutenprint-intl-internal.h::_" ref="ga5" args="(String)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+The macros defined in this header are convenience wrappers around the gettext functions provided by libintl library (or directly by libc on GNU systems). They differ from the normal intl functions in that the textdomain is fixed, for use by functions internal to Gimp-Print. This header should not be included by source files outside the gimp-print source tree. <hr><h2>Define Documentation</h2>
+<a class="anchor" name="g32a3cf3d9dd914f5aeeca5423c157934"></a><!-- doxytag: member="gutenprint-intl-internal.h::_" ref="g32a3cf3d9dd914f5aeeca5423c157934" args="(String)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define _          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">String&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(String)</td>
+          <td class="memname">#define _          </td>
+          <td>(</td>
+          <td class="paramtype">String&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(String)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="gutenprint-intl-internal.h::bindtextdomain" ref="ga4" args="(Domain, Directory)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gdd6dfc1077058ff26d79cdb18099d58a"></a><!-- doxytag: member="gutenprint-intl-internal.h::bindtextdomain" ref="gdd6dfc1077058ff26d79cdb18099d58a" args="(Domain, Directory)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define bindtextdomain          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Domain,         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>Directory&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(Domain)</td>
+          <td class="memname">#define bindtextdomain          </td>
+          <td>(</td>
+          <td class="paramtype">Domain,         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">Directory&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(Domain)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="gutenprint-intl-internal.h::dcgettext" ref="ga3" args="(Domain, Message, Type)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g115dd6a6dd9d7a249f6374a7c06deef5"></a><!-- doxytag: member="gutenprint-intl-internal.h::dcgettext" ref="g115dd6a6dd9d7a249f6374a7c06deef5" args="(Domain, Message, Type)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define dcgettext          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Domain,         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>Message,         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>Type&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(Message)</td>
+          <td class="memname">#define dcgettext          </td>
+          <td>(</td>
+          <td class="paramtype">Domain,         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">Message,         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">Type&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(Message)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="gutenprint-intl-internal.h::dgettext" ref="ga2" args="(Domain, Message)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gd24abc7110e1bdf384dc2ef2b63e5d07"></a><!-- doxytag: member="gutenprint-intl-internal.h::dgettext" ref="gd24abc7110e1bdf384dc2ef2b63e5d07" args="(Domain, Message)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define dgettext          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">Domain,         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>Message&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(Message)</td>
+          <td class="memname">#define dgettext          </td>
+          <td>(</td>
+          <td class="paramtype">Domain,         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">Message&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(Message)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="gutenprint-intl-internal.h::gettext" ref="ga1" args="(String)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g83b8be0887dede025766d25e2bb884c6"></a><!-- doxytag: member="gutenprint-intl-internal.h::gettext" ref="g83b8be0887dede025766d25e2bb884c6" args="(String)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define gettext          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">String&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(String)</td>
+          <td class="memname">#define gettext          </td>
+          <td>(</td>
+          <td class="paramtype">String&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(String)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="gutenprint-intl-internal.h::N_" ref="ga6" args="(String)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g75278405e7f034d2b1af80bfd94675fe"></a><!-- doxytag: member="gutenprint-intl-internal.h::N_" ref="g75278405e7f034d2b1af80bfd94675fe" args="(String)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define N_          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">String&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(String)</td>
+          <td class="memname">#define N_          </td>
+          <td>(</td>
+          <td class="paramtype">String&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(String)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="gutenprint-intl-internal.h::textdomain" ref="ga0" args="(String)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g5f80e8482ab93869489531a8c7ce7006"></a><!-- doxytag: member="gutenprint-intl-internal.h::textdomain" ref="g5f80e8482ab93869489531a8c7ce7006" args="(String)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define textdomain          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">String&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(String)</td>
+          <td class="memname">#define textdomain          </td>
+          <td>(</td>
+          <td class="paramtype">String&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(String)</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__list.html b/doc/gutenprint/html/group__list.html
index 8f82f9d..664b5b8 100644
--- a/doc/gutenprint/html/group__list.html
+++ b/doc/gutenprint/html/group__list.html
@@ -1,357 +1,294 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: list</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1>list</h1>The list data type implements a fast generic doubly-linked list.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_list_item&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga0">stp_list_item_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_list_item&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list item opaque data type.  <a href="#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga1">stp_list_t</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list item opaque data type.  <a href="#g67b4fafe1ab6ead5be7500f88874bdb0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list opaque data type.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga2">stp_node_freefunc</a> )(void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list opaque data type.  <a href="#g53cf4f01ab7d712f771cb5fb479d2ba7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*)&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g4102fc776ec5bbd84eb589cfba97dfc2">stp_node_freefunc</a> (void *)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to free the data a node contains.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga3">stp_node_copyfunc</a> )(const void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to free the data a node contains.  <a href="#g4102fc776ec5bbd84eb589cfba97dfc2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *(*)&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g846d759413f07e91bed397f1fe3224d1">stp_node_copyfunc</a> (const void *)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to copy the data a node contains.  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga4">stp_node_namefunc</a> )(const void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to copy the data a node contains.  <a href="#g846d759413f07e91bed397f1fe3224d1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const char *(*)&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a> (const void *)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to get the name of a node.  <a href="#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga5">stp_node_sortfunc</a> )(const void *, const void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to get the name of a node.  <a href="#g7ecf51e54538837d4e0804da3ce58f12"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int(*)&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gd12571e44981e7acd62137c83652121a">stp_node_sortfunc</a> (const void *, const void *)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to compare two nodes.  <a href="#ga5"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to compare two nodes.  <a href="#gd12571e44981e7acd62137c83652121a"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga6">stp_list_node_free_data</a> (void *item)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g55fbb8f7a3920b783b02183c5ea57624">stp_list_node_free_data</a> (void *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Free node data allocated with stp_malloc.  <a href="#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga7">stp_list_create</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Free node data allocated with stp_malloc.  <a href="#g55fbb8f7a3920b783b02183c5ea57624"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g3cfea94cd07f50d7d9b4ce384d349fca">stp_list_create</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new list object.  <a href="#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga8">stp_list_copy</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new list object.  <a href="#g3cfea94cd07f50d7d9b4ce384d349fca"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g0ba249dd06efbf5c0af8511ceab671e8">stp_list_copy</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a list object.  <a href="#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga9">stp_list_destroy</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a list object.  <a href="#g0ba249dd06efbf5c0af8511ceab671e8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ge23ef06175b27dd6772d4d4c098999b1">stp_list_destroy</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a list object.  <a href="#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga10">stp_list_get_start</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a list object.  <a href="#ge23ef06175b27dd6772d4d4c098999b1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gd185100e8d7969a473e9d42bc8084572">stp_list_get_start</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find the first item in a list.  <a href="#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga11">stp_list_get_end</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find the first item in a list.  <a href="#gd185100e8d7969a473e9d42bc8084572"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ge939f15ee1a6e4c0aaad7a7be7f40b74">stp_list_get_end</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find the last item in a list.  <a href="#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga12">stp_list_get_item_by_index</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list, int idx)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find the last item in a list.  <a href="#ge939f15ee1a6e4c0aaad7a7be7f40b74"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gd377973e8b13d02c9c111d970f491993">stp_list_get_item_by_index</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, int idx)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its index.  <a href="#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga13">stp_list_get_item_by_name</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list, const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its index.  <a href="#gd377973e8b13d02c9c111d970f491993"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g729867c847dd8282f74806968c708f28">stp_list_get_item_by_name</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its name.  <a href="#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga14">stp_list_get_item_by_long_name</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list, const char *long_name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its name.  <a href="#g729867c847dd8282f74806968c708f28"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gcc9140df3f4311cd750ba10a1cbf37d1">stp_list_get_item_by_long_name</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, const char *long_name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its long name.  <a href="#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga15">stp_list_get_length</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its long name.  <a href="#gcc9140df3f4311cd750ba10a1cbf37d1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ge22741060734c9cbc47656c5ea35c3f3">stp_list_get_length</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the length of a list.  <a href="#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga16">stp_list_set_freefunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga2">stp_node_freefunc</a> freefunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the length of a list.  <a href="#ge22741060734c9cbc47656c5ea35c3f3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ge3300d7971c393d119d6fd62e2b578ec">stp_list_set_freefunc</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#g4102fc776ec5bbd84eb589cfba97dfc2">stp_node_freefunc</a> freefunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node free function.  <a href="#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga2">stp_node_freefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga17">stp_list_get_freefunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node free function.  <a href="#ge3300d7971c393d119d6fd62e2b578ec"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g4102fc776ec5bbd84eb589cfba97dfc2">stp_node_freefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gbfc1ef258084a3e1ad959aa3d2f053f4">stp_list_get_freefunc</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node free function.  <a href="#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga18">stp_list_set_copyfunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga3">stp_node_copyfunc</a> copyfunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node free function.  <a href="#gbfc1ef258084a3e1ad959aa3d2f053f4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g7e002ed25bbfbad236c1c619841f1ac6">stp_list_set_copyfunc</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#g846d759413f07e91bed397f1fe3224d1">stp_node_copyfunc</a> copyfunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node copy function.  <a href="#ga18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga3">stp_node_copyfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga19">stp_list_get_copyfunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node copy function.  <a href="#g7e002ed25bbfbad236c1c619841f1ac6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g846d759413f07e91bed397f1fe3224d1">stp_node_copyfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g686e92ee802147171e5fc723d0079b8d">stp_list_get_copyfunc</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node copy function.  <a href="#ga19"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga20">stp_list_set_namefunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga4">stp_node_namefunc</a> namefunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node copy function.  <a href="#g686e92ee802147171e5fc723d0079b8d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g889af512d87a00d696acc0b6b3fafe78">stp_list_set_namefunc</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a> namefunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node name function.  <a href="#ga20"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga4">stp_node_namefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga21">stp_list_get_namefunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node name function.  <a href="#g889af512d87a00d696acc0b6b3fafe78"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g50b1ab3c3b6b0ba7c0cf2128e2024369">stp_list_get_namefunc</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node name function.  <a href="#ga21"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga22">stp_list_set_long_namefunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga4">stp_node_namefunc</a> long_namefunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node name function.  <a href="#g50b1ab3c3b6b0ba7c0cf2128e2024369"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g5be91978431b0ed48ea7919807bdcb73">stp_list_set_long_namefunc</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a> long_namefunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node long name function.  <a href="#ga22"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga4">stp_node_namefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga23">stp_list_get_long_namefunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node long name function.  <a href="#g5be91978431b0ed48ea7919807bdcb73"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gb99b3ed6da1ea739eed3f2c04fbb7fa7">stp_list_get_long_namefunc</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node long name function.  <a href="#ga23"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga24">stp_list_set_sortfunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga5">stp_node_sortfunc</a> sortfunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node long name function.  <a href="#gb99b3ed6da1ea739eed3f2c04fbb7fa7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gb1d2486542b858b44b299cfcdf7d8784">stp_list_set_sortfunc</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#gd12571e44981e7acd62137c83652121a">stp_node_sortfunc</a> sortfunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node sort function.  <a href="#ga24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga5">stp_node_sortfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga25">stp_list_get_sortfunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node sort function.  <a href="#gb1d2486542b858b44b299cfcdf7d8784"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#gd12571e44981e7acd62137c83652121a">stp_node_sortfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g4b32e315d3fd23eabeffcc8d931ea454">stp_list_get_sortfunc</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node sort function.  <a href="#ga25"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga26">stp_list_item_create</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *next, const void *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node sort function.  <a href="#g4b32e315d3fd23eabeffcc8d931ea454"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ge726297a82e140672a018e135ffc6a0e">stp_list_item_create</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *next, const void *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new list item.  <a href="#ga26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga27">stp_list_item_destroy</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new list item.  <a href="#ge726297a82e140672a018e135ffc6a0e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g5e36d4f61e00cb3e4c4a759f5e7e9f4b">stp_list_item_destroy</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a list item.  <a href="#ga27"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga28">stp_list_item_prev</a> (const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a list item.  <a href="#g5e36d4f61e00cb3e4c4a759f5e7e9f4b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gbaa2a241055402438a0cae6f40cf6a78">stp_list_item_prev</a> (const <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the previous item in the list.  <a href="#ga28"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga29">stp_list_item_next</a> (const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the previous item in the list.  <a href="#gbaa2a241055402438a0cae6f40cf6a78"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g81ab310caf6432ce1e492eaafdb6c0d7">stp_list_item_next</a> (const <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the next item in the list.  <a href="#ga29"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga30">stp_list_item_get_data</a> (const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the next item in the list.  <a href="#g81ab310caf6432ce1e492eaafdb6c0d7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gd6f6b303b40fa75f22a86391785178cb">stp_list_item_get_data</a> (const <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data associated with a list item.  <a href="#ga30"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga31">stp_list_item_set_data</a> (<a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item, void *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data associated with a list item.  <a href="#gd6f6b303b40fa75f22a86391785178cb"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gc1e34edcd47ffdc119cdcaf5ad38e1c4">stp_list_item_set_data</a> (<a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item, void *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data associated with a list item.  <a href="#ga31"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data associated with a list item.  <a href="#gc1e34edcd47ffdc119cdcaf5ad38e1c4"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The list data type implements a fast generic doubly-linked list. 
 <p>
-It supports all of the operations you might want in a list (insert, remove, iterate over the list, copy whole lists), plus some (optional) less common features: finding items by index, name or long name, and sorting. These should also be fairly fast, due to caching in the list head.<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="list.h::stp_list_item_t" ref="ga0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+It supports all of the operations you might want in a list (insert, remove, iterate over the list, copy whole lists), plus some (optional) less common features: finding items by index, name or long name, and sorting. These should also be fairly fast, due to caching in the list head. <hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="g67b4fafe1ab6ead5be7500f88874bdb0"></a><!-- doxytag: member="list.h::stp_list_item_t" ref="g67b4fafe1ab6ead5be7500f88874bdb0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_list_item <a class="el" href="group__list.html#ga0">stp_list_item_t</a>          </td>
+          <td class="memname">typedef struct stp_list_item <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 The list item opaque data type. 
 <p>
-This object is a node in the list.    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="list.h::stp_list_t" ref="ga1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+This object is a node in the list. 
+</div>
+</div><p>
+<a class="anchor" name="g53cf4f01ab7d712f771cb5fb479d2ba7"></a><!-- doxytag: member="list.h::stp_list_t" ref="g53cf4f01ab7d712f771cb5fb479d2ba7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_list <a class="el" href="group__list.html#ga1">stp_list_t</a>          </td>
+          <td class="memname">typedef struct stp_list <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 The list opaque data type. 
 <p>
-This object represents the list as a whole.    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="list.h::stp_node_copyfunc" ref="ga3" args=")(const void *)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+This object represents the list as a whole. 
+</div>
+</div><p>
+<a class="anchor" name="g846d759413f07e91bed397f1fe3224d1"></a><!-- doxytag: member="list.h::stp_node_copyfunc" ref="g846d759413f07e91bed397f1fe3224d1" args="(const void *)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef void*(* <a class="el" href="group__list.html#ga3">stp_node_copyfunc</a>)(const void *)          </td>
+          <td class="memname">typedef void*(*) <a class="el" href="group__list.html#g846d759413f07e91bed397f1fe3224d1">stp_node_copyfunc</a>(const void *)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 A callback function to copy the data a node contains. 
 <p>
-The parameter is a pointer to the node data. The return value is a pointer to the new copy of the data.    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="list.h::stp_node_freefunc" ref="ga2" args=")(void *)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+The parameter is a pointer to the node data. The return value is a pointer to the new copy of the data. 
+</div>
+</div><p>
+<a class="anchor" name="g4102fc776ec5bbd84eb589cfba97dfc2"></a><!-- doxytag: member="list.h::stp_node_freefunc" ref="g4102fc776ec5bbd84eb589cfba97dfc2" args="(void *)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef void(* <a class="el" href="group__list.html#ga2">stp_node_freefunc</a>)(void *)          </td>
+          <td class="memname">typedef void(*) <a class="el" href="group__list.html#g4102fc776ec5bbd84eb589cfba97dfc2">stp_node_freefunc</a>(void *)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 A callback function to free the data a node contains. 
 <p>
-The parameter is a pointer to the node data.    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="list.h::stp_node_namefunc" ref="ga4" args=")(const void *)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+The parameter is a pointer to the node data. 
+</div>
+</div><p>
+<a class="anchor" name="g7ecf51e54538837d4e0804da3ce58f12"></a><!-- doxytag: member="list.h::stp_node_namefunc" ref="g7ecf51e54538837d4e0804da3ce58f12" args="(const void *)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef const char*(* <a class="el" href="group__list.html#ga4">stp_node_namefunc</a>)(const void *)          </td>
+          <td class="memname">typedef const char*(*) <a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a>(const void *)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 A callback function to get the name of a node. 
 <p>
-The parameter is a pointer to the node data. The return value is a pointer to the name of the node, or NULL if there is no name.    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="list.h::stp_node_sortfunc" ref="ga5" args=")(const void *, const void *)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+The parameter is a pointer to the node data. The return value is a pointer to the name of the node, or NULL if there is no name. 
+</div>
+</div><p>
+<a class="anchor" name="gd12571e44981e7acd62137c83652121a"></a><!-- doxytag: member="list.h::stp_node_sortfunc" ref="gd12571e44981e7acd62137c83652121a" args="(const void *, const void *)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef int(* <a class="el" href="group__list.html#ga5">stp_node_sortfunc</a>)(const void *, const void *)          </td>
+          <td class="memname">typedef int(*) <a class="el" href="group__list.html#gd12571e44981e7acd62137c83652121a">stp_node_sortfunc</a>(const void *, const void *)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 A callback function to compare two nodes. 
 <p>
-The two parameters are pointers to node data. The return value is &lt;0 if the first sorts before the second, 0 if they sort identically, and &gt;0 if the first sorts after the second.    </td>
-  </tr>
-</table>
+The two parameters are pointers to node data. The return value is &lt;0 if the first sorts before the second, 0 if they sort identically, and &gt;0 if the first sorts after the second. 
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="list.h::stp_list_copy" ref="ga8" args="(const stp_list_t *list)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="g0ba249dd06efbf5c0af8511ceab671e8"></a><!-- doxytag: member="list.h::stp_list_copy" ref="g0ba249dd06efbf5c0af8511ceab671e8" args="(const stp_list_t *list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a>* stp_list_copy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a>* stp_list_copy           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Copy and allocate a list object. 
 <p>
-list must be a valid list object previously created with <a class="el" href="group__list.html#ga7">stp_list_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+list must be a valid list object previously created with <a class="el" href="group__list.html#g3cfea94cd07f50d7d9b4ce384d349fca" title="Create a new list object.">stp_list_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to copy. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the new copy of the list.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="list.h::stp_list_create" ref="ga7" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the new copy of the list. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g3cfea94cd07f50d7d9b4ce384d349fca"></a><!-- doxytag: member="list.h::stp_list_create" ref="g3cfea94cd07f50d7d9b4ce384d349fca" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a>* stp_list_create           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a>* stp_list_create           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Create a new list object. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created list object.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="list.h::stp_list_destroy" ref="ga9" args="(stp_list_t *list)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the newly created list object. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="ge23ef06175b27dd6772d4d4c098999b1"></a><!-- doxytag: member="list.h::stp_list_destroy" ref="ge23ef06175b27dd6772d4d4c098999b1" args="(stp_list_t *list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_list_destroy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int stp_list_destroy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Destroy a list object. 
@@ -361,33 +298,25 @@ It is an error to destroy the list more than once. <dl compact><dt><b>Parameters
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to destroy. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga19"></a><!-- doxytag: member="list.h::stp_list_get_copyfunc" ref="ga19" args="(const stp_list_t *list)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g686e92ee802147171e5fc723d0079b8d"></a><!-- doxytag: member="list.h::stp_list_get_copyfunc" ref="g686e92ee802147171e5fc723d0079b8d" args="(const stp_list_t *list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga3">stp_node_copyfunc</a> stp_list_get_copyfunc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__list.html#g846d759413f07e91bed397f1fe3224d1">stp_node_copyfunc</a> stp_list_get_copyfunc           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a list node copy function. 
@@ -397,33 +326,25 @@ Get a list node copy function.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_copyfunc, or NULL if no function has been set.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="list.h::stp_list_get_end" ref="ga11" args="(const stp_list_t *list)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_copyfunc, or NULL if no function has been set. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="ge939f15ee1a6e4c0aaad7a7be7f40b74"></a><!-- doxytag: member="list.h::stp_list_get_end" ref="ge939f15ee1a6e4c0aaad7a7be7f40b74" args="(const stp_list_t *list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a>* stp_list_get_end           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a>* stp_list_get_end           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Find the last item in a list. 
@@ -433,33 +354,25 @@ Find the last item in a list.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the last list item, or NULL if the list is empty.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga17"></a><!-- doxytag: member="list.h::stp_list_get_freefunc" ref="ga17" args="(const stp_list_t *list)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the last list item, or NULL if the list is empty. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gbfc1ef258084a3e1ad959aa3d2f053f4"></a><!-- doxytag: member="list.h::stp_list_get_freefunc" ref="gbfc1ef258084a3e1ad959aa3d2f053f4" args="(const stp_list_t *list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga2">stp_node_freefunc</a> stp_list_get_freefunc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__list.html#g4102fc776ec5bbd84eb589cfba97dfc2">stp_node_freefunc</a> stp_list_get_freefunc           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a list node free function. 
@@ -469,42 +382,34 @@ Get a list node free function.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_freefunc, or NULL if no function has been set.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="list.h::stp_list_get_item_by_index" ref="ga12" args="(const stp_list_t *list, int idx)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_freefunc, or NULL if no function has been set. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gd377973e8b13d02c9c111d970f491993"></a><!-- doxytag: member="list.h::stp_list_get_item_by_index" ref="gd377973e8b13d02c9c111d970f491993" args="(const stp_list_t *list, int idx)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a>* stp_list_get_item_by_index           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a>* stp_list_get_item_by_index           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>idx</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Find an item in a list by its index. 
@@ -515,42 +420,34 @@ Find an item in a list by its index.
     <tr><td valign="top"></td><td valign="top"><em>idx</em>&nbsp;</td><td>the index to find. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the list item, or NULL if the index is invalid or the list is empty.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga14"></a><!-- doxytag: member="list.h::stp_list_get_item_by_long_name" ref="ga14" args="(const stp_list_t *list, const char *long_name)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the list item, or NULL if the index is invalid or the list is empty. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gcc9140df3f4311cd750ba10a1cbf37d1"></a><!-- doxytag: member="list.h::stp_list_get_item_by_long_name" ref="gcc9140df3f4311cd750ba10a1cbf37d1" args="(const stp_list_t *list, const char *long_name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a>* stp_list_get_item_by_long_name           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a>* stp_list_get_item_by_long_name           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>long_name</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>long_name</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Find an item in a list by its long name. 
@@ -561,42 +458,34 @@ Find an item in a list by its long name.
     <tr><td valign="top"></td><td valign="top"><em>long_name</em>&nbsp;</td><td>the long name to find. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the list item, or NULL if the long name is invalid or the list is empty.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga13"></a><!-- doxytag: member="list.h::stp_list_get_item_by_name" ref="ga13" args="(const stp_list_t *list, const char *name)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the list item, or NULL if the long name is invalid or the list is empty. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g729867c847dd8282f74806968c708f28"></a><!-- doxytag: member="list.h::stp_list_get_item_by_name" ref="g729867c847dd8282f74806968c708f28" args="(const stp_list_t *list, const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a>* stp_list_get_item_by_name           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a>* stp_list_get_item_by_name           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Find an item in a list by its name. 
@@ -607,33 +496,25 @@ Find an item in a list by its name.
     <tr><td valign="top"></td><td valign="top"><em>name</em>&nbsp;</td><td>the name to find. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the list item, or NULL if the name is invalid or the list is empty.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga15"></a><!-- doxytag: member="list.h::stp_list_get_length" ref="ga15" args="(const stp_list_t *list)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the list item, or NULL if the name is invalid or the list is empty. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="ge22741060734c9cbc47656c5ea35c3f3"></a><!-- doxytag: member="list.h::stp_list_get_length" ref="ge22741060734c9cbc47656c5ea35c3f3" args="(const stp_list_t *list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_list_get_length           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int stp_list_get_length           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the length of a list. 
@@ -643,33 +524,25 @@ Get the length of a list.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the list length (number of list items).</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga23"></a><!-- doxytag: member="list.h::stp_list_get_long_namefunc" ref="ga23" args="(const stp_list_t *list)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the list length (number of list items). </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gb99b3ed6da1ea739eed3f2c04fbb7fa7"></a><!-- doxytag: member="list.h::stp_list_get_long_namefunc" ref="gb99b3ed6da1ea739eed3f2c04fbb7fa7" args="(const stp_list_t *list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga4">stp_node_namefunc</a> stp_list_get_long_namefunc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a> stp_list_get_long_namefunc           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a list node long name function. 
@@ -679,33 +552,25 @@ Get a list node long name function.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_long_namefunc, or NULL if no function has been set.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga21"></a><!-- doxytag: member="list.h::stp_list_get_namefunc" ref="ga21" args="(const stp_list_t *list)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_long_namefunc, or NULL if no function has been set. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g50b1ab3c3b6b0ba7c0cf2128e2024369"></a><!-- doxytag: member="list.h::stp_list_get_namefunc" ref="g50b1ab3c3b6b0ba7c0cf2128e2024369" args="(const stp_list_t *list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga4">stp_node_namefunc</a> stp_list_get_namefunc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a> stp_list_get_namefunc           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a list node name function. 
@@ -715,33 +580,25 @@ Get a list node name function.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_namefunc, or NULL if no function has been set.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga25"></a><!-- doxytag: member="list.h::stp_list_get_sortfunc" ref="ga25" args="(const stp_list_t *list)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_namefunc, or NULL if no function has been set. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g4b32e315d3fd23eabeffcc8d931ea454"></a><!-- doxytag: member="list.h::stp_list_get_sortfunc" ref="g4b32e315d3fd23eabeffcc8d931ea454" args="(const stp_list_t *list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga5">stp_node_sortfunc</a> stp_list_get_sortfunc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__list.html#gd12571e44981e7acd62137c83652121a">stp_node_sortfunc</a> stp_list_get_sortfunc           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a list node sort function. 
@@ -751,33 +608,25 @@ Get a list node sort function.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_sortfunc, or NULL if no function has been set.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="list.h::stp_list_get_start" ref="ga10" args="(const stp_list_t *list)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_sortfunc, or NULL if no function has been set. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gd185100e8d7969a473e9d42bc8084572"></a><!-- doxytag: member="list.h::stp_list_get_start" ref="gd185100e8d7969a473e9d42bc8084572" args="(const stp_list_t *list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a>* stp_list_get_start           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a>* stp_list_get_start           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Find the first item in a list. 
@@ -787,48 +636,40 @@ Find the first item in a list.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first list item, or NULL if the list is empty.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga26"></a><!-- doxytag: member="list.h::stp_list_item_create" ref="ga26" args="(stp_list_t *list, stp_list_item_t *next, const void *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the first list item, or NULL if the list is empty. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="ge726297a82e140672a018e135ffc6a0e"></a><!-- doxytag: member="list.h::stp_list_item_create" ref="ge726297a82e140672a018e135ffc6a0e" args="(stp_list_t *list, stp_list_item_t *next, const void *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_list_item_create           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname">int stp_list_item_create           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>next</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>next</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const void *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const void *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Create a new list item. 
@@ -840,42 +681,34 @@ Create a new list item.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>the data the list item will contain. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure (if data is NULL, for example).</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga27"></a><!-- doxytag: member="list.h::stp_list_item_destroy" ref="ga27" args="(stp_list_t *list, stp_list_item_t *item)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure (if data is NULL, for example). </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g5e36d4f61e00cb3e4c4a759f5e7e9f4b"></a><!-- doxytag: member="list.h::stp_list_item_destroy" ref="g5e36d4f61e00cb3e4c4a759f5e7e9f4b" args="(stp_list_t *list, stp_list_item_t *item)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_list_item_destroy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname">int stp_list_item_destroy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>item</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>item</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Destroy a list item. 
@@ -886,33 +719,25 @@ Destroy a list item.
     <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the item to destroy. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga30"></a><!-- doxytag: member="list.h::stp_list_item_get_data" ref="ga30" args="(const stp_list_item_t *item)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gd6f6b303b40fa75f22a86391785178cb"></a><!-- doxytag: member="list.h::stp_list_item_get_data" ref="gd6f6b303b40fa75f22a86391785178cb" args="(const stp_list_item_t *item)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void* stp_list_item_get_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>item</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void* stp_list_item_get_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>item</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the data associated with a list item. 
@@ -922,33 +747,25 @@ Get the data associated with a list item.
     <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the list item to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the data associated with item.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga29"></a><!-- doxytag: member="list.h::stp_list_item_next" ref="ga29" args="(const stp_list_item_t *item)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the data associated with item. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g81ab310caf6432ce1e492eaafdb6c0d7"></a><!-- doxytag: member="list.h::stp_list_item_next" ref="g81ab310caf6432ce1e492eaafdb6c0d7" args="(const stp_list_item_t *item)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a>* stp_list_item_next           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>item</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a>* stp_list_item_next           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>item</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the next item in the list. 
@@ -958,33 +775,25 @@ Get the next item in the list.
     <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the item to start from. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the list item following from item, or NULL if item is the end of the list.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga28"></a><!-- doxytag: member="list.h::stp_list_item_prev" ref="ga28" args="(const stp_list_item_t *item)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the list item following from item, or NULL if item is the end of the list. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gbaa2a241055402438a0cae6f40cf6a78"></a><!-- doxytag: member="list.h::stp_list_item_prev" ref="gbaa2a241055402438a0cae6f40cf6a78" args="(const stp_list_item_t *item)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a>* stp_list_item_prev           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>item</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a>* stp_list_item_prev           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>item</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the previous item in the list. 
@@ -994,124 +803,100 @@ Get the previous item in the list.
     <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the item to start from. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the list item prior to item, or NULL if item is the start of the list.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga31"></a><!-- doxytag: member="list.h::stp_list_item_set_data" ref="ga31" args="(stp_list_item_t *item, void *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the list item prior to item, or NULL if item is the start of the list. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gc1e34edcd47ffdc119cdcaf5ad38e1c4"></a><!-- doxytag: member="list.h::stp_list_item_set_data" ref="gc1e34edcd47ffdc119cdcaf5ad38e1c4" args="(stp_list_item_t *item, void *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_list_item_set_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>item</em>, </td>
+          <td class="memname">int stp_list_item_set_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>item</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>void *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data associated with a list item. 
 <p>
-<dl compact><dt><b>Warning:</b></dt><dd>Note that if a sortfunc is in use, changing the data will NOT re-sort the list! </dd></dl>
+<dl class="warning" compact><dt><b>Warning:</b></dt><dd>Note that if a sortfunc is in use, changing the data will NOT re-sort the list! </dd></dl>
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the list item to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure (if data is NULL).</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="list.h::stp_list_node_free_data" ref="ga6" args="(void *item)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure (if data is NULL). </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g55fbb8f7a3920b783b02183c5ea57624"></a><!-- doxytag: member="list.h::stp_list_node_free_data" ref="g55fbb8f7a3920b783b02183c5ea57624" args="(void *item)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_list_node_free_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>item</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void stp_list_node_free_data           </td>
+          <td>(</td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>item</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Free node data allocated with stp_malloc. 
 <p>
 This function is indended for use as an stp_node_freefunc, which uses stp_free to free the node data. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the node data to free</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the node data to free </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga18"></a><!-- doxytag: member="list.h::stp_list_set_copyfunc" ref="ga18" args="(stp_list_t *list, stp_node_copyfunc copyfunc)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g7e002ed25bbfbad236c1c619841f1ac6"></a><!-- doxytag: member="list.h::stp_list_set_copyfunc" ref="g7e002ed25bbfbad236c1c619841f1ac6" args="(stp_list_t *list, stp_node_copyfunc copyfunc)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_list_set_copyfunc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname">void stp_list_set_copyfunc           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__list.html#ga3">stp_node_copyfunc</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>copyfunc</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__list.html#g846d759413f07e91bed397f1fe3224d1">stp_node_copyfunc</a>&nbsp;</td>
+          <td class="paramname"> <em>copyfunc</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a list node copy function. 
@@ -1119,44 +904,36 @@ Set a list node copy function.
 This callback function will be called whenever a list item is copied. Its intended use is for automatic object copying (since C lacks a copy constructor). <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>copyfunc</em>&nbsp;</td><td>the function to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>copyfunc</em>&nbsp;</td><td>the function to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga16"></a><!-- doxytag: member="list.h::stp_list_set_freefunc" ref="ga16" args="(stp_list_t *list, stp_node_freefunc freefunc)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ge3300d7971c393d119d6fd62e2b578ec"></a><!-- doxytag: member="list.h::stp_list_set_freefunc" ref="ge3300d7971c393d119d6fd62e2b578ec" args="(stp_list_t *list, stp_node_freefunc freefunc)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_list_set_freefunc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname">void stp_list_set_freefunc           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__list.html#ga2">stp_node_freefunc</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>freefunc</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__list.html#g4102fc776ec5bbd84eb589cfba97dfc2">stp_node_freefunc</a>&nbsp;</td>
+          <td class="paramname"> <em>freefunc</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a list node free function. 
@@ -1164,44 +941,36 @@ Set a list node free function.
 This callback function will be called whenever a list item is destroyed. Its intended use is for automatic object destruction and any other cleanup required. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>freefunc</em>&nbsp;</td><td>the function to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>freefunc</em>&nbsp;</td><td>the function to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga22"></a><!-- doxytag: member="list.h::stp_list_set_long_namefunc" ref="ga22" args="(stp_list_t *list, stp_node_namefunc long_namefunc)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g5be91978431b0ed48ea7919807bdcb73"></a><!-- doxytag: member="list.h::stp_list_set_long_namefunc" ref="g5be91978431b0ed48ea7919807bdcb73" args="(stp_list_t *list, stp_node_namefunc long_namefunc)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_list_set_long_namefunc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname">void stp_list_set_long_namefunc           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__list.html#ga4">stp_node_namefunc</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>long_namefunc</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a>&nbsp;</td>
+          <td class="paramname"> <em>long_namefunc</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a list node long name function. 
@@ -1209,44 +978,36 @@ Set a list node long name function.
 This callback function will be called whenever the long name of a list item needs to be determined. This is used to find list items by long name. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>long_namefunc</em>&nbsp;</td><td>the function to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>long_namefunc</em>&nbsp;</td><td>the function to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga20"></a><!-- doxytag: member="list.h::stp_list_set_namefunc" ref="ga20" args="(stp_list_t *list, stp_node_namefunc namefunc)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g889af512d87a00d696acc0b6b3fafe78"></a><!-- doxytag: member="list.h::stp_list_set_namefunc" ref="g889af512d87a00d696acc0b6b3fafe78" args="(stp_list_t *list, stp_node_namefunc namefunc)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_list_set_namefunc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname">void stp_list_set_namefunc           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__list.html#ga4">stp_node_namefunc</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>namefunc</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a>&nbsp;</td>
+          <td class="paramname"> <em>namefunc</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a list node name function. 
@@ -1254,44 +1015,36 @@ Set a list node name function.
 This callback function will be called whenever the name of a list item needs to be determined. This is used to find list items by name. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>namefunc</em>&nbsp;</td><td>the function to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>namefunc</em>&nbsp;</td><td>the function to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga24"></a><!-- doxytag: member="list.h::stp_list_set_sortfunc" ref="ga24" args="(stp_list_t *list, stp_node_sortfunc sortfunc)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gb1d2486542b858b44b299cfcdf7d8784"></a><!-- doxytag: member="list.h::stp_list_set_sortfunc" ref="gb1d2486542b858b44b299cfcdf7d8784" args="(stp_list_t *list, stp_node_sortfunc sortfunc)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_list_set_sortfunc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname">void stp_list_set_sortfunc           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__list.html#ga5">stp_node_sortfunc</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>sortfunc</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__list.html#gd12571e44981e7acd62137c83652121a">stp_node_sortfunc</a>&nbsp;</td>
+          <td class="paramname"> <em>sortfunc</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a list node sort function. 
@@ -1299,14 +1052,14 @@ Set a list node sort function.
 This callback function will be called to determine the sort order for list items in sorted lists. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>sortfunc</em>&nbsp;</td><td>the function to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>sortfunc</em>&nbsp;</td><td>the function to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__papersize.html b/doc/gutenprint/html/group__papersize.html
index 51d70fc..c79e212 100644
--- a/doc/gutenprint/html/group__papersize.html
+++ b/doc/gutenprint/html/group__papersize.html
@@ -1,10 +1,19 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: papersize</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1>papersize</h1>The papersize describes the dimensions of a paper.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -13,137 +22,121 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The papersize data type.  <a href="structstp__papersize__t.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga5">stp_papersize_unit_t</a> { <a class="el" href="group__papersize.html#gga5a0">PAPERSIZE_ENGLISH_STANDARD</a>, 
-<a class="el" href="group__papersize.html#gga5a1">PAPERSIZE_METRIC_STANDARD</a>, 
-<a class="el" href="group__papersize.html#gga5a2">PAPERSIZE_ENGLISH_EXTENDED</a>, 
-<a class="el" href="group__papersize.html#gga5a3">PAPERSIZE_METRIC_EXTENDED</a>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g72e4619e373e38dc02dc452813b7b958">stp_papersize_unit_t</a> { <a class="el" href="group__papersize.html#gg72e4619e373e38dc02dc452813b7b958db394159413ade42022509cd3280fef3">PAPERSIZE_ENGLISH_STANDARD</a>, 
+<a class="el" href="group__papersize.html#gg72e4619e373e38dc02dc452813b7b9586d5868bc6707f8801ce4d584428c2ae8">PAPERSIZE_METRIC_STANDARD</a>, 
+<a class="el" href="group__papersize.html#gg72e4619e373e38dc02dc452813b7b95800b7e9a18afc172872861b26dbcc8cb8">PAPERSIZE_ENGLISH_EXTENDED</a>, 
+<a class="el" href="group__papersize.html#gg72e4619e373e38dc02dc452813b7b95862e2906a87fa4bcf32913943fd5b225a">PAPERSIZE_METRIC_EXTENDED</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Units of measurement.  <a href="group__papersize.html#ga5">More...</a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Units of measurement.  <a href="group__papersize.html#g72e4619e373e38dc02dc452813b7b958">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga0">stp_known_papersizes</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g84fd0bad33b134217f54fa8c1e6c8b99">stp_known_papersizes</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available papersizes.  <a href="#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga1">stp_get_papersize_by_name</a> (const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available papersizes.  <a href="#g84fd0bad33b134217f54fa8c1e6c8b99"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g60f3dee8f26cac05d8d6fcaff1e39630">stp_get_papersize_by_name</a> (const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by name.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga2">stp_get_papersize_by_size</a> (int length, int width)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by name.  <a href="#g60f3dee8f26cac05d8d6fcaff1e39630"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g1484a5e75a2b2921bbe0c9e17deb0b77">stp_get_papersize_by_size</a> (int length, int width)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by size.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga3">stp_get_papersize_by_index</a> (int idx)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by size.  <a href="#g1484a5e75a2b2921bbe0c9e17deb0b77"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#gb2e9f694a3b90aeaaa14d6af3b5fe75a">stp_get_papersize_by_index</a> (int idx)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by its index number.  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga4">stp_default_media_size</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *width, int *height)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by its index number.  <a href="#gb2e9f694a3b90aeaaa14d6af3b5fe75a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g33c0be56646361b1ce85a9d338336dd3">stp_default_media_size</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The papersize describes the dimensions of a paper. 
 <p>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="paper.h::stp_papersize_unit_t" ref="ga5" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="g72e4619e373e38dc02dc452813b7b958"></a><!-- doxytag: member="paper.h::stp_papersize_unit_t" ref="g72e4619e373e38dc02dc452813b7b958" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__papersize.html#ga5">stp_papersize_unit_t</a>          </td>
+          <td class="memname">enum <a class="el" href="group__papersize.html#g72e4619e373e38dc02dc452813b7b958">stp_papersize_unit_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Units of measurement. 
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga5a0"></a><!-- doxytag: member="PAPERSIZE_ENGLISH_STANDARD" ref="gga5a0" args="" -->PAPERSIZE_ENGLISH_STANDARD</em>&nbsp;</td><td>
-English/Imperial units. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga5a1"></a><!-- doxytag: member="PAPERSIZE_METRIC_STANDARD" ref="gga5a1" args="" -->PAPERSIZE_METRIC_STANDARD</em>&nbsp;</td><td>
-Metric units. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga5a2"></a><!-- doxytag: member="PAPERSIZE_ENGLISH_EXTENDED" ref="gga5a2" args="" -->PAPERSIZE_ENGLISH_EXTENDED</em>&nbsp;</td><td>
-English/Imperial units (optional paper, not displayed by default). </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga5a3"></a><!-- doxytag: member="PAPERSIZE_METRIC_EXTENDED" ref="gga5a3" args="" -->PAPERSIZE_METRIC_EXTENDED</em>&nbsp;</td><td>
-Metric units (optional paper, not displayed by default). </td></tr>
+<tr><td valign="top"><em><a class="anchor" name="gg72e4619e373e38dc02dc452813b7b958db394159413ade42022509cd3280fef3"></a><!-- doxytag: member="PAPERSIZE_ENGLISH_STANDARD" ref="gg72e4619e373e38dc02dc452813b7b958db394159413ade42022509cd3280fef3" args="" -->PAPERSIZE_ENGLISH_STANDARD</em>&nbsp;</td><td>
+English/Imperial units. 
+<p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" name="gg72e4619e373e38dc02dc452813b7b9586d5868bc6707f8801ce4d584428c2ae8"></a><!-- doxytag: member="PAPERSIZE_METRIC_STANDARD" ref="gg72e4619e373e38dc02dc452813b7b9586d5868bc6707f8801ce4d584428c2ae8" args="" -->PAPERSIZE_METRIC_STANDARD</em>&nbsp;</td><td>
+Metric units. 
+<p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" name="gg72e4619e373e38dc02dc452813b7b95800b7e9a18afc172872861b26dbcc8cb8"></a><!-- doxytag: member="PAPERSIZE_ENGLISH_EXTENDED" ref="gg72e4619e373e38dc02dc452813b7b95800b7e9a18afc172872861b26dbcc8cb8" args="" -->PAPERSIZE_ENGLISH_EXTENDED</em>&nbsp;</td><td>
+English/Imperial units (optional paper, not displayed by default). 
+<p>
+</td></tr>
+<tr><td valign="top"><em><a class="anchor" name="gg72e4619e373e38dc02dc452813b7b95862e2906a87fa4bcf32913943fd5b225a"></a><!-- doxytag: member="PAPERSIZE_METRIC_EXTENDED" ref="gg72e4619e373e38dc02dc452813b7b95862e2906a87fa4bcf32913943fd5b225a" args="" -->PAPERSIZE_METRIC_EXTENDED</em>&nbsp;</td><td>
+Metric units (optional paper, not displayed by default). 
+<p>
+</td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="paper.h::stp_default_media_size" ref="ga4" args="(const stp_vars_t *v, int *width, int *height)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="g33c0be56646361b1ce85a9d338336dd3"></a><!-- doxytag: member="paper.h::stp_default_media_size" ref="g33c0be56646361b1ce85a9d338336dd3" args="(const stp_vars_t *v, int *width, int *height)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_default_media_size           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_default_media_size           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>width</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>width</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>height</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_index" ref="ga3" args="(int idx)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gb2e9f694a3b90aeaaa14d6af3b5fe75a"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_index" ref="gb2e9f694a3b90aeaaa14d6af3b5fe75a" args="(int idx)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a>* stp_get_papersize_by_index           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>idx</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a>* stp_get_papersize_by_index           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a papersize by its index number. 
@@ -153,33 +146,25 @@ Get a papersize by its index number.
     <tr><td valign="top"></td><td valign="top"><em>idx</em>&nbsp;</td><td>the index number. This must not be greater than (total number of papers - 1). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the papersize, or NULL on failure. The pointer should not be freed.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_name" ref="ga1" args="(const char *name)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the papersize, or NULL on failure. The pointer should not be freed. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g60f3dee8f26cac05d8d6fcaff1e39630"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_name" ref="g60f3dee8f26cac05d8d6fcaff1e39630" args="(const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a>* stp_get_papersize_by_name           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>name</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a>* stp_get_papersize_by_name           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a papersize by name. 
@@ -189,42 +174,34 @@ Get a papersize by name.
     <tr><td valign="top"></td><td valign="top"><em>name</em>&nbsp;</td><td>the short unique name of the paper. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the papersize, or NULL on failure. The pointer should not be freed.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_size" ref="ga2" args="(int length, int width)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the papersize, or NULL on failure. The pointer should not be freed. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g1484a5e75a2b2921bbe0c9e17deb0b77"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_size" ref="g1484a5e75a2b2921bbe0c9e17deb0b77" args="(int length, int width)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a>* stp_get_papersize_by_size           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>length</em>, </td>
+          <td class="memname">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a>* stp_get_papersize_by_size           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>length</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>width</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>width</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a papersize by size. 
@@ -235,43 +212,35 @@ The nearest available size to the size requested will be found. <dl compact><dt>
     <tr><td valign="top"></td><td valign="top"><em>width</em>&nbsp;</td><td>the width of the paper </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the papersize, or NULL on failure. The pointer should not be freed.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="paper.h::stp_known_papersizes" ref="ga0" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the papersize, or NULL on failure. The pointer should not be freed. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g84fd0bad33b134217f54fa8c1e6c8b99"></a><!-- doxytag: member="paper.h::stp_known_papersizes" ref="g84fd0bad33b134217f54fa8c1e6c8b99" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_known_papersizes           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int stp_known_papersizes           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the number of available papersizes. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the number of papersizes.</dd></dl>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the number of papersizes. </dd></dl>
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__printer.html b/doc/gutenprint/html/group__printer.html
index 916581a..15fb2c1 100644
--- a/doc/gutenprint/html/group__printer.html
+++ b/doc/gutenprint/html/group__printer.html
@@ -1,10 +1,19 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: printer</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1>printer</h1>The printer type represents a printer model.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -14,190 +23,158 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html">stp_family</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_printer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga0">stp_printer_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_printer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The printer opaque data type (representation of printer model).  <a href="#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__family.html">stp_family</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga1">stp_family_t</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The printer opaque data type (representation of printer model).  <a href="#gcddc2ce7fa4e0a68fcc30c123503738f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__family.html">stp_family</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g66a5e7cf2b1743a46bd78cb851e1d0a4">stp_family_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga2">stp_printer_model_count</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g6a76f8f76106eddd51af4b1593b4f3af">stp_printer_model_count</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available printer models.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga3">stp_get_printer_by_index</a> (int idx)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available printer models.  <a href="#g6a76f8f76106eddd51af4b1593b4f3af"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g440501ca226e0a9ac1335c7e52ee55a6">stp_get_printer_by_index</a> (int idx)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its index number.  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga4">stp_get_printer_by_long_name</a> (const char *long_name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its index number.  <a href="#g440501ca226e0a9ac1335c7e52ee55a6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g6bd5abd876100c17fc9029659fed92f4">stp_get_printer_by_long_name</a> (const char *long_name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its long (translated) name.  <a href="#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga5">stp_get_printer_by_driver</a> (const char *driver)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its long (translated) name.  <a href="#g6bd5abd876100c17fc9029659fed92f4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ge45de9ef94fb609c2a54f1d80144552e">stp_get_printer_by_driver</a> (const char *driver)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its short name.  <a href="#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga6">stp_get_printer</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its short name.  <a href="#ge45de9ef94fb609c2a54f1d80144552e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gc649c4b3d0a93f26f99deb4b081305c1">stp_get_printer</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the printer model from a vars object.  <a href="#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga7">stp_get_printer_index_by_driver</a> (const char *driver)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the printer model from a vars object.  <a href="#gc649c4b3d0a93f26f99deb4b081305c1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g41094e69b71eb930e770bd2cf8bbf795">stp_get_printer_index_by_driver</a> (const char *driver)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the printer index number from the printer model short (driver) name.  <a href="#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga8">stp_printer_get_long_name</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the printer index number from the printer model short (driver) name.  <a href="#g41094e69b71eb930e770bd2cf8bbf795"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g11804fb9b8d87ed1f2a3acbd39f5f85a">stp_printer_get_long_name</a> (const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's long (translated) name.  <a href="#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga9">stp_printer_get_driver</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's long (translated) name.  <a href="#g11804fb9b8d87ed1f2a3acbd39f5f85a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gc345b8cf8cd78da98fdb4c6b2d9cf7ca">stp_printer_get_driver</a> (const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's short (driver) name.  <a href="#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga10">stp_printer_get_family</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's short (driver) name.  <a href="#gc345b8cf8cd78da98fdb4c6b2d9cf7ca"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g487b74bf101a842f30b5941b8db4769a">stp_printer_get_family</a> (const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's family name.  <a href="#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga11">stp_printer_get_manufacturer</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's family name.  <a href="#g487b74bf101a842f30b5941b8db4769a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gb99dd05c42aed848d1567f2b346fb4f4">stp_printer_get_manufacturer</a> (const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's manufacturer's name.  <a href="#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga12">stp_printer_get_model</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's manufacturer's name.  <a href="#gb99dd05c42aed848d1567f2b346fb4f4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gae84d3fb263c4a171b7b63b6d93a940e">stp_printer_get_model</a> (const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's model number.  <a href="#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga13">stp_printer_get_defaults</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's model number.  <a href="#gae84d3fb263c4a171b7b63b6d93a940e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g4f6859e0f21ed2062075d6b9f680a202">stp_printer_get_defaults</a> (const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the default vars for a particular printer model.  <a href="#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga14">stp_set_printer_defaults</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the default vars for a particular printer model.  <a href="#g4f6859e0f21ed2062075d6b9f680a202"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gf5084888feed9878811ac491cb5313ee">stp_set_printer_defaults</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a vars object to use a particular driver, and set the parameter to its defaults.  <a href="#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga15">stp_print</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a vars object to use a particular driver, and set the parameter to its defaults.  <a href="#gf5084888feed9878811ac491cb5313ee"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g6065874cbb246875925e14d8801898cc">stp_print</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Print the image.  <a href="#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga16">stp_start_job</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Print the image.  <a href="#g6065874cbb246875925e14d8801898cc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g31ef7bcc34dda5d3fd46b2d04fcb0c64">stp_start_job</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Start a print job.  <a href="#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga17">stp_end_job</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Start a print job.  <a href="#g31ef7bcc34dda5d3fd46b2d04fcb0c64"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ge61d056dd504facc72ff56d7f16eb23c">stp_end_job</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">End a print job.  <a href="#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga18">stp_get_model_id</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">End a print job.  <a href="#ge61d056dd504facc72ff56d7f16eb23c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g2057c5fcfc31d8b4cf7f3291cf3c0cf4">stp_get_model_id</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga19">stp_verify_printer_params</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g5b5cb603c9432c03ea459b57a2039bdc">stp_verify_printer_params</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga20">stp_family_register</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *family)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g1c6d389f49a185ca24546107bd6f4993">stp_family_register</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *family)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga21">stp_family_unregister</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *family)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g67e5c18254f7ad0b0fd77b4cc2265405">stp_family_unregister</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *family)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga22">stp_initialize_printer_defaults</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g381f3a4f132a00d6d2e2a9b54f9ed675">stp_initialize_printer_defaults</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga23">stp_printer_list_parameters</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g09bf7aebf0385f7b5aac537a13b6e3ed">stp_printer_list_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga24">stp_printer_describe_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g07bc634c85950526155b711aac42c6a0">stp_printer_describe_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga25">stp_describe_output</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g50b48bab8d6d1734c3a0f6622d65582e">stp_describe_output</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The printer type represents a printer model. 
 <p>
-A particular printer model must selected in order to be able to print. Each printer model provides default print options through a default vars object.<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="printers.h::stp_family_t" ref="ga1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+A particular printer model must selected in order to be able to print. Each printer model provides default print options through a default vars object. <hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="g66a5e7cf2b1743a46bd78cb851e1d0a4"></a><!-- doxytag: member="printers.h::stp_family_t" ref="g66a5e7cf2b1743a46bd78cb851e1d0a4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="structstp__family.html">stp_family</a>  <a class="el" href="structstp__family.html">stp_family_t</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="structstp__family.html">stp_family</a>  <a class="el" href="structstp__family.html">stp_family_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="printers.h::stp_printer_t" ref="ga0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gcddc2ce7fa4e0a68fcc30c123503738f"></a><!-- doxytag: member="printers.h::stp_printer_t" ref="gcddc2ce7fa4e0a68fcc30c123503738f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_printer <a class="el" href="group__printer.html#ga0">stp_printer_t</a>          </td>
+          <td class="memname">typedef struct stp_printer <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 The printer opaque data type (representation of printer model). 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga25"></a><!-- doxytag: member="printers.h::stp_describe_output" ref="ga25" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stp_describe_output           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<a class="anchor" name="g50b48bab8d6d1734c3a0f6622d65582e"></a><!-- doxytag: member="printers.h::stp_describe_output" ref="g50b48bab8d6d1734c3a0f6622d65582e" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stp_describe_output           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga17"></a><!-- doxytag: member="printers.h::stp_end_job" ref="ga17" args="(const stp_vars_t *v, stp_image_t *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ge61d056dd504facc72ff56d7f16eb23c"></a><!-- doxytag: member="printers.h::stp_end_job" ref="ge61d056dd504facc72ff56d7f16eb23c" args="(const stp_vars_t *v, stp_image_t *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_end_job           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_end_job           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>image</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>image</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 End a print job. 
@@ -208,117 +185,85 @@ End a print job.
     <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image to print. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga20"></a><!-- doxytag: member="printers.h::stp_family_register" ref="ga20" args="(stp_list_t *family)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_family_register           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>family</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g1c6d389f49a185ca24546107bd6f4993"></a><!-- doxytag: member="printers.h::stp_family_register" ref="g1c6d389f49a185ca24546107bd6f4993" args="(stp_list_t *family)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_family_register           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>family</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga21"></a><!-- doxytag: member="printers.h::stp_family_unregister" ref="ga21" args="(stp_list_t *family)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_family_unregister           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>family</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="g67e5c18254f7ad0b0fd77b4cc2265405"></a><!-- doxytag: member="printers.h::stp_family_unregister" ref="g67e5c18254f7ad0b0fd77b4cc2265405" args="(stp_list_t *family)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_family_unregister           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>family</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga18"></a><!-- doxytag: member="printers.h::stp_get_model_id" ref="ga18" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_get_model_id           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="g2057c5fcfc31d8b4cf7f3291cf3c0cf4"></a><!-- doxytag: member="printers.h::stp_get_model_id" ref="g2057c5fcfc31d8b4cf7f3291cf3c0cf4" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_get_model_id           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="printers.h::stp_get_printer" ref="ga6" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a>* stp_get_printer           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="gc649c4b3d0a93f26f99deb4b081305c1"></a><!-- doxytag: member="printers.h::stp_get_printer" ref="gc649c4b3d0a93f26f99deb4b081305c1" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a>* stp_get_printer           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the printer model from a vars object. 
@@ -328,33 +273,25 @@ Get the printer model from a vars object.
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="printers.h::stp_get_printer_by_driver" ref="ga5" args="(const char *driver)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a>* stp_get_printer_by_driver           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>driver</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="ge45de9ef94fb609c2a54f1d80144552e"></a><!-- doxytag: member="printers.h::stp_get_printer_by_driver" ref="ge45de9ef94fb609c2a54f1d80144552e" args="(const char *driver)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a>* stp_get_printer_by_driver           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>driver</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a printer model by its short name. 
@@ -364,33 +301,25 @@ Get a printer model by its short name.
     <tr><td valign="top"></td><td valign="top"><em>driver</em>&nbsp;</td><td>the printer model's short (driver) name. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="printers.h::stp_get_printer_by_index" ref="ga3" args="(int idx)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a>* stp_get_printer_by_index           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>idx</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g440501ca226e0a9ac1335c7e52ee55a6"></a><!-- doxytag: member="printers.h::stp_get_printer_by_index" ref="g440501ca226e0a9ac1335c7e52ee55a6" args="(int idx)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a>* stp_get_printer_by_index           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>idx</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a printer model by its index number. 
@@ -400,33 +329,25 @@ Get a printer model by its index number.
     <tr><td valign="top"></td><td valign="top"><em>idx</em>&nbsp;</td><td>the index number. This must not be greater than (total number of printers - 1). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="printers.h::stp_get_printer_by_long_name" ref="ga4" args="(const char *long_name)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a>* stp_get_printer_by_long_name           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>long_name</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g6bd5abd876100c17fc9029659fed92f4"></a><!-- doxytag: member="printers.h::stp_get_printer_by_long_name" ref="g6bd5abd876100c17fc9029659fed92f4" args="(const char *long_name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a>* stp_get_printer_by_long_name           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>long_name</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a printer model by its long (translated) name. 
@@ -436,188 +357,148 @@ Get a printer model by its long (translated) name.
     <tr><td valign="top"></td><td valign="top"><em>long_name</em>&nbsp;</td><td>the printer model's long (translated) name. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="printers.h::stp_get_printer_index_by_driver" ref="ga7" args="(const char *driver)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_get_printer_index_by_driver           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>driver</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g41094e69b71eb930e770bd2cf8bbf795"></a><!-- doxytag: member="printers.h::stp_get_printer_index_by_driver" ref="g41094e69b71eb930e770bd2cf8bbf795" args="(const char *driver)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_get_printer_index_by_driver           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>driver</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the printer index number from the printer model short (driver) name. 
 <p>
-<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000001">Deprecated:</a></b></dt><dd>There should never be any need to use this function.</dd></dl>
+<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000001">Deprecated:</a></b></dt><dd>There should never be any need to use this function. </dd></dl>
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>driver</em>&nbsp;</td><td>the printer model's short (driver) name. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the index number, or -1 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga22"></a><!-- doxytag: member="printers.h::stp_initialize_printer_defaults" ref="ga22" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_initialize_printer_defaults           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the index number, or -1 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g381f3a4f132a00d6d2e2a9b54f9ed675"></a><!-- doxytag: member="printers.h::stp_initialize_printer_defaults" ref="g381f3a4f132a00d6d2e2a9b54f9ed675" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_initialize_printer_defaults           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga15"></a><!-- doxytag: member="printers.h::stp_print" ref="ga15" args="(const stp_vars_t *v, stp_image_t *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g6065874cbb246875925e14d8801898cc"></a><!-- doxytag: member="printers.h::stp_print" ref="g6065874cbb246875925e14d8801898cc" args="(const stp_vars_t *v, stp_image_t *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_print           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_print           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>image</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>image</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Print the image. 
 <p>
-<dl compact><dt><b>Warning:</b></dt><dd>stp_job_start() must be called prior to the first call to this function. </dd></dl>
+<dl class="warning" compact><dt><b>Warning:</b></dt><dd>stp_job_start() must be called prior to the first call to this function. </dd></dl>
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image to print. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>0 on failure, 1 on success, 2 on abort requested by the driver.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga24"></a><!-- doxytag: member="printers.h::stp_printer_describe_parameter" ref="ga24" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>0 on failure, 1 on success, 2 on abort requested by the driver. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g07bc634c85950526155b711aac42c6a0"></a><!-- doxytag: member="printers.h::stp_printer_describe_parameter" ref="g07bc634c85950526155b711aac42c6a0" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_printer_describe_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_printer_describe_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>description</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>description</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga13"></a><!-- doxytag: member="printers.h::stp_printer_get_defaults" ref="ga13" args="(const stp_printer_t *p)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a>* stp_printer_get_defaults           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="g4f6859e0f21ed2062075d6b9f680a202"></a><!-- doxytag: member="printers.h::stp_printer_get_defaults" ref="g4f6859e0f21ed2062075d6b9f680a202" args="(const stp_printer_t *p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a>* stp_printer_get_defaults           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the default vars for a particular printer model. 
@@ -627,33 +508,25 @@ The default vars should be copied to a new vars object and customised prior to p
     <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the printer model's default vars.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="printers.h::stp_printer_get_driver" ref="ga9" args="(const stp_printer_t *p)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stp_printer_get_driver           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the printer model's default vars. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gc345b8cf8cd78da98fdb4c6b2d9cf7ca"></a><!-- doxytag: member="printers.h::stp_printer_get_driver" ref="gc345b8cf8cd78da98fdb4c6b2d9cf7ca" args="(const stp_printer_t *p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stp_printer_get_driver           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a printer model's short (driver) name. 
@@ -663,33 +536,25 @@ Get a printer model's short (driver) name.
     <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the short name (should never be freed).</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="printers.h::stp_printer_get_family" ref="ga10" args="(const stp_printer_t *p)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stp_printer_get_family           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the short name (should never be freed). </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g487b74bf101a842f30b5941b8db4769a"></a><!-- doxytag: member="printers.h::stp_printer_get_family" ref="g487b74bf101a842f30b5941b8db4769a" args="(const stp_printer_t *p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stp_printer_get_family           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a printer model's family name. 
@@ -699,33 +564,25 @@ The family name is the name of the modular "family" driver this model uses. <dl
     <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the family name (should never be freed).</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="printers.h::stp_printer_get_long_name" ref="ga8" args="(const stp_printer_t *p)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stp_printer_get_long_name           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the family name (should never be freed). </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g11804fb9b8d87ed1f2a3acbd39f5f85a"></a><!-- doxytag: member="printers.h::stp_printer_get_long_name" ref="g11804fb9b8d87ed1f2a3acbd39f5f85a" args="(const stp_printer_t *p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stp_printer_get_long_name           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a printer model's long (translated) name. 
@@ -735,33 +592,25 @@ Get a printer model's long (translated) name.
     <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the long name (should never be freed).</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="printers.h::stp_printer_get_manufacturer" ref="ga11" args="(const stp_printer_t *p)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stp_printer_get_manufacturer           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the long name (should never be freed). </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gb99dd05c42aed848d1567f2b346fb4f4"></a><!-- doxytag: member="printers.h::stp_printer_get_manufacturer" ref="gb99dd05c42aed848d1567f2b346fb4f4" args="(const stp_printer_t *p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stp_printer_get_manufacturer           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a printer model's manufacturer's name. 
@@ -771,33 +620,25 @@ Get a printer model's manufacturer's name.
     <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the manufacturer's name (should never be freed).</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="printers.h::stp_printer_get_model" ref="ga12" args="(const stp_printer_t *p)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_printer_get_model           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the manufacturer's name (should never be freed). </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gae84d3fb263c4a171b7b63b6d93a940e"></a><!-- doxytag: member="printers.h::stp_printer_get_model" ref="gae84d3fb263c4a171b7b63b6d93a940e" args="(const stp_printer_t *p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_printer_get_model           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a printer model's model number. 
@@ -807,101 +648,77 @@ The model number is used internally by the "family" driver module, and has no me
     <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the model number.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga23"></a><!-- doxytag: member="printers.h::stp_printer_list_parameters" ref="ga23" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> stp_printer_list_parameters           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the model number. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g09bf7aebf0385f7b5aac537a13b6e3ed"></a><!-- doxytag: member="printers.h::stp_printer_list_parameters" ref="g09bf7aebf0385f7b5aac537a13b6e3ed" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> stp_printer_list_parameters           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="printers.h::stp_printer_model_count" ref="ga2" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_printer_model_count           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="g6a76f8f76106eddd51af4b1593b4f3af"></a><!-- doxytag: member="printers.h::stp_printer_model_count" ref="g6a76f8f76106eddd51af4b1593b4f3af" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_printer_model_count           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the number of available printer models. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the number of printer models.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga14"></a><!-- doxytag: member="printers.h::stp_set_printer_defaults" ref="ga14" args="(stp_vars_t *v, const stp_printer_t *p)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the number of printer models. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gf5084888feed9878811ac491cb5313ee"></a><!-- doxytag: member="printers.h::stp_set_printer_defaults" ref="gf5084888feed9878811ac491cb5313ee" args="(stp_vars_t *v, const stp_printer_t *p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_printer_defaults           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_printer_defaults           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a vars object to use a particular driver, and set the parameter to its defaults. 
@@ -909,89 +726,73 @@ Set a vars object to use a particular driver, and set the parameter to its defau
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga16"></a><!-- doxytag: member="printers.h::stp_start_job" ref="ga16" args="(const stp_vars_t *v, stp_image_t *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g31ef7bcc34dda5d3fd46b2d04fcb0c64"></a><!-- doxytag: member="printers.h::stp_start_job" ref="g31ef7bcc34dda5d3fd46b2d04fcb0c64" args="(const stp_vars_t *v, stp_image_t *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_start_job           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_start_job           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>image</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>image</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Start a print job. 
 <p>
-<dl compact><dt><b>Warning:</b></dt><dd>This function must be called prior to the first call to <a class="el" href="group__printer.html#ga15">stp_print()</a>. </dd></dl>
+<dl class="warning" compact><dt><b>Warning:</b></dt><dd>This function must be called prior to the first call to <a class="el" href="group__printer.html#g6065874cbb246875925e14d8801898cc" title="Print the image.">stp_print()</a>. </dd></dl>
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image to print. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga19"></a><!-- doxytag: member="printers.h::stp_verify_printer_params" ref="ga19" args="(stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_verify_printer_params           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g5b5cb603c9432c03ea459b57a2039bdc"></a><!-- doxytag: member="printers.h::stp_verify_printer_params" ref="g5b5cb603c9432c03ea459b57a2039bdc" args="(stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_verify_printer_params           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__sequence.html b/doc/gutenprint/html/group__sequence.html
index f411bd8..6c4dc76 100644
--- a/doc/gutenprint/html/group__sequence.html
+++ b/doc/gutenprint/html/group__sequence.html
@@ -1,318 +1,279 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: sequence</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1>sequence</h1>The sequence is a simple "vector of numbers" data structure.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_sequence&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_sequence&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The sequence opaque data type.  <a href="#ga0"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The sequence opaque data type.  <a href="#g327a46aa1d782a4cd53abf306068e272"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga1">stp_sequence_create</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g9f0233f39d6a27c796bb283c80974618">stp_sequence_create</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new sequence.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga2">stp_sequence_destroy</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new sequence.  <a href="#g9f0233f39d6a27c796bb283c80974618"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g3d571f155c1d00e7794b8299a41c5099">stp_sequence_destroy</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a sequence.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga3">stp_sequence_copy</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *dest, const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a sequence.  <a href="#g3d571f155c1d00e7794b8299a41c5099"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g28087c76e1106ca11c2d247956e3a3c3">stp_sequence_copy</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *dest, const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an sequence.  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga4">stp_sequence_create_copy</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an sequence.  <a href="#g28087c76e1106ca11c2d247956e3a3c3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gb03a34a03ffd4163f51126916d737df7">stp_sequence_create_copy</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an sequence.  <a href="#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga5">stp_sequence_set_bounds</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, double low, double high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an sequence.  <a href="#gb03a34a03ffd4163f51126916d737df7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g1720509809473bc33e6f11b277c78bf6">stp_sequence_set_bounds</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double low, double high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the lower and upper bounds.  <a href="#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga6">stp_sequence_get_bounds</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the lower and upper bounds.  <a href="#g1720509809473bc33e6f11b277c78bf6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g14ad64c63f45a2716ff8d9ceaf00697d">stp_sequence_get_bounds</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the lower and upper bounds.  <a href="#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga7">stp_sequence_get_range</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the lower and upper bounds.  <a href="#g14ad64c63f45a2716ff8d9ceaf00697d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g999021f2caf1a9d0d6d133123031ce17">stp_sequence_get_range</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get range of values stored in the sequence.  <a href="#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga8">stp_sequence_set_size</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t size)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get range of values stored in the sequence.  <a href="#g999021f2caf1a9d0d6d133123031ce17"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ge0af31b854e61e0e047b3ba6dc6ec528">stp_sequence_set_size</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t size)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the sequence size.  <a href="#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga9">stp_sequence_get_size</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the sequence size.  <a href="#ge0af31b854e61e0e047b3ba6dc6ec528"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gfa512afc64116f673ae2061d04a5ef90">stp_sequence_get_size</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the sequence size.  <a href="#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga10">stp_sequence_set_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the sequence size.  <a href="#gfa512afc64116f673ae2061d04a5ef90"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g44bf5a48231675305718162559205fb6">stp_sequence_set_data</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence.  <a href="#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga11">stp_sequence_set_subrange</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t where, size_t size, const double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence.  <a href="#g44bf5a48231675305718162559205fb6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g5bb962248581af2c3c54193442d9c82f">stp_sequence_set_subrange</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, size_t size, const double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a subrange of a sequence.  <a href="#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga12">stp_sequence_get_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *size, const double **data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a subrange of a sequence.  <a href="#g5bb962248581af2c3c54193442d9c82f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g755c8a35e2e9e83a1dfac4f6138c4122">stp_sequence_get_data</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *size, const double **data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence.  <a href="#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga13">stp_sequence_set_point</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t where, double data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence.  <a href="#g755c8a35e2e9e83a1dfac4f6138c4122"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g42c76060886da02cb4a7d843ffe6d21c">stp_sequence_set_point</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, double data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data at a single point in a sequence.  <a href="#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga14">stp_sequence_get_point</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t where, double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data at a single point in a sequence.  <a href="#g42c76060886da02cb4a7d843ffe6d21c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga79c5f747a80ab2ad9d09b09e0330cc7">stp_sequence_get_point</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data at a single point in a sequence.  <a href="#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga15">stp_sequence_set_float_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const float *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data at a single point in a sequence.  <a href="#ga79c5f747a80ab2ad9d09b09e0330cc7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g35972a289b95891699ade61246882ab4">stp_sequence_set_float_data</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const float *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from float values.  <a href="#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga16">stp_sequence_set_long_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const long *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from float values.  <a href="#g35972a289b95891699ade61246882ab4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gaa76cdc9094ee3c05c49a782fea64478">stp_sequence_set_long_data</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const long *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from long values.  <a href="#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga17">stp_sequence_set_ulong_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const unsigned long *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from long values.  <a href="#gaa76cdc9094ee3c05c49a782fea64478"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g3e274a2095f2e6986892384ee89e1255">stp_sequence_set_ulong_data</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned long *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned long values.  <a href="#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga18">stp_sequence_set_int_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const int *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned long values.  <a href="#g3e274a2095f2e6986892384ee89e1255"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g9d3e18b8e576b5c00531dac444397051">stp_sequence_set_int_data</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const int *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from int values.  <a href="#ga18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga19">stp_sequence_set_uint_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const unsigned int *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from int values.  <a href="#g9d3e18b8e576b5c00531dac444397051"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g497c32dec3d745a2602c5e97819de21d">stp_sequence_set_uint_data</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned int *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned int values.  <a href="#ga19"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga20">stp_sequence_set_short_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const short *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned int values.  <a href="#g497c32dec3d745a2602c5e97819de21d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g572ecad03d772a255481bb8b6d79106f">stp_sequence_set_short_data</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const short *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from short values.  <a href="#ga20"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga21">stp_sequence_set_ushort_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const unsigned short *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from short values.  <a href="#g572ecad03d772a255481bb8b6d79106f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g317d484a67a2b775bee27f3dfe67fed4">stp_sequence_set_ushort_data</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned short *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned short values.  <a href="#ga21"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const float *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga22">stp_sequence_get_float_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned short values.  <a href="#g317d484a67a2b775bee27f3dfe67fed4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const float *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gff096d5b027157151c65978b95d4e29e">stp_sequence_get_float_data</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as float data.  <a href="#ga22"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga23">stp_sequence_get_long_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as float data.  <a href="#gff096d5b027157151c65978b95d4e29e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g039d9054cfd0f7d5a892a7fec3f734f4">stp_sequence_get_long_data</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as long data.  <a href="#ga23"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga24">stp_sequence_get_ulong_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as long data.  <a href="#g039d9054cfd0f7d5a892a7fec3f734f4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g12f54f27144d490893f46dd1b0037b8b">stp_sequence_get_ulong_data</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned long data.  <a href="#ga24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga25">stp_sequence_get_int_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned long data.  <a href="#g12f54f27144d490893f46dd1b0037b8b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g01b0bc9e181a097aff3e97254dbfcb14">stp_sequence_get_int_data</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as int data.  <a href="#ga25"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga26">stp_sequence_get_uint_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as int data.  <a href="#g01b0bc9e181a097aff3e97254dbfcb14"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ge7189582ef9e4d638f909a2b1ee0c1b2">stp_sequence_get_uint_data</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned int data.  <a href="#ga26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga27">stp_sequence_get_short_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned int data.  <a href="#ge7189582ef9e4d638f909a2b1ee0c1b2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g4d1cf137e4a77e9123e2afcdf7d63bec">stp_sequence_get_short_data</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as short data.  <a href="#ga27"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga28">stp_sequence_get_ushort_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as short data.  <a href="#g4d1cf137e4a77e9123e2afcdf7d63bec"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g20007077e1d8365a0eddaa922a5967c3">stp_sequence_get_ushort_data</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned short data.  <a href="#ga28"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned short data.  <a href="#g20007077e1d8365a0eddaa922a5967c3"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The sequence is a simple "vector of numbers" data structure. 
 <p>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="sequence.h::stp_sequence_t" ref="ga0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="g327a46aa1d782a4cd53abf306068e272"></a><!-- doxytag: member="sequence.h::stp_sequence_t" ref="g327a46aa1d782a4cd53abf306068e272" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_sequence <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a>          </td>
+          <td class="memname">typedef struct stp_sequence <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 The sequence opaque data type. 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="sequence.h::stp_sequence_copy" ref="ga3" args="(stp_sequence_t *dest, const stp_sequence_t *source)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="g28087c76e1106ca11c2d247956e3a3c3"></a><!-- doxytag: member="sequence.h::stp_sequence_copy" ref="g28087c76e1106ca11c2d247956e3a3c3" args="(stp_sequence_t *dest, const stp_sequence_t *source)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_sequence_copy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dest</em>, </td>
+          <td class="memname">void stp_sequence_copy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>dest</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>source</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>source</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Copy an sequence. 
 <p>
-Both dest and source must be valid sequences previously created with <a class="el" href="group__sequence.html#ga1">stp_sequence_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+Both dest and source must be valid sequences previously created with <a class="el" href="group__sequence.html#g9f0233f39d6a27c796bb283c80974618" title="Create a new sequence.">stp_sequence_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>dest</em>&nbsp;</td><td>the destination sequence. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source sequence.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source sequence. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="sequence.h::stp_sequence_create" ref="ga1" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a>* stp_sequence_create           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="g9f0233f39d6a27c796bb283c80974618"></a><!-- doxytag: member="sequence.h::stp_sequence_create" ref="g9f0233f39d6a27c796bb283c80974618" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a>* stp_sequence_create           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Create a new sequence. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created sequence.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="sequence.h::stp_sequence_create_copy" ref="ga4" args="(const stp_sequence_t *sequence)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a>* stp_sequence_create_copy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>sequence</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the newly created sequence. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gb03a34a03ffd4163f51126916d737df7"></a><!-- doxytag: member="sequence.h::stp_sequence_create_copy" ref="gb03a34a03ffd4163f51126916d737df7" args="(const stp_sequence_t *sequence)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a>* stp_sequence_create_copy           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Copy and allocate an sequence. 
 <p>
-A new sequence will be created, and then the contents of source will be copied into it. The destination must not have been previously allocated with <a class="el" href="group__sequence.html#ga1">stp_sequence_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+A new sequence will be created, and then the contents of source will be copied into it. The destination must not have been previously allocated with <a class="el" href="group__sequence.html#g9f0233f39d6a27c796bb283c80974618" title="Create a new sequence.">stp_sequence_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>sequence</em>&nbsp;</td><td>the source sequence. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the new copy of the sequence.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="sequence.h::stp_sequence_destroy" ref="ga2" args="(stp_sequence_t *sequence)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_sequence_destroy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>sequence</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the new copy of the sequence. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g3d571f155c1d00e7794b8299a41c5099"></a><!-- doxytag: member="sequence.h::stp_sequence_destroy" ref="g3d571f155c1d00e7794b8299a41c5099" args="(stp_sequence_t *sequence)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_sequence_destroy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Destroy a sequence. 
 <p>
 It is an error to destroy the sequence more than once. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>sequence</em>&nbsp;</td><td>the sequence to destroy.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>sequence</em>&nbsp;</td><td>the sequence to destroy. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="sequence.h::stp_sequence_get_bounds" ref="ga6" args="(const stp_sequence_t *sequence, double *low, double *high)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g14ad64c63f45a2716ff8d9ceaf00697d"></a><!-- doxytag: member="sequence.h::stp_sequence_get_bounds" ref="g14ad64c63f45a2716ff8d9ceaf00697d" args="(const stp_sequence_t *sequence, double *low, double *high)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_sequence_get_bounds           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">void stp_sequence_get_bounds           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>low</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double *&nbsp;</td>
+          <td class="paramname"> <em>low</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>high</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double *&nbsp;</td>
+          <td class="paramname"> <em>high</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the lower and upper bounds. 
@@ -321,50 +282,42 @@ The values are stored in the variables pointed to by low and high. <dl compact><
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>sequence</em>&nbsp;</td><td>the sequence to work on. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>low</em>&nbsp;</td><td>a pointer to a double to store the low bound in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>high</em>&nbsp;</td><td>a pointer to a double to store the high bound in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>high</em>&nbsp;</td><td>a pointer to a double to store the high bound in. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="sequence.h::stp_sequence_get_data" ref="ga12" args="(const stp_sequence_t *sequence, size_t *size, const double **data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g755c8a35e2e9e83a1dfac4f6138c4122"></a><!-- doxytag: member="sequence.h::stp_sequence_get_data" ref="g755c8a35e2e9e83a1dfac4f6138c4122" args="(const stp_sequence_t *sequence, size_t *size, const double **data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_sequence_get_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">void stp_sequence_get_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>size</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>size</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const double **&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const double **&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the data in a sequence. 
@@ -373,48 +326,40 @@ Get the data in a sequence.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>sequence</em>&nbsp;</td><td>the sequence to get the data from. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>size</em>&nbsp;</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first element of an sequence of doubles is stored in a pointer to double*. <div class="fragment"><pre class="fragment"> <a class="code" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence;
- size_t size;
+    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first element of an sequence of doubles is stored in a pointer to double*. <div class="fragment"><pre class="fragment"> <a class="code" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272" title="The sequence opaque data type.">stp_sequence_t</a> *sequence;
+ <span class="keywordtype">size_t</span> size;
  <span class="keywordtype">double</span> *data;
- <a class="code" href="group__sequence.html#ga12">stp_sequence_get_data</a>(sequence, &amp;size, &amp;data);
-</pre></div></td></tr>
+ <a class="code" href="group__sequence.html#g755c8a35e2e9e83a1dfac4f6138c4122" title="Get the data in a sequence.">stp_sequence_get_data</a>(sequence, &amp;size, &amp;data);
+</pre></div> </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga22"></a><!-- doxytag: member="sequence.h::stp_sequence_get_float_data" ref="ga22" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gff096d5b027157151c65978b95d4e29e"></a><!-- doxytag: member="sequence.h::stp_sequence_get_float_data" ref="gff096d5b027157151c65978b95d4e29e" args="(const stp_sequence_t *sequence, size_t *count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const float* stp_sequence_get_float_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">const float* stp_sequence_get_float_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the data in a sequence as float data. 
@@ -425,42 +370,34 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of floats is stored in a pointer to float*.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga25"></a><!-- doxytag: member="sequence.h::stp_sequence_get_int_data" ref="ga25" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of floats is stored in a pointer to float*. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g01b0bc9e181a097aff3e97254dbfcb14"></a><!-- doxytag: member="sequence.h::stp_sequence_get_int_data" ref="g01b0bc9e181a097aff3e97254dbfcb14" args="(const stp_sequence_t *sequence, size_t *count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const int* stp_sequence_get_int_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">const int* stp_sequence_get_int_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the data in a sequence as int data. 
@@ -471,42 +408,34 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of ints is stored in a pointer to int*.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga23"></a><!-- doxytag: member="sequence.h::stp_sequence_get_long_data" ref="ga23" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of ints is stored in a pointer to int*. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g039d9054cfd0f7d5a892a7fec3f734f4"></a><!-- doxytag: member="sequence.h::stp_sequence_get_long_data" ref="g039d9054cfd0f7d5a892a7fec3f734f4" args="(const stp_sequence_t *sequence, size_t *count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const long* stp_sequence_get_long_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">const long* stp_sequence_get_long_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the data in a sequence as long data. 
@@ -517,48 +446,40 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of longs is stored in a pointer to long*.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga14"></a><!-- doxytag: member="sequence.h::stp_sequence_get_point" ref="ga14" args="(const stp_sequence_t *sequence, size_t where, double *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of longs is stored in a pointer to long*. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="ga79c5f747a80ab2ad9d09b09e0330cc7"></a><!-- doxytag: member="sequence.h::stp_sequence_get_point" ref="ga79c5f747a80ab2ad9d09b09e0330cc7" args="(const stp_sequence_t *sequence, size_t where, double *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_sequence_get_point           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">int stp_sequence_get_point           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>where</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>where</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the data at a single point in a sequence. 
@@ -570,48 +491,40 @@ Get the data at a single point in a sequence.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>the datum is stored in the double pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="sequence.h::stp_sequence_get_range" ref="ga7" args="(const stp_sequence_t *sequence, double *low, double *high)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g999021f2caf1a9d0d6d133123031ce17"></a><!-- doxytag: member="sequence.h::stp_sequence_get_range" ref="g999021f2caf1a9d0d6d133123031ce17" args="(const stp_sequence_t *sequence, double *low, double *high)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_sequence_get_range           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">void stp_sequence_get_range           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>low</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double *&nbsp;</td>
+          <td class="paramname"> <em>low</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>high</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double *&nbsp;</td>
+          <td class="paramname"> <em>high</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get range of values stored in the sequence. 
@@ -620,44 +533,36 @@ The values are stored in the variables pointed to by low and high. <dl compact><
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>sequence</em>&nbsp;</td><td>the sequence to work on. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>low</em>&nbsp;</td><td>a pointer to a double to store the low bound in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>high</em>&nbsp;</td><td>a pointer to a double to store the high bound in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>high</em>&nbsp;</td><td>a pointer to a double to store the high bound in. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga27"></a><!-- doxytag: member="sequence.h::stp_sequence_get_short_data" ref="ga27" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g4d1cf137e4a77e9123e2afcdf7d63bec"></a><!-- doxytag: member="sequence.h::stp_sequence_get_short_data" ref="g4d1cf137e4a77e9123e2afcdf7d63bec" args="(const stp_sequence_t *sequence, size_t *count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const short* stp_sequence_get_short_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">const short* stp_sequence_get_short_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the data in a sequence as short data. 
@@ -668,73 +573,57 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of shorts is stored in a pointer to short*.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="sequence.h::stp_sequence_get_size" ref="ga9" args="(const stp_sequence_t *sequence)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">size_t stp_sequence_get_size           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>sequence</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of shorts is stored in a pointer to short*. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gfa512afc64116f673ae2061d04a5ef90"></a><!-- doxytag: member="sequence.h::stp_sequence_get_size" ref="gfa512afc64116f673ae2061d04a5ef90" args="(const stp_sequence_t *sequence)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">size_t stp_sequence_get_size           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the sequence size. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the sequence size.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga26"></a><!-- doxytag: member="sequence.h::stp_sequence_get_uint_data" ref="ga26" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the sequence size. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="ge7189582ef9e4d638f909a2b1ee0c1b2"></a><!-- doxytag: member="sequence.h::stp_sequence_get_uint_data" ref="ge7189582ef9e4d638f909a2b1ee0c1b2" args="(const stp_sequence_t *sequence, size_t *count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned int* stp_sequence_get_uint_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">const unsigned int* stp_sequence_get_uint_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the data in a sequence as unsigned int data. 
@@ -745,42 +634,34 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of unsigned ints is stored in a pointer to unsigned int*.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga24"></a><!-- doxytag: member="sequence.h::stp_sequence_get_ulong_data" ref="ga24" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of unsigned ints is stored in a pointer to unsigned int*. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g12f54f27144d490893f46dd1b0037b8b"></a><!-- doxytag: member="sequence.h::stp_sequence_get_ulong_data" ref="g12f54f27144d490893f46dd1b0037b8b" args="(const stp_sequence_t *sequence, size_t *count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned long* stp_sequence_get_ulong_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">const unsigned long* stp_sequence_get_ulong_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the data in a sequence as unsigned long data. 
@@ -791,42 +672,34 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of unsigned longs is stored in a pointer to unsigned long*.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga28"></a><!-- doxytag: member="sequence.h::stp_sequence_get_ushort_data" ref="ga28" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of unsigned longs is stored in a pointer to unsigned long*. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g20007077e1d8365a0eddaa922a5967c3"></a><!-- doxytag: member="sequence.h::stp_sequence_get_ushort_data" ref="g20007077e1d8365a0eddaa922a5967c3" args="(const stp_sequence_t *sequence, size_t *count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned short* stp_sequence_get_ushort_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">const unsigned short* stp_sequence_get_ushort_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the data in a sequence as unsigned short data. 
@@ -837,48 +710,40 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of unsigned shorts is stored in a pointer to unsigned short*.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="sequence.h::stp_sequence_set_bounds" ref="ga5" args="(stp_sequence_t *sequence, double low, double high)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of unsigned shorts is stored in a pointer to unsigned short*. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g1720509809473bc33e6f11b277c78bf6"></a><!-- doxytag: member="sequence.h::stp_sequence_set_bounds" ref="g1720509809473bc33e6f11b277c78bf6" args="(stp_sequence_t *sequence, double low, double high)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_sequence_set_bounds           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">int stp_sequence_set_bounds           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>low</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>low</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>high</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>high</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the lower and upper bounds. 
@@ -890,48 +755,40 @@ The lower and upper bounds set the minimum and maximum values that a point in th
     <tr><td valign="top"></td><td valign="top"><em>high</em>&nbsp;</td><td>the upper bound. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, or 0 if the lower bound is greater than the upper bound.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="sequence.h::stp_sequence_set_data" ref="ga10" args="(stp_sequence_t *sequence, size_t count, const double *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, or 0 if the lower bound is greater than the upper bound. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g44bf5a48231675305718162559205fb6"></a><!-- doxytag: member="sequence.h::stp_sequence_set_data" ref="g44bf5a48231675305718162559205fb6" args="(stp_sequence_t *sequence, size_t count, const double *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_sequence_set_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">int stp_sequence_set_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const double *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data in a sequence. 
@@ -943,48 +800,40 @@ Set the data in a sequence.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga15"></a><!-- doxytag: member="sequence.h::stp_sequence_set_float_data" ref="ga15" args="(stp_sequence_t *sequence, size_t count, const float *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g35972a289b95891699ade61246882ab4"></a><!-- doxytag: member="sequence.h::stp_sequence_set_float_data" ref="g35972a289b95891699ade61246882ab4" args="(stp_sequence_t *sequence, size_t count, const float *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_sequence_set_float_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">int stp_sequence_set_float_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const float *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const float *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data in a sequence from float values. 
@@ -996,48 +845,40 @@ Set the data in a sequence from float values.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga18"></a><!-- doxytag: member="sequence.h::stp_sequence_set_int_data" ref="ga18" args="(stp_sequence_t *sequence, size_t count, const int *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g9d3e18b8e576b5c00531dac444397051"></a><!-- doxytag: member="sequence.h::stp_sequence_set_int_data" ref="g9d3e18b8e576b5c00531dac444397051" args="(stp_sequence_t *sequence, size_t count, const int *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_sequence_set_int_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">int stp_sequence_set_int_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const int *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data in a sequence from int values. 
@@ -1049,48 +890,40 @@ Set the data in a sequence from int values.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga16"></a><!-- doxytag: member="sequence.h::stp_sequence_set_long_data" ref="ga16" args="(stp_sequence_t *sequence, size_t count, const long *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gaa76cdc9094ee3c05c49a782fea64478"></a><!-- doxytag: member="sequence.h::stp_sequence_set_long_data" ref="gaa76cdc9094ee3c05c49a782fea64478" args="(stp_sequence_t *sequence, size_t count, const long *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_sequence_set_long_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">int stp_sequence_set_long_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const long *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const long *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data in a sequence from long values. 
@@ -1102,48 +935,40 @@ Set the data in a sequence from long values.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga13"></a><!-- doxytag: member="sequence.h::stp_sequence_set_point" ref="ga13" args="(stp_sequence_t *sequence, size_t where, double data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g42c76060886da02cb4a7d843ffe6d21c"></a><!-- doxytag: member="sequence.h::stp_sequence_set_point" ref="g42c76060886da02cb4a7d843ffe6d21c" args="(stp_sequence_t *sequence, size_t where, double data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_sequence_set_point           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">int stp_sequence_set_point           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>where</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>where</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data at a single point in a sequence. 
@@ -1155,48 +980,40 @@ Set the data at a single point in a sequence.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>the datum to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga20"></a><!-- doxytag: member="sequence.h::stp_sequence_set_short_data" ref="ga20" args="(stp_sequence_t *sequence, size_t count, const short *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g572ecad03d772a255481bb8b6d79106f"></a><!-- doxytag: member="sequence.h::stp_sequence_set_short_data" ref="g572ecad03d772a255481bb8b6d79106f" args="(stp_sequence_t *sequence, size_t count, const short *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_sequence_set_short_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">int stp_sequence_set_short_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const short *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const short *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data in a sequence from short values. 
@@ -1208,42 +1025,34 @@ Set the data in a sequence from short values.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="sequence.h::stp_sequence_set_size" ref="ga8" args="(stp_sequence_t *sequence, size_t size)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="ge0af31b854e61e0e047b3ba6dc6ec528"></a><!-- doxytag: member="sequence.h::stp_sequence_set_size" ref="ge0af31b854e61e0e047b3ba6dc6ec528" args="(stp_sequence_t *sequence, size_t size)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_sequence_set_size           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">int stp_sequence_set_size           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>size</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>size</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the sequence size. 
@@ -1254,54 +1063,46 @@ The size is the number of elements the sequence contains. Note that resizing wil
     <tr><td valign="top"></td><td valign="top"><em>size</em>&nbsp;</td><td>the size to set the sequence to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="sequence.h::stp_sequence_set_subrange" ref="ga11" args="(stp_sequence_t *sequence, size_t where, size_t size, const double *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g5bb962248581af2c3c54193442d9c82f"></a><!-- doxytag: member="sequence.h::stp_sequence_set_subrange" ref="g5bb962248581af2c3c54193442d9c82f" args="(stp_sequence_t *sequence, size_t where, size_t size, const double *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_sequence_set_subrange           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">int stp_sequence_set_subrange           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>where</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>where</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>size</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>size</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const double *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const double *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data in a subrange of a sequence. 
@@ -1314,48 +1115,40 @@ Set the data in a subrange of a sequence.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga19"></a><!-- doxytag: member="sequence.h::stp_sequence_set_uint_data" ref="ga19" args="(stp_sequence_t *sequence, size_t count, const unsigned int *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g497c32dec3d745a2602c5e97819de21d"></a><!-- doxytag: member="sequence.h::stp_sequence_set_uint_data" ref="g497c32dec3d745a2602c5e97819de21d" args="(stp_sequence_t *sequence, size_t count, const unsigned int *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_sequence_set_uint_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">int stp_sequence_set_uint_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned int *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data in a sequence from unsigned int values. 
@@ -1367,48 +1160,40 @@ Set the data in a sequence from unsigned int values.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga17"></a><!-- doxytag: member="sequence.h::stp_sequence_set_ulong_data" ref="ga17" args="(stp_sequence_t *sequence, size_t count, const unsigned long *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g3e274a2095f2e6986892384ee89e1255"></a><!-- doxytag: member="sequence.h::stp_sequence_set_ulong_data" ref="g3e274a2095f2e6986892384ee89e1255" args="(stp_sequence_t *sequence, size_t count, const unsigned long *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_sequence_set_ulong_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">int stp_sequence_set_ulong_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned long *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned long *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data in a sequence from unsigned long values. 
@@ -1420,48 +1205,40 @@ Set the data in a sequence from unsigned long values.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga21"></a><!-- doxytag: member="sequence.h::stp_sequence_set_ushort_data" ref="ga21" args="(stp_sequence_t *sequence, size_t count, const unsigned short *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g317d484a67a2b775bee27f3dfe67fed4"></a><!-- doxytag: member="sequence.h::stp_sequence_set_ushort_data" ref="g317d484a67a2b775bee27f3dfe67fed4" args="(stp_sequence_t *sequence, size_t count, const unsigned short *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_sequence_set_ushort_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>sequence</em>, </td>
+          <td class="memname">int stp_sequence_set_ushort_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>sequence</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const unsigned short *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned short *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the data in a sequence from unsigned short values. 
@@ -1473,12 +1250,12 @@ Set the data in a sequence from unsigned short values.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__util.html b/doc/gutenprint/html/group__util.html
index 410d19e..d3fa11c 100644
--- a/doc/gutenprint/html/group__util.html
+++ b/doc/gutenprint/html/group__util.html
@@ -1,1607 +1,1255 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: util</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1>util</h1>Utility functions.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga33">STP_DBG_LUT</a>&nbsp;&nbsp;&nbsp;0x1</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g4472d3ba849ed203d43005f04583decc">STP_DBG_LUT</a>&nbsp;&nbsp;&nbsp;0x1</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga34">STP_DBG_COLORFUNC</a>&nbsp;&nbsp;&nbsp;0x2</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g0beee5fa281098eab25e3f22570c0fdc">STP_DBG_COLORFUNC</a>&nbsp;&nbsp;&nbsp;0x2</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga35">STP_DBG_INK</a>&nbsp;&nbsp;&nbsp;0x4</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g1c6936662d2cbe95de396fe8af2f254d">STP_DBG_INK</a>&nbsp;&nbsp;&nbsp;0x4</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga36">STP_DBG_PS</a>&nbsp;&nbsp;&nbsp;0x8</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g90d230dd93fa96d34b438e82ed3f9639">STP_DBG_PS</a>&nbsp;&nbsp;&nbsp;0x8</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga37">STP_DBG_PCL</a>&nbsp;&nbsp;&nbsp;0x10</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gf8162186c8118e5c3a8543bc0c410a78">STP_DBG_PCL</a>&nbsp;&nbsp;&nbsp;0x10</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga38">STP_DBG_ESCP2</a>&nbsp;&nbsp;&nbsp;0x20</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gda7c4766db0c05ecb5ce435ddd81ecdd">STP_DBG_ESCP2</a>&nbsp;&nbsp;&nbsp;0x20</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga39">STP_DBG_CANON</a>&nbsp;&nbsp;&nbsp;0x40</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g109cde96d907cbd28f0b631f07a3d696">STP_DBG_CANON</a>&nbsp;&nbsp;&nbsp;0x40</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga40">STP_DBG_LEXMARK</a>&nbsp;&nbsp;&nbsp;0x80</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gc71c7cb5cdf49c881d944ef813a3733f">STP_DBG_LEXMARK</a>&nbsp;&nbsp;&nbsp;0x80</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga41">STP_DBG_WEAVE_PARAMS</a>&nbsp;&nbsp;&nbsp;0x100</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g2af8b3f36dbda4cfd313b50ba2dae636">STP_DBG_WEAVE_PARAMS</a>&nbsp;&nbsp;&nbsp;0x100</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga42">STP_DBG_ROWS</a>&nbsp;&nbsp;&nbsp;0x200</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g698ce0ddb2e4f0a8b6d7a77ad7a0fbf0">STP_DBG_ROWS</a>&nbsp;&nbsp;&nbsp;0x200</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga43">STP_DBG_MARK_FILE</a>&nbsp;&nbsp;&nbsp;0x400</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g01f4480bda8819f337b2be4c41e0ebe1">STP_DBG_MARK_FILE</a>&nbsp;&nbsp;&nbsp;0x400</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga44">STP_DBG_LIST</a>&nbsp;&nbsp;&nbsp;0x800</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g3c5672b14a2e2ccdffca5b6277b1aac2">STP_DBG_LIST</a>&nbsp;&nbsp;&nbsp;0x800</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga45">STP_DBG_MODULE</a>&nbsp;&nbsp;&nbsp;0x1000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g9ace1ab545abac936101248caf9a50c6">STP_DBG_MODULE</a>&nbsp;&nbsp;&nbsp;0x1000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga46">STP_DBG_PATH</a>&nbsp;&nbsp;&nbsp;0x2000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g6f8cdfb28d0d73e9579fb1751f540dc7">STP_DBG_PATH</a>&nbsp;&nbsp;&nbsp;0x2000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga47">STP_DBG_PAPER</a>&nbsp;&nbsp;&nbsp;0x4000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gd5eeaeabba7a0a861ae0dc936057aabd">STP_DBG_PAPER</a>&nbsp;&nbsp;&nbsp;0x4000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga48">STP_DBG_PRINTERS</a>&nbsp;&nbsp;&nbsp;0x8000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gdbfb451ebbd246d62bd52e0120fa232b">STP_DBG_PRINTERS</a>&nbsp;&nbsp;&nbsp;0x8000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga49">STP_DBG_XML</a>&nbsp;&nbsp;&nbsp;0x10000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gcf72e68aa70e333b06b0bb821218d967">STP_DBG_XML</a>&nbsp;&nbsp;&nbsp;0x10000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga50">STP_DBG_VARS</a>&nbsp;&nbsp;&nbsp;0x20000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g4c481c5ea8d87ae6c0e556593ab2020e">STP_DBG_VARS</a>&nbsp;&nbsp;&nbsp;0x20000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga51">STP_DBG_OLYMPUS</a>&nbsp;&nbsp;&nbsp;0x40000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g574664feccffc4527df73e32c7e863bf">STP_DBG_OLYMPUS</a>&nbsp;&nbsp;&nbsp;0x40000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga52">STP_DBG_CURVE</a>&nbsp;&nbsp;&nbsp;0x80000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g8f3e76af1b2564a5763e790a45215438">STP_DBG_CURVE</a>&nbsp;&nbsp;&nbsp;0x80000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga53">STP_DBG_CURVE_ERRORS</a>&nbsp;&nbsp;&nbsp;0x100000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gabbc2868668663cc28d6289d50e5f83d">STP_DBG_CURVE_ERRORS</a>&nbsp;&nbsp;&nbsp;0x100000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga54">STP_SAFE_FREE</a>(x)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga5a86efbbd3e2eb391718d82a1d7ffcc">STP_SAFE_FREE</a>(x)</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga0">stp_init</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g2ce0a2e8887fe5ff7f3eed1370d0d691">stp_init</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Initialise libgimpprint.  <a href="#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1">stp_set_output_codeset</a> (const char *codeset)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Initialise libgimpprint.  <a href="#g2ce0a2e8887fe5ff7f3eed1370d0d691"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g7fcc19f0abdc6513dfba7eaebeb16cb9">stp_set_output_codeset</a> (const char *codeset)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the output encoding.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga2">stp_read_and_compose_curves</a> (const char *s1, const char *s2, <a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a> comp, size_t piecewise_point_count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the output encoding.  <a href="#g7fcc19f0abdc6513dfba7eaebeb16cb9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gdbe8c167230b49bc10391d2c246e6dc0">stp_read_and_compose_curves</a> (const char *s1, const char *s2, <a class="el" href="group__curve.html#g7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> comp, size_t piecewise_point_count)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga3">stp_abort</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gd0c145dc5cebecab0bb4e3ac40fc8e4d">stp_abort</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga4">stp_prune_inactive_options</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g13aa8afef5b0872704390adc6a01924e">stp_prune_inactive_options</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga5">stp_zprintf</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gd7ffe058decb939af6a5c1ec1d0d77fa">stp_zprintf</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga6">stp_zfwrite</a> (const char *buf, size_t bytes, size_t nitems, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g183d8f36f187530f9d7acdb176be3409">stp_zfwrite</a> (const char *buf, size_t bytes, size_t nitems, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga7">stp_putc</a> (int ch, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g39e4c5f6fa2a07dfca3090a50a8858f9">stp_putc</a> (int ch, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga8">stp_put16_le</a> (unsigned short sh, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g1ffcb45ea3c37bb6b485addcaf945c99">stp_put16_le</a> (unsigned short sh, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga9">stp_put16_be</a> (unsigned short sh, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g23b504253ceda208b9a4985e6de8a5f7">stp_put16_be</a> (unsigned short sh, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga10">stp_put32_le</a> (unsigned int sh, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gadf69b8b3f713d2bd7ca3a5648da0c56">stp_put32_le</a> (unsigned int sh, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga11">stp_put32_be</a> (unsigned int sh, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g258b7b5f8808d0a3168f798e8bf72608">stp_put32_be</a> (unsigned int sh, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga12">stp_puts</a> (const char *s, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gf6cf72e5e45f175ae8c332c0588832b9">stp_puts</a> (const char *s, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga13">stp_send_command</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *command, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g79dd0a6f5c63f4fbf8591d3c041a7720">stp_putraw</a> (const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *r, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga14">stp_erputc</a> (int ch)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gdb49b9cba9ddf4e506b6f530353ad93d">stp_send_command</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *command, const char *format,...)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga15">stp_eprintf</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g15987fbd850e04f2520cb151e08908e1">stp_erputc</a> (int ch)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga16">stp_erprintf</a> (const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ge53707df5c9945f289c58bfbe08a8d88">stp_eprintf</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga17">stp_asprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g1df22de14e3275cb26ede10da66eebdf">stp_erprintf</a> (const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga18">stp_catprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g3f57c5298a5c6140ac56771dd62bd036">stp_asprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga19">stp_get_debug_level</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gd4f33438f0103a143d90dc9c48d248eb">stp_catprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga20">stp_dprintf</a> (unsigned long level, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#geba8c24f265ee904c5876704b767841c">stp_get_debug_level</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga21">stp_deprintf</a> (unsigned long level, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g511e0c4cac91c674797da98ab96b83e6">stp_dprintf</a> (unsigned long level, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga22">stp_init_debug_messages</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g129f45d7df47fd58d8653538fd13a1f2">stp_deprintf</a> (unsigned long level, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga23">stp_flush_debug_messages</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g6d15e5b4e00f9d242166edb5332f8368">stp_init_debug_messages</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga24">stp_malloc</a> (size_t)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gbe74390c1422e9746745da55692f47b8">stp_flush_debug_messages</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga25">stp_zalloc</a> (size_t)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g86a2976738a237df953655e733c75b3a">stp_malloc</a> (size_t)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga26">stp_realloc</a> (void *ptr, size_t)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gc8fd1a439fa2d8e1ff1a2b104cd0137b">stp_zalloc</a> (size_t)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga27">stp_free</a> (void *ptr)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g2420936ab8b3492581f389deea44f58c">stp_realloc</a> (void *ptr, size_t)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga28">stp_strlen</a> (const char *s)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g7d0c40c3157b2c5c630200352064874c">stp_free</a> (void *ptr)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga29">stp_strndup</a> (const char *s, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g56b08d3e12750bdfae8b53263f97aba9">stp_strlen</a> (const char *s)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga30">stp_strdup</a> (const char *s)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gb026f7022963acd694a8b89e4decbde5">stp_strndup</a> (const char *s, int n)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga31">stp_get_version</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g5c0731867697f555a94b2a1229804381">stp_strdup</a> (const char *s)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library version string (x.y.z).  <a href="#ga31"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga32">stp_get_release_version</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g1f0797636484393574cb95e667819dc1">stp_get_version</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library release version string (x.y).  <a href="#ga32"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library version string (x.y.z).  <a href="#g1f0797636484393574cb95e667819dc1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g5ba7edc43ed094f32ae7d9158a362a7b">stp_get_release_version</a> (void)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library release version string (x.y).  <a href="#g5ba7edc43ed094f32ae7d9158a362a7b"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Utility functions. 
 <p>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="ga39"></a><!-- doxytag: member="util.h::STP_DBG_CANON" ref="ga39" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="g109cde96d907cbd28f0b631f07a3d696"></a><!-- doxytag: member="util.h::STP_DBG_CANON" ref="g109cde96d907cbd28f0b631f07a3d696" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_CANON&nbsp;&nbsp;&nbsp;0x40          </td>
+          <td class="memname">#define STP_DBG_CANON&nbsp;&nbsp;&nbsp;0x40          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga34"></a><!-- doxytag: member="util.h::STP_DBG_COLORFUNC" ref="ga34" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g0beee5fa281098eab25e3f22570c0fdc"></a><!-- doxytag: member="util.h::STP_DBG_COLORFUNC" ref="g0beee5fa281098eab25e3f22570c0fdc" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_COLORFUNC&nbsp;&nbsp;&nbsp;0x2          </td>
+          <td class="memname">#define STP_DBG_COLORFUNC&nbsp;&nbsp;&nbsp;0x2          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga52"></a><!-- doxytag: member="util.h::STP_DBG_CURVE" ref="ga52" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g8f3e76af1b2564a5763e790a45215438"></a><!-- doxytag: member="util.h::STP_DBG_CURVE" ref="g8f3e76af1b2564a5763e790a45215438" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_CURVE&nbsp;&nbsp;&nbsp;0x80000          </td>
+          <td class="memname">#define STP_DBG_CURVE&nbsp;&nbsp;&nbsp;0x80000          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga53"></a><!-- doxytag: member="util.h::STP_DBG_CURVE_ERRORS" ref="ga53" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gabbc2868668663cc28d6289d50e5f83d"></a><!-- doxytag: member="util.h::STP_DBG_CURVE_ERRORS" ref="gabbc2868668663cc28d6289d50e5f83d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_CURVE_ERRORS&nbsp;&nbsp;&nbsp;0x100000          </td>
+          <td class="memname">#define STP_DBG_CURVE_ERRORS&nbsp;&nbsp;&nbsp;0x100000          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga38"></a><!-- doxytag: member="util.h::STP_DBG_ESCP2" ref="ga38" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gda7c4766db0c05ecb5ce435ddd81ecdd"></a><!-- doxytag: member="util.h::STP_DBG_ESCP2" ref="gda7c4766db0c05ecb5ce435ddd81ecdd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_ESCP2&nbsp;&nbsp;&nbsp;0x20          </td>
+          <td class="memname">#define STP_DBG_ESCP2&nbsp;&nbsp;&nbsp;0x20          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga35"></a><!-- doxytag: member="util.h::STP_DBG_INK" ref="ga35" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g1c6936662d2cbe95de396fe8af2f254d"></a><!-- doxytag: member="util.h::STP_DBG_INK" ref="g1c6936662d2cbe95de396fe8af2f254d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_INK&nbsp;&nbsp;&nbsp;0x4          </td>
+          <td class="memname">#define STP_DBG_INK&nbsp;&nbsp;&nbsp;0x4          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga40"></a><!-- doxytag: member="util.h::STP_DBG_LEXMARK" ref="ga40" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gc71c7cb5cdf49c881d944ef813a3733f"></a><!-- doxytag: member="util.h::STP_DBG_LEXMARK" ref="gc71c7cb5cdf49c881d944ef813a3733f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_LEXMARK&nbsp;&nbsp;&nbsp;0x80          </td>
+          <td class="memname">#define STP_DBG_LEXMARK&nbsp;&nbsp;&nbsp;0x80          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga44"></a><!-- doxytag: member="util.h::STP_DBG_LIST" ref="ga44" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g3c5672b14a2e2ccdffca5b6277b1aac2"></a><!-- doxytag: member="util.h::STP_DBG_LIST" ref="g3c5672b14a2e2ccdffca5b6277b1aac2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_LIST&nbsp;&nbsp;&nbsp;0x800          </td>
+          <td class="memname">#define STP_DBG_LIST&nbsp;&nbsp;&nbsp;0x800          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga33"></a><!-- doxytag: member="util.h::STP_DBG_LUT" ref="ga33" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g4472d3ba849ed203d43005f04583decc"></a><!-- doxytag: member="util.h::STP_DBG_LUT" ref="g4472d3ba849ed203d43005f04583decc" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_LUT&nbsp;&nbsp;&nbsp;0x1          </td>
+          <td class="memname">#define STP_DBG_LUT&nbsp;&nbsp;&nbsp;0x1          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga43"></a><!-- doxytag: member="util.h::STP_DBG_MARK_FILE" ref="ga43" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g01f4480bda8819f337b2be4c41e0ebe1"></a><!-- doxytag: member="util.h::STP_DBG_MARK_FILE" ref="g01f4480bda8819f337b2be4c41e0ebe1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_MARK_FILE&nbsp;&nbsp;&nbsp;0x400          </td>
+          <td class="memname">#define STP_DBG_MARK_FILE&nbsp;&nbsp;&nbsp;0x400          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga45"></a><!-- doxytag: member="util.h::STP_DBG_MODULE" ref="ga45" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g9ace1ab545abac936101248caf9a50c6"></a><!-- doxytag: member="util.h::STP_DBG_MODULE" ref="g9ace1ab545abac936101248caf9a50c6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_MODULE&nbsp;&nbsp;&nbsp;0x1000          </td>
+          <td class="memname">#define STP_DBG_MODULE&nbsp;&nbsp;&nbsp;0x1000          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga51"></a><!-- doxytag: member="util.h::STP_DBG_OLYMPUS" ref="ga51" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g574664feccffc4527df73e32c7e863bf"></a><!-- doxytag: member="util.h::STP_DBG_OLYMPUS" ref="g574664feccffc4527df73e32c7e863bf" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_OLYMPUS&nbsp;&nbsp;&nbsp;0x40000          </td>
+          <td class="memname">#define STP_DBG_OLYMPUS&nbsp;&nbsp;&nbsp;0x40000          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga47"></a><!-- doxytag: member="util.h::STP_DBG_PAPER" ref="ga47" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gd5eeaeabba7a0a861ae0dc936057aabd"></a><!-- doxytag: member="util.h::STP_DBG_PAPER" ref="gd5eeaeabba7a0a861ae0dc936057aabd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_PAPER&nbsp;&nbsp;&nbsp;0x4000          </td>
+          <td class="memname">#define STP_DBG_PAPER&nbsp;&nbsp;&nbsp;0x4000          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga46"></a><!-- doxytag: member="util.h::STP_DBG_PATH" ref="ga46" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g6f8cdfb28d0d73e9579fb1751f540dc7"></a><!-- doxytag: member="util.h::STP_DBG_PATH" ref="g6f8cdfb28d0d73e9579fb1751f540dc7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_PATH&nbsp;&nbsp;&nbsp;0x2000          </td>
+          <td class="memname">#define STP_DBG_PATH&nbsp;&nbsp;&nbsp;0x2000          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga37"></a><!-- doxytag: member="util.h::STP_DBG_PCL" ref="ga37" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gf8162186c8118e5c3a8543bc0c410a78"></a><!-- doxytag: member="util.h::STP_DBG_PCL" ref="gf8162186c8118e5c3a8543bc0c410a78" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_PCL&nbsp;&nbsp;&nbsp;0x10          </td>
+          <td class="memname">#define STP_DBG_PCL&nbsp;&nbsp;&nbsp;0x10          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga48"></a><!-- doxytag: member="util.h::STP_DBG_PRINTERS" ref="ga48" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gdbfb451ebbd246d62bd52e0120fa232b"></a><!-- doxytag: member="util.h::STP_DBG_PRINTERS" ref="gdbfb451ebbd246d62bd52e0120fa232b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_PRINTERS&nbsp;&nbsp;&nbsp;0x8000          </td>
+          <td class="memname">#define STP_DBG_PRINTERS&nbsp;&nbsp;&nbsp;0x8000          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga36"></a><!-- doxytag: member="util.h::STP_DBG_PS" ref="ga36" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g90d230dd93fa96d34b438e82ed3f9639"></a><!-- doxytag: member="util.h::STP_DBG_PS" ref="g90d230dd93fa96d34b438e82ed3f9639" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_PS&nbsp;&nbsp;&nbsp;0x8          </td>
+          <td class="memname">#define STP_DBG_PS&nbsp;&nbsp;&nbsp;0x8          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga42"></a><!-- doxytag: member="util.h::STP_DBG_ROWS" ref="ga42" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g698ce0ddb2e4f0a8b6d7a77ad7a0fbf0"></a><!-- doxytag: member="util.h::STP_DBG_ROWS" ref="g698ce0ddb2e4f0a8b6d7a77ad7a0fbf0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_ROWS&nbsp;&nbsp;&nbsp;0x200          </td>
+          <td class="memname">#define STP_DBG_ROWS&nbsp;&nbsp;&nbsp;0x200          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga50"></a><!-- doxytag: member="util.h::STP_DBG_VARS" ref="ga50" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g4c481c5ea8d87ae6c0e556593ab2020e"></a><!-- doxytag: member="util.h::STP_DBG_VARS" ref="g4c481c5ea8d87ae6c0e556593ab2020e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_VARS&nbsp;&nbsp;&nbsp;0x20000          </td>
+          <td class="memname">#define STP_DBG_VARS&nbsp;&nbsp;&nbsp;0x20000          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga41"></a><!-- doxytag: member="util.h::STP_DBG_WEAVE_PARAMS" ref="ga41" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g2af8b3f36dbda4cfd313b50ba2dae636"></a><!-- doxytag: member="util.h::STP_DBG_WEAVE_PARAMS" ref="g2af8b3f36dbda4cfd313b50ba2dae636" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_WEAVE_PARAMS&nbsp;&nbsp;&nbsp;0x100          </td>
+          <td class="memname">#define STP_DBG_WEAVE_PARAMS&nbsp;&nbsp;&nbsp;0x100          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga49"></a><!-- doxytag: member="util.h::STP_DBG_XML" ref="ga49" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gcf72e68aa70e333b06b0bb821218d967"></a><!-- doxytag: member="util.h::STP_DBG_XML" ref="gcf72e68aa70e333b06b0bb821218d967" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_DBG_XML&nbsp;&nbsp;&nbsp;0x10000          </td>
+          <td class="memname">#define STP_DBG_XML&nbsp;&nbsp;&nbsp;0x10000          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga54"></a><!-- doxytag: member="util.h::STP_SAFE_FREE" ref="ga54" args="(x)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">#define STP_SAFE_FREE          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">x&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="ga5a86efbbd3e2eb391718d82a1d7ffcc"></a><!-- doxytag: member="util.h::STP_SAFE_FREE" ref="ga5a86efbbd3e2eb391718d82a1d7ffcc" args="(x)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define STP_SAFE_FREE          </td>
+          <td>(</td>
+          <td class="paramtype">x&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 <b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">do</span>                                              \
 {                                               \
   <span class="keywordflow">if</span> ((x))                                      \
-    <a class="code" href="group__util.html#ga27">stp_free</a>((<span class="keywordtype">char</span> *)(x));                      \
+    <a class="code" href="group__util.html#g7d0c40c3157b2c5c630200352064874c">stp_free</a>((<span class="keywordtype">char</span> *)(x));                      \
   ((x)) = NULL;                                 \
 } <span class="keywordflow">while</span> (0)
-</pre></div>    </td>
-  </tr>
-</table>
+</pre></div>
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="util.h::stp_abort" ref="ga3" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_abort           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<a class="anchor" name="gd0c145dc5cebecab0bb4e3ac40fc8e4d"></a><!-- doxytag: member="util.h::stp_abort" ref="gd0c145dc5cebecab0bb4e3ac40fc8e4d" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_abort           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga17"></a><!-- doxytag: member="util.h::stp_asprintf" ref="ga17" args="(char **strp, const char *format,...) __attribute__((format(__printf__" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g3f57c5298a5c6140ac56771dd62bd036"></a><!-- doxytag: member="util.h::stp_asprintf" ref="g3f57c5298a5c6140ac56771dd62bd036" args="(char **strp, const char *format,...) __attribute__((format(__printf__" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void void void stp_asprintf           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">char **&nbsp;</td>
-          <td class="mdname" nowrap> <em>strp</em>, </td>
+          <td class="memname">void void void stp_asprintf           </td>
+          <td>(</td>
+          <td class="paramtype">char **&nbsp;</td>
+          <td class="paramname"> <em>strp</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>&nbsp;</td>
-          <td class="mdname" nowrap> <em>...</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga18"></a><!-- doxytag: member="util.h::stp_catprintf" ref="ga18" args="(char **strp, const char *format,...) __attribute__((format(__printf__" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gd4f33438f0103a143d90dc9c48d248eb"></a><!-- doxytag: member="util.h::stp_catprintf" ref="gd4f33438f0103a143d90dc9c48d248eb" args="(char **strp, const char *format,...) __attribute__((format(__printf__" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void void void void stp_catprintf           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">char **&nbsp;</td>
-          <td class="mdname" nowrap> <em>strp</em>, </td>
+          <td class="memname">void void void void stp_catprintf           </td>
+          <td>(</td>
+          <td class="paramtype">char **&nbsp;</td>
+          <td class="paramname"> <em>strp</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>&nbsp;</td>
-          <td class="mdname" nowrap> <em>...</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga21"></a><!-- doxytag: member="util.h::stp_deprintf" ref="ga21" args="(unsigned long level, const char *format,...) __attribute__((format(__printf__" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g129f45d7df47fd58d8653538fd13a1f2"></a><!-- doxytag: member="util.h::stp_deprintf" ref="g129f45d7df47fd58d8653538fd13a1f2" args="(unsigned long level, const char *format,...) __attribute__((format(__printf__" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void void stp_deprintf           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>level</em>, </td>
+          <td class="memname">void void stp_deprintf           </td>
+          <td>(</td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>level</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>&nbsp;</td>
-          <td class="mdname" nowrap> <em>...</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga20"></a><!-- doxytag: member="util.h::stp_dprintf" ref="ga20" args="(unsigned long level, const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g511e0c4cac91c674797da98ab96b83e6"></a><!-- doxytag: member="util.h::stp_dprintf" ref="g511e0c4cac91c674797da98ab96b83e6" args="(unsigned long level, const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_dprintf           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">unsigned long&nbsp;</td>
-          <td class="mdname" nowrap> <em>level</em>, </td>
+          <td class="memname">void stp_dprintf           </td>
+          <td>(</td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>level</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>&nbsp;</td>
-          <td class="mdname" nowrap> <em>...</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga15"></a><!-- doxytag: member="util.h::stp_eprintf" ref="ga15" args="(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ge53707df5c9945f289c58bfbe08a8d88"></a><!-- doxytag: member="util.h::stp_eprintf" ref="ge53707df5c9945f289c58bfbe08a8d88" args="(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_eprintf           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_eprintf           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>&nbsp;</td>
-          <td class="mdname" nowrap> <em>...</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga16"></a><!-- doxytag: member="util.h::stp_erprintf" ref="ga16" args="(const char *format,...) __attribute__((format(__printf__" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g1df22de14e3275cb26ede10da66eebdf"></a><!-- doxytag: member="util.h::stp_erprintf" ref="g1df22de14e3275cb26ede10da66eebdf" args="(const char *format,...) __attribute__((format(__printf__" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void void stp_erprintf           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="memname">void void stp_erprintf           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>&nbsp;</td>
-          <td class="mdname" nowrap> <em>...</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga14"></a><!-- doxytag: member="util.h::stp_erputc" ref="ga14" args="(int ch)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_erputc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>ch</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="g15987fbd850e04f2520cb151e08908e1"></a><!-- doxytag: member="util.h::stp_erputc" ref="g15987fbd850e04f2520cb151e08908e1" args="(int ch)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_erputc           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>ch</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga23"></a><!-- doxytag: member="util.h::stp_flush_debug_messages" ref="ga23" args="(stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_flush_debug_messages           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="gbe74390c1422e9746745da55692f47b8"></a><!-- doxytag: member="util.h::stp_flush_debug_messages" ref="gbe74390c1422e9746745da55692f47b8" args="(stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_flush_debug_messages           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga27"></a><!-- doxytag: member="util.h::stp_free" ref="ga27" args="(void *ptr)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_free           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>ptr</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="g7d0c40c3157b2c5c630200352064874c"></a><!-- doxytag: member="util.h::stp_free" ref="g7d0c40c3157b2c5c630200352064874c" args="(void *ptr)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_free           </td>
+          <td>(</td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>ptr</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga19"></a><!-- doxytag: member="util.h::stp_get_debug_level" ref="ga19" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">unsigned long stp_get_debug_level           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="geba8c24f265ee904c5876704b767841c"></a><!-- doxytag: member="util.h::stp_get_debug_level" ref="geba8c24f265ee904c5876704b767841c" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned long stp_get_debug_level           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga32"></a><!-- doxytag: member="util.h::stp_get_release_version" ref="ga32" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stp_get_release_version           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="g5ba7edc43ed094f32ae7d9158a362a7b"></a><!-- doxytag: member="util.h::stp_get_release_version" ref="g5ba7edc43ed094f32ae7d9158a362a7b" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stp_get_release_version           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the library release version string (x.y). 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the release name of the package, which must not be modified or freed.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga31"></a><!-- doxytag: member="util.h::stp_get_version" ref="ga31" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stp_get_version           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the release name of the package, which must not be modified or freed. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g1f0797636484393574cb95e667819dc1"></a><!-- doxytag: member="util.h::stp_get_version" ref="g1f0797636484393574cb95e667819dc1" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stp_get_version           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the library version string (x.y.z). 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the version name of the package, which must not be modified or freed.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="util.h::stp_init" ref="ga0" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_init           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the version name of the package, which must not be modified or freed. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g2ce0a2e8887fe5ff7f3eed1370d0d691"></a><!-- doxytag: member="util.h::stp_init" ref="g2ce0a2e8887fe5ff7f3eed1370d0d691" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_init           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Initialise libgimpprint. 
 <p>
-This function must be called prior to any other use of the library. It is responsible for loading modules and XML data and initialising internal data structures. <dl compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga22"></a><!-- doxytag: member="util.h::stp_init_debug_messages" ref="ga22" args="(stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void void void stp_init_debug_messages           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+This function must be called prior to any other use of the library. It is responsible for loading modules and XML data and initialising internal data structures. <dl class="return" compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g6d15e5b4e00f9d242166edb5332f8368"></a><!-- doxytag: member="util.h::stp_init_debug_messages" ref="g6d15e5b4e00f9d242166edb5332f8368" args="(stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void void void stp_init_debug_messages           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga24"></a><!-- doxytag: member="util.h::stp_malloc" ref="ga24" args="(size_t)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void* stp_malloc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">size_t&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="g86a2976738a237df953655e733c75b3a"></a><!-- doxytag: member="util.h::stp_malloc" ref="g86a2976738a237df953655e733c75b3a" args="(size_t)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void* stp_malloc           </td>
+          <td>(</td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="util.h::stp_prune_inactive_options" ref="ga4" args="(stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_prune_inactive_options           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="g13aa8afef5b0872704390adc6a01924e"></a><!-- doxytag: member="util.h::stp_prune_inactive_options" ref="g13aa8afef5b0872704390adc6a01924e" args="(stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_prune_inactive_options           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="util.h::stp_put16_be" ref="ga9" args="(unsigned short sh, const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g23b504253ceda208b9a4985e6de8a5f7"></a><!-- doxytag: member="util.h::stp_put16_be" ref="g23b504253ceda208b9a4985e6de8a5f7" args="(unsigned short sh, const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_put16_be           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">unsigned short&nbsp;</td>
-          <td class="mdname" nowrap> <em>sh</em>, </td>
+          <td class="memname">void stp_put16_be           </td>
+          <td>(</td>
+          <td class="paramtype">unsigned short&nbsp;</td>
+          <td class="paramname"> <em>sh</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="util.h::stp_put16_le" ref="ga8" args="(unsigned short sh, const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g1ffcb45ea3c37bb6b485addcaf945c99"></a><!-- doxytag: member="util.h::stp_put16_le" ref="g1ffcb45ea3c37bb6b485addcaf945c99" args="(unsigned short sh, const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_put16_le           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">unsigned short&nbsp;</td>
-          <td class="mdname" nowrap> <em>sh</em>, </td>
+          <td class="memname">void stp_put16_le           </td>
+          <td>(</td>
+          <td class="paramtype">unsigned short&nbsp;</td>
+          <td class="paramname"> <em>sh</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="util.h::stp_put32_be" ref="ga11" args="(unsigned int sh, const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g258b7b5f8808d0a3168f798e8bf72608"></a><!-- doxytag: member="util.h::stp_put32_be" ref="g258b7b5f8808d0a3168f798e8bf72608" args="(unsigned int sh, const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_put32_be           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>sh</em>, </td>
+          <td class="memname">void stp_put32_be           </td>
+          <td>(</td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>sh</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="util.h::stp_put32_le" ref="ga10" args="(unsigned int sh, const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gadf69b8b3f713d2bd7ca3a5648da0c56"></a><!-- doxytag: member="util.h::stp_put32_le" ref="gadf69b8b3f713d2bd7ca3a5648da0c56" args="(unsigned int sh, const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_put32_le           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>sh</em>, </td>
+          <td class="memname">void stp_put32_le           </td>
+          <td>(</td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>sh</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="util.h::stp_putc" ref="ga7" args="(int ch, const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g39e4c5f6fa2a07dfca3090a50a8858f9"></a><!-- doxytag: member="util.h::stp_putc" ref="g39e4c5f6fa2a07dfca3090a50a8858f9" args="(int ch, const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_putc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">int&nbsp;</td>
-          <td class="mdname" nowrap> <em>ch</em>, </td>
+          <td class="memname">void stp_putc           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>ch</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="util.h::stp_puts" ref="ga12" args="(const char *s, const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g79dd0a6f5c63f4fbf8591d3c041a7720"></a><!-- doxytag: member="util.h::stp_putraw" ref="g79dd0a6f5c63f4fbf8591d3c041a7720" args="(const stp_raw_t *r, const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_puts           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>s</em>, </td>
+          <td class="memname">void stp_putraw           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>r</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="util.h::stp_read_and_compose_curves" ref="ga2" args="(const char *s1, const char *s2, stp_curve_compose_t comp, size_t piecewise_point_count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gf6cf72e5e45f175ae8c332c0588832b9"></a><!-- doxytag: member="util.h::stp_puts" ref="gf6cf72e5e45f175ae8c332c0588832b9" args="(const char *s, const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_puts           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>s</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em></td><td>&nbsp;</td>
+        </tr>
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_read_and_compose_curves           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>s1</em>, </td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="gdbe8c167230b49bc10391d2c246e6dc0"></a><!-- doxytag: member="util.h::stp_read_and_compose_curves" ref="gdbe8c167230b49bc10391d2c246e6dc0" args="(const char *s1, const char *s2, stp_curve_compose_t comp, size_t piecewise_point_count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>s2</em>, </td>
+          <td class="memname"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* stp_read_and_compose_curves           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>s1</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>comp</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>s2</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>piecewise_point_count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__curve.html#g7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a>&nbsp;</td>
+          <td class="paramname"> <em>comp</em>, </td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>piecewise_point_count</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga26"></a><!-- doxytag: member="util.h::stp_realloc" ref="ga26" args="(void *ptr, size_t)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g2420936ab8b3492581f389deea44f58c"></a><!-- doxytag: member="util.h::stp_realloc" ref="g2420936ab8b3492581f389deea44f58c" args="(void *ptr, size_t)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void* stp_realloc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void *&nbsp;</td>
-          <td class="mdname" nowrap> <em>ptr</em>, </td>
+          <td class="memname">void* stp_realloc           </td>
+          <td>(</td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>ptr</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga13"></a><!-- doxytag: member="util.h::stp_send_command" ref="ga13" args="(const stp_vars_t *v, const char *command, const char *format,...)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gdb49b9cba9ddf4e506b6f530353ad93d"></a><!-- doxytag: member="util.h::stp_send_command" ref="gdb49b9cba9ddf4e506b6f530353ad93d" args="(const stp_vars_t *v, const char *command, const char *format,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_send_command           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_send_command           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>command</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>command</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>&nbsp;</td>
-          <td class="mdname" nowrap> <em>...</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="util.h::stp_set_output_codeset" ref="ga1" args="(const char *codeset)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stp_set_output_codeset           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>codeset</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="g7fcc19f0abdc6513dfba7eaebeb16cb9"></a><!-- doxytag: member="util.h::stp_set_output_codeset" ref="g7fcc19f0abdc6513dfba7eaebeb16cb9" args="(const char *codeset)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stp_set_output_codeset           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>codeset</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the output encoding. 
@@ -1611,225 +1259,177 @@ This function sets the encoding that all strings translated by gettext are outpu
     <tr><td valign="top"></td><td valign="top"><em>codeset</em>&nbsp;</td><td>the standard name of the encoding, which must be usable with iconv_open(). For example, "US-ASCII" or "UTF-8". If NULL, the currently-selected codeset will be returned (or NULL if no codeset has been selected yet). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a string containing the selected codeset, or NULL on failure (errno is set accordingly).</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga30"></a><!-- doxytag: member="util.h::stp_strdup" ref="ga30" args="(const char *s)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">char* stp_strdup           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>s</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a string containing the selected codeset, or NULL on failure (errno is set accordingly). </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g5c0731867697f555a94b2a1229804381"></a><!-- doxytag: member="util.h::stp_strdup" ref="g5c0731867697f555a94b2a1229804381" args="(const char *s)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">char* stp_strdup           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>s</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga28"></a><!-- doxytag: member="util.h::stp_strlen" ref="ga28" args="(const char *s)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">size_t stp_strlen           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>s</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="g56b08d3e12750bdfae8b53263f97aba9"></a><!-- doxytag: member="util.h::stp_strlen" ref="g56b08d3e12750bdfae8b53263f97aba9" args="(const char *s)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">size_t stp_strlen           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>s</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga29"></a><!-- doxytag: member="util.h::stp_strndup" ref="ga29" args="(const char *s, int n)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gb026f7022963acd694a8b89e4decbde5"></a><!-- doxytag: member="util.h::stp_strndup" ref="gb026f7022963acd694a8b89e4decbde5" args="(const char *s, int n)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* stp_strndup           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>s</em>, </td>
+          <td class="memname">char* stp_strndup           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>s</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>n</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>n</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga25"></a><!-- doxytag: member="util.h::stp_zalloc" ref="ga25" args="(size_t)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void* stp_zalloc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">size_t&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="gc8fd1a439fa2d8e1ff1a2b104cd0137b"></a><!-- doxytag: member="util.h::stp_zalloc" ref="gc8fd1a439fa2d8e1ff1a2b104cd0137b" args="(size_t)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void* stp_zalloc           </td>
+          <td>(</td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="util.h::stp_zfwrite" ref="ga6" args="(const char *buf, size_t bytes, size_t nitems, const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g183d8f36f187530f9d7acdb176be3409"></a><!-- doxytag: member="util.h::stp_zfwrite" ref="g183d8f36f187530f9d7acdb176be3409" args="(const char *buf, size_t bytes, size_t nitems, const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void void stp_zfwrite           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>buf</em>, </td>
+          <td class="memname">void void stp_zfwrite           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>buf</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>bytes</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>bytes</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>nitems</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>nitems</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="util.h::stp_zprintf" ref="ga5" args="(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gd7ffe058decb939af6a5c1ec1d0d77fa"></a><!-- doxytag: member="util.h::stp_zprintf" ref="gd7ffe058decb939af6a5c1ec1d0d77fa" args="(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_zprintf           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_zprintf           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>format</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>format</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>&nbsp;</td>
-          <td class="mdname" nowrap> <em>...</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__vars.html b/doc/gutenprint/html/group__vars.html
index 06684d5..ad01050 100644
--- a/doc/gutenprint/html/group__vars.html
+++ b/doc/gutenprint/html/group__vars.html
@@ -1,10 +1,19 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: vars</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1>vars</h1>The vars data type contains all the information about a print job, this includes information such as the printer model, paper size, print resolution etc.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -21,566 +30,572 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a></td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter description.  <a href="structstp__parameter__t.html#_details">More...</a><br></td></tr>
+<tr><td colspan="2"><br><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9fc3819cba14f7f4c5654508a08a1adf">STP_RAW</a>(x)&nbsp;&nbsp;&nbsp;{ sizeof((x)), (x) }</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd888c1f6a36f999ffebfffa7b74f28d2">STP_RAW_STRING</a>(x)&nbsp;&nbsp;&nbsp;{ sizeof((x)) - 1, (x) }</td></tr>
+
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_vars&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0">stp_vars_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_vars&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The vars opaque data type.  <a href="#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The vars opaque data type.  <a href="#g2d49c94847d18d8b62a214995b14680f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The parameter_list opaque data type.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The parameter_list opaque data type.  <a href="#g40c1035f88ac38d77eddb65195b28595"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The constant parameter_list opaque data type.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a> )(void *data, const char *buffer, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The constant parameter_list opaque data type.  <a href="#g53c035a67629ae3b3eb86b3c09df7774"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*)&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">stp_outfunc_t</a> (void *data, const char *buffer, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Output function supplied by the calling application.  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a> )(void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Output function supplied by the calling application.  <a href="#g6922054c644d73006bff95a8ad268a1a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *(*)&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4541229554178e84408cccd89f532cb0">stp_copy_data_func_t</a> (void *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a> )(void *)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*)&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7974f89cff4cbb5b225d0c4fbb92e9bb">stp_free_data_func_t</a> (void *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6">compdata_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4d45b95baae036143e14adfc0014f562">compdata_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga133">stp_parameter_type_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga133a7">STP_PARAMETER_TYPE_STRING_LIST</a>, 
-<a class="el" href="group__vars.html#gga133a8">STP_PARAMETER_TYPE_INT</a>, 
-<a class="el" href="group__vars.html#gga133a9">STP_PARAMETER_TYPE_BOOLEAN</a>, 
-<a class="el" href="group__vars.html#gga133a10">STP_PARAMETER_TYPE_DOUBLE</a>, 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a917a6f3e019c8a92ddecd34c71013acde0">STP_PARAMETER_TYPE_STRING_LIST</a>, 
+<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91ae2cac85ef78157b53c7a79706dc0f70">STP_PARAMETER_TYPE_INT</a>, 
+<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91f97ef629defc99977bd1cb35daabe0c1">STP_PARAMETER_TYPE_BOOLEAN</a>, 
+<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91e0dc60c8435ce0b1355bd5a134395f0c">STP_PARAMETER_TYPE_DOUBLE</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga133a11">STP_PARAMETER_TYPE_CURVE</a>, 
-<a class="el" href="group__vars.html#gga133a12">STP_PARAMETER_TYPE_FILE</a>, 
-<a class="el" href="group__vars.html#gga133a13">STP_PARAMETER_TYPE_RAW</a>, 
-<a class="el" href="group__vars.html#gga133a14">STP_PARAMETER_TYPE_ARRAY</a>, 
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a910d283c33f755969ded0751bbfc5d1912">STP_PARAMETER_TYPE_CURVE</a>, 
+<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a918224a918efbef96fffaa90e31654f7ff">STP_PARAMETER_TYPE_FILE</a>, 
+<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a9133bb02d9ae5b2169d2f75da7684b04e9">STP_PARAMETER_TYPE_RAW</a>, 
+<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a918789c2b5cc718eafca6d1d0022cfe3f3">STP_PARAMETER_TYPE_ARRAY</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga133a15">STP_PARAMETER_TYPE_DIMENSION</a>, 
-<a class="el" href="group__vars.html#gga133a16">STP_PARAMETER_TYPE_INVALID</a>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91aa6f89008bf237c6f0aa2f0ee176e8b7">STP_PARAMETER_TYPE_DIMENSION</a>, 
+<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91d053047279b4c82034d26c4aa4c818d5">STP_PARAMETER_TYPE_INVALID</a>
 <br>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter types.  <a href="group__vars.html#ga133">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga134">stp_parameter_class_t</a> { <a class="el" href="group__vars.html#gga134a17">STP_PARAMETER_CLASS_FEATURE</a>, 
-<a class="el" href="group__vars.html#gga134a18">STP_PARAMETER_CLASS_OUTPUT</a>, 
-<a class="el" href="group__vars.html#gga134a19">STP_PARAMETER_CLASS_CORE</a>, 
-<a class="el" href="group__vars.html#gga134a20">STP_PARAMETER_CLASS_INVALID</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter types.  <a href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4eba7e712c0e17b76e472f26e202d7b8">stp_parameter_class_t</a> { <a class="el" href="group__vars.html#gg4eba7e712c0e17b76e472f26e202d7b8a7ed8b66836057aa58b9a74811057b4a">STP_PARAMETER_CLASS_FEATURE</a>, 
+<a class="el" href="group__vars.html#gg4eba7e712c0e17b76e472f26e202d7b8ffc6ff4bfbf2873ce55dfc03776bb6d9">STP_PARAMETER_CLASS_OUTPUT</a>, 
+<a class="el" href="group__vars.html#gg4eba7e712c0e17b76e472f26e202d7b8a05ce344ff3338e69638d69f9c120d01">STP_PARAMETER_CLASS_CORE</a>, 
+<a class="el" href="group__vars.html#gg4eba7e712c0e17b76e472f26e202d7b82e17ce7ebc18801c11af7ea0a61e93ca">STP_PARAMETER_CLASS_INVALID</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter class.  <a href="group__vars.html#ga134">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga135">stp_parameter_level_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga135a21">STP_PARAMETER_LEVEL_BASIC</a>, 
-<a class="el" href="group__vars.html#gga135a22">STP_PARAMETER_LEVEL_ADVANCED</a>, 
-<a class="el" href="group__vars.html#gga135a23">STP_PARAMETER_LEVEL_ADVANCED1</a>, 
-<a class="el" href="group__vars.html#gga135a24">STP_PARAMETER_LEVEL_ADVANCED2</a>, 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter class.  <a href="group__vars.html#g4eba7e712c0e17b76e472f26e202d7b8">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa9c9265ffe70122bd33659cf2983207">stp_parameter_level_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf2983207e9d7192607a6e1ec92dfed3f13a3a46f">STP_PARAMETER_LEVEL_BASIC</a>, 
+<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf29832073130e7060a3b901ea8dcb37d986d47e0">STP_PARAMETER_LEVEL_ADVANCED</a>, 
+<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf29832073d016c9587f698ee400bc7e66071f06c">STP_PARAMETER_LEVEL_ADVANCED1</a>, 
+<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf298320759a909a8953b8724d57ce85e2b4306bf">STP_PARAMETER_LEVEL_ADVANCED2</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga135a25">STP_PARAMETER_LEVEL_ADVANCED3</a>, 
-<a class="el" href="group__vars.html#gga135a26">STP_PARAMETER_LEVEL_ADVANCED4</a>, 
-<a class="el" href="group__vars.html#gga135a27">STP_PARAMETER_LEVEL_INTERNAL</a>, 
-<a class="el" href="group__vars.html#gga135a28">STP_PARAMETER_LEVEL_EXTERNAL</a>, 
+&nbsp;&nbsp;<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf29832071241066935e94def6ab6d524ed1fabae">STP_PARAMETER_LEVEL_ADVANCED3</a>, 
+<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf29832076036d5761aa9710a66429c625c334a80">STP_PARAMETER_LEVEL_ADVANCED4</a>, 
+<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf2983207b2bc3be82f619147d9a45564fd53a4a0">STP_PARAMETER_LEVEL_INTERNAL</a>, 
+<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf2983207e478f67e409adabc8679d3801604861d">STP_PARAMETER_LEVEL_EXTERNAL</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga135a29">STP_PARAMETER_LEVEL_INVALID</a>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf2983207b8bf539d78e56f06f463d00f7a3b56b3">STP_PARAMETER_LEVEL_INVALID</a>
 <br>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter level.  <a href="group__vars.html#ga135">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> { <a class="el" href="group__vars.html#gga136a30">STP_PARAMETER_INACTIVE</a>, 
-<a class="el" href="group__vars.html#gga136a31">STP_PARAMETER_DEFAULTED</a>, 
-<a class="el" href="group__vars.html#gga136a32">STP_PARAMETER_ACTIVE</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter level.  <a href="group__vars.html#gaa9c9265ffe70122bd33659cf2983207">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> { <a class="el" href="group__vars.html#gg70ebf70dc8e6199d84fc91985c94bae96517762c5800eac253f43eeacd96c22f">STP_PARAMETER_INACTIVE</a>, 
+<a class="el" href="group__vars.html#gg70ebf70dc8e6199d84fc91985c94bae9410b7e080ef62fb8896f2f844b1c1e00">STP_PARAMETER_DEFAULTED</a>, 
+<a class="el" href="group__vars.html#gg70ebf70dc8e6199d84fc91985c94bae9dbc7323a015e40652fd256e49c8d5b8c">STP_PARAMETER_ACTIVE</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter activity.  <a href="group__vars.html#ga136">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga137">stp_parameter_verify_t</a> { <a class="el" href="group__vars.html#gga137a33">PARAMETER_BAD</a>, 
-<a class="el" href="group__vars.html#gga137a34">PARAMETER_OK</a>, 
-<a class="el" href="group__vars.html#gga137a35">PARAMETER_INACTIVE</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter activity.  <a href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc061852de3627383cd415cd80a979e02">stp_parameter_verify_t</a> { <a class="el" href="group__vars.html#ggc061852de3627383cd415cd80a979e02326a171221148779ec7df761b3eee967">PARAMETER_BAD</a>, 
+<a class="el" href="group__vars.html#ggc061852de3627383cd415cd80a979e022df363618282a9164433c0f212b18616">PARAMETER_OK</a>, 
+<a class="el" href="group__vars.html#ggc061852de3627383cd415cd80a979e025cb96da6c2e3ae7187e85a1ef6e41fc6">PARAMETER_INACTIVE</a>
  }</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7">stp_vars_create</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5d641ab7093c9ba82cbd4cfbf904fabc">stp_vars_create</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new vars object.  <a href="#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8">stp_vars_copy</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *dest, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new vars object.  <a href="#g5d641ab7093c9ba82cbd4cfbf904fabc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g88376207367adb4260ff14e5d9ec76e9">stp_vars_copy</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *dest, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy a vars object.  <a href="#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9">stp_vars_create_copy</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy a vars object.  <a href="#g88376207367adb4260ff14e5d9ec76e9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gec00fba49ad08d20890e64773bcdbd48">stp_vars_create_copy</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a vars object.  <a href="#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga10">stp_vars_destroy</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a vars object.  <a href="#gec00fba49ad08d20890e64773bcdbd48"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd3f1ff7a86c3cd1c9f9f62cfa8814437">stp_vars_destroy</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a vars object.  <a href="#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga11">stp_set_driver</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a vars object.  <a href="#gd3f1ff7a86c3cd1c9f9f62cfa8814437"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gcf237afcbc26436ebedac5b11f469fdf">stp_set_driver</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the printer driver.  <a href="#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga12">stp_set_driver_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the printer driver.  <a href="#gcf237afcbc26436ebedac5b11f469fdf"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g188d298a8739b84fcb965f211fc7dc4e">stp_set_driver_n</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the printer driver.  <a href="#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga13">stp_get_driver</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the printer driver.  <a href="#g188d298a8739b84fcb965f211fc7dc4e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g20c45707399ef6fdf6ee8c8209b5c7c0">stp_get_driver</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the name of the printer driver.  <a href="#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga14">stp_set_color_conversion</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the name of the printer driver.  <a href="#g20c45707399ef6fdf6ee8c8209b5c7c0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7eb2a1c4b892efd5507fcd4b7a434cea">stp_set_color_conversion</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga15">stp_set_color_conversion_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="#g7eb2a1c4b892efd5507fcd4b7a434cea"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5a842b31f0a572d8e64f1a5616e25a99">stp_set_color_conversion_n</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga16">stp_get_color_conversion</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="#g5a842b31f0a572d8e64f1a5616e25a99"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g2bac9212773ecf603b7667bd0268c23e">stp_get_color_conversion</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the name of the color conversion routine.  <a href="#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga17">stp_set_left</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the name of the color conversion routine.  <a href="#g2bac9212773ecf603b7667bd0268c23e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3b0cc83e87247854ecafd46a6e446bcb">stp_set_left</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the left edge of the image.  <a href="#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga18">stp_get_left</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the left edge of the image.  <a href="#g3b0cc83e87247854ecafd46a6e446bcb"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5c02ee2422d86e4bcdcae613c70c9e1e">stp_get_left</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the left edge of the image.  <a href="#ga18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga19">stp_set_top</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the left edge of the image.  <a href="#g5c02ee2422d86e4bcdcae613c70c9e1e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g557b5ad44d3b1da8392496681624ad8b">stp_set_top</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the top edge of the image.  <a href="#ga19"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga20">stp_get_top</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the top edge of the image.  <a href="#g557b5ad44d3b1da8392496681624ad8b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g292132b97b20a6d034e22f4146d36131">stp_get_top</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the top edge of the image.  <a href="#ga20"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga21">stp_set_width</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the top edge of the image.  <a href="#g292132b97b20a6d034e22f4146d36131"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3a852ce7e42d7f8e0cef6c7d399e0491">stp_set_width</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the width of the image.  <a href="#ga21"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga22">stp_get_width</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the width of the image.  <a href="#g3a852ce7e42d7f8e0cef6c7d399e0491"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1c54d99b94c69a67eb4ae0349a4720e7">stp_get_width</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the width edge of the image.  <a href="#ga22"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga23">stp_set_height</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the width edge of the image.  <a href="#g1c54d99b94c69a67eb4ae0349a4720e7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8ce73c5efa41f005936d5f84c44c6667">stp_set_height</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the height of the image.  <a href="#ga23"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga24">stp_get_height</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the height of the image.  <a href="#g8ce73c5efa41f005936d5f84c44c6667"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8731a92f5d3047e00ba33577821d5aec">stp_get_height</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the height of the image.  <a href="#ga24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga25">stp_set_page_width</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the height of the image.  <a href="#g8731a92f5d3047e00ba33577821d5aec"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g639be0da07c3e5b7dc6d68ac2aa999e9">stp_set_page_width</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the page width.  <a href="#ga25"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga26">stp_get_page_width</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the page width.  <a href="#g639be0da07c3e5b7dc6d68ac2aa999e9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad2d305eed993707d22263b54578a39b">stp_get_page_width</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the page width.  <a href="#ga26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga27">stp_set_page_height</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the page width.  <a href="#gad2d305eed993707d22263b54578a39b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g83326bacb8b92149af1b70457b23bc8f">stp_set_page_height</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the page height.  <a href="#ga27"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga28">stp_get_page_height</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the page height.  <a href="#g83326bacb8b92149af1b70457b23bc8f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc0c4928fa488bb95e73ba9b8aa932584">stp_get_page_height</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the page height.  <a href="#ga28"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga29">stp_set_outfunc</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga3">stp_outfunc_t</a> val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the page height.  <a href="#gc0c4928fa488bb95e73ba9b8aa932584"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g075ffc274f0d2d2b6edd8326de1d7142">stp_set_outfunc</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">stp_outfunc_t</a> val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the function used to print output information.  <a href="#ga29"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga30">stp_get_outfunc</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the function used to print output information.  <a href="#g075ffc274f0d2d2b6edd8326de1d7142"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">stp_outfunc_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7c6c7c547d0c973ac801362db5ca4879">stp_get_outfunc</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the function used to print output information.  <a href="#ga30"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga31">stp_set_errfunc</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga3">stp_outfunc_t</a> val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the function used to print output information.  <a href="#g7c6c7c547d0c973ac801362db5ca4879"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g82f6a7514840de82c9ed7edd30f16b5d">stp_set_errfunc</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">stp_outfunc_t</a> val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the function used to print error and diagnostic information.  <a href="#ga31"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga32">stp_get_errfunc</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the function used to print error and diagnostic information.  <a href="#g82f6a7514840de82c9ed7edd30f16b5d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">stp_outfunc_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g2f246d3af2be9e108abe423691e16049">stp_get_errfunc</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the function used to print output information.  <a href="#ga32"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga33">stp_set_outdata</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, void *val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the function used to print output information.  <a href="#g2f246d3af2be9e108abe423691e16049"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc2b3408200a9676e6c6063cc0ae2f4bd">stp_set_outdata</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, void *val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the output data.  <a href="#ga33"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga34">stp_get_outdata</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the output data.  <a href="#gc2b3408200a9676e6c6063cc0ae2f4bd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7042b05e0df5b32206d54397429bbac5">stp_get_outdata</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the output data.  <a href="#ga34"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga35">stp_set_errdata</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, void *val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the output data.  <a href="#g7042b05e0df5b32206d54397429bbac5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8b30fbadf3475c59101af9d7d37c33b7">stp_set_errdata</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, void *val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the error data.  <a href="#ga35"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga36">stp_get_errdata</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the error data.  <a href="#g8b30fbadf3475c59101af9d7d37c33b7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd08bdcd721d37f52993c1862e25ebaf7">stp_get_errdata</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the error data.  <a href="#ga36"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga37">stp_merge_printvars</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *user, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *print)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the error data.  <a href="#gd08bdcd721d37f52993c1862e25ebaf7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g086303d36b835d539e75f16187e99e8f">stp_merge_printvars</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *user, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *print)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Merge defaults for a printer with user-chosen settings.  <a href="#ga37"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga38">stp_get_parameter_list</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Merge defaults for a printer with user-chosen settings.  <a href="#g086303d36b835d539e75f16187e99e8f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g12e8bb617e5c90da99d6d74519664634">stp_get_parameter_list</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List the available parameters for the currently chosen settings.  <a href="#ga38"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga39">stp_parameter_list_count</a> (<a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List the available parameters for the currently chosen settings.  <a href="#g12e8bb617e5c90da99d6d74519664634"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7a94856ce75482a5edb6153fe8916a54">stp_parameter_list_count</a> (<a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List the number of available parameters for the currently chosen settings.  <a href="#ga39"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga40">stp_parameter_find</a> (<a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> list, const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List the number of available parameters for the currently chosen settings.  <a href="#g7a94856ce75482a5edb6153fe8916a54"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gdcd8062af7b643c734f53c545694d258">stp_parameter_find</a> (<a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list, const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its name.  <a href="#ga40"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga41">stp_parameter_list_param</a> (<a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> list, size_t item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its name.  <a href="#gdcd8062af7b643c734f53c545694d258"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g70d69ef7dec383004bf4570e57b76e18">stp_parameter_list_param</a> (<a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list, size_t item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its index number.  <a href="#ga41"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga42">stp_parameter_list_destroy</a> (<a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its index number.  <a href="#g70d69ef7dec383004bf4570e57b76e18"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3ffaadbe73187aa1f298c4eaa80ea82e">stp_parameter_list_destroy</a> (<a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a parameter_list.  <a href="#ga42"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga43">stp_parameter_list_create</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a parameter_list.  <a href="#g3ffaadbe73187aa1f298c4eaa80ea82e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g404bf7f1b3632178d559f6980478a312">stp_parameter_list_create</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a parameter_list.  <a href="#ga43"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga44">stp_parameter_list_add_param</a> (<a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> list, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a parameter_list.  <a href="#g404bf7f1b3632178d559f6980478a312"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8f4f06610d1f58bae9e70e632919c405">stp_parameter_list_add_param</a> (<a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Add a parameter to a parameter_list.  <a href="#ga44"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga45">stp_parameter_list_copy</a> (<a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Add a parameter to a parameter_list.  <a href="#g8f4f06610d1f58bae9e70e632919c405"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g92be87a573b883584e5a036743c1bb7d">stp_parameter_list_copy</a> (<a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a parameter_list.  <a href="#ga45"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga46">stp_parameter_list_append</a> (<a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> list, <a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> append)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a parameter_list.  <a href="#g92be87a573b883584e5a036743c1bb7d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4b62bc6d0133704b3a2568b1654b6678">stp_parameter_list_append</a> (<a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list, <a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> append)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Append one parameter_list to another.  <a href="#ga46"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga47">stp_describe_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Append one parameter_list to another.  <a href="#g4b62bc6d0133704b3a2568b1654b6678"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0b8991bd1a91e2cac7d0b355b1186c8e">stp_describe_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Describe a parameter in detail.  <a href="#ga47"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga48">stp_parameter_description_destroy</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Describe a parameter in detail.  <a href="#g0b8991bd1a91e2cac7d0b355b1186c8e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd598d95a82767e05c958ccd44534c51d">stp_parameter_description_destroy</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a parameter description.  <a href="#ga48"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga49">stp_parameter_find_in_settings</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a parameter description.  <a href="#gd598d95a82767e05c958ccd44534c51d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6ce39557b61706421232b5f1ac604b1b">stp_parameter_find_in_settings</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its name from a vars object.  <a href="#ga49"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga50">stp_set_string_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its name from a vars object.  <a href="#g6ce39557b61706421232b5f1ac604b1b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga147483996fa118516ddb36fe3366aa9">stp_set_string_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a string parameter.  <a href="#ga50"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga51">stp_set_string_parameter_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a string parameter.  <a href="#ga147483996fa118516ddb36fe3366aa9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gfe6c8b3d86ca16239a63ce9d2ef57f48">stp_set_string_parameter_n</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a string parameter.  <a href="#ga51"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga52">stp_set_file_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a string parameter.  <a href="#gfe6c8b3d86ca16239a63ce9d2ef57f48"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g537f2ba6c74c9562b2f6883d7e36c59f">stp_set_file_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a file parameter.  <a href="#ga52"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga53">stp_set_file_parameter_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a file parameter.  <a href="#g537f2ba6c74c9562b2f6883d7e36c59f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6f7816adbce50ca9e2fdacad35282e6a">stp_set_file_parameter_n</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a file parameter.  <a href="#ga53"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga54">stp_set_float_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a file parameter.  <a href="#g6f7816adbce50ca9e2fdacad35282e6a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf3a3283247deaad7d1ac19818aa4b796">stp_set_float_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a float parameter.  <a href="#ga54"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga55">stp_set_int_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a float parameter.  <a href="#gf3a3283247deaad7d1ac19818aa4b796"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g70eded5d0df4677dd4b357b4b934f75a">stp_set_int_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set an integer parameter.  <a href="#ga55"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga56">stp_set_dimension_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set an integer parameter.  <a href="#g70eded5d0df4677dd4b357b4b934f75a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6ca7898c212230cdbdc70ada2efb1417">stp_set_dimension_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a dimension parameter.  <a href="#ga56"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga57">stp_set_boolean_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a dimension parameter.  <a href="#g6ca7898c212230cdbdc70ada2efb1417"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g2167971895eea887eaaa656ed075beff">stp_set_boolean_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a boolean parameter.  <a href="#ga57"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga58">stp_set_curve_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a boolean parameter.  <a href="#g2167971895eea887eaaa656ed075beff"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gfe5f1f6364b89437664b2bbc55288025">stp_set_curve_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a curve parameter.  <a href="#ga58"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga59">stp_set_array_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#ga0">stp_array_t</a> *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a curve parameter.  <a href="#gfe5f1f6364b89437664b2bbc55288025"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g88f25e09f9a4b76aca7ba8316cbf9c8b">stp_set_array_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set an array parameter.  <a href="#ga59"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga60">stp_set_raw_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set an array parameter.  <a href="#g88f25e09f9a4b76aca7ba8316cbf9c8b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0155de75bf2aa95ab45a3319539cda56">stp_set_raw_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a raw parameter.  <a href="#ga60"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga61">stp_scale_float_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, double scale)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a raw parameter.  <a href="#g0155de75bf2aa95ab45a3319539cda56"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g227ec3e75a78a5c3dd01c85dbc1e7004">stp_scale_float_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double scale)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Multiply the value of a float parameter by a scaling factor.  <a href="#ga61"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga62">stp_set_default_string_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Multiply the value of a float parameter by a scaling factor.  <a href="#g227ec3e75a78a5c3dd01c85dbc1e7004"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf299bd0827a4d86aca59fb0d9015a866">stp_set_default_string_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default string parameter.  <a href="#ga62"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga63">stp_set_default_string_parameter_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default string parameter.  <a href="#gf299bd0827a4d86aca59fb0d9015a866"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5d6d8858b266517f5899196b062d00d">stp_set_default_string_parameter_n</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default string parameter.  <a href="#ga63"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga64">stp_set_default_file_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default string parameter.  <a href="#ga5d6d8858b266517f5899196b062d00d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf5e225475c66f966f4ba8d8c88374186">stp_set_default_file_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default file parameter.  <a href="#ga64"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga65">stp_set_default_file_parameter_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default file parameter.  <a href="#gf5e225475c66f966f4ba8d8c88374186"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g217eece123630113cfcf8181d475fb53">stp_set_default_file_parameter_n</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default file parameter.  <a href="#ga65"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga66">stp_set_default_float_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default file parameter.  <a href="#g217eece123630113cfcf8181d475fb53"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge52dbb466422a18dec110220c45fe64e">stp_set_default_float_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default float parameter.  <a href="#ga66"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga67">stp_set_default_int_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default float parameter.  <a href="#ge52dbb466422a18dec110220c45fe64e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3c0418772a82144f317dc973f01a8d55">stp_set_default_int_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default integer parameter.  <a href="#ga67"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga68">stp_set_default_dimension_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default integer parameter.  <a href="#g3c0418772a82144f317dc973f01a8d55"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb6f1820cadd75a4311bfc49b01de447b">stp_set_default_dimension_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default dimension parameter.  <a href="#ga68"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga69">stp_set_default_boolean_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default dimension parameter.  <a href="#gb6f1820cadd75a4311bfc49b01de447b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g81d5f09980407b4310dada2a68fc4b09">stp_set_default_boolean_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default boolean parameter.  <a href="#ga69"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga70">stp_set_default_curve_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default boolean parameter.  <a href="#g81d5f09980407b4310dada2a68fc4b09"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gfe38044cc067b2c2afa3da469d1cb860">stp_set_default_curve_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default curve parameter.  <a href="#ga70"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga71">stp_set_default_array_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#ga0">stp_array_t</a> *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default curve parameter.  <a href="#gfe38044cc067b2c2afa3da469d1cb860"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g63e7ff7b4c3e1d092f95c6234f21e39f">stp_set_default_array_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default array parameter.  <a href="#ga71"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga72">stp_set_default_raw_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default array parameter.  <a href="#g63e7ff7b4c3e1d092f95c6234f21e39f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8159b3f5bea06a99711921f0201f5e0f">stp_set_default_raw_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default raw parameter.  <a href="#ga72"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga73">stp_get_string_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default raw parameter.  <a href="#g8159b3f5bea06a99711921f0201f5e0f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb5b21e5606b8ca755c5eac7774260efa">stp_get_string_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a string parameter.  <a href="#ga73"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga74">stp_get_file_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a string parameter.  <a href="#gb5b21e5606b8ca755c5eac7774260efa"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g2021992d89c92b10138fb012a9554a08">stp_get_file_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a file parameter.  <a href="#ga74"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga75">stp_get_float_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a file parameter.  <a href="#g2021992d89c92b10138fb012a9554a08"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g365412d9c176fd3ac9375ded3f22ddb3">stp_get_float_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a float parameter.  <a href="#ga75"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga76">stp_get_int_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a float parameter.  <a href="#g365412d9c176fd3ac9375ded3f22ddb3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7c0d95ba35aba0786bfc5f918efa79fc">stp_get_int_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an integer parameter.  <a href="#ga76"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga77">stp_get_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an integer parameter.  <a href="#g7c0d95ba35aba0786bfc5f918efa79fc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3c8d1333086ca5a01a3439f94d9f94d3">stp_get_dimension_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a dimension parameter.  <a href="#ga77"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga78">stp_get_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a dimension parameter.  <a href="#g3c8d1333086ca5a01a3439f94d9f94d3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8a30b26fa842805384b6ad663cabaea2">stp_get_boolean_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a boolean parameter.  <a href="#ga78"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga79">stp_get_curve_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a boolean parameter.  <a href="#g8a30b26fa842805384b6ad663cabaea2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g553dec81dd8b3e5590d963ba72223557">stp_get_curve_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a curve parameter.  <a href="#ga79"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga80">stp_get_array_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a curve parameter.  <a href="#g553dec81dd8b3e5590d963ba72223557"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc50c216c2d5cd56a9704f48d4338b179">stp_get_array_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an array parameter.  <a href="#ga80"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga81">stp_get_raw_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an array parameter.  <a href="#gc50c216c2d5cd56a9704f48d4338b179"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9fff6c14a71f5f8ec28620ef64a92fd5">stp_get_raw_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a raw parameter.  <a href="#ga81"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga82">stp_clear_string_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a raw parameter.  <a href="#g9fff6c14a71f5f8ec28620ef64a92fd5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9e98ef9a9b1b84a0c0580fe024e35490">stp_clear_string_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a string parameter.  <a href="#ga82"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga83">stp_clear_file_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a string parameter.  <a href="#g9e98ef9a9b1b84a0c0580fe024e35490"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4fad48e3e6453842559bd872650cb88f">stp_clear_file_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a file parameter.  <a href="#ga83"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga84">stp_clear_float_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a file parameter.  <a href="#g4fad48e3e6453842559bd872650cb88f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4eccbbe421f8b0c9342b17cef40b263d">stp_clear_float_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a float parameter.  <a href="#ga84"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga85">stp_clear_int_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a float parameter.  <a href="#g4eccbbe421f8b0c9342b17cef40b263d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g2107c08f37e31f45253f7d75a3773d46">stp_clear_int_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) an integer parameter.  <a href="#ga85"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga86">stp_clear_dimension_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) an integer parameter.  <a href="#g2107c08f37e31f45253f7d75a3773d46"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g514a21602ae7a8ebe8e5072a5a4b6f89">stp_clear_dimension_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a dimension parameter.  <a href="#ga86"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga87">stp_clear_boolean_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a dimension parameter.  <a href="#g514a21602ae7a8ebe8e5072a5a4b6f89"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g42ebfed8dec2054799e4943a8ca84267">stp_clear_boolean_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a boolean parameter.  <a href="#ga87"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga88">stp_clear_curve_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a boolean parameter.  <a href="#g42ebfed8dec2054799e4943a8ca84267"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf52a0b0c3b0e0fee1fc46516b1bc0c4e">stp_clear_curve_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a curve parameter.  <a href="#ga88"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga89">stp_clear_array_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a curve parameter.  <a href="#gf52a0b0c3b0e0fee1fc46516b1bc0c4e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7c67cef38cead5f519fd04ae09265b53">stp_clear_array_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear an array parameter.  <a href="#ga89"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga90">stp_clear_raw_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear an array parameter.  <a href="#g7c67cef38cead5f519fd04ae09265b53"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g11b79add82faf23b0e3c758f9530d95c">stp_clear_raw_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a raw parameter.  <a href="#ga90"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga91">stp_set_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a raw parameter.  <a href="#g11b79add82faf23b0e3c758f9530d95c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6ed828e872f7678a89e1b065d377112e">stp_set_string_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="#ga91"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga92">stp_set_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="#g6ed828e872f7678a89e1b065d377112e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaecd310feb8bd9a2188a9b287656aa1a">stp_set_file_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="#ga92"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga93">stp_set_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="#gaecd310feb8bd9a2188a9b287656aa1a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g15a5458adea6ad4eecda3c990acbc6cb">stp_set_float_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="#ga93"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga94">stp_set_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="#g15a5458adea6ad4eecda3c990acbc6cb"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7487203059e7ccd71c4673656b3042b1">stp_set_int_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="#ga94"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga95">stp_set_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="#g7487203059e7ccd71c4673656b3042b1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0f6e91baac5e78703b162e9d23c0a65c">stp_set_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="#ga95"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga96">stp_set_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="#g0f6e91baac5e78703b162e9d23c0a65c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9ad15a73dd8c755a8b80edbe335285ee">stp_set_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="#ga96"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga97">stp_set_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="#g9ad15a73dd8c755a8b80edbe335285ee"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge7f21b118a8dfb5607334a6141d5dc5c">stp_set_curve_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="#ga97"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga98">stp_set_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="#ge7f21b118a8dfb5607334a6141d5dc5c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb78f4273798c6e3e720afe01680cf752">stp_set_array_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="#ga98"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga99">stp_set_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="#gb78f4273798c6e3e720afe01680cf752"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g364fcdb2e57b8ca99867c94954cf14cd">stp_set_raw_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="#ga99"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga100">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="#g364fcdb2e57b8ca99867c94954cf14cd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8189b61073bfcd0244d5d6f2a2c8ba86">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a string parameter is set.  <a href="#ga100"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga101">stp_check_file_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a string parameter is set.  <a href="#g8189b61073bfcd0244d5d6f2a2c8ba86"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7db6701be5d05e545c79db905e4c7eb">stp_check_file_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a file parameter is set.  <a href="#ga101"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga102">stp_check_float_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a file parameter is set.  <a href="#ga7db6701be5d05e545c79db905e4c7eb"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb12bebb419eb1ae8f323aa931e324389">stp_check_float_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a float parameter is set.  <a href="#ga102"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga103">stp_check_int_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a float parameter is set.  <a href="#gb12bebb419eb1ae8f323aa931e324389"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4fd7914c01e2e1b34797736dfd2c9b9c">stp_check_int_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an integer parameter is set.  <a href="#ga103"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga104">stp_check_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an integer parameter is set.  <a href="#g4fd7914c01e2e1b34797736dfd2c9b9c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc1f2b865c76da441b6c1bd9b5b93aa1f">stp_check_dimension_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a dimension parameter is set.  <a href="#ga104"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga105">stp_check_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a dimension parameter is set.  <a href="#gc1f2b865c76da441b6c1bd9b5b93aa1f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g23b9c17426210460618c4f95c5f34229">stp_check_boolean_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a boolean parameter is set.  <a href="#ga105"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga106">stp_check_curve_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a boolean parameter is set.  <a href="#g23b9c17426210460618c4f95c5f34229"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6c94a1df4388b142d00d5d30df904b47">stp_check_curve_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a curve parameter is set.  <a href="#ga106"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga107">stp_check_array_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a curve parameter is set.  <a href="#g6c94a1df4388b142d00d5d30df904b47"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5a629e6da1f5008f0db034191ad8b1d5">stp_check_array_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an array parameter is set.  <a href="#ga107"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga108">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an array parameter is set.  <a href="#g5a629e6da1f5008f0db034191ad8b1d5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g285f05c648724c80bf05af30f87120a3">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a raw parameter is set.  <a href="#ga108"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga109">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a raw parameter is set.  <a href="#g285f05c648724c80bf05af30f87120a3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0b7be7ba9f763be692dd833a434ed13d">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a string parameter.  <a href="#ga109"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga110">stp_get_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a string parameter.  <a href="#g0b7be7ba9f763be692dd833a434ed13d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g47e7a69ff8e23eed6188542c5c8bff4f">stp_get_file_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a file parameter.  <a href="#ga110"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga111">stp_get_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a file parameter.  <a href="#g47e7a69ff8e23eed6188542c5c8bff4f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4b8f9847f2eebfff53446a9bc235ab68">stp_get_float_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a float parameter.  <a href="#ga111"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga112">stp_get_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a float parameter.  <a href="#g4b8f9847f2eebfff53446a9bc235ab68"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb74fd69c4ef62af7b5ab33c6baf48b8b">stp_get_int_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an integer parameter.  <a href="#ga112"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga113">stp_get_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an integer parameter.  <a href="#gb74fd69c4ef62af7b5ab33c6baf48b8b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g45f9abd8ac6772ea850344c513f6c436">stp_get_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a dimension parameter.  <a href="#ga113"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga114">stp_get_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a dimension parameter.  <a href="#g45f9abd8ac6772ea850344c513f6c436"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb33cf5376adc63e826cd3dedae33e930">stp_get_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a boolean parameter.  <a href="#ga114"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga115">stp_get_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a boolean parameter.  <a href="#gb33cf5376adc63e826cd3dedae33e930"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge36bf982c52215f11fe8e392b4b3d705">stp_get_curve_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a curve parameter.  <a href="#ga115"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga116">stp_get_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a curve parameter.  <a href="#ge36bf982c52215f11fe8e392b4b3d705"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc9f85c3a8bf99e09150cbf4220e4b983">stp_get_array_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an array parameter.  <a href="#ga116"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga117">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an array parameter.  <a href="#gc9f85c3a8bf99e09150cbf4220e4b983"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb6e41a5edb7474ed7ac26e236e00c80c">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a raw parameter.  <a href="#ga117"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga118">stp_get_media_size</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *width, int *height)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a raw parameter.  <a href="#gb6e41a5edb7474ed7ac26e236e00c80c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc9e6d740ffc4cff5dc7d0bf106a3e7df">stp_get_media_size</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media (paper) size.  <a href="#ga118"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga119">stp_get_imageable_area</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media (paper) size.  <a href="#gc9e6d740ffc4cff5dc7d0bf106a3e7df"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g67d1e68ed47e5b554f2021fca1f01978">stp_get_imageable_area</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the imagable area of the page.  <a href="#ga119"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga120">stp_get_maximum_imageable_area</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the imagable area of the page.  <a href="#g67d1e68ed47e5b554f2021fca1f01978"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd17cadb7fd78bffb759f2213a1a90df6">stp_get_maximum_imageable_area</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the maximum imagable area of the page.  <a href="#ga120"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga121">stp_get_size_limit</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the maximum imagable area of the page.  <a href="#gd17cadb7fd78bffb759f2213a1a90df6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0c8ee62453baff3d2c00e0ccae67b049">stp_get_size_limit</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media size limits.  <a href="#ga121"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga122">stp_describe_resolution</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *x, int *y)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media size limits.  <a href="#g0c8ee62453baff3d2c00e0ccae67b049"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g88715b31fcec18778f769ffbc1b55384">stp_describe_resolution</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *x, int *y)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Retrieve the printing resolution of the selected resolution.  <a href="#ga122"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga123">stp_verify</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Retrieve the printing resolution of the selected resolution.  <a href="#g88715b31fcec18778f769ffbc1b55384"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb926417b2f601c78d85df44694cc6d38">stp_verify</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Verify parameters.  <a href="#ga123"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga124">stp_default_settings</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Verify parameters.  <a href="#gb926417b2f601c78d85df44694cc6d38"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf63982a6e44f8b62532346d9ceb3d91c">stp_default_settings</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get default global settings.  <a href="#ga124"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga125">stp_allocate_component_data</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a> freefunc, void *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get default global settings.  <a href="#gf63982a6e44f8b62532346d9ceb3d91c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gfd4f81ca2ad497bd21f005344844f9c4">stp_allocate_component_data</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="group__vars.html#g4541229554178e84408cccd89f532cb0">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#g7974f89cff4cbb5b225d0c4fbb92e9bb">stp_free_data_func_t</a> freefunc, void *data)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga126">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g151b7d922a3e1e5e9d9f0ea8de6ab70a">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga127">stp_get_component_data</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1666dd1571bdb866a85d4318858893be">stp_get_component_data</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga137">stp_parameter_verify_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga128">stp_verify_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int quiet)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gc061852de3627383cd415cd80a979e02">stp_parameter_verify_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gbfffe0d654de156874decdc0338216f4">stp_verify_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int quiet)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga129">stp_get_verified</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6d04a3c444753f11004ad6259a91e853">stp_get_verified</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga130">stp_set_verified</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1023ad18d2c97763137909b6191b0940">stp_set_verified</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int value)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga131">stp_copy_options</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *vd, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *vs)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf7d2d5a9897c9ce77bb16f4a1addaa62">stp_copy_options</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *vd, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *vs)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga132">stp_fill_parameter_settings</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *param)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7f2c578ff7ae28a3db502476aa10137e">stp_fill_parameter_settings</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *param)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The vars data type contains all the information about a print job, this includes information such as the printer model, paper size, print resolution etc. 
 <p>
 Most of these job options are expressed as parameters which vary according to the model and other options selected.<p>
-The representation of printer settings has changed dramatically from 4.2. All (well most, anyway) settings outside of basics such as the printer model and sizing settings are now typed parameters.<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="vars.h::compdata_t" ref="ga6" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+The representation of printer settings has changed dramatically from 4.2. All (well most, anyway) settings outside of basics such as the printer model and sizing settings are now typed parameters. <hr><h2>Define Documentation</h2>
+<a class="anchor" name="g9fc3819cba14f7f4c5654508a08a1adf"></a><!-- doxytag: member="vars.h::STP_RAW" ref="g9fc3819cba14f7f4c5654508a08a1adf" args="(x)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_compdata <a class="el" href="group__vars.html#ga6">compdata_t</a>          </td>
+          <td class="memname">#define STP_RAW          </td>
+          <td>(</td>
+          <td class="paramtype">x&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;{ sizeof((x)), (x) }</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="vars.h::stp_const_parameter_list_t" ref="ga2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gd888c1f6a36f999ffebfffa7b74f28d2"></a><!-- doxytag: member="vars.h::STP_RAW_STRING" ref="gd888c1f6a36f999ffebfffa7b74f28d2" args="(x)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef const void* <a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a>          </td>
+          <td class="memname">#define STP_RAW_STRING          </td>
+          <td>(</td>
+          <td class="paramtype">x&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;{ sizeof((x)) - 1, (x) }</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="g4d45b95baae036143e14adfc0014f562"></a><!-- doxytag: member="vars.h::compdata_t" ref="g4d45b95baae036143e14adfc0014f562" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef struct stp_compdata <a class="el" href="group__vars.html#g4d45b95baae036143e14adfc0014f562">compdata_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="g53c035a67629ae3b3eb86b3c09df7774"></a><!-- doxytag: member="vars.h::stp_const_parameter_list_t" ref="g53c035a67629ae3b3eb86b3c09df7774" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef const void* <a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a>          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 The constant parameter_list opaque data type. 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="vars.h::stp_copy_data_func_t" ref="ga4" args=")(void *)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g4541229554178e84408cccd89f532cb0"></a><!-- doxytag: member="vars.h::stp_copy_data_func_t" ref="g4541229554178e84408cccd89f532cb0" args="(void *)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef void*(* <a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a>)(void *)          </td>
+          <td class="memname">typedef void*(*) <a class="el" href="group__vars.html#g4541229554178e84408cccd89f532cb0">stp_copy_data_func_t</a>(void *)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="vars.h::stp_free_data_func_t" ref="ga5" args=")(void *)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g7974f89cff4cbb5b225d0c4fbb92e9bb"></a><!-- doxytag: member="vars.h::stp_free_data_func_t" ref="g7974f89cff4cbb5b225d0c4fbb92e9bb" args="(void *)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef void(* <a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a>)(void *)          </td>
+          <td class="memname">typedef void(*) <a class="el" href="group__vars.html#g7974f89cff4cbb5b225d0c4fbb92e9bb">stp_free_data_func_t</a>(void *)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="vars.h::stp_outfunc_t" ref="ga3" args=")(void *data, const char *buffer, size_t bytes)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g6922054c644d73006bff95a8ad268a1a"></a><!-- doxytag: member="vars.h::stp_outfunc_t" ref="g6922054c644d73006bff95a8ad268a1a" args="(void *data, const char *buffer, size_t bytes)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef void(* <a class="el" href="group__vars.html#ga3">stp_outfunc_t</a>)(void *data, const char *buffer, size_t bytes)          </td>
+          <td class="memname">typedef void(*) <a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">stp_outfunc_t</a>(void *data, const char *buffer, size_t bytes)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Output function supplied by the calling application. 
@@ -589,358 +604,286 @@ There are two output functions supplied by the caller, one to send output data a
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an opaque object owned by the calling application. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>buffer</em>&nbsp;</td><td>the data to output. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the size of buffer (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the size of buffer (in bytes). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="vars.h::stp_parameter_list_t" ref="ga1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g40c1035f88ac38d77eddb65195b28595"></a><!-- doxytag: member="vars.h::stp_parameter_list_t" ref="g40c1035f88ac38d77eddb65195b28595" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef void* <a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>          </td>
+          <td class="memname">typedef void* <a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 The parameter_list opaque data type. 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="vars.h::stp_vars_t" ref="ga0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g2d49c94847d18d8b62a214995b14680f"></a><!-- doxytag: member="vars.h::stp_vars_t" ref="g2d49c94847d18d8b62a214995b14680f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_vars <a class="el" href="group__vars.html#ga0">stp_vars_t</a>          </td>
+          <td class="memname">typedef struct stp_vars <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 The vars opaque data type. 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="ga136"></a><!-- doxytag: member="vars.h::stp_parameter_activity_t" ref="ga136" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="g70ebf70dc8e6199d84fc91985c94bae9"></a><!-- doxytag: member="vars.h::stp_parameter_activity_t" ref="g70ebf70dc8e6199d84fc91985c94bae9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>          </td>
+          <td class="memname">enum <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Parameter activity. 
 <p>
-Whether a parameter is currently active (i. e. whether its value should be used by the driver or not). All parameters default to being active unless explicitly "turned off".<dl compact><dt><b>Enumerator: </b></dt><dd>
+Whether a parameter is currently active (i. e. whether its value should be used by the driver or not). All parameters default to being active unless explicitly "turned off". <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga136a30"></a><!-- doxytag: member="STP_PARAMETER_INACTIVE" ref="gga136a30" args="" -->STP_PARAMETER_INACTIVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg70ebf70dc8e6199d84fc91985c94bae96517762c5800eac253f43eeacd96c22f"></a><!-- doxytag: member="STP_PARAMETER_INACTIVE" ref="gg70ebf70dc8e6199d84fc91985c94bae96517762c5800eac253f43eeacd96c22f" args="" -->STP_PARAMETER_INACTIVE</em>&nbsp;</td><td>
 Parameter is inactive (unused). </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga136a31"></a><!-- doxytag: member="STP_PARAMETER_DEFAULTED" ref="gga136a31" args="" -->STP_PARAMETER_DEFAULTED</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg70ebf70dc8e6199d84fc91985c94bae9410b7e080ef62fb8896f2f844b1c1e00"></a><!-- doxytag: member="STP_PARAMETER_DEFAULTED" ref="gg70ebf70dc8e6199d84fc91985c94bae9410b7e080ef62fb8896f2f844b1c1e00" args="" -->STP_PARAMETER_DEFAULTED</em>&nbsp;</td><td>
 Parameter is set to its default value. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga136a32"></a><!-- doxytag: member="STP_PARAMETER_ACTIVE" ref="gga136a32" args="" -->STP_PARAMETER_ACTIVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg70ebf70dc8e6199d84fc91985c94bae9dbc7323a015e40652fd256e49c8d5b8c"></a><!-- doxytag: member="STP_PARAMETER_ACTIVE" ref="gg70ebf70dc8e6199d84fc91985c94bae9dbc7323a015e40652fd256e49c8d5b8c" args="" -->STP_PARAMETER_ACTIVE</em>&nbsp;</td><td>
 Parameter is active (used). </td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga134"></a><!-- doxytag: member="vars.h::stp_parameter_class_t" ref="ga134" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g4eba7e712c0e17b76e472f26e202d7b8"></a><!-- doxytag: member="vars.h::stp_parameter_class_t" ref="g4eba7e712c0e17b76e472f26e202d7b8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga134">stp_parameter_class_t</a>          </td>
+          <td class="memname">enum <a class="el" href="group__vars.html#g4eba7e712c0e17b76e472f26e202d7b8">stp_parameter_class_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Parameter class. 
 <p>
-What kind of setting this is, for the purpose of user interface representation.<dl compact><dt><b>Enumerator: </b></dt><dd>
+What kind of setting this is, for the purpose of user interface representation. <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga134a17"></a><!-- doxytag: member="STP_PARAMETER_CLASS_FEATURE" ref="gga134a17" args="" -->STP_PARAMETER_CLASS_FEATURE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg4eba7e712c0e17b76e472f26e202d7b8a7ed8b66836057aa58b9a74811057b4a"></a><!-- doxytag: member="STP_PARAMETER_CLASS_FEATURE" ref="gg4eba7e712c0e17b76e472f26e202d7b8a7ed8b66836057aa58b9a74811057b4a" args="" -->STP_PARAMETER_CLASS_FEATURE</em>&nbsp;</td><td>
 Printer feature. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a18"></a><!-- doxytag: member="STP_PARAMETER_CLASS_OUTPUT" ref="gga134a18" args="" -->STP_PARAMETER_CLASS_OUTPUT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg4eba7e712c0e17b76e472f26e202d7b8ffc6ff4bfbf2873ce55dfc03776bb6d9"></a><!-- doxytag: member="STP_PARAMETER_CLASS_OUTPUT" ref="gg4eba7e712c0e17b76e472f26e202d7b8ffc6ff4bfbf2873ce55dfc03776bb6d9" args="" -->STP_PARAMETER_CLASS_OUTPUT</em>&nbsp;</td><td>
 Output control. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a19"></a><!-- doxytag: member="STP_PARAMETER_CLASS_CORE" ref="gga134a19" args="" -->STP_PARAMETER_CLASS_CORE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg4eba7e712c0e17b76e472f26e202d7b8a05ce344ff3338e69638d69f9c120d01"></a><!-- doxytag: member="STP_PARAMETER_CLASS_CORE" ref="gg4eba7e712c0e17b76e472f26e202d7b8a05ce344ff3338e69638d69f9c120d01" args="" -->STP_PARAMETER_CLASS_CORE</em>&nbsp;</td><td>
 Core Gimp-Print parameter. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a20"></a><!-- doxytag: member="STP_PARAMETER_CLASS_INVALID" ref="gga134a20" args="" -->STP_PARAMETER_CLASS_INVALID</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg4eba7e712c0e17b76e472f26e202d7b82e17ce7ebc18801c11af7ea0a61e93ca"></a><!-- doxytag: member="STP_PARAMETER_CLASS_INVALID" ref="gg4eba7e712c0e17b76e472f26e202d7b82e17ce7ebc18801c11af7ea0a61e93ca" args="" -->STP_PARAMETER_CLASS_INVALID</em>&nbsp;</td><td>
 Invalid class (should never be used). </td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga135"></a><!-- doxytag: member="vars.h::stp_parameter_level_t" ref="ga135" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gaa9c9265ffe70122bd33659cf2983207"></a><!-- doxytag: member="vars.h::stp_parameter_level_t" ref="gaa9c9265ffe70122bd33659cf2983207" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga135">stp_parameter_level_t</a>          </td>
+          <td class="memname">enum <a class="el" href="group__vars.html#gaa9c9265ffe70122bd33659cf2983207">stp_parameter_level_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Parameter level. 
 <p>
-What "level" a setting is at, for UI design.<dl compact><dt><b>Enumerator: </b></dt><dd>
+What "level" a setting is at, for UI design. <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga135a21"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_BASIC" ref="gga135a21" args="" -->STP_PARAMETER_LEVEL_BASIC</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa9c9265ffe70122bd33659cf2983207e9d7192607a6e1ec92dfed3f13a3a46f"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_BASIC" ref="ggaa9c9265ffe70122bd33659cf2983207e9d7192607a6e1ec92dfed3f13a3a46f" args="" -->STP_PARAMETER_LEVEL_BASIC</em>&nbsp;</td><td>
 Basic parameter, shown by all UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga135a22"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED" ref="gga135a22" args="" -->STP_PARAMETER_LEVEL_ADVANCED</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa9c9265ffe70122bd33659cf29832073130e7060a3b901ea8dcb37d986d47e0"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED" ref="ggaa9c9265ffe70122bd33659cf29832073130e7060a3b901ea8dcb37d986d47e0" args="" -->STP_PARAMETER_LEVEL_ADVANCED</em>&nbsp;</td><td>
 Advanced parameter, shown by advanced UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga135a23"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED1" ref="gga135a23" args="" -->STP_PARAMETER_LEVEL_ADVANCED1</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa9c9265ffe70122bd33659cf29832073d016c9587f698ee400bc7e66071f06c"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED1" ref="ggaa9c9265ffe70122bd33659cf29832073d016c9587f698ee400bc7e66071f06c" args="" -->STP_PARAMETER_LEVEL_ADVANCED1</em>&nbsp;</td><td>
 Advanced1 parameter, shown by advanced UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga135a24"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED2" ref="gga135a24" args="" -->STP_PARAMETER_LEVEL_ADVANCED2</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa9c9265ffe70122bd33659cf298320759a909a8953b8724d57ce85e2b4306bf"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED2" ref="ggaa9c9265ffe70122bd33659cf298320759a909a8953b8724d57ce85e2b4306bf" args="" -->STP_PARAMETER_LEVEL_ADVANCED2</em>&nbsp;</td><td>
 Advanced2 parameter, shown by advanced UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga135a25"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED3" ref="gga135a25" args="" -->STP_PARAMETER_LEVEL_ADVANCED3</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa9c9265ffe70122bd33659cf29832071241066935e94def6ab6d524ed1fabae"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED3" ref="ggaa9c9265ffe70122bd33659cf29832071241066935e94def6ab6d524ed1fabae" args="" -->STP_PARAMETER_LEVEL_ADVANCED3</em>&nbsp;</td><td>
 Advanced3 parameter, shown by advanced UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga135a26"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED4" ref="gga135a26" args="" -->STP_PARAMETER_LEVEL_ADVANCED4</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa9c9265ffe70122bd33659cf29832076036d5761aa9710a66429c625c334a80"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED4" ref="ggaa9c9265ffe70122bd33659cf29832076036d5761aa9710a66429c625c334a80" args="" -->STP_PARAMETER_LEVEL_ADVANCED4</em>&nbsp;</td><td>
 Advanced4 parameter, shown by advanced UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga135a27"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_INTERNAL" ref="gga135a27" args="" -->STP_PARAMETER_LEVEL_INTERNAL</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa9c9265ffe70122bd33659cf2983207b2bc3be82f619147d9a45564fd53a4a0"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_INTERNAL" ref="ggaa9c9265ffe70122bd33659cf2983207b2bc3be82f619147d9a45564fd53a4a0" args="" -->STP_PARAMETER_LEVEL_INTERNAL</em>&nbsp;</td><td>
 Parameters used only within Gimp-Print. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga135a28"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_EXTERNAL" ref="gga135a28" args="" -->STP_PARAMETER_LEVEL_EXTERNAL</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa9c9265ffe70122bd33659cf2983207e478f67e409adabc8679d3801604861d"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_EXTERNAL" ref="ggaa9c9265ffe70122bd33659cf2983207e478f67e409adabc8679d3801604861d" args="" -->STP_PARAMETER_LEVEL_EXTERNAL</em>&nbsp;</td><td>
 Parameters used only outside Gimp-Print. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga135a29"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_INVALID" ref="gga135a29" args="" -->STP_PARAMETER_LEVEL_INVALID</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa9c9265ffe70122bd33659cf2983207b8bf539d78e56f06f463d00f7a3b56b3"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_INVALID" ref="ggaa9c9265ffe70122bd33659cf2983207b8bf539d78e56f06f463d00f7a3b56b3" args="" -->STP_PARAMETER_LEVEL_INVALID</em>&nbsp;</td><td>
 Invalid level (should never be used). </td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga133"></a><!-- doxytag: member="vars.h::stp_parameter_type_t" ref="ga133" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g9b3d4f47a44c0c8c9b150cddc56d2a91"></a><!-- doxytag: member="vars.h::stp_parameter_type_t" ref="g9b3d4f47a44c0c8c9b150cddc56d2a91" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga133">stp_parameter_type_t</a>          </td>
+          <td class="memname">enum <a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Parameter types. 
 <p>
-The following types are permitted for a printer setting. Not all are currently implemented.<dl compact><dt><b>Enumerator: </b></dt><dd>
+The following types are permitted for a printer setting. Not all are currently implemented. <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga133a7"></a><!-- doxytag: member="STP_PARAMETER_TYPE_STRING_LIST" ref="gga133a7" args="" -->STP_PARAMETER_TYPE_STRING_LIST</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg9b3d4f47a44c0c8c9b150cddc56d2a917a6f3e019c8a92ddecd34c71013acde0"></a><!-- doxytag: member="STP_PARAMETER_TYPE_STRING_LIST" ref="gg9b3d4f47a44c0c8c9b150cddc56d2a917a6f3e019c8a92ddecd34c71013acde0" args="" -->STP_PARAMETER_TYPE_STRING_LIST</em>&nbsp;</td><td>
 Single string choice from a list. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga133a8"></a><!-- doxytag: member="STP_PARAMETER_TYPE_INT" ref="gga133a8" args="" -->STP_PARAMETER_TYPE_INT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg9b3d4f47a44c0c8c9b150cddc56d2a91ae2cac85ef78157b53c7a79706dc0f70"></a><!-- doxytag: member="STP_PARAMETER_TYPE_INT" ref="gg9b3d4f47a44c0c8c9b150cddc56d2a91ae2cac85ef78157b53c7a79706dc0f70" args="" -->STP_PARAMETER_TYPE_INT</em>&nbsp;</td><td>
 Integer. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga133a9"></a><!-- doxytag: member="STP_PARAMETER_TYPE_BOOLEAN" ref="gga133a9" args="" -->STP_PARAMETER_TYPE_BOOLEAN</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg9b3d4f47a44c0c8c9b150cddc56d2a91f97ef629defc99977bd1cb35daabe0c1"></a><!-- doxytag: member="STP_PARAMETER_TYPE_BOOLEAN" ref="gg9b3d4f47a44c0c8c9b150cddc56d2a91f97ef629defc99977bd1cb35daabe0c1" args="" -->STP_PARAMETER_TYPE_BOOLEAN</em>&nbsp;</td><td>
 Boolean. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga133a10"></a><!-- doxytag: member="STP_PARAMETER_TYPE_DOUBLE" ref="gga133a10" args="" -->STP_PARAMETER_TYPE_DOUBLE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg9b3d4f47a44c0c8c9b150cddc56d2a91e0dc60c8435ce0b1355bd5a134395f0c"></a><!-- doxytag: member="STP_PARAMETER_TYPE_DOUBLE" ref="gg9b3d4f47a44c0c8c9b150cddc56d2a91e0dc60c8435ce0b1355bd5a134395f0c" args="" -->STP_PARAMETER_TYPE_DOUBLE</em>&nbsp;</td><td>
 Floating point number. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga133a11"></a><!-- doxytag: member="STP_PARAMETER_TYPE_CURVE" ref="gga133a11" args="" -->STP_PARAMETER_TYPE_CURVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg9b3d4f47a44c0c8c9b150cddc56d2a910d283c33f755969ded0751bbfc5d1912"></a><!-- doxytag: member="STP_PARAMETER_TYPE_CURVE" ref="gg9b3d4f47a44c0c8c9b150cddc56d2a910d283c33f755969ded0751bbfc5d1912" args="" -->STP_PARAMETER_TYPE_CURVE</em>&nbsp;</td><td>
 Curve. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga133a12"></a><!-- doxytag: member="STP_PARAMETER_TYPE_FILE" ref="gga133a12" args="" -->STP_PARAMETER_TYPE_FILE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg9b3d4f47a44c0c8c9b150cddc56d2a918224a918efbef96fffaa90e31654f7ff"></a><!-- doxytag: member="STP_PARAMETER_TYPE_FILE" ref="gg9b3d4f47a44c0c8c9b150cddc56d2a918224a918efbef96fffaa90e31654f7ff" args="" -->STP_PARAMETER_TYPE_FILE</em>&nbsp;</td><td>
 Filename (NYI, need to consider security). </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga133a13"></a><!-- doxytag: member="STP_PARAMETER_TYPE_RAW" ref="gga133a13" args="" -->STP_PARAMETER_TYPE_RAW</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg9b3d4f47a44c0c8c9b150cddc56d2a9133bb02d9ae5b2169d2f75da7684b04e9"></a><!-- doxytag: member="STP_PARAMETER_TYPE_RAW" ref="gg9b3d4f47a44c0c8c9b150cddc56d2a9133bb02d9ae5b2169d2f75da7684b04e9" args="" -->STP_PARAMETER_TYPE_RAW</em>&nbsp;</td><td>
 Raw, opaque data. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga133a14"></a><!-- doxytag: member="STP_PARAMETER_TYPE_ARRAY" ref="gga133a14" args="" -->STP_PARAMETER_TYPE_ARRAY</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg9b3d4f47a44c0c8c9b150cddc56d2a918789c2b5cc718eafca6d1d0022cfe3f3"></a><!-- doxytag: member="STP_PARAMETER_TYPE_ARRAY" ref="gg9b3d4f47a44c0c8c9b150cddc56d2a918789c2b5cc718eafca6d1d0022cfe3f3" args="" -->STP_PARAMETER_TYPE_ARRAY</em>&nbsp;</td><td>
 Array. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga133a15"></a><!-- doxytag: member="STP_PARAMETER_TYPE_DIMENSION" ref="gga133a15" args="" -->STP_PARAMETER_TYPE_DIMENSION</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg9b3d4f47a44c0c8c9b150cddc56d2a91aa6f89008bf237c6f0aa2f0ee176e8b7"></a><!-- doxytag: member="STP_PARAMETER_TYPE_DIMENSION" ref="gg9b3d4f47a44c0c8c9b150cddc56d2a91aa6f89008bf237c6f0aa2f0ee176e8b7" args="" -->STP_PARAMETER_TYPE_DIMENSION</em>&nbsp;</td><td>
 Linear dimension. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga133a16"></a><!-- doxytag: member="STP_PARAMETER_TYPE_INVALID" ref="gga133a16" args="" -->STP_PARAMETER_TYPE_INVALID</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg9b3d4f47a44c0c8c9b150cddc56d2a91d053047279b4c82034d26c4aa4c818d5"></a><!-- doxytag: member="STP_PARAMETER_TYPE_INVALID" ref="gg9b3d4f47a44c0c8c9b150cddc56d2a91d053047279b4c82034d26c4aa4c818d5" args="" -->STP_PARAMETER_TYPE_INVALID</em>&nbsp;</td><td>
 Invalid type (should never be used). </td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga137"></a><!-- doxytag: member="vars.h::stp_parameter_verify_t" ref="ga137" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gc061852de3627383cd415cd80a979e02"></a><!-- doxytag: member="vars.h::stp_parameter_verify_t" ref="gc061852de3627383cd415cd80a979e02" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga137">stp_parameter_verify_t</a>          </td>
+          <td class="memname">enum <a class="el" href="group__vars.html#gc061852de3627383cd415cd80a979e02">stp_parameter_verify_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga137a33"></a><!-- doxytag: member="PARAMETER_BAD" ref="gga137a33" args="" -->PARAMETER_BAD</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggc061852de3627383cd415cd80a979e02326a171221148779ec7df761b3eee967"></a><!-- doxytag: member="PARAMETER_BAD" ref="ggc061852de3627383cd415cd80a979e02326a171221148779ec7df761b3eee967" args="" -->PARAMETER_BAD</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga137a34"></a><!-- doxytag: member="PARAMETER_OK" ref="gga137a34" args="" -->PARAMETER_OK</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggc061852de3627383cd415cd80a979e022df363618282a9164433c0f212b18616"></a><!-- doxytag: member="PARAMETER_OK" ref="ggc061852de3627383cd415cd80a979e022df363618282a9164433c0f212b18616" args="" -->PARAMETER_OK</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga137a35"></a><!-- doxytag: member="PARAMETER_INACTIVE" ref="gga137a35" args="" -->PARAMETER_INACTIVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggc061852de3627383cd415cd80a979e025cb96da6c2e3ae7187e85a1ef6e41fc6"></a><!-- doxytag: member="PARAMETER_INACTIVE" ref="ggc061852de3627383cd415cd80a979e025cb96da6c2e3ae7187e85a1ef6e41fc6" args="" -->PARAMETER_INACTIVE</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga125"></a><!-- doxytag: member="vars.h::stp_allocate_component_data" ref="ga125" args="(stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="gfd4f81ca2ad497bd21f005344844f9c4"></a><!-- doxytag: member="vars.h::stp_allocate_component_data" ref="gfd4f81ca2ad497bd21f005344844f9c4" args="(stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_allocate_component_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_allocate_component_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>copyfunc</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g4541229554178e84408cccd89f532cb0">stp_copy_data_func_t</a>&nbsp;</td>
+          <td class="paramname"> <em>copyfunc</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>freefunc</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g7974f89cff4cbb5b225d0c4fbb92e9bb">stp_free_data_func_t</a>&nbsp;</td>
+          <td class="paramname"> <em>freefunc</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>void *&nbsp;</td>
-          <td class="mdname" nowrap> <em>data</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>data</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga107"></a><!-- doxytag: member="vars.h::stp_check_array_parameter" ref="ga107" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g5a629e6da1f5008f0db034191ad8b1d5"></a><!-- doxytag: member="vars.h::stp_check_array_parameter" ref="g5a629e6da1f5008f0db034191ad8b1d5" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_check_array_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_check_array_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Check if an array parameter is set. 
@@ -949,50 +892,42 @@ Check if an array parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga105"></a><!-- doxytag: member="vars.h::stp_check_boolean_parameter" ref="ga105" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g23b9c17426210460618c4f95c5f34229"></a><!-- doxytag: member="vars.h::stp_check_boolean_parameter" ref="g23b9c17426210460618c4f95c5f34229" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_check_boolean_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_check_boolean_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Check if a boolean parameter is set. 
@@ -1001,50 +936,42 @@ Check if a boolean parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga106"></a><!-- doxytag: member="vars.h::stp_check_curve_parameter" ref="ga106" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g6c94a1df4388b142d00d5d30df904b47"></a><!-- doxytag: member="vars.h::stp_check_curve_parameter" ref="g6c94a1df4388b142d00d5d30df904b47" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_check_curve_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_check_curve_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Check if a curve parameter is set. 
@@ -1053,50 +980,42 @@ Check if a curve parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga104"></a><!-- doxytag: member="vars.h::stp_check_dimension_parameter" ref="ga104" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gc1f2b865c76da441b6c1bd9b5b93aa1f"></a><!-- doxytag: member="vars.h::stp_check_dimension_parameter" ref="gc1f2b865c76da441b6c1bd9b5b93aa1f" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_check_dimension_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_check_dimension_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Check if a dimension parameter is set. 
@@ -1105,50 +1024,42 @@ Check if a dimension parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga101"></a><!-- doxytag: member="vars.h::stp_check_file_parameter" ref="ga101" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ga7db6701be5d05e545c79db905e4c7eb"></a><!-- doxytag: member="vars.h::stp_check_file_parameter" ref="ga7db6701be5d05e545c79db905e4c7eb" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_check_file_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_check_file_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Check if a file parameter is set. 
@@ -1157,50 +1068,42 @@ Check if a file parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga102"></a><!-- doxytag: member="vars.h::stp_check_float_parameter" ref="ga102" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gb12bebb419eb1ae8f323aa931e324389"></a><!-- doxytag: member="vars.h::stp_check_float_parameter" ref="gb12bebb419eb1ae8f323aa931e324389" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_check_float_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_check_float_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Check if a float parameter is set. 
@@ -1209,50 +1112,42 @@ Check if a float parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga103"></a><!-- doxytag: member="vars.h::stp_check_int_parameter" ref="ga103" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g4fd7914c01e2e1b34797736dfd2c9b9c"></a><!-- doxytag: member="vars.h::stp_check_int_parameter" ref="g4fd7914c01e2e1b34797736dfd2c9b9c" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_check_int_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_check_int_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Check if an integer parameter is set. 
@@ -1261,50 +1156,42 @@ Check if an integer parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga108"></a><!-- doxytag: member="vars.h::stp_check_raw_parameter" ref="ga108" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g285f05c648724c80bf05af30f87120a3"></a><!-- doxytag: member="vars.h::stp_check_raw_parameter" ref="g285f05c648724c80bf05af30f87120a3" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_check_raw_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_check_raw_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Check if a raw parameter is set. 
@@ -1313,50 +1200,42 @@ Check if a raw parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga100"></a><!-- doxytag: member="vars.h::stp_check_string_parameter" ref="ga100" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g8189b61073bfcd0244d5d6f2a2c8ba86"></a><!-- doxytag: member="vars.h::stp_check_string_parameter" ref="g8189b61073bfcd0244d5d6f2a2c8ba86" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_check_string_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_check_string_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Check if a string parameter is set. 
@@ -1365,44 +1244,36 @@ Check if a string parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga89"></a><!-- doxytag: member="vars.h::stp_clear_array_parameter" ref="ga89" args="(stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g7c67cef38cead5f519fd04ae09265b53"></a><!-- doxytag: member="vars.h::stp_clear_array_parameter" ref="g7c67cef38cead5f519fd04ae09265b53" args="(stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_clear_array_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_clear_array_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Clear an array parameter. 
@@ -1410,44 +1281,36 @@ Clear an array parameter.
 The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga87"></a><!-- doxytag: member="vars.h::stp_clear_boolean_parameter" ref="ga87" args="(stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g42ebfed8dec2054799e4943a8ca84267"></a><!-- doxytag: member="vars.h::stp_clear_boolean_parameter" ref="g42ebfed8dec2054799e4943a8ca84267" args="(stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_clear_boolean_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_clear_boolean_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Clear (remove) a boolean parameter. 
@@ -1455,44 +1318,36 @@ Clear (remove) a boolean parameter.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga88"></a><!-- doxytag: member="vars.h::stp_clear_curve_parameter" ref="ga88" args="(stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gf52a0b0c3b0e0fee1fc46516b1bc0c4e"></a><!-- doxytag: member="vars.h::stp_clear_curve_parameter" ref="gf52a0b0c3b0e0fee1fc46516b1bc0c4e" args="(stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_clear_curve_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_clear_curve_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Clear a curve parameter. 
@@ -1500,44 +1355,36 @@ Clear a curve parameter.
 The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga86"></a><!-- doxytag: member="vars.h::stp_clear_dimension_parameter" ref="ga86" args="(stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g514a21602ae7a8ebe8e5072a5a4b6f89"></a><!-- doxytag: member="vars.h::stp_clear_dimension_parameter" ref="g514a21602ae7a8ebe8e5072a5a4b6f89" args="(stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_clear_dimension_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_clear_dimension_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Clear (remove) a dimension parameter. 
@@ -1545,44 +1392,36 @@ Clear (remove) a dimension parameter.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga83"></a><!-- doxytag: member="vars.h::stp_clear_file_parameter" ref="ga83" args="(stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g4fad48e3e6453842559bd872650cb88f"></a><!-- doxytag: member="vars.h::stp_clear_file_parameter" ref="g4fad48e3e6453842559bd872650cb88f" args="(stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_clear_file_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_clear_file_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Clear a file parameter. 
@@ -1590,44 +1429,36 @@ Clear a file parameter.
 The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga84"></a><!-- doxytag: member="vars.h::stp_clear_float_parameter" ref="ga84" args="(stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g4eccbbe421f8b0c9342b17cef40b263d"></a><!-- doxytag: member="vars.h::stp_clear_float_parameter" ref="g4eccbbe421f8b0c9342b17cef40b263d" args="(stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_clear_float_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_clear_float_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Clear (remove) a float parameter. 
@@ -1635,44 +1466,36 @@ Clear (remove) a float parameter.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga85"></a><!-- doxytag: member="vars.h::stp_clear_int_parameter" ref="ga85" args="(stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g2107c08f37e31f45253f7d75a3773d46"></a><!-- doxytag: member="vars.h::stp_clear_int_parameter" ref="g2107c08f37e31f45253f7d75a3773d46" args="(stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_clear_int_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_clear_int_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Clear (remove) an integer parameter. 
@@ -1680,44 +1503,36 @@ Clear (remove) an integer parameter.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga90"></a><!-- doxytag: member="vars.h::stp_clear_raw_parameter" ref="ga90" args="(stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g11b79add82faf23b0e3c758f9530d95c"></a><!-- doxytag: member="vars.h::stp_clear_raw_parameter" ref="g11b79add82faf23b0e3c758f9530d95c" args="(stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_clear_raw_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_clear_raw_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Clear a raw parameter. 
@@ -1725,44 +1540,36 @@ Clear a raw parameter.
 The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga82"></a><!-- doxytag: member="vars.h::stp_clear_string_parameter" ref="ga82" args="(stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g9e98ef9a9b1b84a0c0580fe024e35490"></a><!-- doxytag: member="vars.h::stp_clear_string_parameter" ref="g9e98ef9a9b1b84a0c0580fe024e35490" args="(stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_clear_string_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_clear_string_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Clear a string parameter. 
@@ -1770,118 +1577,94 @@ Clear a string parameter.
 The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga131"></a><!-- doxytag: member="vars.h::stp_copy_options" ref="ga131" args="(stp_vars_t *vd, const stp_vars_t *vs)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gf7d2d5a9897c9ce77bb16f4a1addaa62"></a><!-- doxytag: member="vars.h::stp_copy_options" ref="gf7d2d5a9897c9ce77bb16f4a1addaa62" args="(stp_vars_t *vd, const stp_vars_t *vs)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_copy_options           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>vd</em>, </td>
+          <td class="memname">void stp_copy_options           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>vd</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>vs</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>vs</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga124"></a><!-- doxytag: member="vars.h::stp_default_settings" ref="ga124" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a>* stp_default_settings           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+
+</div>
+</div><p>
+<a class="anchor" name="gf63982a6e44f8b62532346d9ceb3d91c"></a><!-- doxytag: member="vars.h::stp_default_settings" ref="gf63982a6e44f8b62532346d9ceb3d91c" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a>* stp_default_settings           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Get default global settings. 
 <p>
-The main use of this is to provide a usable stp_vars_t for purposes of parameter inquiry in the absence of a specific printer. This is currently used in a variety of places to get information on the standard color parameters without querying a particular printer. <dl compact><dt><b>Returns:</b></dt><dd>the default settings.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga47"></a><!-- doxytag: member="vars.h::stp_describe_parameter" ref="ga47" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+The main use of this is to provide a usable stp_vars_t for purposes of parameter inquiry in the absence of a specific printer. This is currently used in a variety of places to get information on the standard color parameters without querying a particular printer. <dl class="return" compact><dt><b>Returns:</b></dt><dd>the default settings. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g0b8991bd1a91e2cac7d0b355b1186c8e"></a><!-- doxytag: member="vars.h::stp_describe_parameter" ref="g0b8991bd1a91e2cac7d0b355b1186c8e" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_describe_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_describe_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>description</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>description</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Describe a parameter in detail. 
@@ -1890,50 +1673,42 @@ All of the parameter fields will be populated. <dl compact><dt><b>Parameters:</b
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>name</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>description</em>&nbsp;</td><td>a pointer to an <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> to store the parameter description in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>description</em>&nbsp;</td><td>a pointer to an <a class="el" href="structstp__parameter__t.html" title="Parameter description.">stp_parameter_t</a> to store the parameter description in. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga122"></a><!-- doxytag: member="vars.h::stp_describe_resolution" ref="ga122" args="(const stp_vars_t *v, int *x, int *y)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g88715b31fcec18778f769ffbc1b55384"></a><!-- doxytag: member="vars.h::stp_describe_resolution" ref="g88715b31fcec18778f769ffbc1b55384" args="(const stp_vars_t *v, int *x, int *y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_describe_resolution           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_describe_resolution           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>x</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>x</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>y</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>y</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Retrieve the printing resolution of the selected resolution. 
@@ -1942,118 +1717,94 @@ If the resolution is invalid, -1 will be returned in both x and y. <dl compact><
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>x</em>&nbsp;</td><td>a pointer to a int to store the horizontal resolution in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>y</em>&nbsp;</td><td>a pointer to a int to store the vertical resolution in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>y</em>&nbsp;</td><td>a pointer to a int to store the vertical resolution in. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga126"></a><!-- doxytag: member="vars.h::stp_destroy_component_data" ref="ga126" args="(stp_vars_t *v, const char *name)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g151b7d922a3e1e5e9d9f0ea8de6ab70a"></a><!-- doxytag: member="vars.h::stp_destroy_component_data" ref="g151b7d922a3e1e5e9d9f0ea8de6ab70a" args="(stp_vars_t *v, const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_destroy_component_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_destroy_component_data           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga132"></a><!-- doxytag: member="vars.h::stp_fill_parameter_settings" ref="ga132" args="(stp_parameter_t *desc, const stp_parameter_t *param)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g7f2c578ff7ae28a3db502476aa10137e"></a><!-- doxytag: member="vars.h::stp_fill_parameter_settings" ref="g7f2c578ff7ae28a3db502476aa10137e" args="(stp_parameter_t *desc, const stp_parameter_t *param)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_fill_parameter_settings           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>desc</em>, </td>
+          <td class="memname">void stp_fill_parameter_settings           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>desc</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>param</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>param</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga80"></a><!-- doxytag: member="vars.h::stp_get_array_parameter" ref="ga80" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gc50c216c2d5cd56a9704f48d4338b179"></a><!-- doxytag: member="vars.h::stp_get_array_parameter" ref="gc50c216c2d5cd56a9704f48d4338b179" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a>* stp_get_array_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a>* stp_get_array_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get an array parameter. 
@@ -2064,42 +1815,34 @@ Get an array parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the array, or NULL if no parameter was found.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga116"></a><!-- doxytag: member="vars.h::stp_get_array_parameter_active" ref="ga116" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the array, or NULL if no parameter was found. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gc9f85c3a8bf99e09150cbf4220e4b983"></a><!-- doxytag: member="vars.h::stp_get_array_parameter_active" ref="gc9f85c3a8bf99e09150cbf4220e4b983" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_array_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> stp_get_array_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the activity status of an array parameter. 
@@ -2110,42 +1853,34 @@ Get the activity status of an array parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga78"></a><!-- doxytag: member="vars.h::stp_get_boolean_parameter" ref="ga78" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g8a30b26fa842805384b6ad663cabaea2"></a><!-- doxytag: member="vars.h::stp_get_boolean_parameter" ref="g8a30b26fa842805384b6ad663cabaea2" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_get_boolean_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_get_boolean_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a boolean parameter. 
@@ -2156,42 +1891,34 @@ Get a boolean parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the boolean value.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga114"></a><!-- doxytag: member="vars.h::stp_get_boolean_parameter_active" ref="ga114" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the boolean value. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gb33cf5376adc63e826cd3dedae33e930"></a><!-- doxytag: member="vars.h::stp_get_boolean_parameter_active" ref="gb33cf5376adc63e826cd3dedae33e930" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_boolean_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> stp_get_boolean_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the activity status of a boolean parameter. 
@@ -2202,110 +1929,86 @@ Get the activity status of a boolean parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga16"></a><!-- doxytag: member="vars.h::stp_get_color_conversion" ref="ga16" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stp_get_color_conversion           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g2bac9212773ecf603b7667bd0268c23e"></a><!-- doxytag: member="vars.h::stp_get_color_conversion" ref="g2bac9212773ecf603b7667bd0268c23e" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stp_get_color_conversion           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Get the name of the color conversion routine. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the name of the color conversion routine (must not be freed).</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga127"></a><!-- doxytag: member="vars.h::stp_get_component_data" ref="ga127" args="(const stp_vars_t *v, const char *name)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the name of the color conversion routine (must not be freed). </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g1666dd1571bdb866a85d4318858893be"></a><!-- doxytag: member="vars.h::stp_get_component_data" ref="g1666dd1571bdb866a85d4318858893be" args="(const stp_vars_t *v, const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void* stp_get_component_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void* stp_get_component_data           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga79"></a><!-- doxytag: member="vars.h::stp_get_curve_parameter" ref="ga79" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g553dec81dd8b3e5590d963ba72223557"></a><!-- doxytag: member="vars.h::stp_get_curve_parameter" ref="g553dec81dd8b3e5590d963ba72223557" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_get_curve_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* stp_get_curve_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a curve parameter. 
@@ -2316,42 +2019,34 @@ Get a curve parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the curve, or NULL if no parameter was found.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga115"></a><!-- doxytag: member="vars.h::stp_get_curve_parameter_active" ref="ga115" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the curve, or NULL if no parameter was found. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="ge36bf982c52215f11fe8e392b4b3d705"></a><!-- doxytag: member="vars.h::stp_get_curve_parameter_active" ref="ge36bf982c52215f11fe8e392b4b3d705" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_curve_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> stp_get_curve_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the activity status of a curve parameter. 
@@ -2362,42 +2057,34 @@ Get the activity status of a curve parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga77"></a><!-- doxytag: member="vars.h::stp_get_dimension_parameter" ref="ga77" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g3c8d1333086ca5a01a3439f94d9f94d3"></a><!-- doxytag: member="vars.h::stp_get_dimension_parameter" ref="g3c8d1333086ca5a01a3439f94d9f94d3" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_get_dimension_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_get_dimension_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a dimension parameter. 
@@ -2408,42 +2095,34 @@ Get a dimension parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the dimension (integer) value.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga113"></a><!-- doxytag: member="vars.h::stp_get_dimension_parameter_active" ref="ga113" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the dimension (integer) value. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g45f9abd8ac6772ea850344c513f6c436"></a><!-- doxytag: member="vars.h::stp_get_dimension_parameter_active" ref="g45f9abd8ac6772ea850344c513f6c436" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_dimension_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> stp_get_dimension_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the activity status of a dimension parameter. 
@@ -2454,64 +2133,48 @@ Get the activity status of a dimension parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga13"></a><!-- doxytag: member="vars.h::stp_get_driver" ref="ga13" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stp_get_driver           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g20c45707399ef6fdf6ee8c8209b5c7c0"></a><!-- doxytag: member="vars.h::stp_get_driver" ref="g20c45707399ef6fdf6ee8c8209b5c7c0" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stp_get_driver           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Get the name of the printer driver. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the name of the printer driver (must not be freed).</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga36"></a><!-- doxytag: member="vars.h::stp_get_errdata" ref="ga36" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void* stp_get_errdata           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the name of the printer driver (must not be freed). </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gd08bdcd721d37f52993c1862e25ebaf7"></a><!-- doxytag: member="vars.h::stp_get_errdata" ref="gd08bdcd721d37f52993c1862e25ebaf7" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void* stp_get_errdata           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Get the error data. 
@@ -2521,33 +2184,25 @@ Get the error data.
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the output data.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga32"></a><!-- doxytag: member="vars.h::stp_get_errfunc" ref="ga32" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a> stp_get_errfunc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the output data. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g2f246d3af2be9e108abe423691e16049"></a><!-- doxytag: member="vars.h::stp_get_errfunc" ref="g2f246d3af2be9e108abe423691e16049" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">stp_outfunc_t</a> stp_get_errfunc           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Get the function used to print output information. 
@@ -2557,42 +2212,34 @@ Get the function used to print output information.
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the outfunc.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga74"></a><!-- doxytag: member="vars.h::stp_get_file_parameter" ref="ga74" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the outfunc. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g2021992d89c92b10138fb012a9554a08"></a><!-- doxytag: member="vars.h::stp_get_file_parameter" ref="g2021992d89c92b10138fb012a9554a08" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* stp_get_file_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">const char* stp_get_file_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a file parameter. 
@@ -2603,42 +2250,34 @@ Get a file parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the filename, or NULL if no parameter was found.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga110"></a><!-- doxytag: member="vars.h::stp_get_file_parameter_active" ref="ga110" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the filename, or NULL if no parameter was found. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g47e7a69ff8e23eed6188542c5c8bff4f"></a><!-- doxytag: member="vars.h::stp_get_file_parameter_active" ref="g47e7a69ff8e23eed6188542c5c8bff4f" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_file_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> stp_get_file_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the activity status of a file parameter. 
@@ -2649,42 +2288,34 @@ Get the activity status of a file parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga75"></a><!-- doxytag: member="vars.h::stp_get_float_parameter" ref="ga75" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g365412d9c176fd3ac9375ded3f22ddb3"></a><!-- doxytag: member="vars.h::stp_get_float_parameter" ref="g365412d9c176fd3ac9375ded3f22ddb3" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">double stp_get_float_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">double stp_get_float_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a float parameter. 
@@ -2695,42 +2326,34 @@ Get a float parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the float value.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga111"></a><!-- doxytag: member="vars.h::stp_get_float_parameter_active" ref="ga111" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the float value. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g4b8f9847f2eebfff53446a9bc235ab68"></a><!-- doxytag: member="vars.h::stp_get_float_parameter_active" ref="g4b8f9847f2eebfff53446a9bc235ab68" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_float_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> stp_get_float_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the activity status of a float parameter. 
@@ -2741,91 +2364,75 @@ Get the activity status of a float parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga24"></a><!-- doxytag: member="vars.h::stp_get_height" ref="ga24" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_get_height           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g8731a92f5d3047e00ba33577821d5aec"></a><!-- doxytag: member="vars.h::stp_get_height" ref="g8731a92f5d3047e00ba33577821d5aec" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_get_height           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Get the height of the image. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the left edge.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga119"></a><!-- doxytag: member="vars.h::stp_get_imageable_area" ref="ga119" args="(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the left edge. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g67d1e68ed47e5b554f2021fca1f01978"></a><!-- doxytag: member="vars.h::stp_get_imageable_area" ref="g67d1e68ed47e5b554f2021fca1f01978" args="(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_get_imageable_area           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_get_imageable_area           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>left</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>left</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>right</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>right</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>bottom</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>bottom</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>top</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>top</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the imagable area of the page. 
@@ -2839,44 +2446,36 @@ If the media size stored in V is invalid, the return values will be indeterminat
     <tr><td valign="top"></td><td valign="top"><em>left</em>&nbsp;</td><td>a pointer to a int to store the left edge in. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>right</em>&nbsp;</td><td>a pointer to a int to store the right edge in. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>bottom</em>&nbsp;</td><td>a pointer to a int to store the bottom edge in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>top</em>&nbsp;</td><td>a pointer to a int to store the top edge in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>top</em>&nbsp;</td><td>a pointer to a int to store the top edge in. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga76"></a><!-- doxytag: member="vars.h::stp_get_int_parameter" ref="ga76" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g7c0d95ba35aba0786bfc5f918efa79fc"></a><!-- doxytag: member="vars.h::stp_get_int_parameter" ref="g7c0d95ba35aba0786bfc5f918efa79fc" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_get_int_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">int stp_get_int_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get an integer parameter. 
@@ -2887,42 +2486,34 @@ Get an integer parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the integer value.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga112"></a><!-- doxytag: member="vars.h::stp_get_int_parameter_active" ref="ga112" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the integer value. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gb74fd69c4ef62af7b5ab33c6baf48b8b"></a><!-- doxytag: member="vars.h::stp_get_int_parameter_active" ref="gb74fd69c4ef62af7b5ab33c6baf48b8b" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_int_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> stp_get_int_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the activity status of an integer parameter. 
@@ -2933,91 +2524,75 @@ Get the activity status of an integer parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga18"></a><!-- doxytag: member="vars.h::stp_get_left" ref="ga18" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_get_left           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g5c02ee2422d86e4bcdcae613c70c9e1e"></a><!-- doxytag: member="vars.h::stp_get_left" ref="g5c02ee2422d86e4bcdcae613c70c9e1e" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_get_left           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Get the left edge of the image. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the left edge.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga120"></a><!-- doxytag: member="vars.h::stp_get_maximum_imageable_area" ref="ga120" args="(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the left edge. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gd17cadb7fd78bffb759f2213a1a90df6"></a><!-- doxytag: member="vars.h::stp_get_maximum_imageable_area" ref="gd17cadb7fd78bffb759f2213a1a90df6" args="(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_get_maximum_imageable_area           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_get_maximum_imageable_area           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>left</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>left</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>right</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>right</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>bottom</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>bottom</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>top</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>top</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the maximum imagable area of the page. 
@@ -3031,50 +2606,42 @@ If the media size stored in V is invalid, the return values will be indeterminat
     <tr><td valign="top"></td><td valign="top"><em>left</em>&nbsp;</td><td>a pointer to a int to store the left edge in. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>right</em>&nbsp;</td><td>a pointer to a int to store the right edge in. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>bottom</em>&nbsp;</td><td>a pointer to a int to store the bottom edge in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>top</em>&nbsp;</td><td>a pointer to a int to store the top edge in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>top</em>&nbsp;</td><td>a pointer to a int to store the top edge in. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga118"></a><!-- doxytag: member="vars.h::stp_get_media_size" ref="ga118" args="(const stp_vars_t *v, int *width, int *height)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gc9e6d740ffc4cff5dc7d0bf106a3e7df"></a><!-- doxytag: member="vars.h::stp_get_media_size" ref="gc9e6d740ffc4cff5dc7d0bf106a3e7df" args="(const stp_vars_t *v, int *width, int *height)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_get_media_size           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_get_media_size           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>width</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>width</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>height</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the media (paper) size. 
@@ -3083,35 +2650,27 @@ Retrieve the media size of the media type set in V, expressed in units of 1/72".
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>width</em>&nbsp;</td><td>a pointer to an int to store the media width in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>height</em>&nbsp;</td><td>a pointer to an int to store the media height in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>height</em>&nbsp;</td><td>a pointer to an int to store the media height in. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga34"></a><!-- doxytag: member="vars.h::stp_get_outdata" ref="ga34" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void* stp_get_outdata           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+
+</div>
+</div><p>
+<a class="anchor" name="g7042b05e0df5b32206d54397429bbac5"></a><!-- doxytag: member="vars.h::stp_get_outdata" ref="g7042b05e0df5b32206d54397429bbac5" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void* stp_get_outdata           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Get the output data. 
@@ -3121,33 +2680,25 @@ Get the output data.
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the output data.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga30"></a><!-- doxytag: member="vars.h::stp_get_outfunc" ref="ga30" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a> stp_get_outfunc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the output data. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g7c6c7c547d0c973ac801362db5ca4879"></a><!-- doxytag: member="vars.h::stp_get_outfunc" ref="g7c6c7c547d0c973ac801362db5ca4879" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">stp_outfunc_t</a> stp_get_outfunc           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Get the function used to print output information. 
@@ -3157,95 +2708,71 @@ Get the function used to print output information.
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the outfunc.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga28"></a><!-- doxytag: member="vars.h::stp_get_page_height" ref="ga28" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_get_page_height           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the outfunc. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gc0c4928fa488bb95e73ba9b8aa932584"></a><!-- doxytag: member="vars.h::stp_get_page_height" ref="gc0c4928fa488bb95e73ba9b8aa932584" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_get_page_height           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Get the page height. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the page height.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga26"></a><!-- doxytag: member="vars.h::stp_get_page_width" ref="ga26" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_get_page_width           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the page height. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gad2d305eed993707d22263b54578a39b"></a><!-- doxytag: member="vars.h::stp_get_page_width" ref="gad2d305eed993707d22263b54578a39b" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_get_page_width           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Get the page width. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the page width.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga38"></a><!-- doxytag: member="vars.h::stp_get_parameter_list" ref="ga38" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> stp_get_parameter_list           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the page width. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g12e8bb617e5c90da99d6d74519664634"></a><!-- doxytag: member="vars.h::stp_get_parameter_list" ref="g12e8bb617e5c90da99d6d74519664634" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> stp_get_parameter_list           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 List the available parameters for the currently chosen settings. 
@@ -3255,42 +2782,34 @@ This does not fill in the bounds and defaults; it merely provides a list of sett
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a list of available parameters (must be freed with <a class="el" href="group__vars.html#ga42">stp_parameter_list_destroy()</a>).</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga81"></a><!-- doxytag: member="vars.h::stp_get_raw_parameter" ref="ga81" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a list of available parameters (must be freed with <a class="el" href="group__vars.html#g3ffaadbe73187aa1f298c4eaa80ea82e" title="Destroy a parameter_list.">stp_parameter_list_destroy()</a>). </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g9fff6c14a71f5f8ec28620ef64a92fd5"></a><!-- doxytag: member="vars.h::stp_get_raw_parameter" ref="g9fff6c14a71f5f8ec28620ef64a92fd5" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a>* stp_get_raw_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a>* stp_get_raw_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a raw parameter. 
@@ -3301,42 +2820,34 @@ Get a raw parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the raw data, or NULL if no parameter was found.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga117"></a><!-- doxytag: member="vars.h::stp_get_raw_parameter_active" ref="ga117" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the raw data, or NULL if no parameter was found. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gb6e41a5edb7474ed7ac26e236e00c80c"></a><!-- doxytag: member="vars.h::stp_get_raw_parameter_active" ref="gb6e41a5edb7474ed7ac26e236e00c80c" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_raw_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> stp_get_raw_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the activity status of a raw parameter. 
@@ -3347,60 +2858,52 @@ Get the activity status of a raw parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga121"></a><!-- doxytag: member="vars.h::stp_get_size_limit" ref="ga121" args="(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g0c8ee62453baff3d2c00e0ccae67b049"></a><!-- doxytag: member="vars.h::stp_get_size_limit" ref="g0c8ee62453baff3d2c00e0ccae67b049" args="(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_get_size_limit           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_get_size_limit           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>max_width</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>max_width</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>max_height</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>max_height</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>min_width</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>min_width</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>min_height</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int *&nbsp;</td>
+          <td class="paramname"> <em>min_height</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the media size limits. 
@@ -3411,44 +2914,36 @@ Retrieve the minimum and maximum size limits for custom media sizes with the cur
     <tr><td valign="top"></td><td valign="top"><em>max_width</em>&nbsp;</td><td>a pointer to a int to store the maximum width in. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>max_height</em>&nbsp;</td><td>a pointer to a int to store the maximum height in. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>min_width</em>&nbsp;</td><td>a pointer to a int to store the minimum width in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>min_height</em>&nbsp;</td><td>a pointer to a int to store the minimum height in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>min_height</em>&nbsp;</td><td>a pointer to a int to store the minimum height in. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga73"></a><!-- doxytag: member="vars.h::stp_get_string_parameter" ref="ga73" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gb5b21e5606b8ca755c5eac7774260efa"></a><!-- doxytag: member="vars.h::stp_get_string_parameter" ref="gb5b21e5606b8ca755c5eac7774260efa" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* stp_get_string_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">const char* stp_get_string_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get a string parameter. 
@@ -3459,42 +2954,34 @@ Get a string parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the string, or NULL if no parameter was found.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga109"></a><!-- doxytag: member="vars.h::stp_get_string_parameter_active" ref="ga109" args="(const stp_vars_t *v, const char *parameter)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the string, or NULL if no parameter was found. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g0b7be7ba9f763be692dd833a434ed13d"></a><!-- doxytag: member="vars.h::stp_get_string_parameter_active" ref="g0b7be7ba9f763be692dd833a434ed13d" args="(const stp_vars_t *v, const char *parameter)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> stp_get_string_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> stp_get_string_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Get the activity status of a string parameter. 
@@ -3505,213 +2992,165 @@ Get the activity status of a string parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga20"></a><!-- doxytag: member="vars.h::stp_get_top" ref="ga20" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_get_top           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g292132b97b20a6d034e22f4146d36131"></a><!-- doxytag: member="vars.h::stp_get_top" ref="g292132b97b20a6d034e22f4146d36131" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_get_top           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Get the top edge of the image. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the left edge.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga129"></a><!-- doxytag: member="vars.h::stp_get_verified" ref="ga129" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_get_verified           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the left edge. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g6d04a3c444753f11004ad6259a91e853"></a><!-- doxytag: member="vars.h::stp_get_verified" ref="g6d04a3c444753f11004ad6259a91e853" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_get_verified           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga22"></a><!-- doxytag: member="vars.h::stp_get_width" ref="ga22" args="(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_get_width           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+
+</div>
+</div><p>
+<a class="anchor" name="g1c54d99b94c69a67eb4ae0349a4720e7"></a><!-- doxytag: member="vars.h::stp_get_width" ref="g1c54d99b94c69a67eb4ae0349a4720e7" args="(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_get_width           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Get the width edge of the image. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the left edge.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga37"></a><!-- doxytag: member="vars.h::stp_merge_printvars" ref="ga37" args="(stp_vars_t *user, const stp_vars_t *print)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the left edge. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g086303d36b835d539e75f16187e99e8f"></a><!-- doxytag: member="vars.h::stp_merge_printvars" ref="g086303d36b835d539e75f16187e99e8f" args="(stp_vars_t *user, const stp_vars_t *print)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_merge_printvars           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>user</em>, </td>
+          <td class="memname">void stp_merge_printvars           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>user</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>print</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>print</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Merge defaults for a printer with user-chosen settings. 
 <p>
-<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000002">Deprecated:</a></b></dt><dd>This is likely to go away.</dd></dl>
+<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000002">Deprecated:</a></b></dt><dd>This is likely to go away. </dd></dl>
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>user</em>&nbsp;</td><td>the destination vars. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>print</em>&nbsp;</td><td>the vars to merge into user.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>print</em>&nbsp;</td><td>the vars to merge into user. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga48"></a><!-- doxytag: member="vars.h::stp_parameter_description_destroy" ref="ga48" args="(stp_parameter_t *description)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_parameter_description_destroy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>description</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+
+</div>
+</div><p>
+<a class="anchor" name="gd598d95a82767e05c958ccd44534c51d"></a><!-- doxytag: member="vars.h::stp_parameter_description_destroy" ref="gd598d95a82767e05c958ccd44534c51d" args="(stp_parameter_t *description)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_parameter_description_destroy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>description</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Destroy a parameter description. 
 <p>
-This must be called even if the <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> was not allocated with malloc, since some members are dynamically allocated. <dl compact><dt><b>Parameters:</b></dt><dd>
+This must be called even if the <a class="el" href="structstp__parameter__t.html" title="Parameter description.">stp_parameter_t</a> was not allocated with malloc, since some members are dynamically allocated. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>description</em>&nbsp;</td><td>the parameter description to destroy.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>description</em>&nbsp;</td><td>the parameter description to destroy. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga40"></a><!-- doxytag: member="vars.h::stp_parameter_find" ref="ga40" args="(stp_const_parameter_list_t list, const char *name)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gdcd8062af7b643c734f53c545694d258"></a><!-- doxytag: member="vars.h::stp_parameter_find" ref="gdcd8062af7b643c734f53c545694d258" args="(stp_const_parameter_list_t list, const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>* stp_parameter_find           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>* stp_parameter_find           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a>&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Find a parameter by its name. 
@@ -3722,42 +3161,34 @@ Find a parameter by its name.
     <tr><td valign="top"></td><td valign="top"><em>name</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga49"></a><!-- doxytag: member="vars.h::stp_parameter_find_in_settings" ref="ga49" args="(const stp_vars_t *v, const char *name)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g6ce39557b61706421232b5f1ac604b1b"></a><!-- doxytag: member="vars.h::stp_parameter_find_in_settings" ref="g6ce39557b61706421232b5f1ac604b1b" args="(const stp_vars_t *v, const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>* stp_parameter_find_in_settings           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>* stp_parameter_find_in_settings           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Find a parameter by its name from a vars object. 
@@ -3768,42 +3199,34 @@ Find a parameter by its name from a vars object.
     <tr><td valign="top"></td><td valign="top"><em>name</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga44"></a><!-- doxytag: member="vars.h::stp_parameter_list_add_param" ref="ga44" args="(stp_parameter_list_t list, const stp_parameter_t *item)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g8f4f06610d1f58bae9e70e632919c405"></a><!-- doxytag: member="vars.h::stp_parameter_list_add_param" ref="g8f4f06610d1f58bae9e70e632919c405" args="(stp_parameter_list_t list, const stp_parameter_t *item)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_parameter_list_add_param           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname">void stp_parameter_list_add_param           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>item</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>item</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Add a parameter to a parameter_list. 
@@ -3811,44 +3234,36 @@ Add a parameter to a parameter_list.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the parameter_list to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the parameter to add.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the parameter to add. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga46"></a><!-- doxytag: member="vars.h::stp_parameter_list_append" ref="ga46" args="(stp_parameter_list_t list, stp_const_parameter_list_t append)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g4b62bc6d0133704b3a2568b1654b6678"></a><!-- doxytag: member="vars.h::stp_parameter_list_append" ref="g4b62bc6d0133704b3a2568b1654b6678" args="(stp_parameter_list_t list, stp_const_parameter_list_t append)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_parameter_list_append           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname">void stp_parameter_list_append           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>append</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a>&nbsp;</td>
+          <td class="paramname"> <em>append</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Append one parameter_list to another. 
@@ -3856,35 +3271,27 @@ Append one parameter_list to another.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the destination list (to append to). </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>append</em>&nbsp;</td><td>the list of paramters to append. Each item that does not already exist in list will be appended.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>append</em>&nbsp;</td><td>the list of paramters to append. Each item that does not already exist in list will be appended. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga45"></a><!-- doxytag: member="vars.h::stp_parameter_list_copy" ref="ga45" args="(stp_const_parameter_list_t list)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> stp_parameter_list_copy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a>&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+
+</div>
+</div><p>
+<a class="anchor" name="g92be87a573b883584e5a036743c1bb7d"></a><!-- doxytag: member="vars.h::stp_parameter_list_copy" ref="g92be87a573b883584e5a036743c1bb7d" args="(stp_const_parameter_list_t list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> stp_parameter_list_copy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a>&nbsp;</td>
+          <td class="paramname"> <em>list</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Copy and allocate a parameter_list. 
@@ -3894,33 +3301,25 @@ A new parameter_list will be created, and then the contents of source will be co
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the source parameter_list. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the new copy of the parameter_list.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga39"></a><!-- doxytag: member="vars.h::stp_parameter_list_count" ref="ga39" args="(stp_const_parameter_list_t list)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">size_t stp_parameter_list_count           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a>&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the new copy of the parameter_list. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g7a94856ce75482a5edb6153fe8916a54"></a><!-- doxytag: member="vars.h::stp_parameter_list_count" ref="g7a94856ce75482a5edb6153fe8916a54" args="(stp_const_parameter_list_t list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">size_t stp_parameter_list_count           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a>&nbsp;</td>
+          <td class="paramname"> <em>list</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 List the number of available parameters for the currently chosen settings. 
@@ -3930,108 +3329,84 @@ List the number of available parameters for the currently chosen settings.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the parameter_list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the number of parameters.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga43"></a><!-- doxytag: member="vars.h::stp_parameter_list_create" ref="ga43" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> stp_parameter_list_create           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the number of parameters. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g404bf7f1b3632178d559f6980478a312"></a><!-- doxytag: member="vars.h::stp_parameter_list_create" ref="g404bf7f1b3632178d559f6980478a312" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> stp_parameter_list_create           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Create a parameter_list. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created parameter_list.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga42"></a><!-- doxytag: member="vars.h::stp_parameter_list_destroy" ref="ga42" args="(stp_parameter_list_t list)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_parameter_list_destroy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the newly created parameter_list. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g3ffaadbe73187aa1f298c4eaa80ea82e"></a><!-- doxytag: member="vars.h::stp_parameter_list_destroy" ref="g3ffaadbe73187aa1f298c4eaa80ea82e" args="(stp_parameter_list_t list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_parameter_list_destroy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td>
+          <td class="paramname"> <em>list</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Destroy a parameter_list. 
 <p>
 It is an error to destroy the parameter_list more than once. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the parameter_list to destroy.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the parameter_list to destroy. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga41"></a><!-- doxytag: member="vars.h::stp_parameter_list_param" ref="ga41" args="(stp_const_parameter_list_t list, size_t item)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g70d69ef7dec383004bf4570e57b76e18"></a><!-- doxytag: member="vars.h::stp_parameter_list_param" ref="g70d69ef7dec383004bf4570e57b76e18" args="(stp_const_parameter_list_t list, size_t item)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>* stp_parameter_list_param           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>* stp_parameter_list_param           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a>&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>item</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>item</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Find a parameter by its index number. 
@@ -4042,48 +3417,40 @@ Find a parameter by its index number.
     <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the index number of the parameter (must not be greater than stp_parameter_list_count - 1). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga61"></a><!-- doxytag: member="vars.h::stp_scale_float_parameter" ref="ga61" args="(stp_vars_t *v, const char *parameter, double scale)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="g227ec3e75a78a5c3dd01c85dbc1e7004"></a><!-- doxytag: member="vars.h::stp_scale_float_parameter" ref="g227ec3e75a78a5c3dd01c85dbc1e7004" args="(stp_vars_t *v, const char *parameter, double scale)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_scale_float_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_scale_float_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>scale</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>scale</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Multiply the value of a float parameter by a scaling factor. 
@@ -4092,50 +3459,42 @@ Multiply the value of a float parameter by a scaling factor.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>scale</em>&nbsp;</td><td>the factor to multiply the value by.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>scale</em>&nbsp;</td><td>the factor to multiply the value by. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga59"></a><!-- doxytag: member="vars.h::stp_set_array_parameter" ref="ga59" args="(stp_vars_t *v, const char *parameter, const stp_array_t *value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g88f25e09f9a4b76aca7ba8316cbf9c8b"></a><!-- doxytag: member="vars.h::stp_set_array_parameter" ref="g88f25e09f9a4b76aca7ba8316cbf9c8b" args="(stp_vars_t *v, const char *parameter, const stp_array_t *value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_array_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_array_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set an array parameter. 
@@ -4144,50 +3503,42 @@ Set an array parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga98"></a><!-- doxytag: member="vars.h::stp_set_array_parameter_active" ref="ga98" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gb78f4273798c6e3e720afe01680cf752"></a><!-- doxytag: member="vars.h::stp_set_array_parameter_active" ref="gb78f4273798c6e3e720afe01680cf752" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_array_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_array_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the activity of an array parameter. 
@@ -4196,50 +3547,42 @@ Set the activity of an array parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga57"></a><!-- doxytag: member="vars.h::stp_set_boolean_parameter" ref="ga57" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g2167971895eea887eaaa656ed075beff"></a><!-- doxytag: member="vars.h::stp_set_boolean_parameter" ref="g2167971895eea887eaaa656ed075beff" args="(stp_vars_t *v, const char *parameter, int value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_boolean_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_boolean_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a boolean parameter. 
@@ -4248,50 +3591,42 @@ Set a boolean parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga96"></a><!-- doxytag: member="vars.h::stp_set_boolean_parameter_active" ref="ga96" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g9ad15a73dd8c755a8b80edbe335285ee"></a><!-- doxytag: member="vars.h::stp_set_boolean_parameter_active" ref="g9ad15a73dd8c755a8b80edbe335285ee" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_boolean_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_boolean_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the activity of a boolean parameter. 
@@ -4300,44 +3635,36 @@ Set the activity of a boolean parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga14"></a><!-- doxytag: member="vars.h::stp_set_color_conversion" ref="ga14" args="(stp_vars_t *v, const char *val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g7eb2a1c4b892efd5507fcd4b7a434cea"></a><!-- doxytag: member="vars.h::stp_set_color_conversion" ref="g7eb2a1c4b892efd5507fcd4b7a434cea" args="(stp_vars_t *v, const char *val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_color_conversion           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_color_conversion           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the name of the color conversion routine, if not the default. 
@@ -4345,50 +3672,42 @@ Set the name of the color conversion routine, if not the default.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the name to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the name to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga15"></a><!-- doxytag: member="vars.h::stp_set_color_conversion_n" ref="ga15" args="(stp_vars_t *v, const char *val, int bytes)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g5a842b31f0a572d8e64f1a5616e25a99"></a><!-- doxytag: member="vars.h::stp_set_color_conversion_n" ref="g5a842b31f0a572d8e64f1a5616e25a99" args="(stp_vars_t *v, const char *val, int bytes)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_color_conversion_n           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_color_conversion_n           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>val</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>bytes</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>bytes</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the name of the color conversion routine, if not the default. 
@@ -4397,50 +3716,42 @@ Set the name of the color conversion routine, if not the default.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the name to set. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of val (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of val (in bytes). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga58"></a><!-- doxytag: member="vars.h::stp_set_curve_parameter" ref="ga58" args="(stp_vars_t *v, const char *parameter, const stp_curve_t *value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gfe5f1f6364b89437664b2bbc55288025"></a><!-- doxytag: member="vars.h::stp_set_curve_parameter" ref="gfe5f1f6364b89437664b2bbc55288025" args="(stp_vars_t *v, const char *parameter, const stp_curve_t *value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_curve_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_curve_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a curve parameter. 
@@ -4449,50 +3760,42 @@ Set a curve parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga97"></a><!-- doxytag: member="vars.h::stp_set_curve_parameter_active" ref="ga97" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ge7f21b118a8dfb5607334a6141d5dc5c"></a><!-- doxytag: member="vars.h::stp_set_curve_parameter_active" ref="ge7f21b118a8dfb5607334a6141d5dc5c" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_curve_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_curve_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the activity of a curveparameter. 
@@ -4501,50 +3804,42 @@ Set the activity of a curveparameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga71"></a><!-- doxytag: member="vars.h::stp_set_default_array_parameter" ref="ga71" args="(stp_vars_t *v, const char *parameter, const stp_array_t *value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g63e7ff7b4c3e1d092f95c6234f21e39f"></a><!-- doxytag: member="vars.h::stp_set_default_array_parameter" ref="g63e7ff7b4c3e1d092f95c6234f21e39f" args="(stp_vars_t *v, const char *parameter, const stp_array_t *value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_default_array_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_default_array_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a default array parameter. 
@@ -4553,50 +3848,42 @@ The value is set if the parameter is not already set. This avoids having to chec
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga69"></a><!-- doxytag: member="vars.h::stp_set_default_boolean_parameter" ref="ga69" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g81d5f09980407b4310dada2a68fc4b09"></a><!-- doxytag: member="vars.h::stp_set_default_boolean_parameter" ref="g81d5f09980407b4310dada2a68fc4b09" args="(stp_vars_t *v, const char *parameter, int value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_default_boolean_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_default_boolean_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a default boolean parameter. 
@@ -4605,50 +3892,42 @@ The value is set if the parameter is not already set. This avoids having to chec
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga70"></a><!-- doxytag: member="vars.h::stp_set_default_curve_parameter" ref="ga70" args="(stp_vars_t *v, const char *parameter, const stp_curve_t *value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gfe38044cc067b2c2afa3da469d1cb860"></a><!-- doxytag: member="vars.h::stp_set_default_curve_parameter" ref="gfe38044cc067b2c2afa3da469d1cb860" args="(stp_vars_t *v, const char *parameter, const stp_curve_t *value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_default_curve_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_default_curve_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a default curve parameter. 
@@ -4657,50 +3936,42 @@ The value is set if the parameter is not already set. This avoids having to chec
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga68"></a><!-- doxytag: member="vars.h::stp_set_default_dimension_parameter" ref="ga68" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gb6f1820cadd75a4311bfc49b01de447b"></a><!-- doxytag: member="vars.h::stp_set_default_dimension_parameter" ref="gb6f1820cadd75a4311bfc49b01de447b" args="(stp_vars_t *v, const char *parameter, int value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_default_dimension_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_default_dimension_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a default dimension parameter. 
@@ -4709,50 +3980,42 @@ The value is set if the parameter is not already set. This avoids having to chec
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga64"></a><!-- doxytag: member="vars.h::stp_set_default_file_parameter" ref="ga64" args="(stp_vars_t *v, const char *parameter, const char *value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gf5e225475c66f966f4ba8d8c88374186"></a><!-- doxytag: member="vars.h::stp_set_default_file_parameter" ref="gf5e225475c66f966f4ba8d8c88374186" args="(stp_vars_t *v, const char *parameter, const char *value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_default_file_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_default_file_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a default file parameter. 
@@ -4761,56 +4024,48 @@ The value is set if the parameter is not already set. This avoids having to chec
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga65"></a><!-- doxytag: member="vars.h::stp_set_default_file_parameter_n" ref="ga65" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g217eece123630113cfcf8181d475fb53"></a><!-- doxytag: member="vars.h::stp_set_default_file_parameter_n" ref="g217eece123630113cfcf8181d475fb53" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_default_file_parameter_n           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_default_file_parameter_n           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>value</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>bytes</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>bytes</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a default file parameter. 
@@ -4820,50 +4075,42 @@ The value is set if the parameter is not already set. This avoids having to chec
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set (must not contain NUL). </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga66"></a><!-- doxytag: member="vars.h::stp_set_default_float_parameter" ref="ga66" args="(stp_vars_t *v, const char *parameter, double value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ge52dbb466422a18dec110220c45fe64e"></a><!-- doxytag: member="vars.h::stp_set_default_float_parameter" ref="ge52dbb466422a18dec110220c45fe64e" args="(stp_vars_t *v, const char *parameter, double value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_default_float_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_default_float_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a default float parameter. 
@@ -4872,50 +4119,42 @@ The value is set if the parameter is not already set. This avoids having to chec
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga67"></a><!-- doxytag: member="vars.h::stp_set_default_int_parameter" ref="ga67" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g3c0418772a82144f317dc973f01a8d55"></a><!-- doxytag: member="vars.h::stp_set_default_int_parameter" ref="g3c0418772a82144f317dc973f01a8d55" args="(stp_vars_t *v, const char *parameter, int value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_default_int_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_default_int_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a default integer parameter. 
@@ -4924,56 +4163,48 @@ The value is set if the parameter is not already set. This avoids having to chec
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga72"></a><!-- doxytag: member="vars.h::stp_set_default_raw_parameter" ref="ga72" args="(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g8159b3f5bea06a99711921f0201f5e0f"></a><!-- doxytag: member="vars.h::stp_set_default_raw_parameter" ref="g8159b3f5bea06a99711921f0201f5e0f" args="(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_default_raw_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_default_raw_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const void *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const void *&nbsp;</td>
+          <td class="paramname"> <em>value</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>bytes</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>bytes</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a default raw parameter. 
@@ -4983,50 +4214,42 @@ The value is set if the parameter is not already set. This avoids having to chec
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga62"></a><!-- doxytag: member="vars.h::stp_set_default_string_parameter" ref="ga62" args="(stp_vars_t *v, const char *parameter, const char *value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gf299bd0827a4d86aca59fb0d9015a866"></a><!-- doxytag: member="vars.h::stp_set_default_string_parameter" ref="gf299bd0827a4d86aca59fb0d9015a866" args="(stp_vars_t *v, const char *parameter, const char *value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_default_string_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_default_string_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a default string parameter. 
@@ -5035,56 +4258,48 @@ The value is set if the parameter is not already set. This avoids having to chec
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga63"></a><!-- doxytag: member="vars.h::stp_set_default_string_parameter_n" ref="ga63" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ga5d6d8858b266517f5899196b062d00d"></a><!-- doxytag: member="vars.h::stp_set_default_string_parameter_n" ref="ga5d6d8858b266517f5899196b062d00d" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_default_string_parameter_n           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_default_string_parameter_n           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>value</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>bytes</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>bytes</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a default string parameter. 
@@ -5094,50 +4309,42 @@ The value is set if the parameter is not already set. This avoids having to chec
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set (must not contain NUL). </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga56"></a><!-- doxytag: member="vars.h::stp_set_dimension_parameter" ref="ga56" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g6ca7898c212230cdbdc70ada2efb1417"></a><!-- doxytag: member="vars.h::stp_set_dimension_parameter" ref="g6ca7898c212230cdbdc70ada2efb1417" args="(stp_vars_t *v, const char *parameter, int value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_dimension_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_dimension_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a dimension parameter. 
@@ -5146,50 +4353,42 @@ Set a dimension parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga95"></a><!-- doxytag: member="vars.h::stp_set_dimension_parameter_active" ref="ga95" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g0f6e91baac5e78703b162e9d23c0a65c"></a><!-- doxytag: member="vars.h::stp_set_dimension_parameter_active" ref="g0f6e91baac5e78703b162e9d23c0a65c" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_dimension_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_dimension_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the activity of a dimension parameter. 
@@ -5198,44 +4397,36 @@ Set the activity of a dimension parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="vars.h::stp_set_driver" ref="ga11" args="(stp_vars_t *v, const char *val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gcf237afcbc26436ebedac5b11f469fdf"></a><!-- doxytag: member="vars.h::stp_set_driver" ref="gcf237afcbc26436ebedac5b11f469fdf" args="(stp_vars_t *v, const char *val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_driver           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_driver           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the name of the printer driver. 
@@ -5243,50 +4434,42 @@ Set the name of the printer driver.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the name to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the name to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="vars.h::stp_set_driver_n" ref="ga12" args="(stp_vars_t *v, const char *val, int bytes)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g188d298a8739b84fcb965f211fc7dc4e"></a><!-- doxytag: member="vars.h::stp_set_driver_n" ref="g188d298a8739b84fcb965f211fc7dc4e" args="(stp_vars_t *v, const char *val, int bytes)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_driver_n           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_driver_n           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>val</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>bytes</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>bytes</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the name of the printer driver. 
@@ -5295,44 +4478,36 @@ Set the name of the printer driver.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the name to set. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of val (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of val (in bytes). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga35"></a><!-- doxytag: member="vars.h::stp_set_errdata" ref="ga35" args="(stp_vars_t *v, void *val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g8b30fbadf3475c59101af9d7d37c33b7"></a><!-- doxytag: member="vars.h::stp_set_errdata" ref="g8b30fbadf3475c59101af9d7d37c33b7" args="(stp_vars_t *v, void *val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_errdata           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_errdata           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>void *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the error data. 
@@ -5340,44 +4515,36 @@ Set the error data.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the error data. This will typically be a file descriptor, but it is entirely up to the caller exactly what type this might be.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the error data. This will typically be a file descriptor, but it is entirely up to the caller exactly what type this might be. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga31"></a><!-- doxytag: member="vars.h::stp_set_errfunc" ref="ga31" args="(stp_vars_t *v, stp_outfunc_t val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g82f6a7514840de82c9ed7edd30f16b5d"></a><!-- doxytag: member="vars.h::stp_set_errfunc" ref="g82f6a7514840de82c9ed7edd30f16b5d" args="(stp_vars_t *v, stp_outfunc_t val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_errfunc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_errfunc           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">stp_outfunc_t</a>&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the function used to print error and diagnostic information. 
@@ -5385,50 +4552,42 @@ Set the function used to print error and diagnostic information.
 These must be supplied by the caller. errdata is passed as an arguments to errfunc; typically it will be a file descriptor. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga52"></a><!-- doxytag: member="vars.h::stp_set_file_parameter" ref="ga52" args="(stp_vars_t *v, const char *parameter, const char *value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g537f2ba6c74c9562b2f6883d7e36c59f"></a><!-- doxytag: member="vars.h::stp_set_file_parameter" ref="g537f2ba6c74c9562b2f6883d7e36c59f" args="(stp_vars_t *v, const char *parameter, const char *value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_file_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_file_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a file parameter. 
@@ -5437,50 +4596,42 @@ Set a file parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga92"></a><!-- doxytag: member="vars.h::stp_set_file_parameter_active" ref="ga92" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gaecd310feb8bd9a2188a9b287656aa1a"></a><!-- doxytag: member="vars.h::stp_set_file_parameter_active" ref="gaecd310feb8bd9a2188a9b287656aa1a" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_file_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_file_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the activity of a file parameter. 
@@ -5489,56 +4640,48 @@ Set the activity of a file parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga53"></a><!-- doxytag: member="vars.h::stp_set_file_parameter_n" ref="ga53" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g6f7816adbce50ca9e2fdacad35282e6a"></a><!-- doxytag: member="vars.h::stp_set_file_parameter_n" ref="g6f7816adbce50ca9e2fdacad35282e6a" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_file_parameter_n           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_file_parameter_n           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>value</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>bytes</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>bytes</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a file parameter. 
@@ -5548,50 +4691,42 @@ Set a file parameter.
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set (must not contain NUL). </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga54"></a><!-- doxytag: member="vars.h::stp_set_float_parameter" ref="ga54" args="(stp_vars_t *v, const char *parameter, double value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gf3a3283247deaad7d1ac19818aa4b796"></a><!-- doxytag: member="vars.h::stp_set_float_parameter" ref="gf3a3283247deaad7d1ac19818aa4b796" args="(stp_vars_t *v, const char *parameter, double value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_float_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_float_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a float parameter. 
@@ -5600,50 +4735,42 @@ Set a float parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga93"></a><!-- doxytag: member="vars.h::stp_set_float_parameter_active" ref="ga93" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g15a5458adea6ad4eecda3c990acbc6cb"></a><!-- doxytag: member="vars.h::stp_set_float_parameter_active" ref="g15a5458adea6ad4eecda3c990acbc6cb" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_float_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_float_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the activity of a float parameter. 
@@ -5652,44 +4779,36 @@ Set the activity of a float parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga23"></a><!-- doxytag: member="vars.h::stp_set_height" ref="ga23" args="(stp_vars_t *v, int val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g8ce73c5efa41f005936d5f84c44c6667"></a><!-- doxytag: member="vars.h::stp_set_height" ref="g8ce73c5efa41f005936d5f84c44c6667" args="(stp_vars_t *v, int val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_height           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_height           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the height of the image. 
@@ -5697,50 +4816,42 @@ Set the height of the image.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga55"></a><!-- doxytag: member="vars.h::stp_set_int_parameter" ref="ga55" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g70eded5d0df4677dd4b357b4b934f75a"></a><!-- doxytag: member="vars.h::stp_set_int_parameter" ref="g70eded5d0df4677dd4b357b4b934f75a" args="(stp_vars_t *v, const char *parameter, int value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_int_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_int_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set an integer parameter. 
@@ -5749,50 +4860,42 @@ Set an integer parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga94"></a><!-- doxytag: member="vars.h::stp_set_int_parameter_active" ref="ga94" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g7487203059e7ccd71c4673656b3042b1"></a><!-- doxytag: member="vars.h::stp_set_int_parameter_active" ref="g7487203059e7ccd71c4673656b3042b1" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_int_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_int_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the activity of an integer parameter. 
@@ -5801,44 +4904,36 @@ Set the activity of an integer parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga17"></a><!-- doxytag: member="vars.h::stp_set_left" ref="ga17" args="(stp_vars_t *v, int val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g3b0cc83e87247854ecafd46a6e446bcb"></a><!-- doxytag: member="vars.h::stp_set_left" ref="g3b0cc83e87247854ecafd46a6e446bcb" args="(stp_vars_t *v, int val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_left           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_left           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the left edge of the image. 
@@ -5846,44 +4941,36 @@ Set the left edge of the image.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga33"></a><!-- doxytag: member="vars.h::stp_set_outdata" ref="ga33" args="(stp_vars_t *v, void *val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gc2b3408200a9676e6c6063cc0ae2f4bd"></a><!-- doxytag: member="vars.h::stp_set_outdata" ref="gc2b3408200a9676e6c6063cc0ae2f4bd" args="(stp_vars_t *v, void *val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_outdata           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_outdata           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>void *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the output data. 
@@ -5891,44 +4978,36 @@ Set the output data.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the output data. This will typically be a file descriptor, but it is entirely up to the caller exactly what type this might be.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the output data. This will typically be a file descriptor, but it is entirely up to the caller exactly what type this might be. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga29"></a><!-- doxytag: member="vars.h::stp_set_outfunc" ref="ga29" args="(stp_vars_t *v, stp_outfunc_t val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g075ffc274f0d2d2b6edd8326de1d7142"></a><!-- doxytag: member="vars.h::stp_set_outfunc" ref="g075ffc274f0d2d2b6edd8326de1d7142" args="(stp_vars_t *v, stp_outfunc_t val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_outfunc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_outfunc           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">stp_outfunc_t</a>&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the function used to print output information. 
@@ -5936,44 +5015,36 @@ Set the function used to print output information.
 These must be supplied by the caller. outdata is passed as an arguments to outfunc; typically it will be a file descriptor. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga27"></a><!-- doxytag: member="vars.h::stp_set_page_height" ref="ga27" args="(stp_vars_t *v, int val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g83326bacb8b92149af1b70457b23bc8f"></a><!-- doxytag: member="vars.h::stp_set_page_height" ref="g83326bacb8b92149af1b70457b23bc8f" args="(stp_vars_t *v, int val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_page_height           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_page_height           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the page height. 
@@ -5981,44 +5052,36 @@ Set the page height.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga25"></a><!-- doxytag: member="vars.h::stp_set_page_width" ref="ga25" args="(stp_vars_t *v, int val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g639be0da07c3e5b7dc6d68ac2aa999e9"></a><!-- doxytag: member="vars.h::stp_set_page_width" ref="g639be0da07c3e5b7dc6d68ac2aa999e9" args="(stp_vars_t *v, int val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_page_width           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_page_width           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the page width. 
@@ -6026,56 +5089,48 @@ Set the page width.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga60"></a><!-- doxytag: member="vars.h::stp_set_raw_parameter" ref="ga60" args="(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g0155de75bf2aa95ab45a3319539cda56"></a><!-- doxytag: member="vars.h::stp_set_raw_parameter" ref="g0155de75bf2aa95ab45a3319539cda56" args="(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_raw_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_raw_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const void *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const void *&nbsp;</td>
+          <td class="paramname"> <em>value</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>bytes</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>bytes</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a raw parameter. 
@@ -6085,50 +5140,42 @@ Set a raw parameter.
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga99"></a><!-- doxytag: member="vars.h::stp_set_raw_parameter_active" ref="ga99" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g364fcdb2e57b8ca99867c94954cf14cd"></a><!-- doxytag: member="vars.h::stp_set_raw_parameter_active" ref="g364fcdb2e57b8ca99867c94954cf14cd" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_raw_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_raw_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the activity of a raw parameter. 
@@ -6137,50 +5184,42 @@ Set the activity of a raw parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga50"></a><!-- doxytag: member="vars.h::stp_set_string_parameter" ref="ga50" args="(stp_vars_t *v, const char *parameter, const char *value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ga147483996fa118516ddb36fe3366aa9"></a><!-- doxytag: member="vars.h::stp_set_string_parameter" ref="ga147483996fa118516ddb36fe3366aa9" args="(stp_vars_t *v, const char *parameter, const char *value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_string_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_string_parameter           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a string parameter. 
@@ -6189,50 +5228,42 @@ Set a string parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga91"></a><!-- doxytag: member="vars.h::stp_set_string_parameter_active" ref="ga91" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g6ed828e872f7678a89e1b065d377112e"></a><!-- doxytag: member="vars.h::stp_set_string_parameter_active" ref="g6ed828e872f7678a89e1b065d377112e" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_string_parameter_active           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_string_parameter_active           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>active</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="paramname"> <em>active</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the activity of a string parameter. 
@@ -6241,56 +5272,48 @@ Set the activity of a string parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga51"></a><!-- doxytag: member="vars.h::stp_set_string_parameter_n" ref="ga51" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gfe6c8b3d86ca16239a63ce9d2ef57f48"></a><!-- doxytag: member="vars.h::stp_set_string_parameter_n" ref="gfe6c8b3d86ca16239a63ce9d2ef57f48" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_string_parameter_n           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_string_parameter_n           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>value</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>bytes</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>bytes</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set a string parameter. 
@@ -6300,44 +5323,36 @@ Set a string parameter.
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set (must not contain NUL). </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga19"></a><!-- doxytag: member="vars.h::stp_set_top" ref="ga19" args="(stp_vars_t *v, int val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g557b5ad44d3b1da8392496681624ad8b"></a><!-- doxytag: member="vars.h::stp_set_top" ref="g557b5ad44d3b1da8392496681624ad8b" args="(stp_vars_t *v, int val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_top           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_top           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the top edge of the image. 
@@ -6345,81 +5360,65 @@ Set the top edge of the image.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga130"></a><!-- doxytag: member="vars.h::stp_set_verified" ref="ga130" args="(stp_vars_t *v, int value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g1023ad18d2c97763137909b6191b0940"></a><!-- doxytag: member="vars.h::stp_set_verified" ref="g1023ad18d2c97763137909b6191b0940" args="(stp_vars_t *v, int value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_verified           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_verified           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga21"></a><!-- doxytag: member="vars.h::stp_set_width" ref="ga21" args="(stp_vars_t *v, int val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g3a852ce7e42d7f8e0cef6c7d399e0491"></a><!-- doxytag: member="vars.h::stp_set_width" ref="g3a852ce7e42d7f8e0cef6c7d399e0491" args="(stp_vars_t *v, int val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_set_width           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_set_width           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Set the width of the image. 
@@ -6427,182 +5426,142 @@ Set the width of the image.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="vars.h::stp_vars_copy" ref="ga8" args="(stp_vars_t *dest, const stp_vars_t *source)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g88376207367adb4260ff14e5d9ec76e9"></a><!-- doxytag: member="vars.h::stp_vars_copy" ref="g88376207367adb4260ff14e5d9ec76e9" args="(stp_vars_t *dest, const stp_vars_t *source)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_vars_copy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dest</em>, </td>
+          <td class="memname">void stp_vars_copy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>dest</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>source</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>source</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Copy a vars object. 
 <p>
-Both dest and source must be valid vars objects previously created with <a class="el" href="group__vars.html#ga7">stp_vars_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+Both dest and source must be valid vars objects previously created with <a class="el" href="group__vars.html#g5d641ab7093c9ba82cbd4cfbf904fabc" title="Create a new vars object.">stp_vars_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>dest</em>&nbsp;</td><td>the destination vars. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source vars.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source vars. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="vars.h::stp_vars_create" ref="ga7" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a>* stp_vars_create           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+
+</div>
+</div><p>
+<a class="anchor" name="g5d641ab7093c9ba82cbd4cfbf904fabc"></a><!-- doxytag: member="vars.h::stp_vars_create" ref="g5d641ab7093c9ba82cbd4cfbf904fabc" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a>* stp_vars_create           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Create a new vars object. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created vars object.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="vars.h::stp_vars_create_copy" ref="ga9" args="(const stp_vars_t *source)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a>* stp_vars_create_copy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>source</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the newly created vars object. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gec00fba49ad08d20890e64773bcdbd48"></a><!-- doxytag: member="vars.h::stp_vars_create_copy" ref="gec00fba49ad08d20890e64773bcdbd48" args="(const stp_vars_t *source)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a>* stp_vars_create_copy           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>source</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Copy and allocate a vars object. 
 <p>
-source must be a valid vars object previously created with <a class="el" href="group__vars.html#ga7">stp_vars_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+source must be a valid vars object previously created with <a class="el" href="group__vars.html#g5d641ab7093c9ba82cbd4cfbf904fabc" title="Create a new vars object.">stp_vars_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source vars. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the new copy of the vars.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="vars.h::stp_vars_destroy" ref="ga10" args="(stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_vars_destroy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>the new copy of the vars. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gd3f1ff7a86c3cd1c9f9f62cfa8814437"></a><!-- doxytag: member="vars.h::stp_vars_destroy" ref="gd3f1ff7a86c3cd1c9f9f62cfa8814437" args="(stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_vars_destroy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Destroy a vars object. 
 <p>
 It is an error to destroy the vars more than once. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to destroy.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to destroy. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga123"></a><!-- doxytag: member="vars.h::stp_verify" ref="ga123" args="(stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stp_verify           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+
+</div>
+</div><p>
+<a class="anchor" name="gb926417b2f601c78d85df44694cc6d38"></a><!-- doxytag: member="vars.h::stp_verify" ref="gb926417b2f601c78d85df44694cc6d38" args="(stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stp_verify           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
 
 <p>
 Verify parameters. 
@@ -6612,55 +5571,47 @@ Verify that the parameters selected are consistent with those allowed by the dri
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>0 on failure, 1 on success; other status values are reserved.</dd></dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga128"></a><!-- doxytag: member="vars.h::stp_verify_parameter" ref="ga128" args="(const stp_vars_t *v, const char *parameter, int quiet)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>0 on failure, 1 on success; other status values are reserved. </dd></dl>
+
+</div>
+</div><p>
+<a class="anchor" name="gbfffe0d654de156874decdc0338216f4"></a><!-- doxytag: member="vars.h::stp_verify_parameter" ref="gbfffe0d654de156874decdc0338216f4" args="(const stp_vars_t *v, const char *parameter, int quiet)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga137">stp_parameter_verify_t</a> stp_verify_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname"><a class="el" href="group__vars.html#gc061852de3627383cd415cd80a979e02">stp_parameter_verify_t</a> stp_verify_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parameter</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>parameter</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>quiet</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>quiet</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__version.html b/doc/gutenprint/html/group__version.html
index e81969b..54fd342 100644
--- a/doc/gutenprint/html/group__version.html
+++ b/doc/gutenprint/html/group__version.html
@@ -1,273 +1,218 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: version</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1>version</h1>Version information.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga7">STP_MAJOR_VERSION</a>&nbsp;&nbsp;&nbsp;(5)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gdd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a>&nbsp;&nbsp;&nbsp;(5)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga8">STP_MINOR_VERSION</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga9">STP_MICRO_VERSION</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gb860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</a>&nbsp;&nbsp;&nbsp;(1)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga10">STP_CURRENT_INTERFACE</a>&nbsp;&nbsp;&nbsp;(2)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g1969d8a5a74a5c70a978f99aa68d9f4b">STP_CURRENT_INTERFACE</a>&nbsp;&nbsp;&nbsp;(2)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga11">STP_BINARY_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g509ecd9be5329eef0f8d49e0b25f63da">STP_BINARY_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga12">STP_INTERFACE_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g6485cd073e75e01f9df68ecd67b14372">STP_INTERFACE_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga13">STP_CHECK_VERSION</a>(major, minor, micro)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gf20320940416f43ed7735137296fa12b">STP_CHECK_VERSION</a>(major, minor, micro)</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga6">stp_check_version</a> (unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g05a93cb4ac52cc50875b5839c59bcafc">stp_check_version</a> (unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check whether the library provides the requested version.  <a href="#ga6"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check whether the library provides the requested version.  <a href="#g05a93cb4ac52cc50875b5839c59bcafc"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga0">stp_major_version</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g4d72666d9093df7a31e7cd448b7cfd1d">stp_major_version</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library major version number.  <a href="#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga1">stp_minor_version</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library major version number.  <a href="#g4d72666d9093df7a31e7cd448b7cfd1d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g5efc986430f0d27f5d11236c4bc48079">stp_minor_version</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library minor version number.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga2">stp_micro_version</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library minor version number.  <a href="#g5efc986430f0d27f5d11236c4bc48079"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g2c7e65e276ce5af050b3ea9f859f1f89">stp_micro_version</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library micro version number.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga3">stp_current_interface</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library micro version number.  <a href="#g2c7e65e276ce5af050b3ea9f859f1f89"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gfc84e89ce8d6d3302270c56ebe01d5ef">stp_current_interface</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI revision number (number of incompatible revisions).  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga4">stp_binary_age</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI revision number (number of incompatible revisions).  <a href="#gfc84e89ce8d6d3302270c56ebe01d5ef"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g44593f7714544c5886ab34521e05d0bd">stp_binary_age</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI binary age number (number of forward-compatible revisions).  <a href="#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga5">stp_interface_age</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI binary age number (number of forward-compatible revisions).  <a href="#g44593f7714544c5886ab34521e05d0bd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g1284e8ef76a4c864e85b7b698b91bf0c">stp_interface_age</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI interface age number (number of revisions of this ABI).  <a href="#ga5"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI interface age number (number of revisions of this ABI).  <a href="#g1284e8ef76a4c864e85b7b698b91bf0c"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Version information. 
 <p>
-Version information may be used to check the library version at compile-time, using macros, or at run-time, using constants.<hr><h2>Define Documentation</h2>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="gutenprint-version.h::STP_BINARY_AGE" ref="ga11" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Version information may be used to check the library version at compile-time, using macros, or at run-time, using constants. <hr><h2>Define Documentation</h2>
+<a class="anchor" name="g509ecd9be5329eef0f8d49e0b25f63da"></a><!-- doxytag: member="gutenprint-version.h::STP_BINARY_AGE" ref="g509ecd9be5329eef0f8d49e0b25f63da" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_BINARY_AGE&nbsp;&nbsp;&nbsp;(0)          </td>
+          <td class="memname">#define STP_BINARY_AGE&nbsp;&nbsp;&nbsp;(0)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga13"></a><!-- doxytag: member="gutenprint-version.h::STP_CHECK_VERSION" ref="ga13" args="(major, minor, micro)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gf20320940416f43ed7735137296fa12b"></a><!-- doxytag: member="gutenprint-version.h::STP_CHECK_VERSION" ref="gf20320940416f43ed7735137296fa12b" args="(major, minor, micro)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_CHECK_VERSION          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">major,         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>minor,         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>micro&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">#define STP_CHECK_VERSION          </td>
+          <td>(</td>
+          <td class="paramtype">major,         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">minor,         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">micro&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-<b>Value:</b><div class="fragment"><pre class="fragment">(<a class="code" href="group__version.html#ga7">STP_MAJOR_VERSION</a> &gt;  (major) ||                \
-  (<a class="code" href="group__version.html#ga7">STP_MAJOR_VERSION</a> == (major) &amp;&amp;              \
-   <a class="code" href="group__version.html#ga8">STP_MINOR_VERSION</a> &gt; (minor)) ||              \
-  (<a class="code" href="group__version.html#ga7">STP_MAJOR_VERSION</a> == (major) &amp;&amp;              \
-   <a class="code" href="group__version.html#ga8">STP_MINOR_VERSION</a> == (minor) &amp;&amp;              \
-   <a class="code" href="group__version.html#ga9">STP_MICRO_VERSION</a> &gt;= (micro)))
-</pre></div>    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="gutenprint-version.h::STP_CURRENT_INTERFACE" ref="ga10" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<b>Value:</b><div class="fragment"><pre class="fragment">(<a class="code" href="group__version.html#gdd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a> &gt;  (major) ||                \
+  (<a class="code" href="group__version.html#gdd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a> == (major) &amp;&amp;              \
+   <a class="code" href="group__version.html#g87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a> &gt; (minor)) ||              \
+  (<a class="code" href="group__version.html#gdd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a> == (major) &amp;&amp;              \
+   <a class="code" href="group__version.html#g87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a> == (minor) &amp;&amp;              \
+   <a class="code" href="group__version.html#gb860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</a> &gt;= (micro)))
+</pre></div>
+</div>
+</div><p>
+<a class="anchor" name="g1969d8a5a74a5c70a978f99aa68d9f4b"></a><!-- doxytag: member="gutenprint-version.h::STP_CURRENT_INTERFACE" ref="g1969d8a5a74a5c70a978f99aa68d9f4b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_CURRENT_INTERFACE&nbsp;&nbsp;&nbsp;(2)          </td>
+          <td class="memname">#define STP_CURRENT_INTERFACE&nbsp;&nbsp;&nbsp;(2)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="gutenprint-version.h::STP_INTERFACE_AGE" ref="ga12" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g6485cd073e75e01f9df68ecd67b14372"></a><!-- doxytag: member="gutenprint-version.h::STP_INTERFACE_AGE" ref="g6485cd073e75e01f9df68ecd67b14372" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_INTERFACE_AGE&nbsp;&nbsp;&nbsp;(0)          </td>
+          <td class="memname">#define STP_INTERFACE_AGE&nbsp;&nbsp;&nbsp;(0)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="gutenprint-version.h::STP_MAJOR_VERSION" ref="ga7" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gdd0b07630653da8e46b91c2c1bafc2b9"></a><!-- doxytag: member="gutenprint-version.h::STP_MAJOR_VERSION" ref="gdd0b07630653da8e46b91c2c1bafc2b9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MAJOR_VERSION&nbsp;&nbsp;&nbsp;(5)          </td>
+          <td class="memname">#define STP_MAJOR_VERSION&nbsp;&nbsp;&nbsp;(5)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="gutenprint-version.h::STP_MICRO_VERSION" ref="ga9" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gb860ee8cb0b05ea1385e01d130d7358e"></a><!-- doxytag: member="gutenprint-version.h::STP_MICRO_VERSION" ref="gb860ee8cb0b05ea1385e01d130d7358e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MICRO_VERSION&nbsp;&nbsp;&nbsp;(0)          </td>
+          <td class="memname">#define STP_MICRO_VERSION&nbsp;&nbsp;&nbsp;(1)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="gutenprint-version.h::STP_MINOR_VERSION" ref="ga8" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g87507431ad6b7504b129eafad863cb1f"></a><!-- doxytag: member="gutenprint-version.h::STP_MINOR_VERSION" ref="g87507431ad6b7504b129eafad863cb1f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MINOR_VERSION&nbsp;&nbsp;&nbsp;(0)          </td>
+          <td class="memname">#define STP_MINOR_VERSION&nbsp;&nbsp;&nbsp;(0)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="gutenprint-version.h::stp_check_version" ref="ga6" args="(unsigned int required_major, unsigned int required_minor, unsigned int required_micro)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="g05a93cb4ac52cc50875b5839c59bcafc"></a><!-- doxytag: member="gutenprint-version.h::stp_check_version" ref="g05a93cb4ac52cc50875b5839c59bcafc" args="(unsigned int required_major, unsigned int required_minor, unsigned int required_micro)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* stp_check_version           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>required_major</em>, </td>
+          <td class="memname">const char* stp_check_version           </td>
+          <td>(</td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>required_major</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>required_minor</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>required_minor</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned int&nbsp;</td>
-          <td class="mdname" nowrap> <em>required_micro</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>required_micro</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Check whether the library provides the requested version. 
@@ -279,163 +224,115 @@ Check whether the library provides the requested version.
     <tr><td valign="top"></td><td valign="top"><em>required_micro</em>&nbsp;</td><td>the minimum micro revision. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>NULL if the version matches, or else a description of the error if the library is too old or too new.</dd></dl>
-    </td>
-  </tr>
-</table>
+<dl class="return" compact><dt><b>Returns:</b></dt><dd>NULL if the version matches, or else a description of the error if the library is too old or too new. </dd></dl>
+
+</div>
+</div><p>
 <hr><h2>Variable Documentation</h2>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="gutenprint-version.h::stp_binary_age" ref="ga4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="g44593f7714544c5886ab34521e05d0bd"></a><!-- doxytag: member="gutenprint-version.h::stp_binary_age" ref="g44593f7714544c5886ab34521e05d0bd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga4">stp_binary_age</a>          </td>
+          <td class="memname">const unsigned int <a class="el" href="group__version.html#g44593f7714544c5886ab34521e05d0bd">stp_binary_age</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 The library ABI binary age number (number of forward-compatible revisions). 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="gutenprint-version.h::stp_current_interface" ref="ga3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="gfc84e89ce8d6d3302270c56ebe01d5ef"></a><!-- doxytag: member="gutenprint-version.h::stp_current_interface" ref="gfc84e89ce8d6d3302270c56ebe01d5ef" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga3">stp_current_interface</a>          </td>
+          <td class="memname">const unsigned int <a class="el" href="group__version.html#gfc84e89ce8d6d3302270c56ebe01d5ef">stp_current_interface</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 The library ABI revision number (number of incompatible revisions). 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="gutenprint-version.h::stp_interface_age" ref="ga5" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g1284e8ef76a4c864e85b7b698b91bf0c"></a><!-- doxytag: member="gutenprint-version.h::stp_interface_age" ref="g1284e8ef76a4c864e85b7b698b91bf0c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga5">stp_interface_age</a>          </td>
+          <td class="memname">const unsigned int <a class="el" href="group__version.html#g1284e8ef76a4c864e85b7b698b91bf0c">stp_interface_age</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 The library ABI interface age number (number of revisions of this ABI). 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="gutenprint-version.h::stp_major_version" ref="ga0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g4d72666d9093df7a31e7cd448b7cfd1d"></a><!-- doxytag: member="gutenprint-version.h::stp_major_version" ref="g4d72666d9093df7a31e7cd448b7cfd1d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga0">stp_major_version</a>          </td>
+          <td class="memname">const unsigned int <a class="el" href="group__version.html#g4d72666d9093df7a31e7cd448b7cfd1d">stp_major_version</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 The library major version number. 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="gutenprint-version.h::stp_micro_version" ref="ga2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g2c7e65e276ce5af050b3ea9f859f1f89"></a><!-- doxytag: member="gutenprint-version.h::stp_micro_version" ref="g2c7e65e276ce5af050b3ea9f859f1f89" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga2">stp_micro_version</a>          </td>
+          <td class="memname">const unsigned int <a class="el" href="group__version.html#g2c7e65e276ce5af050b3ea9f859f1f89">stp_micro_version</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 The library micro version number. 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="gutenprint-version.h::stp_minor_version" ref="ga1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="g5efc986430f0d27f5d11236c4bc48079"></a><!-- doxytag: member="gutenprint-version.h::stp_minor_version" ref="g5efc986430f0d27f5d11236c4bc48079" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga1">stp_minor_version</a>          </td>
+          <td class="memname">const unsigned int <a class="el" href="group__version.html#g5efc986430f0d27f5d11236c4bc48079">stp_minor_version</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 The library minor version number. 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-intl-internal_8h.html b/doc/gutenprint/html/gutenprint-intl-internal_8h.html
index 76db8ae..a39e055 100644
--- a/doc/gutenprint/html/gutenprint-intl-internal_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl-internal_8h.html
@@ -1,38 +1,51 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/gutenprint-intl-internal.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>gutenprint-intl-internal.h File Reference</h1>Internationalisation functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/gutenprint-intl-internal.h File Reference</h1>Internationalisation functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;locale.h&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga0">textdomain</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#g5f80e8482ab93869489531a8c7ce7006">textdomain</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga1">gettext</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#g83b8be0887dede025766d25e2bb884c6">gettext</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga2">dgettext</a>(Domain, Message)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gd24abc7110e1bdf384dc2ef2b63e5d07">dgettext</a>(Domain, Message)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga3">dcgettext</a>(Domain, Message, Type)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#g115dd6a6dd9d7a249f6374a7c06deef5">dcgettext</a>(Domain, Message, Type)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga4">bindtextdomain</a>(Domain, Directory)&nbsp;&nbsp;&nbsp;(Domain)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gdd6dfc1077058ff26d79cdb18099d58a">bindtextdomain</a>(Domain, Directory)&nbsp;&nbsp;&nbsp;(Domain)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga5">_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#g32a3cf3d9dd914f5aeeca5423c157934">_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga6">N_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#g75278405e7f034d2b1af80bfd94675fe">N_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Internationalisation functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-intl_8h.html b/doc/gutenprint/html/gutenprint-intl_8h.html
index ed539ef..b9ac48e 100644
--- a/doc/gutenprint/html/gutenprint-intl_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl_8h.html
@@ -1,38 +1,51 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/gutenprint-intl.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>gutenprint-intl.h File Reference</h1>Internationalisation functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/gutenprint-intl.h File Reference</h1>Internationalisation functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;locale.h&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga0">textdomain</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#g5f80e8482ab93869489531a8c7ce7006">textdomain</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga1">gettext</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#g83b8be0887dede025766d25e2bb884c6">gettext</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga2">dgettext</a>(Domain, Message)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gd24abc7110e1bdf384dc2ef2b63e5d07">dgettext</a>(Domain, Message)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga3">dcgettext</a>(Domain, Message, Type)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#g115dd6a6dd9d7a249f6374a7c06deef5">dcgettext</a>(Domain, Message, Type)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga4">bindtextdomain</a>(Domain, Directory)&nbsp;&nbsp;&nbsp;(Domain)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gdd6dfc1077058ff26d79cdb18099d58a">bindtextdomain</a>(Domain, Directory)&nbsp;&nbsp;&nbsp;(Domain)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga5">_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#g32a3cf3d9dd914f5aeeca5423c157934">_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga6">N_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#g75278405e7f034d2b1af80bfd94675fe">N_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Internationalisation functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-module_8h.html b/doc/gutenprint/html/gutenprint-module_8h.html
index f2a5182..8de4492 100644
--- a/doc/gutenprint/html/gutenprint-module_8h.html
+++ b/doc/gutenprint/html/gutenprint-module_8h.html
@@ -1,13 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/gutenprint-module.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>gutenprint-module.h File Reference</h1>Gutenprint module header. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/gutenprint-module.h File Reference</h1>Gutenprint module header. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="gutenprint_8h.html">gutenprint/gutenprint.h</a>&gt;</code><br>
 <code>#include &lt;<a class="el" href="bit-ops_8h.html">gutenprint/bit-ops.h</a>&gt;</code><br>
@@ -22,38 +35,30 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprint-module_8h.html#a0">STP_MODULE</a>&nbsp;&nbsp;&nbsp;1</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprint-module_8h.html#38fcab54351f45a3968822e2747aff6b">STP_MODULE</a>&nbsp;&nbsp;&nbsp;1</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Gutenprint module header. 
 <p>
-This header includes all of the public headers used by modules.<hr><h2>Define Documentation</h2>
-<a class="anchor" name="a0"></a><!-- doxytag: member="gutenprint-module.h::STP_MODULE" ref="a0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+This header includes all of the public headers used by modules. <hr><h2>Define Documentation</h2>
+<a class="anchor" name="38fcab54351f45a3968822e2747aff6b"></a><!-- doxytag: member="gutenprint-module.h::STP_MODULE" ref="38fcab54351f45a3968822e2747aff6b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MODULE&nbsp;&nbsp;&nbsp;1          </td>
+          <td class="memname">#define STP_MODULE&nbsp;&nbsp;&nbsp;1          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-version_8h.html b/doc/gutenprint/html/gutenprint-version_8h.html
index 7b8db20..3b3180d 100644
--- a/doc/gutenprint/html/gutenprint-version_8h.html
+++ b/doc/gutenprint/html/gutenprint-version_8h.html
@@ -1,60 +1,73 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/gutenprint-version.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>gutenprint-version.h File Reference</h1>Version functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/gutenprint-version.h File Reference</h1>Version functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga7">STP_MAJOR_VERSION</a>&nbsp;&nbsp;&nbsp;(5)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gdd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a>&nbsp;&nbsp;&nbsp;(5)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga8">STP_MINOR_VERSION</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga9">STP_MICRO_VERSION</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gb860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</a>&nbsp;&nbsp;&nbsp;(1)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga10">STP_CURRENT_INTERFACE</a>&nbsp;&nbsp;&nbsp;(2)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g1969d8a5a74a5c70a978f99aa68d9f4b">STP_CURRENT_INTERFACE</a>&nbsp;&nbsp;&nbsp;(2)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga11">STP_BINARY_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g509ecd9be5329eef0f8d49e0b25f63da">STP_BINARY_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga12">STP_INTERFACE_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g6485cd073e75e01f9df68ecd67b14372">STP_INTERFACE_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga13">STP_CHECK_VERSION</a>(major, minor, micro)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gf20320940416f43ed7735137296fa12b">STP_CHECK_VERSION</a>(major, minor, micro)</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga6">stp_check_version</a> (unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g05a93cb4ac52cc50875b5839c59bcafc">stp_check_version</a> (unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check whether the library provides the requested version.  <a href="group__version.html#ga6"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check whether the library provides the requested version.  <a href="group__version.html#g05a93cb4ac52cc50875b5839c59bcafc"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga0">stp_major_version</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g4d72666d9093df7a31e7cd448b7cfd1d">stp_major_version</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library major version number.  <a href="group__version.html#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga1">stp_minor_version</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library major version number.  <a href="group__version.html#g4d72666d9093df7a31e7cd448b7cfd1d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g5efc986430f0d27f5d11236c4bc48079">stp_minor_version</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library minor version number.  <a href="group__version.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga2">stp_micro_version</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library minor version number.  <a href="group__version.html#g5efc986430f0d27f5d11236c4bc48079"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g2c7e65e276ce5af050b3ea9f859f1f89">stp_micro_version</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library micro version number.  <a href="group__version.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga3">stp_current_interface</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library micro version number.  <a href="group__version.html#g2c7e65e276ce5af050b3ea9f859f1f89"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gfc84e89ce8d6d3302270c56ebe01d5ef">stp_current_interface</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI revision number (number of incompatible revisions).  <a href="group__version.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga4">stp_binary_age</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI revision number (number of incompatible revisions).  <a href="group__version.html#gfc84e89ce8d6d3302270c56ebe01d5ef"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g44593f7714544c5886ab34521e05d0bd">stp_binary_age</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI binary age number (number of forward-compatible revisions).  <a href="group__version.html#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga5">stp_interface_age</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI binary age number (number of forward-compatible revisions).  <a href="group__version.html#g44593f7714544c5886ab34521e05d0bd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g1284e8ef76a4c864e85b7b698b91bf0c">stp_interface_age</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI interface age number (number of revisions of this ABI).  <a href="group__version.html#ga5"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI interface age number (number of revisions of this ABI).  <a href="group__version.html#g1284e8ef76a4c864e85b7b698b91bf0c"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Version functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint_8h.html b/doc/gutenprint/html/gutenprint_8h.html
index e1d25c0..05530e7 100644
--- a/doc/gutenprint/html/gutenprint_8h.html
+++ b/doc/gutenprint/html/gutenprint_8h.html
@@ -1,13 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/gutenprint.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>gutenprint.h File Reference</h1>Gutenprint master header. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/gutenprint.h File Reference</h1>Gutenprint master header. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;stddef.h&gt;</code><br>
 <code>#include &lt;stdio.h&gt;</code><br>
@@ -27,8 +40,8 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Gutenprint master header. 
 <p>
-This header includes all of the public headers.<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+This header includes all of the public headers. <hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/image_8h.html b/doc/gutenprint/html/image_8h.html
index 9c02bfb..63e8b60 100644
--- a/doc/gutenprint/html/image_8h.html
+++ b/doc/gutenprint/html/image_8h.html
@@ -1,13 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/image.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>image.h File Reference</h1>Image functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/image.h File Reference</h1>Image functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -16,39 +29,39 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="structstp__image.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga8">STP_CHANNEL_LIMIT</a>&nbsp;&nbsp;&nbsp;(32)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g0b7daa7e9e9b26fea847d71ca9de7c02">STP_CHANNEL_LIMIT</a>&nbsp;&nbsp;&nbsp;(32)</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__image.html">stp_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga0">stp_image_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__image.html">stp_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="group__image.html#ga0"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="group__image.html#gae0b5ef92b619849a51cb75d376a90fb"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga9">stp_image_status_t</a> { <a class="el" href="group__image.html#gga9a2">STP_IMAGE_STATUS_OK</a>, 
-<a class="el" href="group__image.html#gga9a3">STP_IMAGE_STATUS_ABORT</a>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a> { <a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8b5574da151b93391a337f29b2a7c96cf">STP_IMAGE_STATUS_OK</a>, 
+<a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8224b8ac15cf785b24b2f3f53b4fdc274">STP_IMAGE_STATUS_ABORT</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Image status.  <a href="group__image.html#ga9">More...</a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Image status.  <a href="group__image.html#g58672e1989d582c14328048b207657c8">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga1">stp_image_init</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gd257f72ac5272e94ff9314f8ecd24f1e">stp_image_init</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga2">stp_image_reset</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gf2fc433dba580b9ec8e69aebc2e65338">stp_image_reset</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga3">stp_image_width</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gbe86b2ff9a3a0c0e98248990f9be5652">stp_image_width</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga4">stp_image_height</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gf9dcdf718ad99df9eb71fc542d5b47e1">stp_image_height</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#ga9">stp_image_status_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga5">stp_image_get_row</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image, unsigned char *data, size_t limit, int row)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g01d72a16de9e98722859ca651561e8f5">stp_image_get_row</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image, unsigned char *data, size_t limit, int row)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga6">stp_image_get_appname</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g1643f6b9eb180e98f3c1c267950f18d2">stp_image_get_appname</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga7">stp_image_conclude</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g7598151354fbeb5f6a8b3f92d1e40ad7">stp_image_conclude</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Image functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/index.html b/doc/gutenprint/html/index.html
index 792a2d4..57339c5 100644
--- a/doc/gutenprint/html/index.html
+++ b/doc/gutenprint/html/index.html
@@ -1,14 +1,23 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Main Page</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindexHL" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1>libgutenprint API Reference Documentation</h1>
 <p>
-<h3 align="center">5.0.0 </h3><hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+<h3 align="center">5.0.1 </h3><hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/list_8h.html b/doc/gutenprint/html/list_8h.html
index 3fc29d4..9b23c6e 100644
--- a/doc/gutenprint/html/list_8h.html
+++ b/doc/gutenprint/html/list_8h.html
@@ -1,120 +1,133 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/list.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>list.h File Reference</h1>Generic list functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/list.h File Reference</h1>Generic list functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_list_item&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga0">stp_list_item_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_list_item&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list item opaque data type.  <a href="group__list.html#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga1">stp_list_t</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list item opaque data type.  <a href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list opaque data type.  <a href="group__list.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga2">stp_node_freefunc</a> )(void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list opaque data type.  <a href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*)&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g4102fc776ec5bbd84eb589cfba97dfc2">stp_node_freefunc</a> (void *)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to free the data a node contains.  <a href="group__list.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga3">stp_node_copyfunc</a> )(const void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to free the data a node contains.  <a href="group__list.html#g4102fc776ec5bbd84eb589cfba97dfc2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *(*)&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g846d759413f07e91bed397f1fe3224d1">stp_node_copyfunc</a> (const void *)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to copy the data a node contains.  <a href="group__list.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga4">stp_node_namefunc</a> )(const void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to copy the data a node contains.  <a href="group__list.html#g846d759413f07e91bed397f1fe3224d1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const char *(*)&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a> (const void *)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to get the name of a node.  <a href="group__list.html#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga5">stp_node_sortfunc</a> )(const void *, const void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to get the name of a node.  <a href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int(*)&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gd12571e44981e7acd62137c83652121a">stp_node_sortfunc</a> (const void *, const void *)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to compare two nodes.  <a href="group__list.html#ga5"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to compare two nodes.  <a href="group__list.html#gd12571e44981e7acd62137c83652121a"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga6">stp_list_node_free_data</a> (void *item)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g55fbb8f7a3920b783b02183c5ea57624">stp_list_node_free_data</a> (void *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Free node data allocated with stp_malloc.  <a href="group__list.html#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga7">stp_list_create</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Free node data allocated with stp_malloc.  <a href="group__list.html#g55fbb8f7a3920b783b02183c5ea57624"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g3cfea94cd07f50d7d9b4ce384d349fca">stp_list_create</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new list object.  <a href="group__list.html#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga8">stp_list_copy</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new list object.  <a href="group__list.html#g3cfea94cd07f50d7d9b4ce384d349fca"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g0ba249dd06efbf5c0af8511ceab671e8">stp_list_copy</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a list object.  <a href="group__list.html#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga9">stp_list_destroy</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a list object.  <a href="group__list.html#g0ba249dd06efbf5c0af8511ceab671e8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ge23ef06175b27dd6772d4d4c098999b1">stp_list_destroy</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a list object.  <a href="group__list.html#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga10">stp_list_get_start</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a list object.  <a href="group__list.html#ge23ef06175b27dd6772d4d4c098999b1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gd185100e8d7969a473e9d42bc8084572">stp_list_get_start</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find the first item in a list.  <a href="group__list.html#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga11">stp_list_get_end</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find the first item in a list.  <a href="group__list.html#gd185100e8d7969a473e9d42bc8084572"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ge939f15ee1a6e4c0aaad7a7be7f40b74">stp_list_get_end</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find the last item in a list.  <a href="group__list.html#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga12">stp_list_get_item_by_index</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list, int idx)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find the last item in a list.  <a href="group__list.html#ge939f15ee1a6e4c0aaad7a7be7f40b74"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gd377973e8b13d02c9c111d970f491993">stp_list_get_item_by_index</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, int idx)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its index.  <a href="group__list.html#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga13">stp_list_get_item_by_name</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list, const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its index.  <a href="group__list.html#gd377973e8b13d02c9c111d970f491993"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g729867c847dd8282f74806968c708f28">stp_list_get_item_by_name</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its name.  <a href="group__list.html#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga14">stp_list_get_item_by_long_name</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list, const char *long_name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its name.  <a href="group__list.html#g729867c847dd8282f74806968c708f28"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gcc9140df3f4311cd750ba10a1cbf37d1">stp_list_get_item_by_long_name</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, const char *long_name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its long name.  <a href="group__list.html#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga15">stp_list_get_length</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its long name.  <a href="group__list.html#gcc9140df3f4311cd750ba10a1cbf37d1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ge22741060734c9cbc47656c5ea35c3f3">stp_list_get_length</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the length of a list.  <a href="group__list.html#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga16">stp_list_set_freefunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga2">stp_node_freefunc</a> freefunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the length of a list.  <a href="group__list.html#ge22741060734c9cbc47656c5ea35c3f3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ge3300d7971c393d119d6fd62e2b578ec">stp_list_set_freefunc</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#g4102fc776ec5bbd84eb589cfba97dfc2">stp_node_freefunc</a> freefunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node free function.  <a href="group__list.html#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga2">stp_node_freefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga17">stp_list_get_freefunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node free function.  <a href="group__list.html#ge3300d7971c393d119d6fd62e2b578ec"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g4102fc776ec5bbd84eb589cfba97dfc2">stp_node_freefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gbfc1ef258084a3e1ad959aa3d2f053f4">stp_list_get_freefunc</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node free function.  <a href="group__list.html#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga18">stp_list_set_copyfunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga3">stp_node_copyfunc</a> copyfunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node free function.  <a href="group__list.html#gbfc1ef258084a3e1ad959aa3d2f053f4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g7e002ed25bbfbad236c1c619841f1ac6">stp_list_set_copyfunc</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#g846d759413f07e91bed397f1fe3224d1">stp_node_copyfunc</a> copyfunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node copy function.  <a href="group__list.html#ga18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga3">stp_node_copyfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga19">stp_list_get_copyfunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node copy function.  <a href="group__list.html#g7e002ed25bbfbad236c1c619841f1ac6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g846d759413f07e91bed397f1fe3224d1">stp_node_copyfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g686e92ee802147171e5fc723d0079b8d">stp_list_get_copyfunc</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node copy function.  <a href="group__list.html#ga19"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga20">stp_list_set_namefunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga4">stp_node_namefunc</a> namefunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node copy function.  <a href="group__list.html#g686e92ee802147171e5fc723d0079b8d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g889af512d87a00d696acc0b6b3fafe78">stp_list_set_namefunc</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a> namefunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node name function.  <a href="group__list.html#ga20"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga4">stp_node_namefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga21">stp_list_get_namefunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node name function.  <a href="group__list.html#g889af512d87a00d696acc0b6b3fafe78"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g50b1ab3c3b6b0ba7c0cf2128e2024369">stp_list_get_namefunc</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node name function.  <a href="group__list.html#ga21"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga22">stp_list_set_long_namefunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga4">stp_node_namefunc</a> long_namefunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node name function.  <a href="group__list.html#g50b1ab3c3b6b0ba7c0cf2128e2024369"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g5be91978431b0ed48ea7919807bdcb73">stp_list_set_long_namefunc</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a> long_namefunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node long name function.  <a href="group__list.html#ga22"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga4">stp_node_namefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga23">stp_list_get_long_namefunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node long name function.  <a href="group__list.html#g5be91978431b0ed48ea7919807bdcb73"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g7ecf51e54538837d4e0804da3ce58f12">stp_node_namefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gb99b3ed6da1ea739eed3f2c04fbb7fa7">stp_list_get_long_namefunc</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node long name function.  <a href="group__list.html#ga23"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga24">stp_list_set_sortfunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga5">stp_node_sortfunc</a> sortfunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node long name function.  <a href="group__list.html#gb99b3ed6da1ea739eed3f2c04fbb7fa7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gb1d2486542b858b44b299cfcdf7d8784">stp_list_set_sortfunc</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#gd12571e44981e7acd62137c83652121a">stp_node_sortfunc</a> sortfunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node sort function.  <a href="group__list.html#ga24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga5">stp_node_sortfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga25">stp_list_get_sortfunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node sort function.  <a href="group__list.html#gb1d2486542b858b44b299cfcdf7d8784"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#gd12571e44981e7acd62137c83652121a">stp_node_sortfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g4b32e315d3fd23eabeffcc8d931ea454">stp_list_get_sortfunc</a> (const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node sort function.  <a href="group__list.html#ga25"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga26">stp_list_item_create</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *next, const void *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node sort function.  <a href="group__list.html#g4b32e315d3fd23eabeffcc8d931ea454"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ge726297a82e140672a018e135ffc6a0e">stp_list_item_create</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *next, const void *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new list item.  <a href="group__list.html#ga26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga27">stp_list_item_destroy</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new list item.  <a href="group__list.html#ge726297a82e140672a018e135ffc6a0e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g5e36d4f61e00cb3e4c4a759f5e7e9f4b">stp_list_item_destroy</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a list item.  <a href="group__list.html#ga27"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga28">stp_list_item_prev</a> (const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a list item.  <a href="group__list.html#g5e36d4f61e00cb3e4c4a759f5e7e9f4b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gbaa2a241055402438a0cae6f40cf6a78">stp_list_item_prev</a> (const <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the previous item in the list.  <a href="group__list.html#ga28"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga29">stp_list_item_next</a> (const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the previous item in the list.  <a href="group__list.html#gbaa2a241055402438a0cae6f40cf6a78"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g81ab310caf6432ce1e492eaafdb6c0d7">stp_list_item_next</a> (const <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the next item in the list.  <a href="group__list.html#ga29"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga30">stp_list_item_get_data</a> (const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the next item in the list.  <a href="group__list.html#g81ab310caf6432ce1e492eaafdb6c0d7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gd6f6b303b40fa75f22a86391785178cb">stp_list_item_get_data</a> (const <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data associated with a list item.  <a href="group__list.html#ga30"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga31">stp_list_item_set_data</a> (<a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item, void *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data associated with a list item.  <a href="group__list.html#gd6f6b303b40fa75f22a86391785178cb"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gc1e34edcd47ffdc119cdcaf5ad38e1c4">stp_list_item_set_data</a> (<a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item, void *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data associated with a list item.  <a href="group__list.html#ga31"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data associated with a list item.  <a href="group__list.html#gc1e34edcd47ffdc119cdcaf5ad38e1c4"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Generic list functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/module_8h.html b/doc/gutenprint/html/module_8h.html
index 71de66f..0ff2b5b 100644
--- a/doc/gutenprint/html/module_8h.html
+++ b/doc/gutenprint/html/module_8h.html
@@ -1,13 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/module.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>module.h File Reference</h1>Module functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/module.h File Reference</h1>Module functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="list_8h.html">gutenprint/list.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -18,294 +31,222 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html">stp_module</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__module__version.html">stp_module_version</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a0">stp_module_version_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__module__version.html">stp_module_version</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#753a8450e5ac6b73134c12b89533f16e">stp_module_version_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__module.html">stp_module</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a1">stp_module_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__module.html">stp_module</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#e1e92953e8ffaa00cfbf7fc01e51f36d">stp_module_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a13">stp_module_class_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="module_8h.html#a13a2">STP_MODULE_CLASS_INVALID</a>, 
-<a class="el" href="module_8h.html#a13a3">STP_MODULE_CLASS_MISC</a>, 
-<a class="el" href="module_8h.html#a13a4">STP_MODULE_CLASS_FAMILY</a>, 
-<a class="el" href="module_8h.html#a13a5">STP_MODULE_CLASS_COLOR</a>, 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42dbc54c5b64945a0585177cbfe3cf8e8c">STP_MODULE_CLASS_INVALID</a>, 
+<a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42c250fc9ff4abf739d975edcbe4694030">STP_MODULE_CLASS_MISC</a>, 
+<a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42b8bfa675fcede245786ec7eb9a220090">STP_MODULE_CLASS_FAMILY</a>, 
+<a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a4200077e69aa7fcad42f21bf58d3d8edaa">STP_MODULE_CLASS_COLOR</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="module_8h.html#a13a6">STP_MODULE_CLASS_DITHER</a>
+&nbsp;&nbsp;<a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42904bbf21de98c76882970ca29aee8841">STP_MODULE_CLASS_DITHER</a>
 <br>
  }</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a7">stp_module_load</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#00007a419775e60142cefd98b1dd3f2c">stp_module_load</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a8">stp_module_exit</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#cdfae1da0f4df678750f59c9eb6123f4">stp_module_exit</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a9">stp_module_open</a> (const char *modulename)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#38df0c9e639b108f785be84d087923e9">stp_module_open</a> (const char *modulename)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a10">stp_module_init</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#121493dc584ab4e64059e9594673a756">stp_module_init</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a11">stp_module_close</a> (<a class="el" href="group__list.html#ga0">stp_list_item_t</a> *module)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#bef0168688427992adb80588beadcb62">stp_module_close</a> (<a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *module)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a12">stp_module_get_class</a> (<a class="el" href="module_8h.html#a13">stp_module_class_t</a> class)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#5eee8809d0134f4e7540bc5552bccd7f">stp_module_get_class</a> (<a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a> class)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Module functions. 
 <p>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a1"></a><!-- doxytag: member="module.h::stp_module_t" ref="a1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="e1e92953e8ffaa00cfbf7fc01e51f36d"></a><!-- doxytag: member="module.h::stp_module_t" ref="e1e92953e8ffaa00cfbf7fc01e51f36d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="structstp__module.html">stp_module</a>  <a class="el" href="structstp__module.html">stp_module_t</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="structstp__module.html">stp_module</a>  <a class="el" href="structstp__module.html">stp_module_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="module.h::stp_module_version_t" ref="a0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="753a8450e5ac6b73134c12b89533f16e"></a><!-- doxytag: member="module.h::stp_module_version_t" ref="753a8450e5ac6b73134c12b89533f16e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="structstp__module__version.html">stp_module_version</a>  <a class="el" href="structstp__module__version.html">stp_module_version_t</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="structstp__module__version.html">stp_module_version</a>  <a class="el" href="structstp__module__version.html">stp_module_version_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="a13"></a><!-- doxytag: member="module.h::stp_module_class_t" ref="a13" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="b3da7c3525c26e1d63d7fe1f95da5a42"></a><!-- doxytag: member="module.h::stp_module_class_t" ref="b3da7c3525c26e1d63d7fe1f95da5a42" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="module_8h.html#a13">stp_module_class_t</a>          </td>
+          <td class="memname">enum <a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="a13a2"></a><!-- doxytag: member="STP_MODULE_CLASS_INVALID" ref="a13a2" args="" -->STP_MODULE_CLASS_INVALID</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="b3da7c3525c26e1d63d7fe1f95da5a42dbc54c5b64945a0585177cbfe3cf8e8c"></a><!-- doxytag: member="STP_MODULE_CLASS_INVALID" ref="b3da7c3525c26e1d63d7fe1f95da5a42dbc54c5b64945a0585177cbfe3cf8e8c" args="" -->STP_MODULE_CLASS_INVALID</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a13a3"></a><!-- doxytag: member="STP_MODULE_CLASS_MISC" ref="a13a3" args="" -->STP_MODULE_CLASS_MISC</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="b3da7c3525c26e1d63d7fe1f95da5a42c250fc9ff4abf739d975edcbe4694030"></a><!-- doxytag: member="STP_MODULE_CLASS_MISC" ref="b3da7c3525c26e1d63d7fe1f95da5a42c250fc9ff4abf739d975edcbe4694030" args="" -->STP_MODULE_CLASS_MISC</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a13a4"></a><!-- doxytag: member="STP_MODULE_CLASS_FAMILY" ref="a13a4" args="" -->STP_MODULE_CLASS_FAMILY</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="b3da7c3525c26e1d63d7fe1f95da5a42b8bfa675fcede245786ec7eb9a220090"></a><!-- doxytag: member="STP_MODULE_CLASS_FAMILY" ref="b3da7c3525c26e1d63d7fe1f95da5a42b8bfa675fcede245786ec7eb9a220090" args="" -->STP_MODULE_CLASS_FAMILY</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a13a5"></a><!-- doxytag: member="STP_MODULE_CLASS_COLOR" ref="a13a5" args="" -->STP_MODULE_CLASS_COLOR</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="b3da7c3525c26e1d63d7fe1f95da5a4200077e69aa7fcad42f21bf58d3d8edaa"></a><!-- doxytag: member="STP_MODULE_CLASS_COLOR" ref="b3da7c3525c26e1d63d7fe1f95da5a4200077e69aa7fcad42f21bf58d3d8edaa" args="" -->STP_MODULE_CLASS_COLOR</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a13a6"></a><!-- doxytag: member="STP_MODULE_CLASS_DITHER" ref="a13a6" args="" -->STP_MODULE_CLASS_DITHER</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="b3da7c3525c26e1d63d7fe1f95da5a42904bbf21de98c76882970ca29aee8841"></a><!-- doxytag: member="STP_MODULE_CLASS_DITHER" ref="b3da7c3525c26e1d63d7fe1f95da5a42904bbf21de98c76882970ca29aee8841" args="" -->STP_MODULE_CLASS_DITHER</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a11"></a><!-- doxytag: member="module.h::stp_module_close" ref="a11" args="(stp_list_item_t *module)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="bef0168688427992adb80588beadcb62"></a><!-- doxytag: member="module.h::stp_module_close" ref="bef0168688427992adb80588beadcb62" args="(stp_list_item_t *module)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_module_close           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>module</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int stp_module_close           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>module</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a8"></a><!-- doxytag: member="module.h::stp_module_exit" ref="a8" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="cdfae1da0f4df678750f59c9eb6123f4"></a><!-- doxytag: member="module.h::stp_module_exit" ref="cdfae1da0f4df678750f59c9eb6123f4" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_module_exit           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int stp_module_exit           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a12"></a><!-- doxytag: member="module.h::stp_module_get_class" ref="a12" args="(stp_module_class_t class)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="5eee8809d0134f4e7540bc5552bccd7f"></a><!-- doxytag: member="module.h::stp_module_get_class" ref="5eee8809d0134f4e7540bc5552bccd7f" args="(stp_module_class_t class)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a>* stp_module_get_class           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="module_8h.html#a13">stp_module_class_t</a>&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>class</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a>* stp_module_get_class           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a>&nbsp;</td>
+          <td class="paramname"> <em>class</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="module.h::stp_module_init" ref="a10" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="121493dc584ab4e64059e9594673a756"></a><!-- doxytag: member="module.h::stp_module_init" ref="121493dc584ab4e64059e9594673a756" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_module_init           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int stp_module_init           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a7"></a><!-- doxytag: member="module.h::stp_module_load" ref="a7" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="00007a419775e60142cefd98b1dd3f2c"></a><!-- doxytag: member="module.h::stp_module_load" ref="00007a419775e60142cefd98b1dd3f2c" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_module_load           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int stp_module_load           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a9"></a><!-- doxytag: member="module.h::stp_module_open" ref="a9" args="(const char *modulename)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="38df0c9e639b108f785be84d087923e9"></a><!-- doxytag: member="module.h::stp_module_open" ref="38df0c9e639b108f785be84d087923e9" args="(const char *modulename)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_module_open           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>modulename</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int stp_module_open           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>modulename</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/modules.html b/doc/gutenprint/html/modules.html
index c416a72..ec9f155 100644
--- a/doc/gutenprint/html/modules.html
+++ b/doc/gutenprint/html/modules.html
@@ -1,10 +1,19 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Module Index</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindexHL" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li class="current"><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1>libgutenprint API Reference Modules</h1>Here is a list of all modules:<ul>
 <li><a class="el" href="group__array.html">array</a>
 <li><a class="el" href="group__color.html">color</a>
@@ -20,8 +29,8 @@
 <li><a class="el" href="group__util.html">util</a>
 <li><a class="el" href="group__vars.html">vars</a>
 </ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/mxml_8h.html b/doc/gutenprint/html/mxml_8h.html
index 9321a1a..2cb10f3 100644
--- a/doc/gutenprint/html/mxml_8h.html
+++ b/doc/gutenprint/html/mxml_8h.html
@@ -1,13 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/mxml.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>mxml.h File Reference</h1>Mini-XML XML parsing functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/mxml.h File Reference</h1>Mini-XML XML parsing functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;stdio.h&gt;</code><br>
 <code>#include &lt;stdlib.h&gt;</code><br>
@@ -28,1340 +41,1028 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a0">STP_MXML_WRAP</a>&nbsp;&nbsp;&nbsp;70</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#0958b60267481400b1037902e060027f">STP_MXML_WRAP</a>&nbsp;&nbsp;&nbsp;70</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a1">STP_MXML_TAB</a>&nbsp;&nbsp;&nbsp;8</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#f14eeab60ef7298e7fbb04f9f80ec81f">STP_MXML_TAB</a>&nbsp;&nbsp;&nbsp;8</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a2">STP_MXML_NO_CALLBACK</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#e7115822f446a7b9bde7ce872bd73d83">STP_MXML_NO_CALLBACK</a>&nbsp;&nbsp;&nbsp;0</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a3">STP_MXML_NO_PARENT</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#4d9598080b3b0381f5c94518a885e867">STP_MXML_NO_PARENT</a>&nbsp;&nbsp;&nbsp;0</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a4">STP_MXML_DESCEND</a>&nbsp;&nbsp;&nbsp;1</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#7c552ec507bb896f89f002de30a21378">STP_MXML_DESCEND</a>&nbsp;&nbsp;&nbsp;1</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a5">STP_MXML_NO_DESCEND</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#df7d31182924f15ecbeae9b6c0f35ca2">STP_MXML_NO_DESCEND</a>&nbsp;&nbsp;&nbsp;0</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a6">STP_MXML_DESCEND_FIRST</a>&nbsp;&nbsp;&nbsp;-1</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#bff818057f8c875f4152aa49ed5c046b">STP_MXML_DESCEND_FIRST</a>&nbsp;&nbsp;&nbsp;-1</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a7">STP_MXML_WS_BEFORE_OPEN</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#60a753631e81e819a2dad91834b0a7f5">STP_MXML_WS_BEFORE_OPEN</a>&nbsp;&nbsp;&nbsp;0</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a8">STP_MXML_WS_AFTER_OPEN</a>&nbsp;&nbsp;&nbsp;1</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#4e7558f3b8bc4d9b3e39c57108b11cea">STP_MXML_WS_AFTER_OPEN</a>&nbsp;&nbsp;&nbsp;1</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a9">STP_MXML_WS_BEFORE_CLOSE</a>&nbsp;&nbsp;&nbsp;2</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a8d71b9879129c853422282b2b728131">STP_MXML_WS_BEFORE_CLOSE</a>&nbsp;&nbsp;&nbsp;2</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a10">STP_MXML_WS_AFTER_CLOSE</a>&nbsp;&nbsp;&nbsp;3</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#010da4f7fffd4a3b3eec433031d466f9">STP_MXML_WS_AFTER_CLOSE</a>&nbsp;&nbsp;&nbsp;3</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a11">STP_MXML_ADD_BEFORE</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#1920c86773f4394ebd778b6e6b8f1aba">STP_MXML_ADD_BEFORE</a>&nbsp;&nbsp;&nbsp;0</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a12">STP_MXML_ADD_AFTER</a>&nbsp;&nbsp;&nbsp;1</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a046bb0b67f278cb7ffdd0be5336b4f3">STP_MXML_ADD_AFTER</a>&nbsp;&nbsp;&nbsp;1</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a13">STP_MXML_ADD_TO_PARENT</a>&nbsp;&nbsp;&nbsp;NULL</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#5c364d2523fb6f7a133df3fdfd7f44d5">STP_MXML_ADD_TO_PARENT</a>&nbsp;&nbsp;&nbsp;NULL</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef enum <a class="el" href="mxml_8h.html#a43">stp_mxml_type_e</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a14">stp_mxml_type_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef enum <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba">stp_mxml_type_e</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a15">stp_mxml_attr_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#b271ad8c2bb8d7e6b4b453ffe5589564">stp_mxml_attr_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a16">stp_mxml_element_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#70e20b752807f49a56b56d80ee470b47">stp_mxml_element_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a17">stp_mxml_text_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#b9c0236a2d70c3bcb210a9f6fadf00a3">stp_mxml_text_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a18">stp_mxml_value_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#9a2e2ffccac3c73524e76f3e816d35bf">stp_mxml_value_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a19">stp_mxml_node_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a43">stp_mxml_type_e</a> { <br>
-&nbsp;&nbsp;<a class="el" href="mxml_8h.html#a43a20">STP_MXML_ELEMENT</a>, 
-<a class="el" href="mxml_8h.html#a43a21">STP_MXML_INTEGER</a>, 
-<a class="el" href="mxml_8h.html#a43a22">STP_MXML_OPAQUE</a>, 
-<a class="el" href="mxml_8h.html#a43a23">STP_MXML_REAL</a>, 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba">stp_mxml_type_e</a> { <br>
+&nbsp;&nbsp;<a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba10846b9327c59bbfee28dd522a0c258e">STP_MXML_ELEMENT</a>, 
+<a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6baeb129c9841502a2f3d095751f4e21a79">STP_MXML_INTEGER</a>, 
+<a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba4ebe16a2dc2aac2531e09b56051eb47a">STP_MXML_OPAQUE</a>, 
+<a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba9411f902a8e7e839252b7a440ef53790">STP_MXML_REAL</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="mxml_8h.html#a43a24">STP_MXML_TEXT</a>
+&nbsp;&nbsp;<a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6baccc874638f0a0d375e1066d8c82c8be9">STP_MXML_TEXT</a>
 <br>
  }</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a25">stp_mxmlAdd</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, int where, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *child, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#b1227e00e25c3b91220a93ff65a978be">stp_mxmlAdd</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, int where, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *child, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a26">stp_mxmlDelete</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#72999dc22e850ea456b336f3e802be28">stp_mxmlDelete</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a27">stp_mxmlElementGetAttr</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#c60696919428e3b2e34ee8e2eb110962">stp_mxmlElementGetAttr</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a28">stp_mxmlElementSetAttr</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *name, const char *value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#6cac6d18e5cddb0847268c46a8d4dbfa">stp_mxmlElementSetAttr</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *name, const char *value)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a29">stp_mxmlFindElement</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, const char *name, const char *attr, const char *value, int descend)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#65c27e9c331c88b3f010f040591cc401">stp_mxmlFindElement</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, const char *name, const char *attr, const char *value, int descend)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a30">stp_mxmlLoadFile</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, FILE *fp, <a class="el" href="mxml_8h.html#a14">stp_mxml_type_t</a>(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#88f8bf556fb254728ab23ce931ee9224">stp_mxmlLoadFile</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, FILE *fp, <a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a31">stp_mxmlLoadString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, const char *s, <a class="el" href="mxml_8h.html#a14">stp_mxml_type_t</a>(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#4a2465973559fe7815386d0d59d9a8ee">stp_mxmlLoadString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, const char *s, <a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a32">stp_mxmlNewElement</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#9430b1f2b1d6b6060d9e358309de3772">stp_mxmlNewElement</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a33">stp_mxmlNewInteger</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, int integer)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#cefddfa295df71e8617b607d207980eb">stp_mxmlNewInteger</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, int integer)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a34">stp_mxmlNewOpaque</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, const char *opaque)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#1897cb8faa2141879d45d9fec0463119">stp_mxmlNewOpaque</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, const char *opaque)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a35">stp_mxmlNewReal</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, double real)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#1b4b2ee1a0c75a31981d70e35398d6dd">stp_mxmlNewReal</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, double real)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a36">stp_mxmlNewText</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, int whitespace, const char *string)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#05bd9944cadbef034730a53ca47c9f6a">stp_mxmlNewText</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, int whitespace, const char *string)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a37">stp_mxmlRemove</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#7e0322b42cbe0398de7bbe38c4b0a9e6">stp_mxmlRemove</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a38">stp_mxmlSaveAllocString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#de7e653595e3ea46d9f3b5545d0a10ea">stp_mxmlSaveAllocString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a39">stp_mxmlSaveFile</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, FILE *fp, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#1038b1003e9a3fbd8396cdbe989a64c8">stp_mxmlSaveFile</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, FILE *fp, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a40">stp_mxmlSaveString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, char *buffer, int bufsize, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#054f6b6df45f2e0072a61c1a438d3ebe">stp_mxmlSaveString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, char *buffer, int bufsize, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a41">stp_mxmlWalkNext</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, int descend)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#f478d00f31cfae58314bd6f40531923b">stp_mxmlWalkNext</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, int descend)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a42">stp_mxmlWalkPrev</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, int descend)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#cc0525bdade1c9e0e83c154592fe815c">stp_mxmlWalkPrev</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, int descend)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Mini-XML XML parsing functions. 
 <p>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="a12"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_AFTER" ref="a12" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="a046bb0b67f278cb7ffdd0be5336b4f3"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_AFTER" ref="a046bb0b67f278cb7ffdd0be5336b4f3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MXML_ADD_AFTER&nbsp;&nbsp;&nbsp;1          </td>
+          <td class="memname">#define STP_MXML_ADD_AFTER&nbsp;&nbsp;&nbsp;1          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a11"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_BEFORE" ref="a11" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="1920c86773f4394ebd778b6e6b8f1aba"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_BEFORE" ref="1920c86773f4394ebd778b6e6b8f1aba" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MXML_ADD_BEFORE&nbsp;&nbsp;&nbsp;0          </td>
+          <td class="memname">#define STP_MXML_ADD_BEFORE&nbsp;&nbsp;&nbsp;0          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a13"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_TO_PARENT" ref="a13" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="5c364d2523fb6f7a133df3fdfd7f44d5"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_TO_PARENT" ref="5c364d2523fb6f7a133df3fdfd7f44d5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MXML_ADD_TO_PARENT&nbsp;&nbsp;&nbsp;NULL          </td>
+          <td class="memname">#define STP_MXML_ADD_TO_PARENT&nbsp;&nbsp;&nbsp;NULL          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="mxml.h::STP_MXML_DESCEND" ref="a4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="7c552ec507bb896f89f002de30a21378"></a><!-- doxytag: member="mxml.h::STP_MXML_DESCEND" ref="7c552ec507bb896f89f002de30a21378" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MXML_DESCEND&nbsp;&nbsp;&nbsp;1          </td>
+          <td class="memname">#define STP_MXML_DESCEND&nbsp;&nbsp;&nbsp;1          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a6"></a><!-- doxytag: member="mxml.h::STP_MXML_DESCEND_FIRST" ref="a6" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="bff818057f8c875f4152aa49ed5c046b"></a><!-- doxytag: member="mxml.h::STP_MXML_DESCEND_FIRST" ref="bff818057f8c875f4152aa49ed5c046b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MXML_DESCEND_FIRST&nbsp;&nbsp;&nbsp;-1          </td>
+          <td class="memname">#define STP_MXML_DESCEND_FIRST&nbsp;&nbsp;&nbsp;-1          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_CALLBACK" ref="a2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="e7115822f446a7b9bde7ce872bd73d83"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_CALLBACK" ref="e7115822f446a7b9bde7ce872bd73d83" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MXML_NO_CALLBACK&nbsp;&nbsp;&nbsp;0          </td>
+          <td class="memname">#define STP_MXML_NO_CALLBACK&nbsp;&nbsp;&nbsp;0          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_DESCEND" ref="a5" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="df7d31182924f15ecbeae9b6c0f35ca2"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_DESCEND" ref="df7d31182924f15ecbeae9b6c0f35ca2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MXML_NO_DESCEND&nbsp;&nbsp;&nbsp;0          </td>
+          <td class="memname">#define STP_MXML_NO_DESCEND&nbsp;&nbsp;&nbsp;0          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_PARENT" ref="a3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="4d9598080b3b0381f5c94518a885e867"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_PARENT" ref="4d9598080b3b0381f5c94518a885e867" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MXML_NO_PARENT&nbsp;&nbsp;&nbsp;0          </td>
+          <td class="memname">#define STP_MXML_NO_PARENT&nbsp;&nbsp;&nbsp;0          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a1"></a><!-- doxytag: member="mxml.h::STP_MXML_TAB" ref="a1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f14eeab60ef7298e7fbb04f9f80ec81f"></a><!-- doxytag: member="mxml.h::STP_MXML_TAB" ref="f14eeab60ef7298e7fbb04f9f80ec81f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MXML_TAB&nbsp;&nbsp;&nbsp;8          </td>
+          <td class="memname">#define STP_MXML_TAB&nbsp;&nbsp;&nbsp;8          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="mxml.h::STP_MXML_WRAP" ref="a0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="0958b60267481400b1037902e060027f"></a><!-- doxytag: member="mxml.h::STP_MXML_WRAP" ref="0958b60267481400b1037902e060027f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MXML_WRAP&nbsp;&nbsp;&nbsp;70          </td>
+          <td class="memname">#define STP_MXML_WRAP&nbsp;&nbsp;&nbsp;70          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_AFTER_CLOSE" ref="a10" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="010da4f7fffd4a3b3eec433031d466f9"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_AFTER_CLOSE" ref="010da4f7fffd4a3b3eec433031d466f9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MXML_WS_AFTER_CLOSE&nbsp;&nbsp;&nbsp;3          </td>
+          <td class="memname">#define STP_MXML_WS_AFTER_CLOSE&nbsp;&nbsp;&nbsp;3          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a8"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_AFTER_OPEN" ref="a8" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="4e7558f3b8bc4d9b3e39c57108b11cea"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_AFTER_OPEN" ref="4e7558f3b8bc4d9b3e39c57108b11cea" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MXML_WS_AFTER_OPEN&nbsp;&nbsp;&nbsp;1          </td>
+          <td class="memname">#define STP_MXML_WS_AFTER_OPEN&nbsp;&nbsp;&nbsp;1          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a9"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_BEFORE_CLOSE" ref="a9" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="a8d71b9879129c853422282b2b728131"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_BEFORE_CLOSE" ref="a8d71b9879129c853422282b2b728131" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MXML_WS_BEFORE_CLOSE&nbsp;&nbsp;&nbsp;2          </td>
+          <td class="memname">#define STP_MXML_WS_BEFORE_CLOSE&nbsp;&nbsp;&nbsp;2          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a7"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_BEFORE_OPEN" ref="a7" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="60a753631e81e819a2dad91834b0a7f5"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_BEFORE_OPEN" ref="60a753631e81e819a2dad91834b0a7f5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MXML_WS_BEFORE_OPEN&nbsp;&nbsp;&nbsp;0          </td>
+          <td class="memname">#define STP_MXML_WS_BEFORE_OPEN&nbsp;&nbsp;&nbsp;0          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a15"></a><!-- doxytag: member="mxml.h::stp_mxml_attr_t" ref="a15" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="b271ad8c2bb8d7e6b4b453ffe5589564"></a><!-- doxytag: member="mxml.h::stp_mxml_attr_t" ref="b271ad8c2bb8d7e6b4b453ffe5589564" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>  <a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_t</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>  <a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a16"></a><!-- doxytag: member="mxml.h::stp_mxml_element_t" ref="a16" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="70e20b752807f49a56b56d80ee470b47"></a><!-- doxytag: member="mxml.h::stp_mxml_element_t" ref="70e20b752807f49a56b56d80ee470b47" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>  <a class="el" href="structstp__mxml__value__s.html">stp_mxml_element_t</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>  <a class="el" href="structstp__mxml__value__s.html">stp_mxml_element_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a19"></a><!-- doxytag: member="mxml.h::stp_mxml_node_t" ref="a19" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="8fb80a78e3ac8d8aa9eb14c35326bd82"></a><!-- doxytag: member="mxml.h::stp_mxml_node_t" ref="8fb80a78e3ac8d8aa9eb14c35326bd82" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a> <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a> <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a17"></a><!-- doxytag: member="mxml.h::stp_mxml_text_t" ref="a17" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="b9c0236a2d70c3bcb210a9f6fadf00a3"></a><!-- doxytag: member="mxml.h::stp_mxml_text_t" ref="b9c0236a2d70c3bcb210a9f6fadf00a3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>  <a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_t</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>  <a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a14"></a><!-- doxytag: member="mxml.h::stp_mxml_type_t" ref="a14" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="3ff7086c4e8f1557e81c32a61420017e"></a><!-- doxytag: member="mxml.h::stp_mxml_type_t" ref="3ff7086c4e8f1557e81c32a61420017e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef enum <a class="el" href="mxml_8h.html#a43">stp_mxml_type_e</a>  <a class="el" href="mxml_8h.html#a14">stp_mxml_type_t</a>          </td>
+          <td class="memname">typedef enum <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba">stp_mxml_type_e</a>  <a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a18"></a><!-- doxytag: member="mxml.h::stp_mxml_value_t" ref="a18" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="9a2e2ffccac3c73524e76f3e816d35bf"></a><!-- doxytag: member="mxml.h::stp_mxml_value_t" ref="9a2e2ffccac3c73524e76f3e816d35bf" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef union <a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>  <a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_t</a>          </td>
+          <td class="memname">typedef union <a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>  <a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="a43"></a><!-- doxytag: member="mxml.h::stp_mxml_type_e" ref="a43" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="f8b58610b5fb382d0f075cb3bcf3b6ba"></a><!-- doxytag: member="mxml.h::stp_mxml_type_e" ref="f8b58610b5fb382d0f075cb3bcf3b6ba" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="mxml_8h.html#a43">stp_mxml_type_e</a>          </td>
+          <td class="memname">enum <a class="el" href="mxml_8h.html#f8b58610b5fb382d0f075cb3bcf3b6ba">stp_mxml_type_e</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="a43a20"></a><!-- doxytag: member="STP_MXML_ELEMENT" ref="a43a20" args="" -->STP_MXML_ELEMENT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="f8b58610b5fb382d0f075cb3bcf3b6ba10846b9327c59bbfee28dd522a0c258e"></a><!-- doxytag: member="STP_MXML_ELEMENT" ref="f8b58610b5fb382d0f075cb3bcf3b6ba10846b9327c59bbfee28dd522a0c258e" args="" -->STP_MXML_ELEMENT</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a43a21"></a><!-- doxytag: member="STP_MXML_INTEGER" ref="a43a21" args="" -->STP_MXML_INTEGER</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="f8b58610b5fb382d0f075cb3bcf3b6baeb129c9841502a2f3d095751f4e21a79"></a><!-- doxytag: member="STP_MXML_INTEGER" ref="f8b58610b5fb382d0f075cb3bcf3b6baeb129c9841502a2f3d095751f4e21a79" args="" -->STP_MXML_INTEGER</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a43a22"></a><!-- doxytag: member="STP_MXML_OPAQUE" ref="a43a22" args="" -->STP_MXML_OPAQUE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="f8b58610b5fb382d0f075cb3bcf3b6ba4ebe16a2dc2aac2531e09b56051eb47a"></a><!-- doxytag: member="STP_MXML_OPAQUE" ref="f8b58610b5fb382d0f075cb3bcf3b6ba4ebe16a2dc2aac2531e09b56051eb47a" args="" -->STP_MXML_OPAQUE</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a43a23"></a><!-- doxytag: member="STP_MXML_REAL" ref="a43a23" args="" -->STP_MXML_REAL</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="f8b58610b5fb382d0f075cb3bcf3b6ba9411f902a8e7e839252b7a440ef53790"></a><!-- doxytag: member="STP_MXML_REAL" ref="f8b58610b5fb382d0f075cb3bcf3b6ba9411f902a8e7e839252b7a440ef53790" args="" -->STP_MXML_REAL</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a43a24"></a><!-- doxytag: member="STP_MXML_TEXT" ref="a43a24" args="" -->STP_MXML_TEXT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="f8b58610b5fb382d0f075cb3bcf3b6baccc874638f0a0d375e1066d8c82c8be9"></a><!-- doxytag: member="STP_MXML_TEXT" ref="f8b58610b5fb382d0f075cb3bcf3b6baccc874638f0a0d375e1066d8c82c8be9" args="" -->STP_MXML_TEXT</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a25"></a><!-- doxytag: member="mxml.h::stp_mxmlAdd" ref="a25" args="(stp_mxml_node_t *parent, int where, stp_mxml_node_t *child, stp_mxml_node_t *node)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="b1227e00e25c3b91220a93ff65a978be"></a><!-- doxytag: member="mxml.h::stp_mxmlAdd" ref="b1227e00e25c3b91220a93ff65a978be" args="(stp_mxml_node_t *parent, int where, stp_mxml_node_t *child, stp_mxml_node_t *node)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_mxmlAdd           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parent</em>, </td>
+          <td class="memname">void stp_mxmlAdd           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>parent</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>where</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>where</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>child</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>child</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>node</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>node</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a26"></a><!-- doxytag: member="mxml.h::stp_mxmlDelete" ref="a26" args="(stp_mxml_node_t *node)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_mxmlDelete           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>node</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="72999dc22e850ea456b336f3e802be28"></a><!-- doxytag: member="mxml.h::stp_mxmlDelete" ref="72999dc22e850ea456b336f3e802be28" args="(stp_mxml_node_t *node)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_mxmlDelete           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>node</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a27"></a><!-- doxytag: member="mxml.h::stp_mxmlElementGetAttr" ref="a27" args="(stp_mxml_node_t *node, const char *name)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="c60696919428e3b2e34ee8e2eb110962"></a><!-- doxytag: member="mxml.h::stp_mxmlElementGetAttr" ref="c60696919428e3b2e34ee8e2eb110962" args="(stp_mxml_node_t *node, const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* stp_mxmlElementGetAttr           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>node</em>, </td>
+          <td class="memname">const char* stp_mxmlElementGetAttr           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>node</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a28"></a><!-- doxytag: member="mxml.h::stp_mxmlElementSetAttr" ref="a28" args="(stp_mxml_node_t *node, const char *name, const char *value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="6cac6d18e5cddb0847268c46a8d4dbfa"></a><!-- doxytag: member="mxml.h::stp_mxmlElementSetAttr" ref="6cac6d18e5cddb0847268c46a8d4dbfa" args="(stp_mxml_node_t *node, const char *name, const char *value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_mxmlElementSetAttr           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>node</em>, </td>
+          <td class="memname">void stp_mxmlElementSetAttr           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>node</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a29"></a><!-- doxytag: member="mxml.h::stp_mxmlFindElement" ref="a29" args="(stp_mxml_node_t *node, stp_mxml_node_t *top, const char *name, const char *attr, const char *value, int descend)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="65c27e9c331c88b3f010f040591cc401"></a><!-- doxytag: member="mxml.h::stp_mxmlFindElement" ref="65c27e9c331c88b3f010f040591cc401" args="(stp_mxml_node_t *node, stp_mxml_node_t *top, const char *name, const char *attr, const char *value, int descend)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlFindElement           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>node</em>, </td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlFindElement           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>node</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>top</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>top</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>attr</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>attr</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>value</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>descend</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>descend</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a30"></a><!-- doxytag: member="mxml.h::stp_mxmlLoadFile" ref="a30" args="(stp_mxml_node_t *top, FILE *fp, stp_mxml_type_t(*cb)(stp_mxml_node_t *))" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="88f8bf556fb254728ab23ce931ee9224"></a><!-- doxytag: member="mxml.h::stp_mxmlLoadFile" ref="88f8bf556fb254728ab23ce931ee9224" args="(stp_mxml_node_t *top, FILE *fp, stp_mxml_type_t(*cb)(stp_mxml_node_t *))" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlLoadFile           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>top</em>, </td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlLoadFile           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>top</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>FILE *&nbsp;</td>
-          <td class="mdname" nowrap> <em>fp</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">FILE *&nbsp;</td>
+          <td class="paramname"> <em>fp</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="mxml_8h.html#a14">stp_mxml_type_t</a>(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *)&nbsp;</td>
-          <td class="mdname" nowrap> <em>cb</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *)&nbsp;</td>
+          <td class="paramname"> <em>cb</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a31"></a><!-- doxytag: member="mxml.h::stp_mxmlLoadString" ref="a31" args="(stp_mxml_node_t *top, const char *s, stp_mxml_type_t(*cb)(stp_mxml_node_t *))" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="4a2465973559fe7815386d0d59d9a8ee"></a><!-- doxytag: member="mxml.h::stp_mxmlLoadString" ref="4a2465973559fe7815386d0d59d9a8ee" args="(stp_mxml_node_t *top, const char *s, stp_mxml_type_t(*cb)(stp_mxml_node_t *))" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlLoadString           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>top</em>, </td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlLoadString           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>top</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>s</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>s</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="mxml_8h.html#a14">stp_mxml_type_t</a>(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *)&nbsp;</td>
-          <td class="mdname" nowrap> <em>cb</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *)&nbsp;</td>
+          <td class="paramname"> <em>cb</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a32"></a><!-- doxytag: member="mxml.h::stp_mxmlNewElement" ref="a32" args="(stp_mxml_node_t *parent, const char *name)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="9430b1f2b1d6b6060d9e358309de3772"></a><!-- doxytag: member="mxml.h::stp_mxmlNewElement" ref="9430b1f2b1d6b6060d9e358309de3772" args="(stp_mxml_node_t *parent, const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlNewElement           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parent</em>, </td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlNewElement           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>parent</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a33"></a><!-- doxytag: member="mxml.h::stp_mxmlNewInteger" ref="a33" args="(stp_mxml_node_t *parent, int integer)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="cefddfa295df71e8617b607d207980eb"></a><!-- doxytag: member="mxml.h::stp_mxmlNewInteger" ref="cefddfa295df71e8617b607d207980eb" args="(stp_mxml_node_t *parent, int integer)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlNewInteger           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parent</em>, </td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlNewInteger           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>parent</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>integer</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>integer</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a34"></a><!-- doxytag: member="mxml.h::stp_mxmlNewOpaque" ref="a34" args="(stp_mxml_node_t *parent, const char *opaque)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="1897cb8faa2141879d45d9fec0463119"></a><!-- doxytag: member="mxml.h::stp_mxmlNewOpaque" ref="1897cb8faa2141879d45d9fec0463119" args="(stp_mxml_node_t *parent, const char *opaque)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlNewOpaque           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parent</em>, </td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlNewOpaque           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>parent</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>opaque</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>opaque</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a35"></a><!-- doxytag: member="mxml.h::stp_mxmlNewReal" ref="a35" args="(stp_mxml_node_t *parent, double real)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="1b4b2ee1a0c75a31981d70e35398d6dd"></a><!-- doxytag: member="mxml.h::stp_mxmlNewReal" ref="1b4b2ee1a0c75a31981d70e35398d6dd" args="(stp_mxml_node_t *parent, double real)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlNewReal           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parent</em>, </td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlNewReal           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>parent</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>double&nbsp;</td>
-          <td class="mdname" nowrap> <em>real</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">double&nbsp;</td>
+          <td class="paramname"> <em>real</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a36"></a><!-- doxytag: member="mxml.h::stp_mxmlNewText" ref="a36" args="(stp_mxml_node_t *parent, int whitespace, const char *string)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="05bd9944cadbef034730a53ca47c9f6a"></a><!-- doxytag: member="mxml.h::stp_mxmlNewText" ref="05bd9944cadbef034730a53ca47c9f6a" args="(stp_mxml_node_t *parent, int whitespace, const char *string)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlNewText           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>parent</em>, </td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlNewText           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>parent</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>whitespace</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>whitespace</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>string</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>string</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a37"></a><!-- doxytag: member="mxml.h::stp_mxmlRemove" ref="a37" args="(stp_mxml_node_t *node)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_mxmlRemove           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>node</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="7e0322b42cbe0398de7bbe38c4b0a9e6"></a><!-- doxytag: member="mxml.h::stp_mxmlRemove" ref="7e0322b42cbe0398de7bbe38c4b0a9e6" args="(stp_mxml_node_t *node)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_mxmlRemove           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>node</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a38"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveAllocString" ref="a38" args="(stp_mxml_node_t *node, int(*cb)(stp_mxml_node_t *, int))" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="de7e653595e3ea46d9f3b5545d0a10ea"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveAllocString" ref="de7e653595e3ea46d9f3b5545d0a10ea" args="(stp_mxml_node_t *node, int(*cb)(stp_mxml_node_t *, int))" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* stp_mxmlSaveAllocString           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>node</em>, </td>
+          <td class="memname">char* stp_mxmlSaveAllocString           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>node</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int)&nbsp;</td>
-          <td class="mdname" nowrap> <em>cb</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int)&nbsp;</td>
+          <td class="paramname"> <em>cb</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a39"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveFile" ref="a39" args="(stp_mxml_node_t *node, FILE *fp, int(*cb)(stp_mxml_node_t *, int))" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="1038b1003e9a3fbd8396cdbe989a64c8"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveFile" ref="1038b1003e9a3fbd8396cdbe989a64c8" args="(stp_mxml_node_t *node, FILE *fp, int(*cb)(stp_mxml_node_t *, int))" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_mxmlSaveFile           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>node</em>, </td>
+          <td class="memname">int stp_mxmlSaveFile           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>node</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>FILE *&nbsp;</td>
-          <td class="mdname" nowrap> <em>fp</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">FILE *&nbsp;</td>
+          <td class="paramname"> <em>fp</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int)&nbsp;</td>
-          <td class="mdname" nowrap> <em>cb</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int)&nbsp;</td>
+          <td class="paramname"> <em>cb</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a40"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveString" ref="a40" args="(stp_mxml_node_t *node, char *buffer, int bufsize, int(*cb)(stp_mxml_node_t *, int))" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="054f6b6df45f2e0072a61c1a438d3ebe"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveString" ref="054f6b6df45f2e0072a61c1a438d3ebe" args="(stp_mxml_node_t *node, char *buffer, int bufsize, int(*cb)(stp_mxml_node_t *, int))" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_mxmlSaveString           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>node</em>, </td>
+          <td class="memname">int stp_mxmlSaveString           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>node</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>buffer</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">char *&nbsp;</td>
+          <td class="paramname"> <em>buffer</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>bufsize</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>bufsize</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int)&nbsp;</td>
-          <td class="mdname" nowrap> <em>cb</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int)&nbsp;</td>
+          <td class="paramname"> <em>cb</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a41"></a><!-- doxytag: member="mxml.h::stp_mxmlWalkNext" ref="a41" args="(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f478d00f31cfae58314bd6f40531923b"></a><!-- doxytag: member="mxml.h::stp_mxmlWalkNext" ref="f478d00f31cfae58314bd6f40531923b" args="(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlWalkNext           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>node</em>, </td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlWalkNext           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>node</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>top</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>top</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>descend</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>descend</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a42"></a><!-- doxytag: member="mxml.h::stp_mxmlWalkPrev" ref="a42" args="(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="cc0525bdade1c9e0e83c154592fe815c"></a><!-- doxytag: member="mxml.h::stp_mxmlWalkPrev" ref="cc0525bdade1c9e0e83c154592fe815c" args="(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlWalkPrev           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>node</em>, </td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlWalkPrev           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>node</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>top</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>top</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>descend</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>descend</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/pages.html b/doc/gutenprint/html/pages.html
index 5f0d006..0be72df 100644
--- a/doc/gutenprint/html/pages.html
+++ b/doc/gutenprint/html/pages.html
@@ -1,16 +1,25 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: Page Index</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindexHL" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li class="current"><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
 <h1>libgutenprint API Reference Related Pages</h1>Here is a list of all related documentation pages:<ul>
 <li><a class="el" href="deprecated.html">Deprecated List</a>
 
 </ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/paper_8h.html b/doc/gutenprint/html/paper_8h.html
index f0dce9d..303d536 100644
--- a/doc/gutenprint/html/paper_8h.html
+++ b/doc/gutenprint/html/paper_8h.html
@@ -1,13 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/paper.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>paper.h File Reference</h1>Paper size functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/paper.h File Reference</h1>Paper size functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="vars_8h.html">gutenprint/vars.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -17,34 +30,34 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The papersize data type.  <a href="structstp__papersize__t.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga5">stp_papersize_unit_t</a> { <a class="el" href="group__papersize.html#gga5a0">PAPERSIZE_ENGLISH_STANDARD</a>, 
-<a class="el" href="group__papersize.html#gga5a1">PAPERSIZE_METRIC_STANDARD</a>, 
-<a class="el" href="group__papersize.html#gga5a2">PAPERSIZE_ENGLISH_EXTENDED</a>, 
-<a class="el" href="group__papersize.html#gga5a3">PAPERSIZE_METRIC_EXTENDED</a>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g72e4619e373e38dc02dc452813b7b958">stp_papersize_unit_t</a> { <a class="el" href="group__papersize.html#gg72e4619e373e38dc02dc452813b7b958db394159413ade42022509cd3280fef3">PAPERSIZE_ENGLISH_STANDARD</a>, 
+<a class="el" href="group__papersize.html#gg72e4619e373e38dc02dc452813b7b9586d5868bc6707f8801ce4d584428c2ae8">PAPERSIZE_METRIC_STANDARD</a>, 
+<a class="el" href="group__papersize.html#gg72e4619e373e38dc02dc452813b7b95800b7e9a18afc172872861b26dbcc8cb8">PAPERSIZE_ENGLISH_EXTENDED</a>, 
+<a class="el" href="group__papersize.html#gg72e4619e373e38dc02dc452813b7b95862e2906a87fa4bcf32913943fd5b225a">PAPERSIZE_METRIC_EXTENDED</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Units of measurement.  <a href="group__papersize.html#ga5">More...</a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Units of measurement.  <a href="group__papersize.html#g72e4619e373e38dc02dc452813b7b958">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga0">stp_known_papersizes</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g84fd0bad33b134217f54fa8c1e6c8b99">stp_known_papersizes</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available papersizes.  <a href="group__papersize.html#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga1">stp_get_papersize_by_name</a> (const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available papersizes.  <a href="group__papersize.html#g84fd0bad33b134217f54fa8c1e6c8b99"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g60f3dee8f26cac05d8d6fcaff1e39630">stp_get_papersize_by_name</a> (const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by name.  <a href="group__papersize.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga2">stp_get_papersize_by_size</a> (int length, int width)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by name.  <a href="group__papersize.html#g60f3dee8f26cac05d8d6fcaff1e39630"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g1484a5e75a2b2921bbe0c9e17deb0b77">stp_get_papersize_by_size</a> (int length, int width)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by size.  <a href="group__papersize.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga3">stp_get_papersize_by_index</a> (int idx)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by size.  <a href="group__papersize.html#g1484a5e75a2b2921bbe0c9e17deb0b77"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#gb2e9f694a3b90aeaaa14d6af3b5fe75a">stp_get_papersize_by_index</a> (int idx)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by its index number.  <a href="group__papersize.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga4">stp_default_media_size</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *width, int *height)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by its index number.  <a href="group__papersize.html#gb2e9f694a3b90aeaaa14d6af3b5fe75a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g33c0be56646361b1ce85a9d338336dd3">stp_default_media_size</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Paper size functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/path_8h.html b/doc/gutenprint/html/path_8h.html
index b6695d0..64522c4 100644
--- a/doc/gutenprint/html/path_8h.html
+++ b/doc/gutenprint/html/path_8h.html
@@ -1,102 +1,99 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/path.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>path.h File Reference</h1>Simple directory path functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/path.h File Reference</h1>Simple directory path functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#a0">stp_path_search</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *dirlist, const char *suffix)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#b1754e7b09717741f4bdc7a4b973d4a5">stp_path_search</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *dirlist, const char *suffix)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#a1">stp_path_split</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, const char *path)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#f08851d96a1197c5ce39f7dc812cef3f">stp_path_split</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, const char *path)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Simple directory path functions. 
 <p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0"></a><!-- doxytag: member="path.h::stp_path_search" ref="a0" args="(stp_list_t *dirlist, const char *suffix)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="b1754e7b09717741f4bdc7a4b973d4a5"></a><!-- doxytag: member="path.h::stp_path_search" ref="b1754e7b09717741f4bdc7a4b973d4a5" args="(stp_list_t *dirlist, const char *suffix)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a>* stp_path_search           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>dirlist</em>, </td>
+          <td class="memname"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a>* stp_path_search           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>dirlist</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>suffix</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>suffix</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a1"></a><!-- doxytag: member="path.h::stp_path_split" ref="a1" args="(stp_list_t *list, const char *path)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f08851d96a1197c5ce39f7dc812cef3f"></a><!-- doxytag: member="path.h::stp_path_split" ref="f08851d96a1197c5ce39f7dc812cef3f" args="(stp_list_t *list, const char *path)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_path_split           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname">void stp_path_split           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>path</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>path</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:46 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/printers_8h.html b/doc/gutenprint/html/printers_8h.html
index 4d31c1b..00e3fe0 100644
--- a/doc/gutenprint/html/printers_8h.html
+++ b/doc/gutenprint/html/printers_8h.html
@@ -1,13 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/printers.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>printers.h File Reference</h1>Printer functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/printers.h File Reference</h1>Printer functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="list_8h.html">gutenprint/list.h</a>&gt;</code><br>
 <code>#include &lt;<a class="el" href="vars_8h.html">gutenprint/vars.h</a>&gt;</code><br>
@@ -19,82 +32,82 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html">stp_family</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_printer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga0">stp_printer_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_printer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The printer opaque data type (representation of printer model).  <a href="group__printer.html#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__family.html">stp_family</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga1">stp_family_t</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The printer opaque data type (representation of printer model).  <a href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__family.html">stp_family</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g66a5e7cf2b1743a46bd78cb851e1d0a4">stp_family_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga2">stp_printer_model_count</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g6a76f8f76106eddd51af4b1593b4f3af">stp_printer_model_count</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available printer models.  <a href="group__printer.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga3">stp_get_printer_by_index</a> (int idx)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available printer models.  <a href="group__printer.html#g6a76f8f76106eddd51af4b1593b4f3af"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g440501ca226e0a9ac1335c7e52ee55a6">stp_get_printer_by_index</a> (int idx)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its index number.  <a href="group__printer.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga4">stp_get_printer_by_long_name</a> (const char *long_name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its index number.  <a href="group__printer.html#g440501ca226e0a9ac1335c7e52ee55a6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g6bd5abd876100c17fc9029659fed92f4">stp_get_printer_by_long_name</a> (const char *long_name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its long (translated) name.  <a href="group__printer.html#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga5">stp_get_printer_by_driver</a> (const char *driver)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its long (translated) name.  <a href="group__printer.html#g6bd5abd876100c17fc9029659fed92f4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ge45de9ef94fb609c2a54f1d80144552e">stp_get_printer_by_driver</a> (const char *driver)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its short name.  <a href="group__printer.html#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga6">stp_get_printer</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its short name.  <a href="group__printer.html#ge45de9ef94fb609c2a54f1d80144552e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gc649c4b3d0a93f26f99deb4b081305c1">stp_get_printer</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the printer model from a vars object.  <a href="group__printer.html#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga7">stp_get_printer_index_by_driver</a> (const char *driver)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the printer model from a vars object.  <a href="group__printer.html#gc649c4b3d0a93f26f99deb4b081305c1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g41094e69b71eb930e770bd2cf8bbf795">stp_get_printer_index_by_driver</a> (const char *driver)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the printer index number from the printer model short (driver) name.  <a href="group__printer.html#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga8">stp_printer_get_long_name</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the printer index number from the printer model short (driver) name.  <a href="group__printer.html#g41094e69b71eb930e770bd2cf8bbf795"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g11804fb9b8d87ed1f2a3acbd39f5f85a">stp_printer_get_long_name</a> (const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's long (translated) name.  <a href="group__printer.html#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga9">stp_printer_get_driver</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's long (translated) name.  <a href="group__printer.html#g11804fb9b8d87ed1f2a3acbd39f5f85a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gc345b8cf8cd78da98fdb4c6b2d9cf7ca">stp_printer_get_driver</a> (const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's short (driver) name.  <a href="group__printer.html#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga10">stp_printer_get_family</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's short (driver) name.  <a href="group__printer.html#gc345b8cf8cd78da98fdb4c6b2d9cf7ca"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g487b74bf101a842f30b5941b8db4769a">stp_printer_get_family</a> (const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's family name.  <a href="group__printer.html#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga11">stp_printer_get_manufacturer</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's family name.  <a href="group__printer.html#g487b74bf101a842f30b5941b8db4769a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gb99dd05c42aed848d1567f2b346fb4f4">stp_printer_get_manufacturer</a> (const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's manufacturer's name.  <a href="group__printer.html#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga12">stp_printer_get_model</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's manufacturer's name.  <a href="group__printer.html#gb99dd05c42aed848d1567f2b346fb4f4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gae84d3fb263c4a171b7b63b6d93a940e">stp_printer_get_model</a> (const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's model number.  <a href="group__printer.html#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga13">stp_printer_get_defaults</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's model number.  <a href="group__printer.html#gae84d3fb263c4a171b7b63b6d93a940e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g4f6859e0f21ed2062075d6b9f680a202">stp_printer_get_defaults</a> (const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the default vars for a particular printer model.  <a href="group__printer.html#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga14">stp_set_printer_defaults</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the default vars for a particular printer model.  <a href="group__printer.html#g4f6859e0f21ed2062075d6b9f680a202"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gf5084888feed9878811ac491cb5313ee">stp_set_printer_defaults</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a vars object to use a particular driver, and set the parameter to its defaults.  <a href="group__printer.html#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga15">stp_print</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a vars object to use a particular driver, and set the parameter to its defaults.  <a href="group__printer.html#gf5084888feed9878811ac491cb5313ee"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g6065874cbb246875925e14d8801898cc">stp_print</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Print the image.  <a href="group__printer.html#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga16">stp_start_job</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Print the image.  <a href="group__printer.html#g6065874cbb246875925e14d8801898cc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g31ef7bcc34dda5d3fd46b2d04fcb0c64">stp_start_job</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Start a print job.  <a href="group__printer.html#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga17">stp_end_job</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Start a print job.  <a href="group__printer.html#g31ef7bcc34dda5d3fd46b2d04fcb0c64"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ge61d056dd504facc72ff56d7f16eb23c">stp_end_job</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">End a print job.  <a href="group__printer.html#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga18">stp_get_model_id</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">End a print job.  <a href="group__printer.html#ge61d056dd504facc72ff56d7f16eb23c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g2057c5fcfc31d8b4cf7f3291cf3c0cf4">stp_get_model_id</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga19">stp_verify_printer_params</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g5b5cb603c9432c03ea459b57a2039bdc">stp_verify_printer_params</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga20">stp_family_register</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *family)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g1c6d389f49a185ca24546107bd6f4993">stp_family_register</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *family)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga21">stp_family_unregister</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *family)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g67e5c18254f7ad0b0fd77b4cc2265405">stp_family_unregister</a> (<a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *family)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga22">stp_initialize_printer_defaults</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g381f3a4f132a00d6d2e2a9b54f9ed675">stp_initialize_printer_defaults</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga23">stp_printer_list_parameters</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g09bf7aebf0385f7b5aac537a13b6e3ed">stp_printer_list_parameters</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga24">stp_printer_describe_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g07bc634c85950526155b711aac42c6a0">stp_printer_describe_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga25">stp_describe_output</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g50b48bab8d6d1734c3a0f6622d65582e">stp_describe_output</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Printer functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/sequence_8h.html b/doc/gutenprint/html/sequence_8h.html
index e14282e..187cb37 100644
--- a/doc/gutenprint/html/sequence_8h.html
+++ b/doc/gutenprint/html/sequence_8h.html
@@ -1,111 +1,124 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/sequence.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>sequence.h File Reference</h1>Sequence functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/sequence.h File Reference</h1>Sequence functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_sequence&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_sequence&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The sequence opaque data type.  <a href="group__sequence.html#ga0"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The sequence opaque data type.  <a href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga1">stp_sequence_create</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g9f0233f39d6a27c796bb283c80974618">stp_sequence_create</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new sequence.  <a href="group__sequence.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga2">stp_sequence_destroy</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new sequence.  <a href="group__sequence.html#g9f0233f39d6a27c796bb283c80974618"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g3d571f155c1d00e7794b8299a41c5099">stp_sequence_destroy</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a sequence.  <a href="group__sequence.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga3">stp_sequence_copy</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *dest, const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a sequence.  <a href="group__sequence.html#g3d571f155c1d00e7794b8299a41c5099"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g28087c76e1106ca11c2d247956e3a3c3">stp_sequence_copy</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *dest, const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an sequence.  <a href="group__sequence.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga4">stp_sequence_create_copy</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an sequence.  <a href="group__sequence.html#g28087c76e1106ca11c2d247956e3a3c3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gb03a34a03ffd4163f51126916d737df7">stp_sequence_create_copy</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an sequence.  <a href="group__sequence.html#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga5">stp_sequence_set_bounds</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, double low, double high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an sequence.  <a href="group__sequence.html#gb03a34a03ffd4163f51126916d737df7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g1720509809473bc33e6f11b277c78bf6">stp_sequence_set_bounds</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double low, double high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the lower and upper bounds.  <a href="group__sequence.html#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga6">stp_sequence_get_bounds</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the lower and upper bounds.  <a href="group__sequence.html#g1720509809473bc33e6f11b277c78bf6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g14ad64c63f45a2716ff8d9ceaf00697d">stp_sequence_get_bounds</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the lower and upper bounds.  <a href="group__sequence.html#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga7">stp_sequence_get_range</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the lower and upper bounds.  <a href="group__sequence.html#g14ad64c63f45a2716ff8d9ceaf00697d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g999021f2caf1a9d0d6d133123031ce17">stp_sequence_get_range</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get range of values stored in the sequence.  <a href="group__sequence.html#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga8">stp_sequence_set_size</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t size)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get range of values stored in the sequence.  <a href="group__sequence.html#g999021f2caf1a9d0d6d133123031ce17"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ge0af31b854e61e0e047b3ba6dc6ec528">stp_sequence_set_size</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t size)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the sequence size.  <a href="group__sequence.html#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga9">stp_sequence_get_size</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the sequence size.  <a href="group__sequence.html#ge0af31b854e61e0e047b3ba6dc6ec528"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gfa512afc64116f673ae2061d04a5ef90">stp_sequence_get_size</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the sequence size.  <a href="group__sequence.html#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga10">stp_sequence_set_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the sequence size.  <a href="group__sequence.html#gfa512afc64116f673ae2061d04a5ef90"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g44bf5a48231675305718162559205fb6">stp_sequence_set_data</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence.  <a href="group__sequence.html#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga11">stp_sequence_set_subrange</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t where, size_t size, const double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence.  <a href="group__sequence.html#g44bf5a48231675305718162559205fb6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g5bb962248581af2c3c54193442d9c82f">stp_sequence_set_subrange</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, size_t size, const double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a subrange of a sequence.  <a href="group__sequence.html#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga12">stp_sequence_get_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *size, const double **data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a subrange of a sequence.  <a href="group__sequence.html#g5bb962248581af2c3c54193442d9c82f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g755c8a35e2e9e83a1dfac4f6138c4122">stp_sequence_get_data</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *size, const double **data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence.  <a href="group__sequence.html#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga13">stp_sequence_set_point</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t where, double data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence.  <a href="group__sequence.html#g755c8a35e2e9e83a1dfac4f6138c4122"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g42c76060886da02cb4a7d843ffe6d21c">stp_sequence_set_point</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, double data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data at a single point in a sequence.  <a href="group__sequence.html#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga14">stp_sequence_get_point</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t where, double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data at a single point in a sequence.  <a href="group__sequence.html#g42c76060886da02cb4a7d843ffe6d21c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga79c5f747a80ab2ad9d09b09e0330cc7">stp_sequence_get_point</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data at a single point in a sequence.  <a href="group__sequence.html#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga15">stp_sequence_set_float_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const float *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data at a single point in a sequence.  <a href="group__sequence.html#ga79c5f747a80ab2ad9d09b09e0330cc7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g35972a289b95891699ade61246882ab4">stp_sequence_set_float_data</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const float *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from float values.  <a href="group__sequence.html#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga16">stp_sequence_set_long_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const long *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from float values.  <a href="group__sequence.html#g35972a289b95891699ade61246882ab4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gaa76cdc9094ee3c05c49a782fea64478">stp_sequence_set_long_data</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const long *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from long values.  <a href="group__sequence.html#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga17">stp_sequence_set_ulong_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const unsigned long *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from long values.  <a href="group__sequence.html#gaa76cdc9094ee3c05c49a782fea64478"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g3e274a2095f2e6986892384ee89e1255">stp_sequence_set_ulong_data</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned long *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned long values.  <a href="group__sequence.html#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga18">stp_sequence_set_int_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const int *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned long values.  <a href="group__sequence.html#g3e274a2095f2e6986892384ee89e1255"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g9d3e18b8e576b5c00531dac444397051">stp_sequence_set_int_data</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const int *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from int values.  <a href="group__sequence.html#ga18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga19">stp_sequence_set_uint_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const unsigned int *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from int values.  <a href="group__sequence.html#g9d3e18b8e576b5c00531dac444397051"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g497c32dec3d745a2602c5e97819de21d">stp_sequence_set_uint_data</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned int *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned int values.  <a href="group__sequence.html#ga19"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga20">stp_sequence_set_short_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const short *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned int values.  <a href="group__sequence.html#g497c32dec3d745a2602c5e97819de21d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g572ecad03d772a255481bb8b6d79106f">stp_sequence_set_short_data</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const short *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from short values.  <a href="group__sequence.html#ga20"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga21">stp_sequence_set_ushort_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const unsigned short *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from short values.  <a href="group__sequence.html#g572ecad03d772a255481bb8b6d79106f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g317d484a67a2b775bee27f3dfe67fed4">stp_sequence_set_ushort_data</a> (<a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned short *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned short values.  <a href="group__sequence.html#ga21"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const float *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga22">stp_sequence_get_float_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned short values.  <a href="group__sequence.html#g317d484a67a2b775bee27f3dfe67fed4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const float *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gff096d5b027157151c65978b95d4e29e">stp_sequence_get_float_data</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as float data.  <a href="group__sequence.html#ga22"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga23">stp_sequence_get_long_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as float data.  <a href="group__sequence.html#gff096d5b027157151c65978b95d4e29e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g039d9054cfd0f7d5a892a7fec3f734f4">stp_sequence_get_long_data</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as long data.  <a href="group__sequence.html#ga23"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga24">stp_sequence_get_ulong_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as long data.  <a href="group__sequence.html#g039d9054cfd0f7d5a892a7fec3f734f4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g12f54f27144d490893f46dd1b0037b8b">stp_sequence_get_ulong_data</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned long data.  <a href="group__sequence.html#ga24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga25">stp_sequence_get_int_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned long data.  <a href="group__sequence.html#g12f54f27144d490893f46dd1b0037b8b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g01b0bc9e181a097aff3e97254dbfcb14">stp_sequence_get_int_data</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as int data.  <a href="group__sequence.html#ga25"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga26">stp_sequence_get_uint_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as int data.  <a href="group__sequence.html#g01b0bc9e181a097aff3e97254dbfcb14"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ge7189582ef9e4d638f909a2b1ee0c1b2">stp_sequence_get_uint_data</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned int data.  <a href="group__sequence.html#ga26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga27">stp_sequence_get_short_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned int data.  <a href="group__sequence.html#ge7189582ef9e4d638f909a2b1ee0c1b2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g4d1cf137e4a77e9123e2afcdf7d63bec">stp_sequence_get_short_data</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as short data.  <a href="group__sequence.html#ga27"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga28">stp_sequence_get_ushort_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as short data.  <a href="group__sequence.html#g4d1cf137e4a77e9123e2afcdf7d63bec"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g20007077e1d8365a0eddaa922a5967c3">stp_sequence_get_ushort_data</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned short data.  <a href="group__sequence.html#ga28"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned short data.  <a href="group__sequence.html#g20007077e1d8365a0eddaa922a5967c3"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Sequence functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/string-list_8h.html b/doc/gutenprint/html/string-list_8h.html
index 29a2ed7..acaf9d2 100644
--- a/doc/gutenprint/html/string-list_8h.html
+++ b/doc/gutenprint/html/string-list_8h.html
@@ -1,13 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/string-list.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>string-list.h File Reference</h1>String list functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/string-list.h File Reference</h1>String list functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -16,403 +29,315 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">String parameter.  <a href="structstp__param__string__t.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_string_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_string_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The string_list opaque data type.  <a href="#a0"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The string_list opaque data type.  <a href="#5e3b69c7c2eca2523184cce51ca26543"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a1">stp_string_list_create</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#b964b745d73a6d5e2e141f31941bea42">stp_string_list_create</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a2">stp_string_list_destroy</a> (<a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *list)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#aa57feca43ce7cdf50af1dd8b4dd3a1b">stp_string_list_destroy</a> (<a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a3">stp_string_list_param</a> (const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *list, size_t element)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#e254c1408b96ab6cc373643f1b4d91d0">stp_string_list_param</a> (const <a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list, size_t element)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a4">stp_string_list_find</a> (const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *list, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#0b5f5c20933a0f9c50259de3f16dc649">stp_string_list_find</a> (const <a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a5">stp_string_list_count</a> (const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *list)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#9bed3cf935ed01fa9a0066c5e2a47ffb">stp_string_list_count</a> (const <a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a6">stp_string_list_create_copy</a> (const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *list)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#6318f71fac5645c37e2d353f0881cc5b">stp_string_list_create_copy</a> (const <a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a7">stp_string_list_add_string</a> (<a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *list, const char *name, const char *text)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#6aa3d7cf2dabfefb3e3162827d086d3d">stp_string_list_add_string</a> (<a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list, const char *name, const char *text)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a8">stp_string_list_remove_string</a> (<a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *list, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#087298f0cc92cc8864016a2f65a9c012">stp_string_list_remove_string</a> (<a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a9">stp_string_list_create_from_params</a> (const <a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *list, size_t count)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#4f78d1a53d017db20fe5b690d9362e7a">stp_string_list_create_from_params</a> (const <a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *list, size_t count)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a10">stp_string_list_is_present</a> (const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *list, const char *value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#c776e9cd6ca5690b446cd6e4869978a1">stp_string_list_is_present</a> (const <a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list, const char *value)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 String list functions. 
 <p>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a0"></a><!-- doxytag: member="string-list.h::stp_string_list_t" ref="a0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="5e3b69c7c2eca2523184cce51ca26543"></a><!-- doxytag: member="string-list.h::stp_string_list_t" ref="5e3b69c7c2eca2523184cce51ca26543" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_string_list <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a>          </td>
+          <td class="memname">typedef struct stp_string_list <a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 The string_list opaque data type. 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a7"></a><!-- doxytag: member="string-list.h::stp_string_list_add_string" ref="a7" args="(stp_string_list_t *list, const char *name, const char *text)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="6aa3d7cf2dabfefb3e3162827d086d3d"></a><!-- doxytag: member="string-list.h::stp_string_list_add_string" ref="6aa3d7cf2dabfefb3e3162827d086d3d" args="(stp_string_list_t *list, const char *name, const char *text)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_string_list_add_string           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname">void stp_string_list_add_string           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>text</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>text</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="string-list.h::stp_string_list_count" ref="a5" args="(const stp_string_list_t *list)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="9bed3cf935ed01fa9a0066c5e2a47ffb"></a><!-- doxytag: member="string-list.h::stp_string_list_count" ref="9bed3cf935ed01fa9a0066c5e2a47ffb" args="(const stp_string_list_t *list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">size_t stp_string_list_count           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">size_t stp_string_list_count           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a1"></a><!-- doxytag: member="string-list.h::stp_string_list_create" ref="a1" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="b964b745d73a6d5e2e141f31941bea42"></a><!-- doxytag: member="string-list.h::stp_string_list_create" ref="b964b745d73a6d5e2e141f31941bea42" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a>* stp_string_list_create           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* stp_string_list_create           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a6"></a><!-- doxytag: member="string-list.h::stp_string_list_create_copy" ref="a6" args="(const stp_string_list_t *list)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="6318f71fac5645c37e2d353f0881cc5b"></a><!-- doxytag: member="string-list.h::stp_string_list_create_copy" ref="6318f71fac5645c37e2d353f0881cc5b" args="(const stp_string_list_t *list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a>* stp_string_list_create_copy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* stp_string_list_create_copy           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a9"></a><!-- doxytag: member="string-list.h::stp_string_list_create_from_params" ref="a9" args="(const stp_param_string_t *list, size_t count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="4f78d1a53d017db20fe5b690d9362e7a"></a><!-- doxytag: member="string-list.h::stp_string_list_create_from_params" ref="4f78d1a53d017db20fe5b690d9362e7a" args="(const stp_param_string_t *list, size_t count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a>* stp_string_list_create_from_params           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* stp_string_list_create_from_params           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="string-list.h::stp_string_list_destroy" ref="a2" args="(stp_string_list_t *list)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="aa57feca43ce7cdf50af1dd8b4dd3a1b"></a><!-- doxytag: member="string-list.h::stp_string_list_destroy" ref="aa57feca43ce7cdf50af1dd8b4dd3a1b" args="(stp_string_list_t *list)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_string_list_destroy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void stp_string_list_destroy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="string-list.h::stp_string_list_find" ref="a4" args="(const stp_string_list_t *list, const char *name)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="0b5f5c20933a0f9c50259de3f16dc649"></a><!-- doxytag: member="string-list.h::stp_string_list_find" ref="0b5f5c20933a0f9c50259de3f16dc649" args="(const stp_string_list_t *list, const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a>* stp_string_list_find           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a>* stp_string_list_find           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="string-list.h::stp_string_list_is_present" ref="a10" args="(const stp_string_list_t *list, const char *value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="c776e9cd6ca5690b446cd6e4869978a1"></a><!-- doxytag: member="string-list.h::stp_string_list_is_present" ref="c776e9cd6ca5690b446cd6e4869978a1" args="(const stp_string_list_t *list, const char *value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_string_list_is_present           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname">int stp_string_list_is_present           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="string-list.h::stp_string_list_param" ref="a3" args="(const stp_string_list_t *list, size_t element)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="e254c1408b96ab6cc373643f1b4d91d0"></a><!-- doxytag: member="string-list.h::stp_string_list_param" ref="e254c1408b96ab6cc373643f1b4d91d0" args="(const stp_string_list_t *list, size_t element)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a>* stp_string_list_param           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a>* stp_string_list_param           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>size_t&nbsp;</td>
-          <td class="mdname" nowrap> <em>element</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t&nbsp;</td>
+          <td class="paramname"> <em>element</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a8"></a><!-- doxytag: member="string-list.h::stp_string_list_remove_string" ref="a8" args="(stp_string_list_t *list, const char *name)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="087298f0cc92cc8864016a2f65a9c012"></a><!-- doxytag: member="string-list.h::stp_string_list_remove_string" ref="087298f0cc92cc8864016a2f65a9c012" args="(stp_string_list_t *list, const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_string_list_remove_string           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>list</em>, </td>
+          <td class="memname">void stp_string_list_remove_string           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>list</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structdither__matrix__impl.html b/doc/gutenprint/html/structdither__matrix__impl.html
index b418e8a..3e4535e 100644
--- a/doc/gutenprint/html/structdither__matrix__impl.html
+++ b/doc/gutenprint/html/structdither__matrix__impl.html
@@ -1,396 +1,292 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: dither_matrix_impl Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>dither_matrix_impl Struct Reference</h1><!-- doxytag: class="dither_matrix_impl" --><code>#include &lt;dither.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o0">base</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#331debb887e076f8b52952ba6cc2b50b">base</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o1">exp</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#db0e7fb4b5e5149f0815af448676df8b">exp</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o2">x_size</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#063e3b3617c3a9b4883f3b01cd7dfb48">x_size</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o3">y_size</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#33370af30d4c6cb0e441744c8d1c3686">y_size</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o4">total_size</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#54645c1c4edad222cf3f5aba03cdfae5">total_size</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o5">last_x</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#f0728348e6da1cf904204ef88e0a5853">last_x</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o6">last_x_mod</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#16f516218f0c5a31a1eac49e5c57add5">last_x_mod</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o7">last_y</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#c1a83c82c364098dce631ec7174574be">last_y</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o8">last_y_mod</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#d03881dd78211b5bcb1a62453c060d2e">last_y_mod</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o9">index</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#b744f40c883acc93ad0afbf5f048f27a">index</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o10">i_own</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#78152fe120c430f6400b731e5c722bd3">i_own</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o11">x_offset</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#665c02056a2d046a15aab462492d9dbc">x_offset</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o12">y_offset</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#844cb19ea61f035bc2a21536f6f392c4">y_offset</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o13">fast_mask</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#8c7141e2e35f6cc14896d23d15a81914">fast_mask</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o14">matrix</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#e28102f9e3d3cfb8eb48d9e69e807f96">matrix</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="dither_matrix_impl::base" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="331debb887e076f8b52952ba6cc2b50b"></a><!-- doxytag: member="dither_matrix_impl::base" ref="331debb887e076f8b52952ba6cc2b50b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o0">dither_matrix_impl::base</a>          </td>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#331debb887e076f8b52952ba6cc2b50b">dither_matrix_impl::base</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="dither_matrix_impl::exp" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="db0e7fb4b5e5149f0815af448676df8b"></a><!-- doxytag: member="dither_matrix_impl::exp" ref="db0e7fb4b5e5149f0815af448676df8b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o1">dither_matrix_impl::exp</a>          </td>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#db0e7fb4b5e5149f0815af448676df8b">dither_matrix_impl::exp</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o13"></a><!-- doxytag: member="dither_matrix_impl::fast_mask" ref="o13" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="063e3b3617c3a9b4883f3b01cd7dfb48"></a><!-- doxytag: member="dither_matrix_impl::x_size" ref="063e3b3617c3a9b4883f3b01cd7dfb48" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned <a class="el" href="structdither__matrix__impl.html#o13">dither_matrix_impl::fast_mask</a>          </td>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#063e3b3617c3a9b4883f3b01cd7dfb48">dither_matrix_impl::x_size</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o10"></a><!-- doxytag: member="dither_matrix_impl::i_own" ref="o10" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="33370af30d4c6cb0e441744c8d1c3686"></a><!-- doxytag: member="dither_matrix_impl::y_size" ref="33370af30d4c6cb0e441744c8d1c3686" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o10">dither_matrix_impl::i_own</a>          </td>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#33370af30d4c6cb0e441744c8d1c3686">dither_matrix_impl::y_size</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o9"></a><!-- doxytag: member="dither_matrix_impl::index" ref="o9" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="54645c1c4edad222cf3f5aba03cdfae5"></a><!-- doxytag: member="dither_matrix_impl::total_size" ref="54645c1c4edad222cf3f5aba03cdfae5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o9">dither_matrix_impl::index</a>          </td>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#54645c1c4edad222cf3f5aba03cdfae5">dither_matrix_impl::total_size</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="dither_matrix_impl::last_x" ref="o5" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f0728348e6da1cf904204ef88e0a5853"></a><!-- doxytag: member="dither_matrix_impl::last_x" ref="f0728348e6da1cf904204ef88e0a5853" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o5">dither_matrix_impl::last_x</a>          </td>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#f0728348e6da1cf904204ef88e0a5853">dither_matrix_impl::last_x</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="dither_matrix_impl::last_x_mod" ref="o6" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="16f516218f0c5a31a1eac49e5c57add5"></a><!-- doxytag: member="dither_matrix_impl::last_x_mod" ref="16f516218f0c5a31a1eac49e5c57add5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o6">dither_matrix_impl::last_x_mod</a>          </td>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#16f516218f0c5a31a1eac49e5c57add5">dither_matrix_impl::last_x_mod</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o7"></a><!-- doxytag: member="dither_matrix_impl::last_y" ref="o7" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="c1a83c82c364098dce631ec7174574be"></a><!-- doxytag: member="dither_matrix_impl::last_y" ref="c1a83c82c364098dce631ec7174574be" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o7">dither_matrix_impl::last_y</a>          </td>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#c1a83c82c364098dce631ec7174574be">dither_matrix_impl::last_y</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o8"></a><!-- doxytag: member="dither_matrix_impl::last_y_mod" ref="o8" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="d03881dd78211b5bcb1a62453c060d2e"></a><!-- doxytag: member="dither_matrix_impl::last_y_mod" ref="d03881dd78211b5bcb1a62453c060d2e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o8">dither_matrix_impl::last_y_mod</a>          </td>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#d03881dd78211b5bcb1a62453c060d2e">dither_matrix_impl::last_y_mod</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o14"></a><!-- doxytag: member="dither_matrix_impl::matrix" ref="o14" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="b744f40c883acc93ad0afbf5f048f27a"></a><!-- doxytag: member="dither_matrix_impl::index" ref="b744f40c883acc93ad0afbf5f048f27a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned* <a class="el" href="structdither__matrix__impl.html#o14">dither_matrix_impl::matrix</a>          </td>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#b744f40c883acc93ad0afbf5f048f27a">dither_matrix_impl::index</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="dither_matrix_impl::total_size" ref="o4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="78152fe120c430f6400b731e5c722bd3"></a><!-- doxytag: member="dither_matrix_impl::i_own" ref="78152fe120c430f6400b731e5c722bd3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o4">dither_matrix_impl::total_size</a>          </td>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#78152fe120c430f6400b731e5c722bd3">dither_matrix_impl::i_own</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o11"></a><!-- doxytag: member="dither_matrix_impl::x_offset" ref="o11" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="665c02056a2d046a15aab462492d9dbc"></a><!-- doxytag: member="dither_matrix_impl::x_offset" ref="665c02056a2d046a15aab462492d9dbc" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o11">dither_matrix_impl::x_offset</a>          </td>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#665c02056a2d046a15aab462492d9dbc">dither_matrix_impl::x_offset</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="dither_matrix_impl::x_size" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="844cb19ea61f035bc2a21536f6f392c4"></a><!-- doxytag: member="dither_matrix_impl::y_offset" ref="844cb19ea61f035bc2a21536f6f392c4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o2">dither_matrix_impl::x_size</a>          </td>
+          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#844cb19ea61f035bc2a21536f6f392c4">dither_matrix_impl::y_offset</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o12"></a><!-- doxytag: member="dither_matrix_impl::y_offset" ref="o12" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="8c7141e2e35f6cc14896d23d15a81914"></a><!-- doxytag: member="dither_matrix_impl::fast_mask" ref="8c7141e2e35f6cc14896d23d15a81914" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o12">dither_matrix_impl::y_offset</a>          </td>
+          <td class="memname">unsigned <a class="el" href="structdither__matrix__impl.html#8c7141e2e35f6cc14896d23d15a81914">dither_matrix_impl::fast_mask</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="dither_matrix_impl::y_size" ref="o3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="e28102f9e3d3cfb8eb48d9e69e807f96"></a><!-- doxytag: member="dither_matrix_impl::matrix" ref="e28102f9e3d3cfb8eb48d9e69e807f96" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o3">dither_matrix_impl::y_size</a>          </td>
+          <td class="memname">unsigned* <a class="el" href="structdither__matrix__impl.html#e28102f9e3d3cfb8eb48d9e69e807f96">dither_matrix_impl::matrix</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__cached__curve__t.html b/doc/gutenprint/html/structstp__cached__curve__t.html
index de6dd12..115d1b7 100644
--- a/doc/gutenprint/html/structstp__cached__curve__t.html
+++ b/doc/gutenprint/html/structstp__cached__curve__t.html
@@ -1,121 +1,105 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_cached_curve_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_cached_curve_t Struct Reference</h1><!-- doxytag: class="stp_cached_curve_t" --><code>#include &lt;curve-cache.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#o0">curve</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#e9b4170bfafe7d85b36689cbd8eea41e">curve</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const double *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#o1">d_cache</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const double *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#59c26647178724471f383dea6e85f8ae">d_cache</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#o2">s_cache</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#c55d549f6d2f567ba84ecb9e0417f074">s_cache</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#o3">count</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#99b772c3f4db71d58a4ee2315e712f04">count</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_cached_curve_t::count" ref="o3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="e9b4170bfafe7d85b36689cbd8eea41e"></a><!-- doxytag: member="stp_cached_curve_t::curve" ref="e9b4170bfafe7d85b36689cbd8eea41e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">size_t <a class="el" href="structstp__cached__curve__t.html#o3">stp_cached_curve_t::count</a>          </td>
+          <td class="memname"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* <a class="el" href="structstp__cached__curve__t.html#e9b4170bfafe7d85b36689cbd8eea41e">stp_cached_curve_t::curve</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_cached_curve_t::curve" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="59c26647178724471f383dea6e85f8ae"></a><!-- doxytag: member="stp_cached_curve_t::d_cache" ref="59c26647178724471f383dea6e85f8ae" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* <a class="el" href="structstp__cached__curve__t.html#o0">stp_cached_curve_t::curve</a>          </td>
+          <td class="memname">const double* <a class="el" href="structstp__cached__curve__t.html#59c26647178724471f383dea6e85f8ae">stp_cached_curve_t::d_cache</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_cached_curve_t::d_cache" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="c55d549f6d2f567ba84ecb9e0417f074"></a><!-- doxytag: member="stp_cached_curve_t::s_cache" ref="c55d549f6d2f567ba84ecb9e0417f074" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const double* <a class="el" href="structstp__cached__curve__t.html#o1">stp_cached_curve_t::d_cache</a>          </td>
+          <td class="memname">const unsigned short* <a class="el" href="structstp__cached__curve__t.html#c55d549f6d2f567ba84ecb9e0417f074">stp_cached_curve_t::s_cache</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_cached_curve_t::s_cache" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="99b772c3f4db71d58a4ee2315e712f04"></a><!-- doxytag: member="stp_cached_curve_t::count" ref="99b772c3f4db71d58a4ee2315e712f04" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned short* <a class="el" href="structstp__cached__curve__t.html#o2">stp_cached_curve_t::s_cache</a>          </td>
+          <td class="memname">size_t <a class="el" href="structstp__cached__curve__t.html#99b772c3f4db71d58a4ee2315e712f04">stp_cached_curve_t::count</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="curve-cache_8h.html">curve-cache.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__color.html b/doc/gutenprint/html/structstp__color.html
index 7aa0850..b31a233 100644
--- a/doc/gutenprint/html/structstp__color.html
+++ b/doc/gutenprint/html/structstp__color.html
@@ -1,10 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_color Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_color Struct Reference<br>
 <small>
 [<a class="el" href="group__color.html">color</a>]</small>
@@ -13,87 +29,63 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#o0">short_name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#23ed4d11629625e2ad24b124c36c7fab">short_name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#o1">long_name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#b7c0a627b31ebfb97fd1db2677032479">long_name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#o2">colorfuncs</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#4442d36d0bcf746130f82ffe6f90147f">colorfuncs</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_color::colorfuncs" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="23ed4d11629625e2ad24b124c36c7fab"></a><!-- doxytag: member="stp_color::short_name" ref="23ed4d11629625e2ad24b124c36c7fab" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>* <a class="el" href="structstp__color.html#o2">stp_color::colorfuncs</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__color.html#23ed4d11629625e2ad24b124c36c7fab">stp_color::short_name</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_color::long_name" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="b7c0a627b31ebfb97fd1db2677032479"></a><!-- doxytag: member="stp_color::long_name" ref="b7c0a627b31ebfb97fd1db2677032479" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__color.html#o1">stp_color::long_name</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__color.html#b7c0a627b31ebfb97fd1db2677032479">stp_color::long_name</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_color::short_name" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="4442d36d0bcf746130f82ffe6f90147f"></a><!-- doxytag: member="stp_color::colorfuncs" ref="4442d36d0bcf746130f82ffe6f90147f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__color.html#o0">stp_color::short_name</a>          </td>
+          <td class="memname">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>* <a class="el" href="structstp__color.html#4442d36d0bcf746130f82ffe6f90147f">stp_color::colorfuncs</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="color_8h.html">color.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__colorfuncs__t.html b/doc/gutenprint/html/structstp__colorfuncs__t.html
index 4dd7910..df0fc6d 100644
--- a/doc/gutenprint/html/structstp__colorfuncs__t.html
+++ b/doc/gutenprint/html/structstp__colorfuncs__t.html
@@ -1,10 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_colorfuncs_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_colorfuncs_t Struct Reference<br>
 <small>
 [<a class="el" href="group__color.html">color</a>]</small>
@@ -13,112 +29,80 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#o0">init</a> )(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#a10cf47dc6db374ef209d0d96592b1fe">init</a> )(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#o1">get_row</a> )(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#f00aab442da969ffa5c6c1e592bad7cd">get_row</a> )(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#o2">list_parameters</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#14c6ae1a87ba1ba33f88fa71038f9ec9">list_parameters</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#o3">describe_parameter</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#bf691142b608f4f02f33283dd3e67bae">describe_parameter</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_colorfuncs_t::describe_parameter" ref="o3" args=")(const stp_vars_t *v, const char *name, stp_parameter_t *description)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="a10cf47dc6db374ef209d0d96592b1fe"></a><!-- doxytag: member="stp_colorfuncs_t::init" ref="a10cf47dc6db374ef209d0d96592b1fe" args=")(stp_vars_t *v, stp_image_t *image, size_t steps)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__colorfuncs__t.html#o3">stp_colorfuncs_t::describe_parameter</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__colorfuncs__t.html#a10cf47dc6db374ef209d0d96592b1fe">stp_colorfuncs_t::init</a>)(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_colorfuncs_t::get_row" ref="o1" args=")(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f00aab442da969ffa5c6c1e592bad7cd"></a><!-- doxytag: member="stp_colorfuncs_t::get_row" ref="f00aab442da969ffa5c6c1e592bad7cd" args=")(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__colorfuncs__t.html#o1">stp_colorfuncs_t::get_row</a>)(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__colorfuncs__t.html#f00aab442da969ffa5c6c1e592bad7cd">stp_colorfuncs_t::get_row</a>)(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_colorfuncs_t::init" ref="o0" args=")(stp_vars_t *v, stp_image_t *image, size_t steps)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="14c6ae1a87ba1ba33f88fa71038f9ec9"></a><!-- doxytag: member="stp_colorfuncs_t::list_parameters" ref="14c6ae1a87ba1ba33f88fa71038f9ec9" args=")(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__colorfuncs__t.html#o0">stp_colorfuncs_t::init</a>)(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)          </td>
+          <td class="memname"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>(* <a class="el" href="structstp__colorfuncs__t.html#14c6ae1a87ba1ba33f88fa71038f9ec9">stp_colorfuncs_t::list_parameters</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_colorfuncs_t::list_parameters" ref="o2" args=")(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="bf691142b608f4f02f33283dd3e67bae"></a><!-- doxytag: member="stp_colorfuncs_t::describe_parameter" ref="bf691142b608f4f02f33283dd3e67bae" args=")(const stp_vars_t *v, const char *name, stp_parameter_t *description)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>(* <a class="el" href="structstp__colorfuncs__t.html#o2">stp_colorfuncs_t::list_parameters</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)          </td>
+          <td class="memname">void(* <a class="el" href="structstp__colorfuncs__t.html#bf691142b608f4f02f33283dd3e67bae">stp_colorfuncs_t::describe_parameter</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="color_8h.html">color.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__curve__point__t.html b/doc/gutenprint/html/structstp__curve__point__t.html
index 6fa7387..6bdfdd7 100644
--- a/doc/gutenprint/html/structstp__curve__point__t.html
+++ b/doc/gutenprint/html/structstp__curve__point__t.html
@@ -1,10 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_curve_point_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_curve_point_t Struct Reference<br>
 <small>
 [<a class="el" href="group__curve.html">curve</a>]</small>
@@ -16,71 +32,57 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__curve__point__t.html#o0">x</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__curve__point__t.html#92b13b94109b1270563a1116dc19b926">x</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Horizontal position.  <a href="#o0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__curve__point__t.html#o1">y</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Horizontal position.  <a href="#92b13b94109b1270563a1116dc19b926"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__curve__point__t.html#132b1e8be20525667ece971d02f60b9d">y</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Vertical position.  <a href="#o1"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Vertical position.  <a href="#132b1e8be20525667ece971d02f60b9d"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Point (x,y) for piecewise curve. 
 <p>
+
+<p>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_curve_point_t::x" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="92b13b94109b1270563a1116dc19b926"></a><!-- doxytag: member="stp_curve_point_t::x" ref="92b13b94109b1270563a1116dc19b926" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">double <a class="el" href="structstp__curve__point__t.html#o0">stp_curve_point_t::x</a>          </td>
+          <td class="memname">double <a class="el" href="structstp__curve__point__t.html#92b13b94109b1270563a1116dc19b926">stp_curve_point_t::x</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Horizontal position. 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_curve_point_t::y" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="132b1e8be20525667ece971d02f60b9d"></a><!-- doxytag: member="stp_curve_point_t::y" ref="132b1e8be20525667ece971d02f60b9d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">double <a class="el" href="structstp__curve__point__t.html#o1">stp_curve_point_t::y</a>          </td>
+          <td class="memname">double <a class="el" href="structstp__curve__point__t.html#132b1e8be20525667ece971d02f60b9d">stp_curve_point_t::y</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 Vertical position. 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="curve_8h.html">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__generic.html b/doc/gutenprint/html/structstp__dither__matrix__generic.html
index d4c8094..630053a 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__generic.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__generic.html
@@ -1,146 +1,122 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_dither_matrix_generic Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_dither_matrix_generic Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_generic" --><code>#include &lt;dither.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#o0">x</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#6b8bd1cc589c2195f055e5a57a05e03a">x</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#o1">y</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#aaddcac2ca33a3e822ded567bbbecfb9">y</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#o2">bytes</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#b963ddf7c0826bd3cc316c2375f1205b">bytes</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#o3">prescaled</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#478d54ddf9ba50e783ddec1532a0eff6">prescaled</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#o4">data</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#52acbda296a57a6087852eab62bc62db">data</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_dither_matrix_generic::bytes" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="6b8bd1cc589c2195f055e5a57a05e03a"></a><!-- doxytag: member="stp_dither_matrix_generic::x" ref="6b8bd1cc589c2195f055e5a57a05e03a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__generic.html#o2">stp_dither_matrix_generic::bytes</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic.html#6b8bd1cc589c2195f055e5a57a05e03a">stp_dither_matrix_generic::x</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_dither_matrix_generic::data" ref="o4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="aaddcac2ca33a3e822ded567bbbecfb9"></a><!-- doxytag: member="stp_dither_matrix_generic::y" ref="aaddcac2ca33a3e822ded567bbbecfb9" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const void* <a class="el" href="structstp__dither__matrix__generic.html#o4">stp_dither_matrix_generic::data</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic.html#aaddcac2ca33a3e822ded567bbbecfb9">stp_dither_matrix_generic::y</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_dither_matrix_generic::prescaled" ref="o3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="b963ddf7c0826bd3cc316c2375f1205b"></a><!-- doxytag: member="stp_dither_matrix_generic::bytes" ref="b963ddf7c0826bd3cc316c2375f1205b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__generic.html#o3">stp_dither_matrix_generic::prescaled</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic.html#b963ddf7c0826bd3cc316c2375f1205b">stp_dither_matrix_generic::bytes</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_dither_matrix_generic::x" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="478d54ddf9ba50e783ddec1532a0eff6"></a><!-- doxytag: member="stp_dither_matrix_generic::prescaled" ref="478d54ddf9ba50e783ddec1532a0eff6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__generic.html#o0">stp_dither_matrix_generic::x</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic.html#478d54ddf9ba50e783ddec1532a0eff6">stp_dither_matrix_generic::prescaled</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_dither_matrix_generic::y" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="52acbda296a57a6087852eab62bc62db"></a><!-- doxytag: member="stp_dither_matrix_generic::data" ref="52acbda296a57a6087852eab62bc62db" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__generic.html#o1">stp_dither_matrix_generic::y</a>          </td>
+          <td class="memname">const void* <a class="el" href="structstp__dither__matrix__generic.html#52acbda296a57a6087852eab62bc62db">stp_dither_matrix_generic::data</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__normal.html b/doc/gutenprint/html/structstp__dither__matrix__normal.html
index e5063d4..f0ea672 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__normal.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__normal.html
@@ -1,146 +1,122 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_dither_matrix_normal Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_dither_matrix_normal Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_normal" --><code>#include &lt;dither.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#o0">x</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#b9564690be42859d88ea264a29321af3">x</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#o1">y</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#410560f5186761cb7430f5b0a804b09c">y</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#o2">bytes</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#d72d088edfe3223c2df8fd4fb6178b98">bytes</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#o3">prescaled</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#042561ad856d67506fe81b1bbbffd966">prescaled</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#o4">data</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#e67cb37136c5e9d9c4b1a44cd2dab87b">data</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_dither_matrix_normal::bytes" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="b9564690be42859d88ea264a29321af3"></a><!-- doxytag: member="stp_dither_matrix_normal::x" ref="b9564690be42859d88ea264a29321af3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__normal.html#o2">stp_dither_matrix_normal::bytes</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal.html#b9564690be42859d88ea264a29321af3">stp_dither_matrix_normal::x</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_dither_matrix_normal::data" ref="o4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="410560f5186761cb7430f5b0a804b09c"></a><!-- doxytag: member="stp_dither_matrix_normal::y" ref="410560f5186761cb7430f5b0a804b09c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned* <a class="el" href="structstp__dither__matrix__normal.html#o4">stp_dither_matrix_normal::data</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal.html#410560f5186761cb7430f5b0a804b09c">stp_dither_matrix_normal::y</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_dither_matrix_normal::prescaled" ref="o3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="d72d088edfe3223c2df8fd4fb6178b98"></a><!-- doxytag: member="stp_dither_matrix_normal::bytes" ref="d72d088edfe3223c2df8fd4fb6178b98" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__normal.html#o3">stp_dither_matrix_normal::prescaled</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal.html#d72d088edfe3223c2df8fd4fb6178b98">stp_dither_matrix_normal::bytes</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_dither_matrix_normal::x" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="042561ad856d67506fe81b1bbbffd966"></a><!-- doxytag: member="stp_dither_matrix_normal::prescaled" ref="042561ad856d67506fe81b1bbbffd966" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__normal.html#o0">stp_dither_matrix_normal::x</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal.html#042561ad856d67506fe81b1bbbffd966">stp_dither_matrix_normal::prescaled</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_dither_matrix_normal::y" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="e67cb37136c5e9d9c4b1a44cd2dab87b"></a><!-- doxytag: member="stp_dither_matrix_normal::data" ref="e67cb37136c5e9d9c4b1a44cd2dab87b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__normal.html#o1">stp_dither_matrix_normal::y</a>          </td>
+          <td class="memname">const unsigned* <a class="el" href="structstp__dither__matrix__normal.html#e67cb37136c5e9d9c4b1a44cd2dab87b">stp_dither_matrix_normal::data</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__short.html b/doc/gutenprint/html/structstp__dither__matrix__short.html
index cace20f..ae5e4c0 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__short.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__short.html
@@ -1,146 +1,122 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_dither_matrix_short Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_dither_matrix_short Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_short" --><code>#include &lt;dither.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#o0">x</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#81e0b20e763080b79faa837a00cac832">x</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#o1">y</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#2bbc6c72006541250ba23b48bcab60e8">y</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#o2">bytes</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#d4d85727401505eab74e3e667f4a38f4">bytes</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#o3">prescaled</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#755361acae80fa4cba01a1cc71638274">prescaled</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#o4">data</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#f4f6b5634ea79cf694782e35a8d7607d">data</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_dither_matrix_short::bytes" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="81e0b20e763080b79faa837a00cac832"></a><!-- doxytag: member="stp_dither_matrix_short::x" ref="81e0b20e763080b79faa837a00cac832" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__short.html#o2">stp_dither_matrix_short::bytes</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__short.html#81e0b20e763080b79faa837a00cac832">stp_dither_matrix_short::x</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_dither_matrix_short::data" ref="o4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="2bbc6c72006541250ba23b48bcab60e8"></a><!-- doxytag: member="stp_dither_matrix_short::y" ref="2bbc6c72006541250ba23b48bcab60e8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned short* <a class="el" href="structstp__dither__matrix__short.html#o4">stp_dither_matrix_short::data</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__short.html#2bbc6c72006541250ba23b48bcab60e8">stp_dither_matrix_short::y</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_dither_matrix_short::prescaled" ref="o3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="d4d85727401505eab74e3e667f4a38f4"></a><!-- doxytag: member="stp_dither_matrix_short::bytes" ref="d4d85727401505eab74e3e667f4a38f4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__short.html#o3">stp_dither_matrix_short::prescaled</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__short.html#d4d85727401505eab74e3e667f4a38f4">stp_dither_matrix_short::bytes</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_dither_matrix_short::x" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="755361acae80fa4cba01a1cc71638274"></a><!-- doxytag: member="stp_dither_matrix_short::prescaled" ref="755361acae80fa4cba01a1cc71638274" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__short.html#o0">stp_dither_matrix_short::x</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__dither__matrix__short.html#755361acae80fa4cba01a1cc71638274">stp_dither_matrix_short::prescaled</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_dither_matrix_short::y" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f4f6b5634ea79cf694782e35a8d7607d"></a><!-- doxytag: member="stp_dither_matrix_short::data" ref="f4f6b5634ea79cf694782e35a8d7607d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__short.html#o1">stp_dither_matrix_short::y</a>          </td>
+          <td class="memname">const unsigned short* <a class="el" href="structstp__dither__matrix__short.html#f4f6b5634ea79cf694782e35a8d7607d">stp_dither_matrix_short::data</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dotsize.html b/doc/gutenprint/html/structstp__dotsize.html
index 70c1fd3..9ce0441 100644
--- a/doc/gutenprint/html/structstp__dotsize.html
+++ b/doc/gutenprint/html/structstp__dotsize.html
@@ -1,71 +1,71 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_dotsize Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_dotsize Struct Reference</h1><!-- doxytag: class="stp_dotsize" --><code>#include &lt;dither.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html#o0">bit_pattern</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html#8d5273395d0e27004f779de0ea81ff23">bit_pattern</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html#o1">value</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html#d259e8d169a7d140e4964b80790c7ddd">value</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_dotsize::bit_pattern" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="8d5273395d0e27004f779de0ea81ff23"></a><!-- doxytag: member="stp_dotsize::bit_pattern" ref="8d5273395d0e27004f779de0ea81ff23" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__dotsize.html#o0">stp_dotsize::bit_pattern</a>          </td>
+          <td class="memname">unsigned <a class="el" href="structstp__dotsize.html#8d5273395d0e27004f779de0ea81ff23">stp_dotsize::bit_pattern</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_dotsize::value" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="d259e8d169a7d140e4964b80790c7ddd"></a><!-- doxytag: member="stp_dotsize::value" ref="d259e8d169a7d140e4964b80790c7ddd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">double <a class="el" href="structstp__dotsize.html#o1">stp_dotsize::value</a>          </td>
+          <td class="memname">double <a class="el" href="structstp__dotsize.html#d259e8d169a7d140e4964b80790c7ddd">stp_dotsize::value</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__double__bound__t.html b/doc/gutenprint/html/structstp__double__bound__t.html
index 0e57b02..906e2b2 100644
--- a/doc/gutenprint/html/structstp__double__bound__t.html
+++ b/doc/gutenprint/html/structstp__double__bound__t.html
@@ -1,10 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_double_bound_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_double_bound_t Struct Reference<br>
 <small>
 [<a class="el" href="group__vars.html">vars</a>]</small>
@@ -16,65 +32,51 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__double__bound__t.html#o0">lower</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__double__bound__t.html#a00903ee6e04e01b6b2bb7033e3c76ce">lower</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__double__bound__t.html#o1">upper</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__double__bound__t.html#07d734f8f82f059460cee55927b0216c">upper</a></td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 double_bound (range) parameter. 
 <p>
+
+<p>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_double_bound_t::lower" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="a00903ee6e04e01b6b2bb7033e3c76ce"></a><!-- doxytag: member="stp_double_bound_t::lower" ref="a00903ee6e04e01b6b2bb7033e3c76ce" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">double <a class="el" href="structstp__double__bound__t.html#o0">stp_double_bound_t::lower</a>          </td>
+          <td class="memname">double <a class="el" href="structstp__double__bound__t.html#a00903ee6e04e01b6b2bb7033e3c76ce">stp_double_bound_t::lower</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Lower bound.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_double_bound_t::upper" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Lower bound. 
+</div>
+</div><p>
+<a class="anchor" name="07d734f8f82f059460cee55927b0216c"></a><!-- doxytag: member="stp_double_bound_t::upper" ref="07d734f8f82f059460cee55927b0216c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">double <a class="el" href="structstp__double__bound__t.html#o1">stp_double_bound_t::upper</a>          </td>
+          <td class="memname">double <a class="el" href="structstp__double__bound__t.html#07d734f8f82f059460cee55927b0216c">stp_double_bound_t::upper</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Upper bound.     </td>
-  </tr>
-</table>
+Upper bound. 
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__family.html b/doc/gutenprint/html/structstp__family.html
index 589aaaf..01c46d1 100644
--- a/doc/gutenprint/html/structstp__family.html
+++ b/doc/gutenprint/html/structstp__family.html
@@ -1,10 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_family Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_family Struct Reference<br>
 <small>
 [<a class="el" href="group__printer.html">printer</a>]</small>
@@ -13,62 +29,46 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html#o0">printfuncs</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html#d29f00ba3565e93c138b00e4a48cde77">printfuncs</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html#o1">printer_list</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html#6e4f0c216f5ced14a819fbacdb26547d">printer_list</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_family::printer_list" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="d29f00ba3565e93c138b00e4a48cde77"></a><!-- doxytag: member="stp_family::printfuncs" ref="d29f00ba3565e93c138b00e4a48cde77" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a>* <a class="el" href="structstp__family.html#o1">stp_family::printer_list</a>          </td>
+          <td class="memname">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>* <a class="el" href="structstp__family.html#d29f00ba3565e93c138b00e4a48cde77">stp_family::printfuncs</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_family::printfuncs" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="6e4f0c216f5ced14a819fbacdb26547d"></a><!-- doxytag: member="stp_family::printer_list" ref="6e4f0c216f5ced14a819fbacdb26547d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>* <a class="el" href="structstp__family.html#o0">stp_family::printfuncs</a>          </td>
+          <td class="memname"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a>* <a class="el" href="structstp__family.html#6e4f0c216f5ced14a819fbacdb26547d">stp_family::printer_list</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="printers_8h.html">printers.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__image.html b/doc/gutenprint/html/structstp__image.html
index 75688f4..66376f7 100644
--- a/doc/gutenprint/html/structstp__image.html
+++ b/doc/gutenprint/html/structstp__image.html
@@ -1,10 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_image Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_image Struct Reference<br>
 <small>
 [<a class="el" href="group__image.html">image</a>]</small>
@@ -16,270 +32,206 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#o0">init</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#ce69bf25344a814cabea38afa4527086">init</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is used to perform any initialization required by the image layer for the image.  <a href="#o0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#o1">reset</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is used to perform any initialization required by the image layer for the image.  <a href="#ce69bf25344a814cabea38afa4527086"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#7bb2244368c6b1e07d27afb3dd249ffd">reset</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is called to reset the image to the beginning.  <a href="#o1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#o2">width</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is called to reset the image to the beginning.  <a href="#7bb2244368c6b1e07d27afb3dd249ffd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#890033525988e15f4f4a0b4132e5f19b">width</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the width of the image in pixels.  <a href="#o2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#o3">height</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the width of the image in pixels.  <a href="#890033525988e15f4f4a0b4132e5f19b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#4977ad211581999a3f3290983929cce9">height</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the height of the image in pixels.  <a href="#o3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#ga9">stp_image_status_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#o4">get_row</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image, unsigned char *data, size_t byte_limit, int row)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the height of the image in pixels.  <a href="#4977ad211581999a3f3290983929cce9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#8f7f8fb5826f52b8bd820f422c583350">get_row</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image, unsigned char *data, size_t byte_limit, int row)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback transfers the data from the image to the gimp-print library.  <a href="#o4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#o5">get_appname</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback transfers the data from the image to the gimp-print library.  <a href="#8f7f8fb5826f52b8bd820f422c583350"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#56636ad7c0dbf0a82284241f796d95cd">get_appname</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the name of the application.  <a href="#o5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#o6">conclude</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the name of the application.  <a href="#56636ad7c0dbf0a82284241f796d95cd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#5d2385711b303e055258c28f42ab7f4c">conclude</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is called at the end of each page.  <a href="#o6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#o7">rep</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is called at the end of each page.  <a href="#5d2385711b303e055258c28f42ab7f4c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#b18e6ee35037589bf485213022e2d871">rep</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A pointer to an application-specific state information that might need to be associated with the image object.  <a href="#o7"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A pointer to an application-specific state information that might need to be associated with the image object.  <a href="#b18e6ee35037589bf485213022e2d871"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The image type is an abstract data type for interfacing with the image creation program. 
 <p>
-It provides callbacks to functions defined within the client application which are called while printing the image.
+It provides callbacks to functions defined within the client application which are called while printing the image. 
 <p>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stp_image::conclude" ref="o6" args=")(struct stp_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="ce69bf25344a814cabea38afa4527086"></a><!-- doxytag: member="stp_image::init" ref="ce69bf25344a814cabea38afa4527086" args=")(struct stp_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__image.html#o6">stp_image::conclude</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
+          <td class="memname">void(* <a class="el" href="structstp__image.html#ce69bf25344a814cabea38afa4527086">stp_image::init</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-This callback is called at the end of each page. 
+This callback is used to perform any initialization required by the image layer for the image. 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stp_image::get_appname" ref="o5" args=")(struct stp_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+It will be called once per image. <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
+<a class="anchor" name="7bb2244368c6b1e07d27afb3dd249ffd"></a><!-- doxytag: member="stp_image::reset" ref="7bb2244368c6b1e07d27afb3dd249ffd" args=")(struct stp_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char*(* <a class="el" href="structstp__image.html#o5">stp_image::get_appname</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
+          <td class="memname">void(* <a class="el" href="structstp__image.html#7bb2244368c6b1e07d27afb3dd249ffd">stp_image::reset</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-This callback returns the name of the application. 
+This callback is called to reset the image to the beginning. 
 <p>
-This is embedded in the output by some drivers.    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_image::get_row" ref="o4" args=")(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+It may (in principle) be called multiple times if a page is being printed more than once. <dl class="warning" compact><dt><b>Warning:</b></dt><dd>The <a class="el" href="structstp__image.html#7bb2244368c6b1e07d27afb3dd249ffd" title="This callback is called to reset the image to the beginning.">reset()</a> call may be removed in the future. </dd></dl>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
+<a class="anchor" name="890033525988e15f4f4a0b4132e5f19b"></a><!-- doxytag: member="stp_image::width" ref="890033525988e15f4f4a0b4132e5f19b" args=")(struct stp_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__image.html#ga9">stp_image_status_t</a>(* <a class="el" href="structstp__image.html#o4">stp_image::get_row</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image, unsigned char *data, size_t byte_limit, int row)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__image.html#890033525988e15f4f4a0b4132e5f19b">stp_image::width</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-This callback transfers the data from the image to the gimp-print library. 
+This callback returns the width of the image in pixels. 
 <p>
-It is called from the driver layer. It should copy WIDTH (as returned by the <a class="el" href="structstp__image.html#o2">width()</a> member) pixels of data into the data buffer. It normally returns STP_IMAGE_STATUS_OK; if something goes wrong, or the application wishes to stop producing any further output (e. g. because the user cancelled the print job), it should return STP_IMAGE_STATUS_ABORT. This will cause the driver to flush any remaining data to the output. It will always request rows in monotonically ascending order, but it may skip rows (if, for example, the resolution of the input is higher than the resolution of the output). <dl compact><dt><b>Parameters:</b></dt><dd>
+<dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to <a class="el" href="structstp__image.html#o2">width()</a> bytes of pixel data. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>byte_limit</em>&nbsp;</td><td>(image width * number of channels). </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>row</em>&nbsp;</td><td>(unused).</td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_image::height" ref="o3" args=")(struct stp_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="4977ad211581999a3f3290983929cce9"></a><!-- doxytag: member="stp_image::height" ref="4977ad211581999a3f3290983929cce9" args=")(struct stp_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__image.html#o3">stp_image::height</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__image.html#4977ad211581999a3f3290983929cce9">stp_image::height</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 This callback returns the height of the image in pixels. 
 <p>
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use. </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_image::init" ref="o0" args=")(struct stp_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="8f7f8fb5826f52b8bd820f422c583350"></a><!-- doxytag: member="stp_image::get_row" ref="8f7f8fb5826f52b8bd820f422c583350" args=")(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__image.html#o0">stp_image::init</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
+          <td class="memname"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a>(* <a class="el" href="structstp__image.html#8f7f8fb5826f52b8bd820f422c583350">stp_image::get_row</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image, unsigned char *data, size_t byte_limit, int row)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-This callback is used to perform any initialization required by the image layer for the image. 
+This callback transfers the data from the image to the gimp-print library. 
 <p>
-It will be called once per image. <dl compact><dt><b>Parameters:</b></dt><dd>
+It is called from the driver layer. It should copy WIDTH (as returned by the <a class="el" href="structstp__image.html#890033525988e15f4f4a0b4132e5f19b" title="This callback returns the width of the image in pixels.">width()</a> member) pixels of data into the data buffer. It normally returns STP_IMAGE_STATUS_OK; if something goes wrong, or the application wishes to stop producing any further output (e. g. because the user cancelled the print job), it should return STP_IMAGE_STATUS_ABORT. This will cause the driver to flush any remaining data to the output. It will always request rows in monotonically ascending order, but it may skip rows (if, for example, the resolution of the input is higher than the resolution of the output). <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to <a class="el" href="structstp__image.html#890033525988e15f4f4a0b4132e5f19b" title="This callback returns the width of the image in pixels.">width()</a> bytes of pixel data. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>byte_limit</em>&nbsp;</td><td>(image width * number of channels). </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>row</em>&nbsp;</td><td>(unused). </td></tr>
   </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o7"></a><!-- doxytag: member="stp_image::rep" ref="o7" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="56636ad7c0dbf0a82284241f796d95cd"></a><!-- doxytag: member="stp_image::get_appname" ref="56636ad7c0dbf0a82284241f796d95cd" args=")(struct stp_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void* <a class="el" href="structstp__image.html#o7">stp_image::rep</a>          </td>
+          <td class="memname">const char*(* <a class="el" href="structstp__image.html#56636ad7c0dbf0a82284241f796d95cd">stp_image::get_appname</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-A pointer to an application-specific state information that might need to be associated with the image object. 
+This callback returns the name of the application. 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_image::reset" ref="o1" args=")(struct stp_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+This is embedded in the output by some drivers. 
+</div>
+</div><p>
+<a class="anchor" name="5d2385711b303e055258c28f42ab7f4c"></a><!-- doxytag: member="stp_image::conclude" ref="5d2385711b303e055258c28f42ab7f4c" args=")(struct stp_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__image.html#o1">stp_image::reset</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
+          <td class="memname">void(* <a class="el" href="structstp__image.html#5d2385711b303e055258c28f42ab7f4c">stp_image::conclude</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-This callback is called to reset the image to the beginning. 
+This callback is called at the end of each page. 
 <p>
-It may (in principle) be called multiple times if a page is being printed more than once. <dl compact><dt><b>Warning:</b></dt><dd>The <a class="el" href="structstp__image.html#o1">reset()</a> call may be removed in the future. </dd></dl>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use.</td></tr>
-  </table>
-</dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_image::width" ref="o2" args=")(struct stp_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="b18e6ee35037589bf485213022e2d871"></a><!-- doxytag: member="stp_image::rep" ref="b18e6ee35037589bf485213022e2d871" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__image.html#o2">stp_image::width</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
+          <td class="memname">void* <a class="el" href="structstp__image.html#b18e6ee35037589bf485213022e2d871">stp_image::rep</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-This callback returns the width of the image in pixels. 
+A pointer to an application-specific state information that might need to be associated with the image object. 
 <p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use.</td></tr>
-  </table>
-</dl>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="image_8h.html">image.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__int__bound__t.html b/doc/gutenprint/html/structstp__int__bound__t.html
index ba41b09..f5011d8 100644
--- a/doc/gutenprint/html/structstp__int__bound__t.html
+++ b/doc/gutenprint/html/structstp__int__bound__t.html
@@ -1,10 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_int_bound_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_int_bound_t Struct Reference<br>
 <small>
 [<a class="el" href="group__vars.html">vars</a>]</small>
@@ -16,65 +32,51 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__int__bound__t.html#o0">lower</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__int__bound__t.html#c5ae98fad865ad6d4816016e233f5a53">lower</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__int__bound__t.html#o1">upper</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__int__bound__t.html#a71bcebaae24712ee7a66955b345de19">upper</a></td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 int_bound (range) parameter. 
 <p>
+
+<p>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_int_bound_t::lower" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="c5ae98fad865ad6d4816016e233f5a53"></a><!-- doxytag: member="stp_int_bound_t::lower" ref="c5ae98fad865ad6d4816016e233f5a53" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__int__bound__t.html#o0">stp_int_bound_t::lower</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__int__bound__t.html#c5ae98fad865ad6d4816016e233f5a53">stp_int_bound_t::lower</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Lower bound.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_int_bound_t::upper" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Lower bound. 
+</div>
+</div><p>
+<a class="anchor" name="a71bcebaae24712ee7a66955b345de19"></a><!-- doxytag: member="stp_int_bound_t::upper" ref="a71bcebaae24712ee7a66955b345de19" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__int__bound__t.html#o1">stp_int_bound_t::upper</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__int__bound__t.html#a71bcebaae24712ee7a66955b345de19">stp_int_bound_t::upper</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Upper bound.     </td>
-  </tr>
-</table>
+Upper bound. 
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__lineactive__t.html b/doc/gutenprint/html/structstp__lineactive__t.html
index 47b4310..62a7c61 100644
--- a/doc/gutenprint/html/structstp__lineactive__t.html
+++ b/doc/gutenprint/html/structstp__lineactive__t.html
@@ -1,71 +1,71 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_lineactive_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_lineactive_t Struct Reference</h1><!-- doxytag: class="stp_lineactive_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineactive__t.html#o0">ncolors</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineactive__t.html#266bdeb14e62fb5b17a31746ad511761">ncolors</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineactive__t.html#o1">v</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineactive__t.html#5bb5843aa2a4817ef84fb83714b200f3">v</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_lineactive_t::ncolors" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="266bdeb14e62fb5b17a31746ad511761"></a><!-- doxytag: member="stp_lineactive_t::ncolors" ref="266bdeb14e62fb5b17a31746ad511761" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__lineactive__t.html#o0">stp_lineactive_t::ncolors</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__lineactive__t.html#266bdeb14e62fb5b17a31746ad511761">stp_lineactive_t::ncolors</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_lineactive_t::v" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="5bb5843aa2a4817ef84fb83714b200f3"></a><!-- doxytag: member="stp_lineactive_t::v" ref="5bb5843aa2a4817ef84fb83714b200f3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__lineactive__t.html#o1">stp_lineactive_t::v</a>          </td>
+          <td class="memname">char* <a class="el" href="structstp__lineactive__t.html#5bb5843aa2a4817ef84fb83714b200f3">stp_lineactive_t::v</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linebounds__t.html b/doc/gutenprint/html/structstp__linebounds__t.html
index e20e95b..d1f85ac 100644
--- a/doc/gutenprint/html/structstp__linebounds__t.html
+++ b/doc/gutenprint/html/structstp__linebounds__t.html
@@ -1,96 +1,88 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_linebounds_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_linebounds_t Struct Reference</h1><!-- doxytag: class="stp_linebounds_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#o0">ncolors</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#dc4641abb41a9204c258a380aa00b7f4">ncolors</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#o1">start_pos</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#b46a1a4ec130dd043009fb96b0115467">start_pos</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#o2">end_pos</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#9bc2a60779ccf4ac3d90d47441e883ab">end_pos</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_linebounds_t::end_pos" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="dc4641abb41a9204c258a380aa00b7f4"></a><!-- doxytag: member="stp_linebounds_t::ncolors" ref="dc4641abb41a9204c258a380aa00b7f4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int* <a class="el" href="structstp__linebounds__t.html#o2">stp_linebounds_t::end_pos</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__linebounds__t.html#dc4641abb41a9204c258a380aa00b7f4">stp_linebounds_t::ncolors</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_linebounds_t::ncolors" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="b46a1a4ec130dd043009fb96b0115467"></a><!-- doxytag: member="stp_linebounds_t::start_pos" ref="b46a1a4ec130dd043009fb96b0115467" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__linebounds__t.html#o0">stp_linebounds_t::ncolors</a>          </td>
+          <td class="memname">int* <a class="el" href="structstp__linebounds__t.html#b46a1a4ec130dd043009fb96b0115467">stp_linebounds_t::start_pos</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_linebounds_t::start_pos" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="9bc2a60779ccf4ac3d90d47441e883ab"></a><!-- doxytag: member="stp_linebounds_t::end_pos" ref="9bc2a60779ccf4ac3d90d47441e883ab" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int* <a class="el" href="structstp__linebounds__t.html#o1">stp_linebounds_t::start_pos</a>          </td>
+          <td class="memname">int* <a class="el" href="structstp__linebounds__t.html#9bc2a60779ccf4ac3d90d47441e883ab">stp_linebounds_t::end_pos</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linebufs__t.html b/doc/gutenprint/html/structstp__linebufs__t.html
index ba550f4..a426dd8 100644
--- a/doc/gutenprint/html/structstp__linebufs__t.html
+++ b/doc/gutenprint/html/structstp__linebufs__t.html
@@ -1,71 +1,71 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_linebufs_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_linebufs_t Struct Reference</h1><!-- doxytag: class="stp_linebufs_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebufs__t.html#o0">ncolors</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebufs__t.html#5ad1c52050c8d71da5609d2526854696">ncolors</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char **&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebufs__t.html#o1">v</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char **&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebufs__t.html#485ecae7a892476331d31079d33b9891">v</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_linebufs_t::ncolors" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="5ad1c52050c8d71da5609d2526854696"></a><!-- doxytag: member="stp_linebufs_t::ncolors" ref="5ad1c52050c8d71da5609d2526854696" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__linebufs__t.html#o0">stp_linebufs_t::ncolors</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__linebufs__t.html#5ad1c52050c8d71da5609d2526854696">stp_linebufs_t::ncolors</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_linebufs_t::v" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="485ecae7a892476331d31079d33b9891"></a><!-- doxytag: member="stp_linebufs_t::v" ref="485ecae7a892476331d31079d33b9891" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned char** <a class="el" href="structstp__linebufs__t.html#o1">stp_linebufs_t::v</a>          </td>
+          <td class="memname">unsigned char** <a class="el" href="structstp__linebufs__t.html#485ecae7a892476331d31079d33b9891">stp_linebufs_t::v</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linecount__t.html b/doc/gutenprint/html/structstp__linecount__t.html
index 49a9ffe..25c5600 100644
--- a/doc/gutenprint/html/structstp__linecount__t.html
+++ b/doc/gutenprint/html/structstp__linecount__t.html
@@ -1,71 +1,71 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_linecount_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_linecount_t Struct Reference</h1><!-- doxytag: class="stp_linecount_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linecount__t.html#o0">ncolors</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linecount__t.html#69275ad8687438976d07950fa65a1728">ncolors</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linecount__t.html#o1">v</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linecount__t.html#2164f4045d892c45105f5780c80489a4">v</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_linecount_t::ncolors" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="69275ad8687438976d07950fa65a1728"></a><!-- doxytag: member="stp_linecount_t::ncolors" ref="69275ad8687438976d07950fa65a1728" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__linecount__t.html#o0">stp_linecount_t::ncolors</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__linecount__t.html#69275ad8687438976d07950fa65a1728">stp_linecount_t::ncolors</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_linecount_t::v" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="2164f4045d892c45105f5780c80489a4"></a><!-- doxytag: member="stp_linecount_t::v" ref="2164f4045d892c45105f5780c80489a4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int* <a class="el" href="structstp__linecount__t.html#o1">stp_linecount_t::v</a>          </td>
+          <td class="memname">int* <a class="el" href="structstp__linecount__t.html#2164f4045d892c45105f5780c80489a4">stp_linecount_t::v</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__lineoff__t.html b/doc/gutenprint/html/structstp__lineoff__t.html
index 21a468f..972fb81 100644
--- a/doc/gutenprint/html/structstp__lineoff__t.html
+++ b/doc/gutenprint/html/structstp__lineoff__t.html
@@ -1,71 +1,71 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_lineoff_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_lineoff_t Struct Reference</h1><!-- doxytag: class="stp_lineoff_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineoff__t.html#o0">ncolors</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineoff__t.html#97c5a2281b3cddb9c546e8299ea4e2b0">ncolors</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineoff__t.html#o1">v</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineoff__t.html#88bbe86454fbda432487952640948328">v</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_lineoff_t::ncolors" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="97c5a2281b3cddb9c546e8299ea4e2b0"></a><!-- doxytag: member="stp_lineoff_t::ncolors" ref="97c5a2281b3cddb9c546e8299ea4e2b0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__lineoff__t.html#o0">stp_lineoff_t::ncolors</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__lineoff__t.html#97c5a2281b3cddb9c546e8299ea4e2b0">stp_lineoff_t::ncolors</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_lineoff_t::v" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="88bbe86454fbda432487952640948328"></a><!-- doxytag: member="stp_lineoff_t::v" ref="88bbe86454fbda432487952640948328" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned long* <a class="el" href="structstp__lineoff__t.html#o1">stp_lineoff_t::v</a>          </td>
+          <td class="memname">unsigned long* <a class="el" href="structstp__lineoff__t.html#88bbe86454fbda432487952640948328">stp_lineoff_t::v</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__module.html b/doc/gutenprint/html/structstp__module.html
index 88a1a3c..5f1819e 100644
--- a/doc/gutenprint/html/structstp__module.html
+++ b/doc/gutenprint/html/structstp__module.html
@@ -1,221 +1,173 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_module Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_module Struct Reference</h1><!-- doxytag: class="stp_module" --><code>#include &lt;module.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#o0">name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#32e2db7046f281afd6748afe111aee76">name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#o1">version</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#e2038239913d3ddbece919082501c8d0">version</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#o2">comment</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#b60ac536d9ec7b3a306cddf4c06e18bb">comment</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="module_8h.html#a13">stp_module_class_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#o3">class</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#4ebc727be1ec8edaaa1b25415a3932e3">class</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#o4">handle</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#1a96aa2db220972e124717cc6dd03c8e">handle</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#o5">init</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#fa7d4259940b8d42a36f14108f504944">init</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#o6">fini</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#e04ff0565f8ebd56b383917b602ffc4a">fini</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#o7">syms</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#0e7297a93920d8f6849718d0a32fa2ba">syms</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_module::class" ref="o3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="32e2db7046f281afd6748afe111aee76"></a><!-- doxytag: member="stp_module::name" ref="32e2db7046f281afd6748afe111aee76" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="module_8h.html#a13">stp_module_class_t</a> <a class="el" href="structstp__module.html#o3">stp_module::class</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__module.html#32e2db7046f281afd6748afe111aee76">stp_module::name</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_module::comment" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="e2038239913d3ddbece919082501c8d0"></a><!-- doxytag: member="stp_module::version" ref="e2038239913d3ddbece919082501c8d0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__module.html#o2">stp_module::comment</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__module.html#e2038239913d3ddbece919082501c8d0">stp_module::version</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stp_module::fini" ref="o6" args=")(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="b60ac536d9ec7b3a306cddf4c06e18bb"></a><!-- doxytag: member="stp_module::comment" ref="b60ac536d9ec7b3a306cddf4c06e18bb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__module.html#o6">stp_module::fini</a>)(void)          </td>
+          <td class="memname">const char* <a class="el" href="structstp__module.html#b60ac536d9ec7b3a306cddf4c06e18bb">stp_module::comment</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_module::handle" ref="o4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="4ebc727be1ec8edaaa1b25415a3932e3"></a><!-- doxytag: member="stp_module::class" ref="4ebc727be1ec8edaaa1b25415a3932e3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void* <a class="el" href="structstp__module.html#o4">stp_module::handle</a>          </td>
+          <td class="memname"><a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a> <a class="el" href="structstp__module.html#4ebc727be1ec8edaaa1b25415a3932e3">stp_module::class</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stp_module::init" ref="o5" args=")(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="1a96aa2db220972e124717cc6dd03c8e"></a><!-- doxytag: member="stp_module::handle" ref="1a96aa2db220972e124717cc6dd03c8e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__module.html#o5">stp_module::init</a>)(void)          </td>
+          <td class="memname">void* <a class="el" href="structstp__module.html#1a96aa2db220972e124717cc6dd03c8e">stp_module::handle</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_module::name" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="fa7d4259940b8d42a36f14108f504944"></a><!-- doxytag: member="stp_module::init" ref="fa7d4259940b8d42a36f14108f504944" args=")(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__module.html#o0">stp_module::name</a>          </td>
+          <td class="memname">int(* <a class="el" href="structstp__module.html#fa7d4259940b8d42a36f14108f504944">stp_module::init</a>)(void)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o7"></a><!-- doxytag: member="stp_module::syms" ref="o7" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="e04ff0565f8ebd56b383917b602ffc4a"></a><!-- doxytag: member="stp_module::fini" ref="e04ff0565f8ebd56b383917b602ffc4a" args=")(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void* <a class="el" href="structstp__module.html#o7">stp_module::syms</a>          </td>
+          <td class="memname">int(* <a class="el" href="structstp__module.html#e04ff0565f8ebd56b383917b602ffc4a">stp_module::fini</a>)(void)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_module::version" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="0e7297a93920d8f6849718d0a32fa2ba"></a><!-- doxytag: member="stp_module::syms" ref="0e7297a93920d8f6849718d0a32fa2ba" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__module.html#o1">stp_module::version</a>          </td>
+          <td class="memname">void* <a class="el" href="structstp__module.html#0e7297a93920d8f6849718d0a32fa2ba">stp_module::syms</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="module_8h.html">module.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__module__version.html b/doc/gutenprint/html/structstp__module__version.html
index 6853cf4..c92e532 100644
--- a/doc/gutenprint/html/structstp__module__version.html
+++ b/doc/gutenprint/html/structstp__module__version.html
@@ -1,71 +1,71 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_module_version Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_module_version Struct Reference</h1><!-- doxytag: class="stp_module_version" --><code>#include &lt;module.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html#o0">major</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html#15add43e03d0e1624f40c083fa958692">major</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html#o1">minor</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html#eced49a93c5e461fa95f809ad077fced">minor</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_module_version::major" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="15add43e03d0e1624f40c083fa958692"></a><!-- doxytag: member="stp_module_version::major" ref="15add43e03d0e1624f40c083fa958692" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__module__version.html#o0">stp_module_version::major</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__module__version.html#15add43e03d0e1624f40c083fa958692">stp_module_version::major</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_module_version::minor" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="eced49a93c5e461fa95f809ad077fced"></a><!-- doxytag: member="stp_module_version::minor" ref="eced49a93c5e461fa95f809ad077fced" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__module__version.html#o1">stp_module_version::minor</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__module__version.html#eced49a93c5e461fa95f809ad077fced">stp_module_version::minor</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="module_8h.html">module.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__mxml__attr__s.html b/doc/gutenprint/html/structstp__mxml__attr__s.html
index 8c31201..cb586e2 100644
--- a/doc/gutenprint/html/structstp__mxml__attr__s.html
+++ b/doc/gutenprint/html/structstp__mxml__attr__s.html
@@ -1,71 +1,71 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_mxml_attr_s Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_mxml_attr_s Struct Reference</h1><!-- doxytag: class="stp_mxml_attr_s" --><code>#include &lt;mxml.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html#o0">name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html#4ea32ac1f797cf7722bf3e8638b21dee">name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html#o1">value</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html#25554324bd8ccf8e9558e4705eda0daa">value</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_mxml_attr_s::name" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="4ea32ac1f797cf7722bf3e8638b21dee"></a><!-- doxytag: member="stp_mxml_attr_s::name" ref="4ea32ac1f797cf7722bf3e8638b21dee" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__mxml__attr__s.html#o0">stp_mxml_attr_s::name</a>          </td>
+          <td class="memname">char* <a class="el" href="structstp__mxml__attr__s.html#4ea32ac1f797cf7722bf3e8638b21dee">stp_mxml_attr_s::name</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_mxml_attr_s::value" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="25554324bd8ccf8e9558e4705eda0daa"></a><!-- doxytag: member="stp_mxml_attr_s::value" ref="25554324bd8ccf8e9558e4705eda0daa" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__mxml__attr__s.html#o1">stp_mxml_attr_s::value</a>          </td>
+          <td class="memname">char* <a class="el" href="structstp__mxml__attr__s.html#25554324bd8ccf8e9558e4705eda0daa">stp_mxml_attr_s::value</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__mxml__node__s.html b/doc/gutenprint/html/structstp__mxml__node__s.html
index a59df42..909a54a 100644
--- a/doc/gutenprint/html/structstp__mxml__node__s.html
+++ b/doc/gutenprint/html/structstp__mxml__node__s.html
@@ -1,196 +1,156 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_mxml_node_s Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_mxml_node_s Struct Reference</h1><!-- doxytag: class="stp_mxml_node_s" --><code>#include &lt;mxml.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="mxml_8h.html#a14">stp_mxml_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#o0">type</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#e1bff9adee67699067516eee014a7510">type</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#o1">next</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#8831071db5a4b4df95ea3c5c2e95476b">next</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#o2">prev</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#2174125dc205e7c760e4e8c9c9048ddf">prev</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#o3">parent</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#353df68e26a33380dcacda213a741487">parent</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#o4">child</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#44550ea8d68a483ccc130c58b66ddd33">child</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#o5">last_child</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#5fb356e73f91b24211882f42cbbe7a08">last_child</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#o6">value</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#ad44d6b2fe0842de0bbf1312035372cd">value</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_mxml_node_s::child" ref="o4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="e1bff9adee67699067516eee014a7510"></a><!-- doxytag: member="stp_mxml_node_s::type" ref="e1bff9adee67699067516eee014a7510" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#o4">stp_mxml_node_s::child</a>          </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a> <a class="el" href="structstp__mxml__node__s.html#e1bff9adee67699067516eee014a7510">stp_mxml_node_s::type</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stp_mxml_node_s::last_child" ref="o5" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="8831071db5a4b4df95ea3c5c2e95476b"></a><!-- doxytag: member="stp_mxml_node_s::next" ref="8831071db5a4b4df95ea3c5c2e95476b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#o5">stp_mxml_node_s::last_child</a>          </td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#8831071db5a4b4df95ea3c5c2e95476b">stp_mxml_node_s::next</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_mxml_node_s::next" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="2174125dc205e7c760e4e8c9c9048ddf"></a><!-- doxytag: member="stp_mxml_node_s::prev" ref="2174125dc205e7c760e4e8c9c9048ddf" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#o1">stp_mxml_node_s::next</a>          </td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#2174125dc205e7c760e4e8c9c9048ddf">stp_mxml_node_s::prev</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_mxml_node_s::parent" ref="o3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="353df68e26a33380dcacda213a741487"></a><!-- doxytag: member="stp_mxml_node_s::parent" ref="353df68e26a33380dcacda213a741487" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#o3">stp_mxml_node_s::parent</a>          </td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#353df68e26a33380dcacda213a741487">stp_mxml_node_s::parent</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_mxml_node_s::prev" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="44550ea8d68a483ccc130c58b66ddd33"></a><!-- doxytag: member="stp_mxml_node_s::child" ref="44550ea8d68a483ccc130c58b66ddd33" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#o2">stp_mxml_node_s::prev</a>          </td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#44550ea8d68a483ccc130c58b66ddd33">stp_mxml_node_s::child</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_mxml_node_s::type" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="5fb356e73f91b24211882f42cbbe7a08"></a><!-- doxytag: member="stp_mxml_node_s::last_child" ref="5fb356e73f91b24211882f42cbbe7a08" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="mxml_8h.html#a14">stp_mxml_type_t</a> <a class="el" href="structstp__mxml__node__s.html#o0">stp_mxml_node_s::type</a>          </td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#5fb356e73f91b24211882f42cbbe7a08">stp_mxml_node_s::last_child</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stp_mxml_node_s::value" ref="o6" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ad44d6b2fe0842de0bbf1312035372cd"></a><!-- doxytag: member="stp_mxml_node_s::value" ref="ad44d6b2fe0842de0bbf1312035372cd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_t</a> <a class="el" href="structstp__mxml__node__s.html#o6">stp_mxml_node_s::value</a>          </td>
+          <td class="memname"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_t</a> <a class="el" href="structstp__mxml__node__s.html#ad44d6b2fe0842de0bbf1312035372cd">stp_mxml_node_s::value</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__mxml__text__s.html b/doc/gutenprint/html/structstp__mxml__text__s.html
index 719a0cc..cf9e192 100644
--- a/doc/gutenprint/html/structstp__mxml__text__s.html
+++ b/doc/gutenprint/html/structstp__mxml__text__s.html
@@ -1,71 +1,71 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_mxml_text_s Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_mxml_text_s Struct Reference</h1><!-- doxytag: class="stp_mxml_text_s" --><code>#include &lt;mxml.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html#o0">whitespace</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html#76bcfbb8c3de4e1c597468d51ef47184">whitespace</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html#o1">string</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html#ef1865e8cab7d5ab175c6e67f122be15">string</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_mxml_text_s::string" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="76bcfbb8c3de4e1c597468d51ef47184"></a><!-- doxytag: member="stp_mxml_text_s::whitespace" ref="76bcfbb8c3de4e1c597468d51ef47184" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__mxml__text__s.html#o1">stp_mxml_text_s::string</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__mxml__text__s.html#76bcfbb8c3de4e1c597468d51ef47184">stp_mxml_text_s::whitespace</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_mxml_text_s::whitespace" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ef1865e8cab7d5ab175c6e67f122be15"></a><!-- doxytag: member="stp_mxml_text_s::string" ref="ef1865e8cab7d5ab175c6e67f122be15" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__mxml__text__s.html#o0">stp_mxml_text_s::whitespace</a>          </td>
+          <td class="memname">char* <a class="el" href="structstp__mxml__text__s.html#ef1865e8cab7d5ab175c6e67f122be15">stp_mxml_text_s::string</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__mxml__value__s.html b/doc/gutenprint/html/structstp__mxml__value__s.html
index 5132428..233a8d8 100644
--- a/doc/gutenprint/html/structstp__mxml__value__s.html
+++ b/doc/gutenprint/html/structstp__mxml__value__s.html
@@ -1,96 +1,88 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_mxml_value_s Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_mxml_value_s Struct Reference</h1><!-- doxytag: class="stp_mxml_value_s" --><code>#include &lt;mxml.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#o0">name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#959d5315fd98119aa5d23d2b8d307c58">name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#o1">num_attrs</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#f29b9bbc769c278dad18ff2cb098ef6a">num_attrs</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#o2">attrs</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#69974b612f59fd3ef1d5db85db2d1a07">attrs</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_mxml_value_s::attrs" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="959d5315fd98119aa5d23d2b8d307c58"></a><!-- doxytag: member="stp_mxml_value_s::name" ref="959d5315fd98119aa5d23d2b8d307c58" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_t</a>* <a class="el" href="structstp__mxml__value__s.html#o2">stp_mxml_value_s::attrs</a>          </td>
+          <td class="memname">char* <a class="el" href="structstp__mxml__value__s.html#959d5315fd98119aa5d23d2b8d307c58">stp_mxml_value_s::name</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_mxml_value_s::name" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f29b9bbc769c278dad18ff2cb098ef6a"></a><!-- doxytag: member="stp_mxml_value_s::num_attrs" ref="f29b9bbc769c278dad18ff2cb098ef6a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__mxml__value__s.html#o0">stp_mxml_value_s::name</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__mxml__value__s.html#f29b9bbc769c278dad18ff2cb098ef6a">stp_mxml_value_s::num_attrs</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_mxml_value_s::num_attrs" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="69974b612f59fd3ef1d5db85db2d1a07"></a><!-- doxytag: member="stp_mxml_value_s::attrs" ref="69974b612f59fd3ef1d5db85db2d1a07" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__mxml__value__s.html#o1">stp_mxml_value_s::num_attrs</a>          </td>
+          <td class="memname"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_t</a>* <a class="el" href="structstp__mxml__value__s.html#69974b612f59fd3ef1d5db85db2d1a07">stp_mxml_value_s::attrs</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__papersize__t.html b/doc/gutenprint/html/structstp__papersize__t.html
index 469dcd0..9c6c493 100644
--- a/doc/gutenprint/html/structstp__papersize__t.html
+++ b/doc/gutenprint/html/structstp__papersize__t.html
@@ -1,10 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_papersize_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_papersize_t Struct Reference<br>
 <small>
 [<a class="el" href="group__papersize.html">papersize</a>]</small>
@@ -16,295 +32,217 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o0">name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#660431e579bf100782f7164b45597982">name</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Short unique name (not translated).  <a href="#o0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o1">text</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Short unique name (not translated).  <a href="#660431e579bf100782f7164b45597982"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#26e8b5d0ce282614f128dd9d4aeaf9f6">text</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Long descriptive name (translated).  <a href="#o1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o2">comment</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Long descriptive name (translated).  <a href="#26e8b5d0ce282614f128dd9d4aeaf9f6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#5cdc973122b8cc2e612d2dee306cbf1d">comment</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Comment.  <a href="#o2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o3">width</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Comment.  <a href="#5cdc973122b8cc2e612d2dee306cbf1d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#edcca3776ddeb5ed815df3aa112147dd">width</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Paper width.  <a href="#o3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o4">height</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Paper width.  <a href="#edcca3776ddeb5ed815df3aa112147dd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#040d59e39abdef9b12c929734fb7a08c">height</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Paper height.  <a href="#o4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o5">top</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Paper height.  <a href="#040d59e39abdef9b12c929734fb7a08c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#7fc8acdb1d905d6ca4a0b9b247a6c48e">top</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Top margin.  <a href="#o5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o6">left</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Top margin.  <a href="#7fc8acdb1d905d6ca4a0b9b247a6c48e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#9ceb7ef01ea56c990eddbef4140b34a0">left</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Left margin.  <a href="#o6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o7">bottom</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Left margin.  <a href="#9ceb7ef01ea56c990eddbef4140b34a0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#9c7fcf4d0bac23817b6f56996fed4043">bottom</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Bottom margin.  <a href="#o7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o8">right</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Bottom margin.  <a href="#9c7fcf4d0bac23817b6f56996fed4043"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#6899599f2f940e95e03545ff71e2b4c5">right</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Right margin.  <a href="#o8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__papersize.html#ga5">stp_papersize_unit_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o9">paper_unit</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Right margin.  <a href="#6899599f2f940e95e03545ff71e2b4c5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__papersize.html#g72e4619e373e38dc02dc452813b7b958">stp_papersize_unit_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#5692b27332297abca9e4715e3e9e3ce8">paper_unit</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Units of measurement.  <a href="#o9"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Units of measurement.  <a href="#5692b27332297abca9e4715e3e9e3ce8"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The papersize data type. 
 <p>
+
+<p>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o7"></a><!-- doxytag: member="stp_papersize_t::bottom" ref="o7" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="660431e579bf100782f7164b45597982"></a><!-- doxytag: member="stp_papersize_t::name" ref="660431e579bf100782f7164b45597982" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o7">stp_papersize_t::bottom</a>          </td>
+          <td class="memname">char* <a class="el" href="structstp__papersize__t.html#660431e579bf100782f7164b45597982">stp_papersize_t::name</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Bottom margin. 
+Short unique name (not translated). 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_papersize_t::comment" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="26e8b5d0ce282614f128dd9d4aeaf9f6"></a><!-- doxytag: member="stp_papersize_t::text" ref="26e8b5d0ce282614f128dd9d4aeaf9f6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__papersize__t.html#o2">stp_papersize_t::comment</a>          </td>
+          <td class="memname">char* <a class="el" href="structstp__papersize__t.html#26e8b5d0ce282614f128dd9d4aeaf9f6">stp_papersize_t::text</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Comment. 
+Long descriptive name (translated). 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_papersize_t::height" ref="o4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="5cdc973122b8cc2e612d2dee306cbf1d"></a><!-- doxytag: member="stp_papersize_t::comment" ref="5cdc973122b8cc2e612d2dee306cbf1d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o4">stp_papersize_t::height</a>          </td>
+          <td class="memname">char* <a class="el" href="structstp__papersize__t.html#5cdc973122b8cc2e612d2dee306cbf1d">stp_papersize_t::comment</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Paper height. 
+Comment. 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stp_papersize_t::left" ref="o6" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="edcca3776ddeb5ed815df3aa112147dd"></a><!-- doxytag: member="stp_papersize_t::width" ref="edcca3776ddeb5ed815df3aa112147dd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o6">stp_papersize_t::left</a>          </td>
+          <td class="memname">unsigned <a class="el" href="structstp__papersize__t.html#edcca3776ddeb5ed815df3aa112147dd">stp_papersize_t::width</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Left margin. 
+Paper width. 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_papersize_t::name" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="040d59e39abdef9b12c929734fb7a08c"></a><!-- doxytag: member="stp_papersize_t::height" ref="040d59e39abdef9b12c929734fb7a08c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__papersize__t.html#o0">stp_papersize_t::name</a>          </td>
+          <td class="memname">unsigned <a class="el" href="structstp__papersize__t.html#040d59e39abdef9b12c929734fb7a08c">stp_papersize_t::height</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Short unique name (not translated). 
+Paper height. 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o9"></a><!-- doxytag: member="stp_papersize_t::paper_unit" ref="o9" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="7fc8acdb1d905d6ca4a0b9b247a6c48e"></a><!-- doxytag: member="stp_papersize_t::top" ref="7fc8acdb1d905d6ca4a0b9b247a6c48e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__papersize.html#ga5">stp_papersize_unit_t</a> <a class="el" href="structstp__papersize__t.html#o9">stp_papersize_t::paper_unit</a>          </td>
+          <td class="memname">unsigned <a class="el" href="structstp__papersize__t.html#7fc8acdb1d905d6ca4a0b9b247a6c48e">stp_papersize_t::top</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Units of measurement. 
+Top margin. 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o8"></a><!-- doxytag: member="stp_papersize_t::right" ref="o8" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="9ceb7ef01ea56c990eddbef4140b34a0"></a><!-- doxytag: member="stp_papersize_t::left" ref="9ceb7ef01ea56c990eddbef4140b34a0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o8">stp_papersize_t::right</a>          </td>
+          <td class="memname">unsigned <a class="el" href="structstp__papersize__t.html#9ceb7ef01ea56c990eddbef4140b34a0">stp_papersize_t::left</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Right margin. 
+Left margin. 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_papersize_t::text" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="9c7fcf4d0bac23817b6f56996fed4043"></a><!-- doxytag: member="stp_papersize_t::bottom" ref="9c7fcf4d0bac23817b6f56996fed4043" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__papersize__t.html#o1">stp_papersize_t::text</a>          </td>
+          <td class="memname">unsigned <a class="el" href="structstp__papersize__t.html#9c7fcf4d0bac23817b6f56996fed4043">stp_papersize_t::bottom</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Long descriptive name (translated). 
+Bottom margin. 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stp_papersize_t::top" ref="o5" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="6899599f2f940e95e03545ff71e2b4c5"></a><!-- doxytag: member="stp_papersize_t::right" ref="6899599f2f940e95e03545ff71e2b4c5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o5">stp_papersize_t::top</a>          </td>
+          <td class="memname">unsigned <a class="el" href="structstp__papersize__t.html#6899599f2f940e95e03545ff71e2b4c5">stp_papersize_t::right</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Top margin. 
+Right margin. 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_papersize_t::width" ref="o3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="5692b27332297abca9e4715e3e9e3ce8"></a><!-- doxytag: member="stp_papersize_t::paper_unit" ref="5692b27332297abca9e4715e3e9e3ce8" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o3">stp_papersize_t::width</a>          </td>
+          <td class="memname"><a class="el" href="group__papersize.html#g72e4619e373e38dc02dc452813b7b958">stp_papersize_unit_t</a> <a class="el" href="structstp__papersize__t.html#5692b27332297abca9e4715e3e9e3ce8">stp_papersize_t::paper_unit</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Paper width. 
+Units of measurement. 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="paper_8h.html">paper.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__param__string__t.html b/doc/gutenprint/html/structstp__param__string__t.html
index 0550248..ab76de7 100644
--- a/doc/gutenprint/html/structstp__param__string__t.html
+++ b/doc/gutenprint/html/structstp__param__string__t.html
@@ -1,10 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_param_string_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_param_string_t Struct Reference</h1><!-- doxytag: class="stp_param_string_t" -->String parameter.  
 <a href="#_details">More...</a>
 <p>
@@ -13,67 +29,51 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__param__string__t.html#o0">name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__param__string__t.html#c4ccea0dded827b9acdb2d22aa25857b">name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__param__string__t.html#o1">text</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__param__string__t.html#db032e80e118c233adb9f27544920bd1">text</a></td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 String parameter. 
 <p>
-Representation of a choice list of strings. The choices themselves consist of a key and a human-readable name. The list object is opaque.
+Representation of a choice list of strings. The choices themselves consist of a key and a human-readable name. The list object is opaque. 
 <p>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_param_string_t::name" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="c4ccea0dded827b9acdb2d22aa25857b"></a><!-- doxytag: member="stp_param_string_t::name" ref="c4ccea0dded827b9acdb2d22aa25857b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__param__string__t.html#o0">stp_param_string_t::name</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__param__string__t.html#c4ccea0dded827b9acdb2d22aa25857b">stp_param_string_t::name</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Option name (key, untranslated).     </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_param_string_t::text" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Option name (key, untranslated). 
+</div>
+</div><p>
+<a class="anchor" name="db032e80e118c233adb9f27544920bd1"></a><!-- doxytag: member="stp_param_string_t::text" ref="db032e80e118c233adb9f27544920bd1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char * <a class="el" href="structstp__param__string__t.html#o1">stp_param_string_t::text</a>          </td>
+          <td class="memname">const char * <a class="el" href="structstp__param__string__t.html#db032e80e118c233adb9f27544920bd1">stp_param_string_t::text</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Human-readable (translated) text.     </td>
-  </tr>
-</table>
+Human-readable (translated) text. 
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="string-list_8h.html">string-list.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__parameter__t.html b/doc/gutenprint/html/structstp__parameter__t.html
index bbc3639..51baa17 100644
--- a/doc/gutenprint/html/structstp__parameter__t.html
+++ b/doc/gutenprint/html/structstp__parameter__t.html
@@ -1,10 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_parameter_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_parameter_t Struct Reference<br>
 <small>
 [<a class="el" href="group__vars.html">vars</a>]</small>
@@ -16,694 +32,480 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o0">name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#092430e582e7560fb532f546f78ca70c">name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o1">text</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#396e4980926c200e9ce4454f19e7311a">text</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o2">category</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#2cb67e4324a017746ca9bfda772aa50f">category</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o3">help</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#9f0637d6b97f0daa3122840eb2bd13db">help</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga133">stp_parameter_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o4">p_type</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#ebe5dea02843240fe03461abf007f154">p_type</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga134">stp_parameter_class_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o5">p_class</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g4eba7e712c0e17b76e472f26e202d7b8">stp_parameter_class_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#410388e541bdb14fbd0af2984e229217">p_class</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_level_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o6">p_level</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gaa9c9265ffe70122bd33659cf2983207">stp_parameter_level_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#2a4a1195c06243e08acb03475fb1e7cc">p_level</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o7">is_mandatory</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#ce4d02e3665f9cdfe83ed7dd559e1c1a">is_mandatory</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o8">is_active</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#8b1af01f0874c79b6dbc4d0eca432952">is_active</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o9">channel</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#79bc0b76d5d5e238ddd205aa4a97ebad">channel</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o10">verify_this_parameter</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#56100203c262c60d4cb18c7a49cde27d">verify_this_parameter</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o11">read_only</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#4421135f9985be49d156cbc9aa74c710">read_only</a></td></tr>
 
 <tr><td class="memItemLeft" nowrap>union {</td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o12">curve</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#d64f0c31d200d3d413725621b3ef9133">curve</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o13">dbl</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#12fc8869d3056687e576af63c6fbd675">dbl</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o14">integer</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#32ee2ba322a0b7d16520f52ded591cc5">integer</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o15">dimension</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#29505a2b48cd755e10cedf01f3683d61">dimension</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o16">str</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#bfe1adab94129fefdafe9e64be135fb6">str</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o17">array</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#28aef58241d3a500968ca65df099ee3a">array</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap valign="top">}&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o18">bounds</a></td></tr>
+<tr><td class="memItemLeft" nowrap valign="top">}&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#bb297424036e868212f5086d5c5235fe">bounds</a></td></tr>
 
 <tr><td class="memItemLeft" nowrap>union {</td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o19">curve</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#d64f0c31d200d3d413725621b3ef9133">curve</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;double&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o20">dbl</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;double&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#222137e14dadb05adfbdde061679ce61">dbl</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;int&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o21">dimension</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;int&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#5d8633772783bb1c66ffa66d7f720a9d">dimension</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;int&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o22">integer</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;int&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#3563548500d3ec917d8e1cf88c34f8cd">integer</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;int&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o23">boolean</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;int&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#74aaa2515728660657133ca3191e422c">boolean</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;const char *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o24">str</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;const char *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#e4409d001a6f1b7f8bbf237016900e48">str</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o25">array</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#28aef58241d3a500968ca65df099ee3a">array</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap valign="top">}&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o26">deflt</a></td></tr>
+<tr><td class="memItemLeft" nowrap valign="top">}&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#79042d88fa0ab284a8e3e4ad7b969f90">deflt</a></td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Parameter description. 
 <p>
+
+<p>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o25"></a><!-- doxytag: member="stp_parameter_t::array" ref="o25" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="092430e582e7560fb532f546f78ca70c"></a><!-- doxytag: member="stp_parameter_t::name" ref="092430e582e7560fb532f546f78ca70c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a>* <a class="el" href="structstp__parameter__t.html#o17">stp_parameter_t::array</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__parameter__t.html#092430e582e7560fb532f546f78ca70c">stp_parameter_t::name</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Default array parameter value.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o17"></a><!-- doxytag: member="stp_parameter_t::array" ref="o17" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Internal name (key). 
+</div>
+</div><p>
+<a class="anchor" name="396e4980926c200e9ce4454f19e7311a"></a><!-- doxytag: member="stp_parameter_t::text" ref="396e4980926c200e9ce4454f19e7311a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a>* <a class="el" href="structstp__parameter__t.html#o17">stp_parameter_t::array</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__parameter__t.html#396e4980926c200e9ce4454f19e7311a">stp_parameter_t::text</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-array parameter value.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o23"></a><!-- doxytag: member="stp_parameter_t::boolean" ref="o23" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+User-visible name. 
+</div>
+</div><p>
+<a class="anchor" name="2cb67e4324a017746ca9bfda772aa50f"></a><!-- doxytag: member="stp_parameter_t::category" ref="2cb67e4324a017746ca9bfda772aa50f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__parameter__t.html#o23">stp_parameter_t::boolean</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__parameter__t.html#2cb67e4324a017746ca9bfda772aa50f">stp_parameter_t::category</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Default boolean parameter value.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o18"></a><!-- doxytag: member="stp_parameter_t::bounds" ref="o18" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+User-visible category name. 
+</div>
+</div><p>
+<a class="anchor" name="9f0637d6b97f0daa3122840eb2bd13db"></a><!-- doxytag: member="stp_parameter_t::help" ref="9f0637d6b97f0daa3122840eb2bd13db" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">union { ... }   <a class="el" href="structstp__parameter__t.html#o18">stp_parameter_t::bounds</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__parameter__t.html#9f0637d6b97f0daa3122840eb2bd13db">stp_parameter_t::help</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Limits on the values the parameter may take.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_parameter_t::category" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Help string. 
+</div>
+</div><p>
+<a class="anchor" name="ebe5dea02843240fe03461abf007f154"></a><!-- doxytag: member="stp_parameter_t::p_type" ref="ebe5dea02843240fe03461abf007f154" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__parameter__t.html#o2">stp_parameter_t::category</a>          </td>
+          <td class="memname"><a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> <a class="el" href="structstp__parameter__t.html#ebe5dea02843240fe03461abf007f154">stp_parameter_t::p_type</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-User-visible category name.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o9"></a><!-- doxytag: member="stp_parameter_t::channel" ref="o9" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Parameter type. 
+</div>
+</div><p>
+<a class="anchor" name="410388e541bdb14fbd0af2984e229217"></a><!-- doxytag: member="stp_parameter_t::p_class" ref="410388e541bdb14fbd0af2984e229217" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned char <a class="el" href="structstp__parameter__t.html#o9">stp_parameter_t::channel</a>          </td>
+          <td class="memname"><a class="el" href="group__vars.html#g4eba7e712c0e17b76e472f26e202d7b8">stp_parameter_class_t</a> <a class="el" href="structstp__parameter__t.html#410388e541bdb14fbd0af2984e229217">stp_parameter_t::p_class</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-The channel to which this parameter applies     </td>
-  </tr>
-</table>
-<a class="anchor" name="o19"></a><!-- doxytag: member="stp_parameter_t::curve" ref="o19" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Parameter class. 
+</div>
+</div><p>
+<a class="anchor" name="2a4a1195c06243e08acb03475fb1e7cc"></a><!-- doxytag: member="stp_parameter_t::p_level" ref="2a4a1195c06243e08acb03475fb1e7cc" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* <a class="el" href="structstp__parameter__t.html#o12">stp_parameter_t::curve</a>          </td>
+          <td class="memname"><a class="el" href="group__vars.html#gaa9c9265ffe70122bd33659cf2983207">stp_parameter_level_t</a> <a class="el" href="structstp__parameter__t.html#2a4a1195c06243e08acb03475fb1e7cc">stp_parameter_t::p_level</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Default curve parameter value.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o12"></a><!-- doxytag: member="stp_parameter_t::curve" ref="o12" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Parameter level. 
+</div>
+</div><p>
+<a class="anchor" name="ce4d02e3665f9cdfe83ed7dd559e1c1a"></a><!-- doxytag: member="stp_parameter_t::is_mandatory" ref="ce4d02e3665f9cdfe83ed7dd559e1c1a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* <a class="el" href="structstp__parameter__t.html#o12">stp_parameter_t::curve</a>          </td>
+          <td class="memname">unsigned char <a class="el" href="structstp__parameter__t.html#ce4d02e3665f9cdfe83ed7dd559e1c1a">stp_parameter_t::is_mandatory</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-curve parameter value.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o20"></a><!-- doxytag: member="stp_parameter_t::dbl" ref="o20" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+The parameter is required, even when set inactive. 
+</div>
+</div><p>
+<a class="anchor" name="8b1af01f0874c79b6dbc4d0eca432952"></a><!-- doxytag: member="stp_parameter_t::is_active" ref="8b1af01f0874c79b6dbc4d0eca432952" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">double <a class="el" href="structstp__parameter__t.html#o13">stp_parameter_t::dbl</a>          </td>
+          <td class="memname">unsigned char <a class="el" href="structstp__parameter__t.html#8b1af01f0874c79b6dbc4d0eca432952">stp_parameter_t::is_active</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Default double parameter value.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o13"></a><!-- doxytag: member="stp_parameter_t::dbl" ref="o13" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Is the parameter active? 
+</div>
+</div><p>
+<a class="anchor" name="79bc0b76d5d5e238ddd205aa4a97ebad"></a><!-- doxytag: member="stp_parameter_t::channel" ref="79bc0b76d5d5e238ddd205aa4a97ebad" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a> <a class="el" href="structstp__parameter__t.html#o13">stp_parameter_t::dbl</a>          </td>
+          <td class="memname">unsigned char <a class="el" href="structstp__parameter__t.html#79bc0b76d5d5e238ddd205aa4a97ebad">stp_parameter_t::channel</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-double_bound parameter value.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o26"></a><!-- doxytag: member="stp_parameter_t::deflt" ref="o26" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+The channel to which this parameter applies 
+</div>
+</div><p>
+<a class="anchor" name="56100203c262c60d4cb18c7a49cde27d"></a><!-- doxytag: member="stp_parameter_t::verify_this_parameter" ref="56100203c262c60d4cb18c7a49cde27d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">union { ... }   <a class="el" href="structstp__parameter__t.html#o26">stp_parameter_t::deflt</a>          </td>
+          <td class="memname">unsigned char <a class="el" href="structstp__parameter__t.html#56100203c262c60d4cb18c7a49cde27d">stp_parameter_t::verify_this_parameter</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Default value of the parameter.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o21"></a><!-- doxytag: member="stp_parameter_t::dimension" ref="o21" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Should the verify system check this parameter? 
+</div>
+</div><p>
+<a class="anchor" name="4421135f9985be49d156cbc9aa74c710"></a><!-- doxytag: member="stp_parameter_t::read_only" ref="4421135f9985be49d156cbc9aa74c710" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__parameter__t.html#o15">stp_parameter_t::dimension</a>          </td>
+          <td class="memname">unsigned char <a class="el" href="structstp__parameter__t.html#4421135f9985be49d156cbc9aa74c710">stp_parameter_t::read_only</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Default dimension parameter value.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o15"></a><!-- doxytag: member="stp_parameter_t::dimension" ref="o15" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="d64f0c31d200d3d413725621b3ef9133"></a><!-- doxytag: member="stp_parameter_t::curve" ref="d64f0c31d200d3d413725621b3ef9133" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a> <a class="el" href="structstp__parameter__t.html#o15">stp_parameter_t::dimension</a>          </td>
+          <td class="memname"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* <a class="el" href="structstp__parameter__t.html#d64f0c31d200d3d413725621b3ef9133">stp_parameter_t::curve</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-int_bound parameter value.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_parameter_t::help" ref="o3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+curve parameter value. 
+</div>
+</div><p>
+<a class="anchor" name="12fc8869d3056687e576af63c6fbd675"></a><!-- doxytag: member="stp_parameter_t::dbl" ref="12fc8869d3056687e576af63c6fbd675" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__parameter__t.html#o3">stp_parameter_t::help</a>          </td>
+          <td class="memname"><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a> <a class="el" href="structstp__parameter__t.html#12fc8869d3056687e576af63c6fbd675">stp_parameter_t::dbl</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Help string.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o22"></a><!-- doxytag: member="stp_parameter_t::integer" ref="o22" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+double_bound parameter value. 
+</div>
+</div><p>
+<a class="anchor" name="32ee2ba322a0b7d16520f52ded591cc5"></a><!-- doxytag: member="stp_parameter_t::integer" ref="32ee2ba322a0b7d16520f52ded591cc5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__parameter__t.html#o14">stp_parameter_t::integer</a>          </td>
+          <td class="memname"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a> <a class="el" href="structstp__parameter__t.html#32ee2ba322a0b7d16520f52ded591cc5">stp_parameter_t::integer</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Default int parameter value.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o14"></a><!-- doxytag: member="stp_parameter_t::integer" ref="o14" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+int_bound parameter value. 
+</div>
+</div><p>
+<a class="anchor" name="29505a2b48cd755e10cedf01f3683d61"></a><!-- doxytag: member="stp_parameter_t::dimension" ref="29505a2b48cd755e10cedf01f3683d61" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a> <a class="el" href="structstp__parameter__t.html#o14">stp_parameter_t::integer</a>          </td>
+          <td class="memname"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a> <a class="el" href="structstp__parameter__t.html#29505a2b48cd755e10cedf01f3683d61">stp_parameter_t::dimension</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-int_bound parameter value.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o8"></a><!-- doxytag: member="stp_parameter_t::is_active" ref="o8" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+int_bound parameter value. 
+</div>
+</div><p>
+<a class="anchor" name="bfe1adab94129fefdafe9e64be135fb6"></a><!-- doxytag: member="stp_parameter_t::str" ref="bfe1adab94129fefdafe9e64be135fb6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned char <a class="el" href="structstp__parameter__t.html#o8">stp_parameter_t::is_active</a>          </td>
+          <td class="memname"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* <a class="el" href="structstp__parameter__t.html#bfe1adab94129fefdafe9e64be135fb6">stp_parameter_t::str</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Is the parameter active?     </td>
-  </tr>
-</table>
-<a class="anchor" name="o7"></a><!-- doxytag: member="stp_parameter_t::is_mandatory" ref="o7" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+string_list parameter value. 
+</div>
+</div><p>
+<a class="anchor" name="28aef58241d3a500968ca65df099ee3a"></a><!-- doxytag: member="stp_parameter_t::array" ref="28aef58241d3a500968ca65df099ee3a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned char <a class="el" href="structstp__parameter__t.html#o7">stp_parameter_t::is_mandatory</a>          </td>
+          <td class="memname"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a>* <a class="el" href="structstp__parameter__t.html#28aef58241d3a500968ca65df099ee3a">stp_parameter_t::array</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-The parameter is required, even when set inactive.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_parameter_t::name" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+array parameter value. 
+</div>
+</div><p>
+<a class="anchor" name="bb297424036e868212f5086d5c5235fe"></a><!-- doxytag: member="stp_parameter_t::bounds" ref="bb297424036e868212f5086d5c5235fe" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__parameter__t.html#o0">stp_parameter_t::name</a>          </td>
+          <td class="memname">union { ... }   <a class="el" href="structstp__parameter__t.html#bb297424036e868212f5086d5c5235fe">stp_parameter_t::bounds</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Internal name (key).     </td>
-  </tr>
-</table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stp_parameter_t::p_class" ref="o5" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Limits on the values the parameter may take. 
+</div>
+</div><p>
+<a class="anchor" name="d64f0c31d200d3d413725621b3ef9133"></a><!-- doxytag: member="stp_parameter_t::curve" ref="d64f0c31d200d3d413725621b3ef9133" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga134">stp_parameter_class_t</a> <a class="el" href="structstp__parameter__t.html#o5">stp_parameter_t::p_class</a>          </td>
+          <td class="memname"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* <a class="el" href="structstp__parameter__t.html#d64f0c31d200d3d413725621b3ef9133">stp_parameter_t::curve</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Parameter class.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stp_parameter_t::p_level" ref="o6" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Default curve parameter value. 
+</div>
+</div><p>
+<a class="anchor" name="222137e14dadb05adfbdde061679ce61"></a><!-- doxytag: member="stp_parameter_t::dbl" ref="222137e14dadb05adfbdde061679ce61" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_level_t</a> <a class="el" href="structstp__parameter__t.html#o6">stp_parameter_t::p_level</a>          </td>
+          <td class="memname">double <a class="el" href="structstp__parameter__t.html#12fc8869d3056687e576af63c6fbd675">stp_parameter_t::dbl</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Parameter level.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_parameter_t::p_type" ref="o4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Default double parameter value. 
+</div>
+</div><p>
+<a class="anchor" name="5d8633772783bb1c66ffa66d7f720a9d"></a><!-- doxytag: member="stp_parameter_t::dimension" ref="5d8633772783bb1c66ffa66d7f720a9d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga133">stp_parameter_type_t</a> <a class="el" href="structstp__parameter__t.html#o4">stp_parameter_t::p_type</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__parameter__t.html#29505a2b48cd755e10cedf01f3683d61">stp_parameter_t::dimension</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Parameter type.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o11"></a><!-- doxytag: member="stp_parameter_t::read_only" ref="o11" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Default dimension parameter value. 
+</div>
+</div><p>
+<a class="anchor" name="3563548500d3ec917d8e1cf88c34f8cd"></a><!-- doxytag: member="stp_parameter_t::integer" ref="3563548500d3ec917d8e1cf88c34f8cd" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned char <a class="el" href="structstp__parameter__t.html#o11">stp_parameter_t::read_only</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__parameter__t.html#32ee2ba322a0b7d16520f52ded591cc5">stp_parameter_t::integer</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o24"></a><!-- doxytag: member="stp_parameter_t::str" ref="o24" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Default int parameter value. 
+</div>
+</div><p>
+<a class="anchor" name="74aaa2515728660657133ca3191e422c"></a><!-- doxytag: member="stp_parameter_t::boolean" ref="74aaa2515728660657133ca3191e422c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__parameter__t.html#o16">stp_parameter_t::str</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__parameter__t.html#74aaa2515728660657133ca3191e422c">stp_parameter_t::boolean</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Default string parameter value.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o16"></a><!-- doxytag: member="stp_parameter_t::str" ref="o16" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Default boolean parameter value. 
+</div>
+</div><p>
+<a class="anchor" name="e4409d001a6f1b7f8bbf237016900e48"></a><!-- doxytag: member="stp_parameter_t::str" ref="e4409d001a6f1b7f8bbf237016900e48" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a>* <a class="el" href="structstp__parameter__t.html#o16">stp_parameter_t::str</a>          </td>
+          <td class="memname">const char* <a class="el" href="structstp__parameter__t.html#bfe1adab94129fefdafe9e64be135fb6">stp_parameter_t::str</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-string_list parameter value.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_parameter_t::text" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Default string parameter value. 
+</div>
+</div><p>
+<a class="anchor" name="28aef58241d3a500968ca65df099ee3a"></a><!-- doxytag: member="stp_parameter_t::array" ref="28aef58241d3a500968ca65df099ee3a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__parameter__t.html#o1">stp_parameter_t::text</a>          </td>
+          <td class="memname"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a>* <a class="el" href="structstp__parameter__t.html#28aef58241d3a500968ca65df099ee3a">stp_parameter_t::array</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-User-visible name.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o10"></a><!-- doxytag: member="stp_parameter_t::verify_this_parameter" ref="o10" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Default array parameter value. 
+</div>
+</div><p>
+<a class="anchor" name="79042d88fa0ab284a8e3e4ad7b969f90"></a><!-- doxytag: member="stp_parameter_t::deflt" ref="79042d88fa0ab284a8e3e4ad7b969f90" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned char <a class="el" href="structstp__parameter__t.html#o10">stp_parameter_t::verify_this_parameter</a>          </td>
+          <td class="memname">union { ... }   <a class="el" href="structstp__parameter__t.html#79042d88fa0ab284a8e3e4ad7b969f90">stp_parameter_t::deflt</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Should the verify system check this parameter?     </td>
-  </tr>
-</table>
+Default value of the parameter. 
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__pass__t.html b/doc/gutenprint/html/structstp__pass__t.html
index 93eb7a7..22677e1 100644
--- a/doc/gutenprint/html/structstp__pass__t.html
+++ b/doc/gutenprint/html/structstp__pass__t.html
@@ -1,171 +1,139 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_pass_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_pass_t Struct Reference</h1><!-- doxytag: class="stp_pass_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#o0">pass</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#fdb7d267dad9bfc69e8deb86da07ee7b">pass</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#o1">missingstartrows</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#462d1714bab638212fcae32b869c11d2">missingstartrows</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#o2">logicalpassstart</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#e93d9d32f282f62426160626ff6c5ca3">logicalpassstart</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#o3">physpassstart</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#0da3d73932d6c07aceaf4bce93cf6163">physpassstart</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#o4">physpassend</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#4d75f7e07ebbffb75c2a7f36f43b3c9e">physpassend</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#o5">subpass</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#a4a3363d8de9121ba3d8bf28076b1c89">subpass</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_pass_t::logicalpassstart" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="fdb7d267dad9bfc69e8deb86da07ee7b"></a><!-- doxytag: member="stp_pass_t::pass" ref="fdb7d267dad9bfc69e8deb86da07ee7b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o2">stp_pass_t::logicalpassstart</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__pass__t.html#fdb7d267dad9bfc69e8deb86da07ee7b">stp_pass_t::pass</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_pass_t::missingstartrows" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="462d1714bab638212fcae32b869c11d2"></a><!-- doxytag: member="stp_pass_t::missingstartrows" ref="462d1714bab638212fcae32b869c11d2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o1">stp_pass_t::missingstartrows</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__pass__t.html#462d1714bab638212fcae32b869c11d2">stp_pass_t::missingstartrows</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_pass_t::pass" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="e93d9d32f282f62426160626ff6c5ca3"></a><!-- doxytag: member="stp_pass_t::logicalpassstart" ref="e93d9d32f282f62426160626ff6c5ca3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o0">stp_pass_t::pass</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__pass__t.html#e93d9d32f282f62426160626ff6c5ca3">stp_pass_t::logicalpassstart</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_pass_t::physpassend" ref="o4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="0da3d73932d6c07aceaf4bce93cf6163"></a><!-- doxytag: member="stp_pass_t::physpassstart" ref="0da3d73932d6c07aceaf4bce93cf6163" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o4">stp_pass_t::physpassend</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__pass__t.html#0da3d73932d6c07aceaf4bce93cf6163">stp_pass_t::physpassstart</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_pass_t::physpassstart" ref="o3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="4d75f7e07ebbffb75c2a7f36f43b3c9e"></a><!-- doxytag: member="stp_pass_t::physpassend" ref="4d75f7e07ebbffb75c2a7f36f43b3c9e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o3">stp_pass_t::physpassstart</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__pass__t.html#4d75f7e07ebbffb75c2a7f36f43b3c9e">stp_pass_t::physpassend</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stp_pass_t::subpass" ref="o5" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="a4a3363d8de9121ba3d8bf28076b1c89"></a><!-- doxytag: member="stp_pass_t::subpass" ref="a4a3363d8de9121ba3d8bf28076b1c89" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o5">stp_pass_t::subpass</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__pass__t.html#a4a3363d8de9121ba3d8bf28076b1c89">stp_pass_t::subpass</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__printfuncs__t.html b/doc/gutenprint/html/structstp__printfuncs__t.html
index c25ce18..50eb073 100644
--- a/doc/gutenprint/html/structstp__printfuncs__t.html
+++ b/doc/gutenprint/html/structstp__printfuncs__t.html
@@ -1,10 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_printfuncs_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_printfuncs_t Struct Reference<br>
 <small>
 [<a class="el" href="group__printer.html">printer</a>]</small>
@@ -13,312 +29,216 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o0">list_parameters</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#19dc0ba4351a154cf9450ac4fce1ca1a">list_parameters</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o1">parameters</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#c4eab991ca917968e0f264b7105faaa4">parameters</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o2">media_size</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *width, int *height)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#102e995ff1ce583f84e38409852bf95f">media_size</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o3">imageable_area</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#68c9339cc1b74382ec07eed78c2bd501">imageable_area</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o4">maximum_imageable_area</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#3661a4612e62e8e5aef31eaab345675c">maximum_imageable_area</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o5">limit</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#36e471ee24b92cfd67390a025cbc427e">limit</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o6">print</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#7704d7a1e997039deedfdf76a353c35d">print</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o7">describe_resolution</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *x, int *y)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#18e0da9638360173e0d75d839ce72b92">describe_resolution</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *x, int *y)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o8">describe_output</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#444ec86f3fe02ac479cbf2fc152d3423">describe_output</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o9">verify</a> )(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#948b6d7219dbb30f47a93eef2f85fde2">verify</a> )(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o10">start_job</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#5c99986ad02cbcc4dce313bc7f5293fc">start_job</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o11">end_job</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#81fa6b507a316a8d6d7404b29920936e">end_job</a> )(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o8"></a><!-- doxytag: member="stp_printfuncs_t::describe_output" ref="o8" args=")(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="19dc0ba4351a154cf9450ac4fce1ca1a"></a><!-- doxytag: member="stp_printfuncs_t::list_parameters" ref="19dc0ba4351a154cf9450ac4fce1ca1a" args=")(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const char*(* <a class="el" href="structstp__printfuncs__t.html#o8">stp_printfuncs_t::describe_output</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)          </td>
+          <td class="memname"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>(* <a class="el" href="structstp__printfuncs__t.html#19dc0ba4351a154cf9450ac4fce1ca1a">stp_printfuncs_t::list_parameters</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o7"></a><!-- doxytag: member="stp_printfuncs_t::describe_resolution" ref="o7" args=")(const stp_vars_t *v, int *x, int *y)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="c4eab991ca917968e0f264b7105faaa4"></a><!-- doxytag: member="stp_printfuncs_t::parameters" ref="c4eab991ca917968e0f264b7105faaa4" args=")(const stp_vars_t *v, const char *name, stp_parameter_t *)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#o7">stp_printfuncs_t::describe_resolution</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *x, int *y)          </td>
+          <td class="memname">void(* <a class="el" href="structstp__printfuncs__t.html#c4eab991ca917968e0f264b7105faaa4">stp_printfuncs_t::parameters</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o11"></a><!-- doxytag: member="stp_printfuncs_t::end_job" ref="o11" args=")(const stp_vars_t *v, stp_image_t *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="102e995ff1ce583f84e38409852bf95f"></a><!-- doxytag: member="stp_printfuncs_t::media_size" ref="102e995ff1ce583f84e38409852bf95f" args=")(const stp_vars_t *v, int *width, int *height)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#o11">stp_printfuncs_t::end_job</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
+          <td class="memname">void(* <a class="el" href="structstp__printfuncs__t.html#102e995ff1ce583f84e38409852bf95f">stp_printfuncs_t::media_size</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_printfuncs_t::imageable_area" ref="o3" args=")(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="68c9339cc1b74382ec07eed78c2bd501"></a><!-- doxytag: member="stp_printfuncs_t::imageable_area" ref="68c9339cc1b74382ec07eed78c2bd501" args=")(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#o3">stp_printfuncs_t::imageable_area</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)          </td>
+          <td class="memname">void(* <a class="el" href="structstp__printfuncs__t.html#68c9339cc1b74382ec07eed78c2bd501">stp_printfuncs_t::imageable_area</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stp_printfuncs_t::limit" ref="o5" args=")(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="3661a4612e62e8e5aef31eaab345675c"></a><!-- doxytag: member="stp_printfuncs_t::maximum_imageable_area" ref="3661a4612e62e8e5aef31eaab345675c" args=")(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#o5">stp_printfuncs_t::limit</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)          </td>
+          <td class="memname">void(* <a class="el" href="structstp__printfuncs__t.html#3661a4612e62e8e5aef31eaab345675c">stp_printfuncs_t::maximum_imageable_area</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_printfuncs_t::list_parameters" ref="o0" args=")(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="36e471ee24b92cfd67390a025cbc427e"></a><!-- doxytag: member="stp_printfuncs_t::limit" ref="36e471ee24b92cfd67390a025cbc427e" args=")(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>(* <a class="el" href="structstp__printfuncs__t.html#o0">stp_printfuncs_t::list_parameters</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)          </td>
+          <td class="memname">void(* <a class="el" href="structstp__printfuncs__t.html#36e471ee24b92cfd67390a025cbc427e">stp_printfuncs_t::limit</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_printfuncs_t::maximum_imageable_area" ref="o4" args=")(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="7704d7a1e997039deedfdf76a353c35d"></a><!-- doxytag: member="stp_printfuncs_t::print" ref="7704d7a1e997039deedfdf76a353c35d" args=")(const stp_vars_t *v, stp_image_t *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#o4">stp_printfuncs_t::maximum_imageable_area</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__printfuncs__t.html#7704d7a1e997039deedfdf76a353c35d">stp_printfuncs_t::print</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_printfuncs_t::media_size" ref="o2" args=")(const stp_vars_t *v, int *width, int *height)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="18e0da9638360173e0d75d839ce72b92"></a><!-- doxytag: member="stp_printfuncs_t::describe_resolution" ref="18e0da9638360173e0d75d839ce72b92" args=")(const stp_vars_t *v, int *x, int *y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#o2">stp_printfuncs_t::media_size</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *width, int *height)          </td>
+          <td class="memname">void(* <a class="el" href="structstp__printfuncs__t.html#18e0da9638360173e0d75d839ce72b92">stp_printfuncs_t::describe_resolution</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *x, int *y)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_printfuncs_t::parameters" ref="o1" args=")(const stp_vars_t *v, const char *name, stp_parameter_t *)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="444ec86f3fe02ac479cbf2fc152d3423"></a><!-- doxytag: member="stp_printfuncs_t::describe_output" ref="444ec86f3fe02ac479cbf2fc152d3423" args=")(const stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#o1">stp_printfuncs_t::parameters</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *)          </td>
+          <td class="memname">const char*(* <a class="el" href="structstp__printfuncs__t.html#444ec86f3fe02ac479cbf2fc152d3423">stp_printfuncs_t::describe_output</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stp_printfuncs_t::print" ref="o6" args=")(const stp_vars_t *v, stp_image_t *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="948b6d7219dbb30f47a93eef2f85fde2"></a><!-- doxytag: member="stp_printfuncs_t::verify" ref="948b6d7219dbb30f47a93eef2f85fde2" args=")(stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#o6">stp_printfuncs_t::print</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__printfuncs__t.html#948b6d7219dbb30f47a93eef2f85fde2">stp_printfuncs_t::verify</a>)(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o10"></a><!-- doxytag: member="stp_printfuncs_t::start_job" ref="o10" args=")(const stp_vars_t *v, stp_image_t *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="5c99986ad02cbcc4dce313bc7f5293fc"></a><!-- doxytag: member="stp_printfuncs_t::start_job" ref="5c99986ad02cbcc4dce313bc7f5293fc" args=")(const stp_vars_t *v, stp_image_t *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#o10">stp_printfuncs_t::start_job</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__printfuncs__t.html#5c99986ad02cbcc4dce313bc7f5293fc">stp_printfuncs_t::start_job</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o9"></a><!-- doxytag: member="stp_printfuncs_t::verify" ref="o9" args=")(stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="81fa6b507a316a8d6d7404b29920936e"></a><!-- doxytag: member="stp_printfuncs_t::end_job" ref="81fa6b507a316a8d6d7404b29920936e" args=")(const stp_vars_t *v, stp_image_t *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#o9">stp_printfuncs_t::verify</a>)(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)          </td>
+          <td class="memname">int(* <a class="el" href="structstp__printfuncs__t.html#81fa6b507a316a8d6d7404b29920936e">stp_printfuncs_t::end_job</a>)(const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="printers_8h.html">printers.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__raw__t.html b/doc/gutenprint/html/structstp__raw__t.html
index 76b5543..18267a1 100644
--- a/doc/gutenprint/html/structstp__raw__t.html
+++ b/doc/gutenprint/html/structstp__raw__t.html
@@ -1,10 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_raw_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_raw_t Struct Reference<br>
 <small>
 [<a class="el" href="group__vars.html">vars</a>]</small>
@@ -16,65 +32,51 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__raw__t.html#o0">bytes</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__raw__t.html#5e4620104d47e7e593d75d1ebc977407">bytes</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__raw__t.html#o1">data</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__raw__t.html#36151f67569592aeac5c549a2a0daa2a">data</a></td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Raw parameter. 
 <p>
+
+<p>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_raw_t::bytes" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="5e4620104d47e7e593d75d1ebc977407"></a><!-- doxytag: member="stp_raw_t::bytes" ref="5e4620104d47e7e593d75d1ebc977407" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">size_t <a class="el" href="structstp__raw__t.html#o0">stp_raw_t::bytes</a>          </td>
+          <td class="memname">size_t <a class="el" href="structstp__raw__t.html#5e4620104d47e7e593d75d1ebc977407">stp_raw_t::bytes</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Size of data.     </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_raw_t::data" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+Size of data. 
+</div>
+</div><p>
+<a class="anchor" name="36151f67569592aeac5c549a2a0daa2a"></a><!-- doxytag: member="stp_raw_t::data" ref="36151f67569592aeac5c549a2a0daa2a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const void* <a class="el" href="structstp__raw__t.html#o1">stp_raw_t::data</a>          </td>
+          <td class="memname">const void* <a class="el" href="structstp__raw__t.html#36151f67569592aeac5c549a2a0daa2a">stp_raw_t::data</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-Raw data.     </td>
-  </tr>
-</table>
+Raw data. 
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__shade.html b/doc/gutenprint/html/structstp__shade.html
index 3d18aed..3cc7180 100644
--- a/doc/gutenprint/html/structstp__shade.html
+++ b/doc/gutenprint/html/structstp__shade.html
@@ -1,96 +1,88 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_shade Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_shade Struct Reference</h1><!-- doxytag: class="stp_shade" --><code>#include &lt;dither.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#o0">value</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#07a72426c7bcbf22f1cc253a97a453d4">value</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#o1">numsizes</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#8e68774d99e3eecb76f06f7704f1eb90">numsizes</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__dotsize.html">stp_dotsize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#o2">dot_sizes</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__dotsize.html">stp_dotsize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#5057a856d4a6f7095af66b8cefc3cdc3">dot_sizes</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_shade::dot_sizes" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="07a72426c7bcbf22f1cc253a97a453d4"></a><!-- doxytag: member="stp_shade::value" ref="07a72426c7bcbf22f1cc253a97a453d4" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__dotsize.html">stp_dotsize_t</a>* <a class="el" href="structstp__shade.html#o2">stp_shade::dot_sizes</a>          </td>
+          <td class="memname">double <a class="el" href="structstp__shade.html#07a72426c7bcbf22f1cc253a97a453d4">stp_shade::value</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_shade::numsizes" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="8e68774d99e3eecb76f06f7704f1eb90"></a><!-- doxytag: member="stp_shade::numsizes" ref="8e68774d99e3eecb76f06f7704f1eb90" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__shade.html#o1">stp_shade::numsizes</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__shade.html#8e68774d99e3eecb76f06f7704f1eb90">stp_shade::numsizes</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_shade::value" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="5057a856d4a6f7095af66b8cefc3cdc3"></a><!-- doxytag: member="stp_shade::dot_sizes" ref="5057a856d4a6f7095af66b8cefc3cdc3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">double <a class="el" href="structstp__shade.html#o0">stp_shade::value</a>          </td>
+          <td class="memname">const <a class="el" href="structstp__dotsize.html">stp_dotsize_t</a>* <a class="el" href="structstp__shade.html#5057a856d4a6f7095af66b8cefc3cdc3">stp_shade::dot_sizes</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__weave__t.html b/doc/gutenprint/html/structstp__weave__t.html
index 1858218..1b4d2cc 100644
--- a/doc/gutenprint/html/structstp__weave__t.html
+++ b/doc/gutenprint/html/structstp__weave__t.html
@@ -1,196 +1,156 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_weave_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_weave_t Struct Reference</h1><!-- doxytag: class="stp_weave_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#o0">row</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#708ad2c7d2f76b864fe92b9e0582eece">row</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#o1">pass</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#2536ce303e27f679c4afd6c33eea8d07">pass</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#o2">jet</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#31163b246a77f7959161edb6dd9ff61e">jet</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#o3">missingstartrows</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#f60b909adb3f9efb541be500c08cf87e">missingstartrows</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#o4">logicalpassstart</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#1e50ffa910d33a365572ceb93f0197c6">logicalpassstart</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#o5">physpassstart</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#aec693e98c7587da452ac604b675be3c">physpassstart</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#o6">physpassend</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#3041aa5f7a90d0d7d82d1b2406044bb3">physpassend</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_weave_t::jet" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="708ad2c7d2f76b864fe92b9e0582eece"></a><!-- doxytag: member="stp_weave_t::row" ref="708ad2c7d2f76b864fe92b9e0582eece" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o2">stp_weave_t::jet</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__weave__t.html#708ad2c7d2f76b864fe92b9e0582eece">stp_weave_t::row</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_weave_t::logicalpassstart" ref="o4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="2536ce303e27f679c4afd6c33eea8d07"></a><!-- doxytag: member="stp_weave_t::pass" ref="2536ce303e27f679c4afd6c33eea8d07" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o4">stp_weave_t::logicalpassstart</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__weave__t.html#2536ce303e27f679c4afd6c33eea8d07">stp_weave_t::pass</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_weave_t::missingstartrows" ref="o3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="31163b246a77f7959161edb6dd9ff61e"></a><!-- doxytag: member="stp_weave_t::jet" ref="31163b246a77f7959161edb6dd9ff61e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o3">stp_weave_t::missingstartrows</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__weave__t.html#31163b246a77f7959161edb6dd9ff61e">stp_weave_t::jet</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_weave_t::pass" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f60b909adb3f9efb541be500c08cf87e"></a><!-- doxytag: member="stp_weave_t::missingstartrows" ref="f60b909adb3f9efb541be500c08cf87e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o1">stp_weave_t::pass</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__weave__t.html#f60b909adb3f9efb541be500c08cf87e">stp_weave_t::missingstartrows</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stp_weave_t::physpassend" ref="o6" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="1e50ffa910d33a365572ceb93f0197c6"></a><!-- doxytag: member="stp_weave_t::logicalpassstart" ref="1e50ffa910d33a365572ceb93f0197c6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o6">stp_weave_t::physpassend</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__weave__t.html#1e50ffa910d33a365572ceb93f0197c6">stp_weave_t::logicalpassstart</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stp_weave_t::physpassstart" ref="o5" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="aec693e98c7587da452ac604b675be3c"></a><!-- doxytag: member="stp_weave_t::physpassstart" ref="aec693e98c7587da452ac604b675be3c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o5">stp_weave_t::physpassstart</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__weave__t.html#aec693e98c7587da452ac604b675be3c">stp_weave_t::physpassstart</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_weave_t::row" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="3041aa5f7a90d0d7d82d1b2406044bb3"></a><!-- doxytag: member="stp_weave_t::physpassend" ref="3041aa5f7a90d0d7d82d1b2406044bb3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o0">stp_weave_t::row</a>          </td>
+          <td class="memname">int <a class="el" href="structstp__weave__t.html#3041aa5f7a90d0d7d82d1b2406044bb3">stp_weave_t::physpassend</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/tab_b.gif b/doc/gutenprint/html/tab_b.gif
new file mode 100644
index 0000000..0d62348
--- /dev/null
+++ b/doc/gutenprint/html/tab_b.gif
diff --git a/doc/gutenprint/html/tab_l.gif b/doc/gutenprint/html/tab_l.gif
new file mode 100644
index 0000000..9b1e633
--- /dev/null
+++ b/doc/gutenprint/html/tab_l.gif
diff --git a/doc/gutenprint/html/tab_r.gif b/doc/gutenprint/html/tab_r.gif
new file mode 100644
index 0000000..ce9dd9f
--- /dev/null
+++ b/doc/gutenprint/html/tab_r.gif
diff --git a/doc/gutenprint/html/tabs.css b/doc/gutenprint/html/tabs.css
new file mode 100644
index 0000000..c37faaf
--- /dev/null
+++ b/doc/gutenprint/html/tabs.css
@@ -0,0 +1,102 @@
+/* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */
+
+DIV.tabs
+{
+   float            : left;
+   width            : 100%;
+   background       : url("tab_b.gif") repeat-x bottom;
+   margin-bottom    : 4px;
+}
+
+DIV.tabs UL
+{
+   margin           : 0px;
+   padding-left     : 10px;
+   list-style       : none;
+}
+
+DIV.tabs LI, DIV.tabs FORM
+{
+   display          : inline;
+   margin           : 0px;
+   padding          : 0px;
+}
+
+DIV.tabs FORM
+{
+   float            : right;
+}
+
+DIV.tabs A
+{
+   float            : left;
+   background       : url("tab_r.gif") no-repeat right top;
+   border-bottom    : 1px solid #84B0C7;
+   font-size        : x-small;
+   font-weight      : bold;
+   text-decoration  : none;
+}
+
+DIV.tabs A:hover
+{
+   background-position: 100% -150px;
+}
+
+DIV.tabs A:link, DIV.tabs A:visited,
+DIV.tabs A:active, DIV.tabs A:hover
+{
+       color: #1A419D;
+}
+
+DIV.tabs SPAN
+{
+   float            : left;
+   display          : block;
+   background       : url("tab_l.gif") no-repeat left top;
+   padding          : 5px 9px;
+   white-space      : nowrap;
+}
+
+DIV.tabs INPUT
+{
+   float            : right;
+   display          : inline;
+   font-size        : 1em;
+}
+
+DIV.tabs TD
+{
+   font-size        : x-small;
+   font-weight      : bold;
+   text-decoration  : none;
+}
+
+
+
+/* Commented Backslash Hack hides rule from IE5-Mac \*/
+DIV.tabs SPAN {float : none;}
+/* End IE5-Mac hack */
+
+DIV.tabs A:hover SPAN
+{
+   background-position: 0% -150px;
+}
+
+DIV.tabs LI.current A
+{
+   background-position: 100% -150px;
+   border-width     : 0px;
+}
+
+DIV.tabs LI.current SPAN
+{
+   background-position: 0% -150px;
+   padding-bottom   : 6px;
+}
+
+DIV.nav
+{
+   background       : none;
+   border           : none;
+   border-bottom    : 1px solid #84B0C7;
+}
diff --git a/doc/gutenprint/html/unionstp__mxml__value__u.html b/doc/gutenprint/html/unionstp__mxml__value__u.html
index 77c68e9..e6ed343 100644
--- a/doc/gutenprint/html/unionstp__mxml__value__u.html
+++ b/doc/gutenprint/html/unionstp__mxml__value__u.html
@@ -1,146 +1,122 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: stp_mxml_value_u Union Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stp_mxml_value_u Union Reference</h1><!-- doxytag: class="stp_mxml_value_u" --><code>#include &lt;mxml.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_element_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#o0">element</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_element_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#d4d8442bb433ac3da208e22ff0eaccf7">element</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#o1">integer</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#9540870864c06f2bf901024b7cc9048d">integer</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#o2">opaque</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#ca8f6bf03f29248dee0b8d364454d051">opaque</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#o3">real</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#3f253397958ad919a1fc97c42a58bc67">real</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#o4">text</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#82c76c9aca350baca3b72723d0a4e99d">text</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_mxml_value_u::element" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="d4d8442bb433ac3da208e22ff0eaccf7"></a><!-- doxytag: member="stp_mxml_value_u::element" ref="d4d8442bb433ac3da208e22ff0eaccf7" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_element_t</a> <a class="el" href="unionstp__mxml__value__u.html#o0">stp_mxml_value_u::element</a>          </td>
+          <td class="memname"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_element_t</a> <a class="el" href="unionstp__mxml__value__u.html#d4d8442bb433ac3da208e22ff0eaccf7">stp_mxml_value_u::element</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_mxml_value_u::integer" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="9540870864c06f2bf901024b7cc9048d"></a><!-- doxytag: member="stp_mxml_value_u::integer" ref="9540870864c06f2bf901024b7cc9048d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="unionstp__mxml__value__u.html#o1">stp_mxml_value_u::integer</a>          </td>
+          <td class="memname">int <a class="el" href="unionstp__mxml__value__u.html#9540870864c06f2bf901024b7cc9048d">stp_mxml_value_u::integer</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_mxml_value_u::opaque" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ca8f6bf03f29248dee0b8d364454d051"></a><!-- doxytag: member="stp_mxml_value_u::opaque" ref="ca8f6bf03f29248dee0b8d364454d051" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="unionstp__mxml__value__u.html#o2">stp_mxml_value_u::opaque</a>          </td>
+          <td class="memname">char* <a class="el" href="unionstp__mxml__value__u.html#ca8f6bf03f29248dee0b8d364454d051">stp_mxml_value_u::opaque</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_mxml_value_u::real" ref="o3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="3f253397958ad919a1fc97c42a58bc67"></a><!-- doxytag: member="stp_mxml_value_u::real" ref="3f253397958ad919a1fc97c42a58bc67" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">double <a class="el" href="unionstp__mxml__value__u.html#o3">stp_mxml_value_u::real</a>          </td>
+          <td class="memname">double <a class="el" href="unionstp__mxml__value__u.html#3f253397958ad919a1fc97c42a58bc67">stp_mxml_value_u::real</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_mxml_value_u::text" ref="o4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="82c76c9aca350baca3b72723d0a4e99d"></a><!-- doxytag: member="stp_mxml_value_u::text" ref="82c76c9aca350baca3b72723d0a4e99d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_t</a> <a class="el" href="unionstp__mxml__value__u.html#o4">stp_mxml_value_u::text</a>          </td>
+          <td class="memname"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_t</a> <a class="el" href="unionstp__mxml__value__u.html#82c76c9aca350baca3b72723d0a4e99d">stp_mxml_value_u::text</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this union was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:12 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/util_8h.html b/doc/gutenprint/html/util_8h.html
index cdd5950..bb5d977 100644
--- a/doc/gutenprint/html/util_8h.html
+++ b/doc/gutenprint/html/util_8h.html
@@ -1,140 +1,178 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/util.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>util.h File Reference</h1>Utility functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/util.h File Reference</h1>Utility functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="curve_8h.html">gutenprint/curve.h</a>&gt;</code><br>
 <code>#include &lt;<a class="el" href="vars_8h.html">gutenprint/vars.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga33">STP_DBG_LUT</a>&nbsp;&nbsp;&nbsp;0x1</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="util_8h.html#9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>(x)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga34">STP_DBG_COLORFUNC</a>&nbsp;&nbsp;&nbsp;0x2</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g4472d3ba849ed203d43005f04583decc">STP_DBG_LUT</a>&nbsp;&nbsp;&nbsp;0x1</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga35">STP_DBG_INK</a>&nbsp;&nbsp;&nbsp;0x4</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g0beee5fa281098eab25e3f22570c0fdc">STP_DBG_COLORFUNC</a>&nbsp;&nbsp;&nbsp;0x2</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga36">STP_DBG_PS</a>&nbsp;&nbsp;&nbsp;0x8</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g1c6936662d2cbe95de396fe8af2f254d">STP_DBG_INK</a>&nbsp;&nbsp;&nbsp;0x4</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga37">STP_DBG_PCL</a>&nbsp;&nbsp;&nbsp;0x10</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g90d230dd93fa96d34b438e82ed3f9639">STP_DBG_PS</a>&nbsp;&nbsp;&nbsp;0x8</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga38">STP_DBG_ESCP2</a>&nbsp;&nbsp;&nbsp;0x20</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gf8162186c8118e5c3a8543bc0c410a78">STP_DBG_PCL</a>&nbsp;&nbsp;&nbsp;0x10</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga39">STP_DBG_CANON</a>&nbsp;&nbsp;&nbsp;0x40</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gda7c4766db0c05ecb5ce435ddd81ecdd">STP_DBG_ESCP2</a>&nbsp;&nbsp;&nbsp;0x20</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga40">STP_DBG_LEXMARK</a>&nbsp;&nbsp;&nbsp;0x80</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g109cde96d907cbd28f0b631f07a3d696">STP_DBG_CANON</a>&nbsp;&nbsp;&nbsp;0x40</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga41">STP_DBG_WEAVE_PARAMS</a>&nbsp;&nbsp;&nbsp;0x100</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gc71c7cb5cdf49c881d944ef813a3733f">STP_DBG_LEXMARK</a>&nbsp;&nbsp;&nbsp;0x80</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga42">STP_DBG_ROWS</a>&nbsp;&nbsp;&nbsp;0x200</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g2af8b3f36dbda4cfd313b50ba2dae636">STP_DBG_WEAVE_PARAMS</a>&nbsp;&nbsp;&nbsp;0x100</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga43">STP_DBG_MARK_FILE</a>&nbsp;&nbsp;&nbsp;0x400</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g698ce0ddb2e4f0a8b6d7a77ad7a0fbf0">STP_DBG_ROWS</a>&nbsp;&nbsp;&nbsp;0x200</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga44">STP_DBG_LIST</a>&nbsp;&nbsp;&nbsp;0x800</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g01f4480bda8819f337b2be4c41e0ebe1">STP_DBG_MARK_FILE</a>&nbsp;&nbsp;&nbsp;0x400</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga45">STP_DBG_MODULE</a>&nbsp;&nbsp;&nbsp;0x1000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g3c5672b14a2e2ccdffca5b6277b1aac2">STP_DBG_LIST</a>&nbsp;&nbsp;&nbsp;0x800</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga46">STP_DBG_PATH</a>&nbsp;&nbsp;&nbsp;0x2000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g9ace1ab545abac936101248caf9a50c6">STP_DBG_MODULE</a>&nbsp;&nbsp;&nbsp;0x1000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga47">STP_DBG_PAPER</a>&nbsp;&nbsp;&nbsp;0x4000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g6f8cdfb28d0d73e9579fb1751f540dc7">STP_DBG_PATH</a>&nbsp;&nbsp;&nbsp;0x2000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga48">STP_DBG_PRINTERS</a>&nbsp;&nbsp;&nbsp;0x8000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gd5eeaeabba7a0a861ae0dc936057aabd">STP_DBG_PAPER</a>&nbsp;&nbsp;&nbsp;0x4000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga49">STP_DBG_XML</a>&nbsp;&nbsp;&nbsp;0x10000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gdbfb451ebbd246d62bd52e0120fa232b">STP_DBG_PRINTERS</a>&nbsp;&nbsp;&nbsp;0x8000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga50">STP_DBG_VARS</a>&nbsp;&nbsp;&nbsp;0x20000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gcf72e68aa70e333b06b0bb821218d967">STP_DBG_XML</a>&nbsp;&nbsp;&nbsp;0x10000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga51">STP_DBG_OLYMPUS</a>&nbsp;&nbsp;&nbsp;0x40000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g4c481c5ea8d87ae6c0e556593ab2020e">STP_DBG_VARS</a>&nbsp;&nbsp;&nbsp;0x20000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga52">STP_DBG_CURVE</a>&nbsp;&nbsp;&nbsp;0x80000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g574664feccffc4527df73e32c7e863bf">STP_DBG_OLYMPUS</a>&nbsp;&nbsp;&nbsp;0x40000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga53">STP_DBG_CURVE_ERRORS</a>&nbsp;&nbsp;&nbsp;0x100000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g8f3e76af1b2564a5763e790a45215438">STP_DBG_CURVE</a>&nbsp;&nbsp;&nbsp;0x80000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga54">STP_SAFE_FREE</a>(x)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gabbc2868668663cc28d6289d50e5f83d">STP_DBG_CURVE_ERRORS</a>&nbsp;&nbsp;&nbsp;0x100000</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga5a86efbbd3e2eb391718d82a1d7ffcc">STP_SAFE_FREE</a>(x)</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga0">stp_init</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g2ce0a2e8887fe5ff7f3eed1370d0d691">stp_init</a> (void)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Initialise libgimpprint.  <a href="group__util.html#g2ce0a2e8887fe5ff7f3eed1370d0d691"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g7fcc19f0abdc6513dfba7eaebeb16cb9">stp_set_output_codeset</a> (const char *codeset)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Initialise libgimpprint.  <a href="group__util.html#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1">stp_set_output_codeset</a> (const char *codeset)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the output encoding.  <a href="group__util.html#g7fcc19f0abdc6513dfba7eaebeb16cb9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gdbe8c167230b49bc10391d2c246e6dc0">stp_read_and_compose_curves</a> (const char *s1, const char *s2, <a class="el" href="group__curve.html#g7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> comp, size_t piecewise_point_count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the output encoding.  <a href="group__util.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga2">stp_read_and_compose_curves</a> (const char *s1, const char *s2, <a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a> comp, size_t piecewise_point_count)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gd0c145dc5cebecab0bb4e3ac40fc8e4d">stp_abort</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga3">stp_abort</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g13aa8afef5b0872704390adc6a01924e">stp_prune_inactive_options</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga4">stp_prune_inactive_options</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gd7ffe058decb939af6a5c1ec1d0d77fa">stp_zprintf</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga5">stp_zprintf</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g183d8f36f187530f9d7acdb176be3409">stp_zfwrite</a> (const char *buf, size_t bytes, size_t nitems, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga6">stp_zfwrite</a> (const char *buf, size_t bytes, size_t nitems, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g39e4c5f6fa2a07dfca3090a50a8858f9">stp_putc</a> (int ch, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga7">stp_putc</a> (int ch, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g1ffcb45ea3c37bb6b485addcaf945c99">stp_put16_le</a> (unsigned short sh, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga8">stp_put16_le</a> (unsigned short sh, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g23b504253ceda208b9a4985e6de8a5f7">stp_put16_be</a> (unsigned short sh, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga9">stp_put16_be</a> (unsigned short sh, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gadf69b8b3f713d2bd7ca3a5648da0c56">stp_put32_le</a> (unsigned int sh, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga10">stp_put32_le</a> (unsigned int sh, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g258b7b5f8808d0a3168f798e8bf72608">stp_put32_be</a> (unsigned int sh, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga11">stp_put32_be</a> (unsigned int sh, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gf6cf72e5e45f175ae8c332c0588832b9">stp_puts</a> (const char *s, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga12">stp_puts</a> (const char *s, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g79dd0a6f5c63f4fbf8591d3c041a7720">stp_putraw</a> (const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *r, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga13">stp_send_command</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *command, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gdb49b9cba9ddf4e506b6f530353ad93d">stp_send_command</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *command, const char *format,...)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga14">stp_erputc</a> (int ch)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g15987fbd850e04f2520cb151e08908e1">stp_erputc</a> (int ch)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga15">stp_eprintf</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ge53707df5c9945f289c58bfbe08a8d88">stp_eprintf</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga16">stp_erprintf</a> (const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g1df22de14e3275cb26ede10da66eebdf">stp_erprintf</a> (const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga17">stp_asprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g3f57c5298a5c6140ac56771dd62bd036">stp_asprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga18">stp_catprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gd4f33438f0103a143d90dc9c48d248eb">stp_catprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga19">stp_get_debug_level</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#geba8c24f265ee904c5876704b767841c">stp_get_debug_level</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga20">stp_dprintf</a> (unsigned long level, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g511e0c4cac91c674797da98ab96b83e6">stp_dprintf</a> (unsigned long level, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga21">stp_deprintf</a> (unsigned long level, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g129f45d7df47fd58d8653538fd13a1f2">stp_deprintf</a> (unsigned long level, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga22">stp_init_debug_messages</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g6d15e5b4e00f9d242166edb5332f8368">stp_init_debug_messages</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga23">stp_flush_debug_messages</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gbe74390c1422e9746745da55692f47b8">stp_flush_debug_messages</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga24">stp_malloc</a> (size_t)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g86a2976738a237df953655e733c75b3a">stp_malloc</a> (size_t)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga25">stp_zalloc</a> (size_t)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gc8fd1a439fa2d8e1ff1a2b104cd0137b">stp_zalloc</a> (size_t)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga26">stp_realloc</a> (void *ptr, size_t)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g2420936ab8b3492581f389deea44f58c">stp_realloc</a> (void *ptr, size_t)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga27">stp_free</a> (void *ptr)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g7d0c40c3157b2c5c630200352064874c">stp_free</a> (void *ptr)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga28">stp_strlen</a> (const char *s)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g56b08d3e12750bdfae8b53263f97aba9">stp_strlen</a> (const char *s)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga29">stp_strndup</a> (const char *s, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gb026f7022963acd694a8b89e4decbde5">stp_strndup</a> (const char *s, int n)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga30">stp_strdup</a> (const char *s)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g5c0731867697f555a94b2a1229804381">stp_strdup</a> (const char *s)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga31">stp_get_version</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g1f0797636484393574cb95e667819dc1">stp_get_version</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library version string (x.y.z).  <a href="group__util.html#ga31"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga32">stp_get_release_version</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library version string (x.y.z).  <a href="group__util.html#g1f0797636484393574cb95e667819dc1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g5ba7edc43ed094f32ae7d9158a362a7b">stp_get_release_version</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library release version string (x.y).  <a href="group__util.html#ga32"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library release version string (x.y).  <a href="group__util.html#g5ba7edc43ed094f32ae7d9158a362a7b"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Utility functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr><h2>Define Documentation</h2>
+<a class="anchor" name="9d373a9b65ff25b2db84c07394e1c212"></a><!-- doxytag: member="util.h::__attribute__" ref="9d373a9b65ff25b2db84c07394e1c212" args="(x)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define __attribute__          </td>
+          <td>(</td>
+          <td class="paramtype">x&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/vars_8h.html b/doc/gutenprint/html/vars_8h.html
index e92ef23..e06f2e8 100644
--- a/doc/gutenprint/html/vars_8h.html
+++ b/doc/gutenprint/html/vars_8h.html
@@ -1,13 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/vars.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>vars.h File Reference</h1>Print job functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/vars.h File Reference</h1>Print job functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="array_8h.html">gutenprint/array.h</a>&gt;</code><br>
 <code>#include &lt;<a class="el" href="curve_8h.html">gutenprint/curve.h</a>&gt;</code><br>
@@ -27,454 +40,459 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a></td></tr>
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter description.  <a href="structstp__parameter__t.html#_details">More...</a><br></td></tr>
+<tr><td colspan="2"><br><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9fc3819cba14f7f4c5654508a08a1adf">STP_RAW</a>(x)&nbsp;&nbsp;&nbsp;{ sizeof((x)), (x) }</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd888c1f6a36f999ffebfffa7b74f28d2">STP_RAW_STRING</a>(x)&nbsp;&nbsp;&nbsp;{ sizeof((x)) - 1, (x) }</td></tr>
+
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_vars&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0">stp_vars_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_vars&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The vars opaque data type.  <a href="group__vars.html#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The vars opaque data type.  <a href="group__vars.html#g2d49c94847d18d8b62a214995b14680f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The parameter_list opaque data type.  <a href="group__vars.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The parameter_list opaque data type.  <a href="group__vars.html#g40c1035f88ac38d77eddb65195b28595"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The constant parameter_list opaque data type.  <a href="group__vars.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a> )(void *data, const char *buffer, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The constant parameter_list opaque data type.  <a href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*)&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">stp_outfunc_t</a> (void *data, const char *buffer, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Output function supplied by the calling application.  <a href="group__vars.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a> )(void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Output function supplied by the calling application.  <a href="group__vars.html#g6922054c644d73006bff95a8ad268a1a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *(*)&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4541229554178e84408cccd89f532cb0">stp_copy_data_func_t</a> (void *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a> )(void *)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*)&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7974f89cff4cbb5b225d0c4fbb92e9bb">stp_free_data_func_t</a> (void *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6">compdata_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4d45b95baae036143e14adfc0014f562">compdata_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga133">stp_parameter_type_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga133a7">STP_PARAMETER_TYPE_STRING_LIST</a>, 
-<a class="el" href="group__vars.html#gga133a8">STP_PARAMETER_TYPE_INT</a>, 
-<a class="el" href="group__vars.html#gga133a9">STP_PARAMETER_TYPE_BOOLEAN</a>, 
-<a class="el" href="group__vars.html#gga133a10">STP_PARAMETER_TYPE_DOUBLE</a>, 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a917a6f3e019c8a92ddecd34c71013acde0">STP_PARAMETER_TYPE_STRING_LIST</a>, 
+<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91ae2cac85ef78157b53c7a79706dc0f70">STP_PARAMETER_TYPE_INT</a>, 
+<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91f97ef629defc99977bd1cb35daabe0c1">STP_PARAMETER_TYPE_BOOLEAN</a>, 
+<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91e0dc60c8435ce0b1355bd5a134395f0c">STP_PARAMETER_TYPE_DOUBLE</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga133a11">STP_PARAMETER_TYPE_CURVE</a>, 
-<a class="el" href="group__vars.html#gga133a12">STP_PARAMETER_TYPE_FILE</a>, 
-<a class="el" href="group__vars.html#gga133a13">STP_PARAMETER_TYPE_RAW</a>, 
-<a class="el" href="group__vars.html#gga133a14">STP_PARAMETER_TYPE_ARRAY</a>, 
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a910d283c33f755969ded0751bbfc5d1912">STP_PARAMETER_TYPE_CURVE</a>, 
+<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a918224a918efbef96fffaa90e31654f7ff">STP_PARAMETER_TYPE_FILE</a>, 
+<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a9133bb02d9ae5b2169d2f75da7684b04e9">STP_PARAMETER_TYPE_RAW</a>, 
+<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a918789c2b5cc718eafca6d1d0022cfe3f3">STP_PARAMETER_TYPE_ARRAY</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga133a15">STP_PARAMETER_TYPE_DIMENSION</a>, 
-<a class="el" href="group__vars.html#gga133a16">STP_PARAMETER_TYPE_INVALID</a>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91aa6f89008bf237c6f0aa2f0ee176e8b7">STP_PARAMETER_TYPE_DIMENSION</a>, 
+<a class="el" href="group__vars.html#gg9b3d4f47a44c0c8c9b150cddc56d2a91d053047279b4c82034d26c4aa4c818d5">STP_PARAMETER_TYPE_INVALID</a>
 <br>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter types.  <a href="group__vars.html#ga133">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga134">stp_parameter_class_t</a> { <a class="el" href="group__vars.html#gga134a17">STP_PARAMETER_CLASS_FEATURE</a>, 
-<a class="el" href="group__vars.html#gga134a18">STP_PARAMETER_CLASS_OUTPUT</a>, 
-<a class="el" href="group__vars.html#gga134a19">STP_PARAMETER_CLASS_CORE</a>, 
-<a class="el" href="group__vars.html#gga134a20">STP_PARAMETER_CLASS_INVALID</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter types.  <a href="group__vars.html#g9b3d4f47a44c0c8c9b150cddc56d2a91">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4eba7e712c0e17b76e472f26e202d7b8">stp_parameter_class_t</a> { <a class="el" href="group__vars.html#gg4eba7e712c0e17b76e472f26e202d7b8a7ed8b66836057aa58b9a74811057b4a">STP_PARAMETER_CLASS_FEATURE</a>, 
+<a class="el" href="group__vars.html#gg4eba7e712c0e17b76e472f26e202d7b8ffc6ff4bfbf2873ce55dfc03776bb6d9">STP_PARAMETER_CLASS_OUTPUT</a>, 
+<a class="el" href="group__vars.html#gg4eba7e712c0e17b76e472f26e202d7b8a05ce344ff3338e69638d69f9c120d01">STP_PARAMETER_CLASS_CORE</a>, 
+<a class="el" href="group__vars.html#gg4eba7e712c0e17b76e472f26e202d7b82e17ce7ebc18801c11af7ea0a61e93ca">STP_PARAMETER_CLASS_INVALID</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter class.  <a href="group__vars.html#ga134">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga135">stp_parameter_level_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga135a21">STP_PARAMETER_LEVEL_BASIC</a>, 
-<a class="el" href="group__vars.html#gga135a22">STP_PARAMETER_LEVEL_ADVANCED</a>, 
-<a class="el" href="group__vars.html#gga135a23">STP_PARAMETER_LEVEL_ADVANCED1</a>, 
-<a class="el" href="group__vars.html#gga135a24">STP_PARAMETER_LEVEL_ADVANCED2</a>, 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter class.  <a href="group__vars.html#g4eba7e712c0e17b76e472f26e202d7b8">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa9c9265ffe70122bd33659cf2983207">stp_parameter_level_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf2983207e9d7192607a6e1ec92dfed3f13a3a46f">STP_PARAMETER_LEVEL_BASIC</a>, 
+<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf29832073130e7060a3b901ea8dcb37d986d47e0">STP_PARAMETER_LEVEL_ADVANCED</a>, 
+<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf29832073d016c9587f698ee400bc7e66071f06c">STP_PARAMETER_LEVEL_ADVANCED1</a>, 
+<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf298320759a909a8953b8724d57ce85e2b4306bf">STP_PARAMETER_LEVEL_ADVANCED2</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga135a25">STP_PARAMETER_LEVEL_ADVANCED3</a>, 
-<a class="el" href="group__vars.html#gga135a26">STP_PARAMETER_LEVEL_ADVANCED4</a>, 
-<a class="el" href="group__vars.html#gga135a27">STP_PARAMETER_LEVEL_INTERNAL</a>, 
-<a class="el" href="group__vars.html#gga135a28">STP_PARAMETER_LEVEL_EXTERNAL</a>, 
+&nbsp;&nbsp;<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf29832071241066935e94def6ab6d524ed1fabae">STP_PARAMETER_LEVEL_ADVANCED3</a>, 
+<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf29832076036d5761aa9710a66429c625c334a80">STP_PARAMETER_LEVEL_ADVANCED4</a>, 
+<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf2983207b2bc3be82f619147d9a45564fd53a4a0">STP_PARAMETER_LEVEL_INTERNAL</a>, 
+<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf2983207e478f67e409adabc8679d3801604861d">STP_PARAMETER_LEVEL_EXTERNAL</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga135a29">STP_PARAMETER_LEVEL_INVALID</a>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#ggaa9c9265ffe70122bd33659cf2983207b8bf539d78e56f06f463d00f7a3b56b3">STP_PARAMETER_LEVEL_INVALID</a>
 <br>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter level.  <a href="group__vars.html#ga135">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> { <a class="el" href="group__vars.html#gga136a30">STP_PARAMETER_INACTIVE</a>, 
-<a class="el" href="group__vars.html#gga136a31">STP_PARAMETER_DEFAULTED</a>, 
-<a class="el" href="group__vars.html#gga136a32">STP_PARAMETER_ACTIVE</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter level.  <a href="group__vars.html#gaa9c9265ffe70122bd33659cf2983207">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> { <a class="el" href="group__vars.html#gg70ebf70dc8e6199d84fc91985c94bae96517762c5800eac253f43eeacd96c22f">STP_PARAMETER_INACTIVE</a>, 
+<a class="el" href="group__vars.html#gg70ebf70dc8e6199d84fc91985c94bae9410b7e080ef62fb8896f2f844b1c1e00">STP_PARAMETER_DEFAULTED</a>, 
+<a class="el" href="group__vars.html#gg70ebf70dc8e6199d84fc91985c94bae9dbc7323a015e40652fd256e49c8d5b8c">STP_PARAMETER_ACTIVE</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter activity.  <a href="group__vars.html#ga136">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga137">stp_parameter_verify_t</a> { <a class="el" href="group__vars.html#gga137a33">PARAMETER_BAD</a>, 
-<a class="el" href="group__vars.html#gga137a34">PARAMETER_OK</a>, 
-<a class="el" href="group__vars.html#gga137a35">PARAMETER_INACTIVE</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter activity.  <a href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc061852de3627383cd415cd80a979e02">stp_parameter_verify_t</a> { <a class="el" href="group__vars.html#ggc061852de3627383cd415cd80a979e02326a171221148779ec7df761b3eee967">PARAMETER_BAD</a>, 
+<a class="el" href="group__vars.html#ggc061852de3627383cd415cd80a979e022df363618282a9164433c0f212b18616">PARAMETER_OK</a>, 
+<a class="el" href="group__vars.html#ggc061852de3627383cd415cd80a979e025cb96da6c2e3ae7187e85a1ef6e41fc6">PARAMETER_INACTIVE</a>
  }</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7">stp_vars_create</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5d641ab7093c9ba82cbd4cfbf904fabc">stp_vars_create</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new vars object.  <a href="group__vars.html#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8">stp_vars_copy</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *dest, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new vars object.  <a href="group__vars.html#g5d641ab7093c9ba82cbd4cfbf904fabc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g88376207367adb4260ff14e5d9ec76e9">stp_vars_copy</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *dest, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy a vars object.  <a href="group__vars.html#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9">stp_vars_create_copy</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy a vars object.  <a href="group__vars.html#g88376207367adb4260ff14e5d9ec76e9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gec00fba49ad08d20890e64773bcdbd48">stp_vars_create_copy</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a vars object.  <a href="group__vars.html#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga10">stp_vars_destroy</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a vars object.  <a href="group__vars.html#gec00fba49ad08d20890e64773bcdbd48"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd3f1ff7a86c3cd1c9f9f62cfa8814437">stp_vars_destroy</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a vars object.  <a href="group__vars.html#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga11">stp_set_driver</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a vars object.  <a href="group__vars.html#gd3f1ff7a86c3cd1c9f9f62cfa8814437"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gcf237afcbc26436ebedac5b11f469fdf">stp_set_driver</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the printer driver.  <a href="group__vars.html#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga12">stp_set_driver_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the printer driver.  <a href="group__vars.html#gcf237afcbc26436ebedac5b11f469fdf"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g188d298a8739b84fcb965f211fc7dc4e">stp_set_driver_n</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the printer driver.  <a href="group__vars.html#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga13">stp_get_driver</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the printer driver.  <a href="group__vars.html#g188d298a8739b84fcb965f211fc7dc4e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g20c45707399ef6fdf6ee8c8209b5c7c0">stp_get_driver</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the name of the printer driver.  <a href="group__vars.html#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga14">stp_set_color_conversion</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the name of the printer driver.  <a href="group__vars.html#g20c45707399ef6fdf6ee8c8209b5c7c0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7eb2a1c4b892efd5507fcd4b7a434cea">stp_set_color_conversion</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="group__vars.html#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga15">stp_set_color_conversion_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="group__vars.html#g7eb2a1c4b892efd5507fcd4b7a434cea"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5a842b31f0a572d8e64f1a5616e25a99">stp_set_color_conversion_n</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="group__vars.html#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga16">stp_get_color_conversion</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="group__vars.html#g5a842b31f0a572d8e64f1a5616e25a99"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g2bac9212773ecf603b7667bd0268c23e">stp_get_color_conversion</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the name of the color conversion routine.  <a href="group__vars.html#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga17">stp_set_left</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the name of the color conversion routine.  <a href="group__vars.html#g2bac9212773ecf603b7667bd0268c23e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3b0cc83e87247854ecafd46a6e446bcb">stp_set_left</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the left edge of the image.  <a href="group__vars.html#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga18">stp_get_left</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the left edge of the image.  <a href="group__vars.html#g3b0cc83e87247854ecafd46a6e446bcb"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5c02ee2422d86e4bcdcae613c70c9e1e">stp_get_left</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the left edge of the image.  <a href="group__vars.html#ga18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga19">stp_set_top</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the left edge of the image.  <a href="group__vars.html#g5c02ee2422d86e4bcdcae613c70c9e1e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g557b5ad44d3b1da8392496681624ad8b">stp_set_top</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the top edge of the image.  <a href="group__vars.html#ga19"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga20">stp_get_top</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the top edge of the image.  <a href="group__vars.html#g557b5ad44d3b1da8392496681624ad8b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g292132b97b20a6d034e22f4146d36131">stp_get_top</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the top edge of the image.  <a href="group__vars.html#ga20"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga21">stp_set_width</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the top edge of the image.  <a href="group__vars.html#g292132b97b20a6d034e22f4146d36131"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3a852ce7e42d7f8e0cef6c7d399e0491">stp_set_width</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the width of the image.  <a href="group__vars.html#ga21"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga22">stp_get_width</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the width of the image.  <a href="group__vars.html#g3a852ce7e42d7f8e0cef6c7d399e0491"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1c54d99b94c69a67eb4ae0349a4720e7">stp_get_width</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the width edge of the image.  <a href="group__vars.html#ga22"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga23">stp_set_height</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the width edge of the image.  <a href="group__vars.html#g1c54d99b94c69a67eb4ae0349a4720e7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8ce73c5efa41f005936d5f84c44c6667">stp_set_height</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the height of the image.  <a href="group__vars.html#ga23"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga24">stp_get_height</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the height of the image.  <a href="group__vars.html#g8ce73c5efa41f005936d5f84c44c6667"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8731a92f5d3047e00ba33577821d5aec">stp_get_height</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the height of the image.  <a href="group__vars.html#ga24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga25">stp_set_page_width</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the height of the image.  <a href="group__vars.html#g8731a92f5d3047e00ba33577821d5aec"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g639be0da07c3e5b7dc6d68ac2aa999e9">stp_set_page_width</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the page width.  <a href="group__vars.html#ga25"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga26">stp_get_page_width</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the page width.  <a href="group__vars.html#g639be0da07c3e5b7dc6d68ac2aa999e9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad2d305eed993707d22263b54578a39b">stp_get_page_width</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the page width.  <a href="group__vars.html#ga26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga27">stp_set_page_height</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the page width.  <a href="group__vars.html#gad2d305eed993707d22263b54578a39b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g83326bacb8b92149af1b70457b23bc8f">stp_set_page_height</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the page height.  <a href="group__vars.html#ga27"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga28">stp_get_page_height</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the page height.  <a href="group__vars.html#g83326bacb8b92149af1b70457b23bc8f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc0c4928fa488bb95e73ba9b8aa932584">stp_get_page_height</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the page height.  <a href="group__vars.html#ga28"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga29">stp_set_outfunc</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga3">stp_outfunc_t</a> val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the page height.  <a href="group__vars.html#gc0c4928fa488bb95e73ba9b8aa932584"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g075ffc274f0d2d2b6edd8326de1d7142">stp_set_outfunc</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">stp_outfunc_t</a> val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the function used to print output information.  <a href="group__vars.html#ga29"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga30">stp_get_outfunc</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the function used to print output information.  <a href="group__vars.html#g075ffc274f0d2d2b6edd8326de1d7142"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">stp_outfunc_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7c6c7c547d0c973ac801362db5ca4879">stp_get_outfunc</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the function used to print output information.  <a href="group__vars.html#ga30"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga31">stp_set_errfunc</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga3">stp_outfunc_t</a> val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the function used to print output information.  <a href="group__vars.html#g7c6c7c547d0c973ac801362db5ca4879"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g82f6a7514840de82c9ed7edd30f16b5d">stp_set_errfunc</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">stp_outfunc_t</a> val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the function used to print error and diagnostic information.  <a href="group__vars.html#ga31"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga32">stp_get_errfunc</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the function used to print error and diagnostic information.  <a href="group__vars.html#g82f6a7514840de82c9ed7edd30f16b5d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g6922054c644d73006bff95a8ad268a1a">stp_outfunc_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g2f246d3af2be9e108abe423691e16049">stp_get_errfunc</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the function used to print output information.  <a href="group__vars.html#ga32"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga33">stp_set_outdata</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, void *val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the function used to print output information.  <a href="group__vars.html#g2f246d3af2be9e108abe423691e16049"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc2b3408200a9676e6c6063cc0ae2f4bd">stp_set_outdata</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, void *val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the output data.  <a href="group__vars.html#ga33"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga34">stp_get_outdata</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the output data.  <a href="group__vars.html#gc2b3408200a9676e6c6063cc0ae2f4bd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7042b05e0df5b32206d54397429bbac5">stp_get_outdata</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the output data.  <a href="group__vars.html#ga34"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga35">stp_set_errdata</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, void *val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the output data.  <a href="group__vars.html#g7042b05e0df5b32206d54397429bbac5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8b30fbadf3475c59101af9d7d37c33b7">stp_set_errdata</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, void *val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the error data.  <a href="group__vars.html#ga35"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga36">stp_get_errdata</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the error data.  <a href="group__vars.html#g8b30fbadf3475c59101af9d7d37c33b7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd08bdcd721d37f52993c1862e25ebaf7">stp_get_errdata</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the error data.  <a href="group__vars.html#ga36"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga37">stp_merge_printvars</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *user, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *print)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the error data.  <a href="group__vars.html#gd08bdcd721d37f52993c1862e25ebaf7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g086303d36b835d539e75f16187e99e8f">stp_merge_printvars</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *user, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *print)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Merge defaults for a printer with user-chosen settings.  <a href="group__vars.html#ga37"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga38">stp_get_parameter_list</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Merge defaults for a printer with user-chosen settings.  <a href="group__vars.html#g086303d36b835d539e75f16187e99e8f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g12e8bb617e5c90da99d6d74519664634">stp_get_parameter_list</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List the available parameters for the currently chosen settings.  <a href="group__vars.html#ga38"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga39">stp_parameter_list_count</a> (<a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List the available parameters for the currently chosen settings.  <a href="group__vars.html#g12e8bb617e5c90da99d6d74519664634"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7a94856ce75482a5edb6153fe8916a54">stp_parameter_list_count</a> (<a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List the number of available parameters for the currently chosen settings.  <a href="group__vars.html#ga39"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga40">stp_parameter_find</a> (<a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> list, const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List the number of available parameters for the currently chosen settings.  <a href="group__vars.html#g7a94856ce75482a5edb6153fe8916a54"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gdcd8062af7b643c734f53c545694d258">stp_parameter_find</a> (<a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list, const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its name.  <a href="group__vars.html#ga40"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga41">stp_parameter_list_param</a> (<a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> list, size_t item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its name.  <a href="group__vars.html#gdcd8062af7b643c734f53c545694d258"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g70d69ef7dec383004bf4570e57b76e18">stp_parameter_list_param</a> (<a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list, size_t item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its index number.  <a href="group__vars.html#ga41"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga42">stp_parameter_list_destroy</a> (<a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its index number.  <a href="group__vars.html#g70d69ef7dec383004bf4570e57b76e18"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3ffaadbe73187aa1f298c4eaa80ea82e">stp_parameter_list_destroy</a> (<a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a parameter_list.  <a href="group__vars.html#ga42"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga43">stp_parameter_list_create</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a parameter_list.  <a href="group__vars.html#g3ffaadbe73187aa1f298c4eaa80ea82e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g404bf7f1b3632178d559f6980478a312">stp_parameter_list_create</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a parameter_list.  <a href="group__vars.html#ga43"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga44">stp_parameter_list_add_param</a> (<a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> list, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a parameter_list.  <a href="group__vars.html#g404bf7f1b3632178d559f6980478a312"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8f4f06610d1f58bae9e70e632919c405">stp_parameter_list_add_param</a> (<a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Add a parameter to a parameter_list.  <a href="group__vars.html#ga44"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga45">stp_parameter_list_copy</a> (<a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Add a parameter to a parameter_list.  <a href="group__vars.html#g8f4f06610d1f58bae9e70e632919c405"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g92be87a573b883584e5a036743c1bb7d">stp_parameter_list_copy</a> (<a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a parameter_list.  <a href="group__vars.html#ga45"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga46">stp_parameter_list_append</a> (<a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> list, <a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> append)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a parameter_list.  <a href="group__vars.html#g92be87a573b883584e5a036743c1bb7d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4b62bc6d0133704b3a2568b1654b6678">stp_parameter_list_append</a> (<a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list, <a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> append)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Append one parameter_list to another.  <a href="group__vars.html#ga46"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga47">stp_describe_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Append one parameter_list to another.  <a href="group__vars.html#g4b62bc6d0133704b3a2568b1654b6678"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0b8991bd1a91e2cac7d0b355b1186c8e">stp_describe_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Describe a parameter in detail.  <a href="group__vars.html#ga47"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga48">stp_parameter_description_destroy</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Describe a parameter in detail.  <a href="group__vars.html#g0b8991bd1a91e2cac7d0b355b1186c8e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd598d95a82767e05c958ccd44534c51d">stp_parameter_description_destroy</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a parameter description.  <a href="group__vars.html#ga48"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga49">stp_parameter_find_in_settings</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a parameter description.  <a href="group__vars.html#gd598d95a82767e05c958ccd44534c51d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6ce39557b61706421232b5f1ac604b1b">stp_parameter_find_in_settings</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its name from a vars object.  <a href="group__vars.html#ga49"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga50">stp_set_string_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its name from a vars object.  <a href="group__vars.html#g6ce39557b61706421232b5f1ac604b1b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga147483996fa118516ddb36fe3366aa9">stp_set_string_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a string parameter.  <a href="group__vars.html#ga50"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga51">stp_set_string_parameter_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a string parameter.  <a href="group__vars.html#ga147483996fa118516ddb36fe3366aa9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gfe6c8b3d86ca16239a63ce9d2ef57f48">stp_set_string_parameter_n</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a string parameter.  <a href="group__vars.html#ga51"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga52">stp_set_file_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a string parameter.  <a href="group__vars.html#gfe6c8b3d86ca16239a63ce9d2ef57f48"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g537f2ba6c74c9562b2f6883d7e36c59f">stp_set_file_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a file parameter.  <a href="group__vars.html#ga52"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga53">stp_set_file_parameter_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a file parameter.  <a href="group__vars.html#g537f2ba6c74c9562b2f6883d7e36c59f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6f7816adbce50ca9e2fdacad35282e6a">stp_set_file_parameter_n</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a file parameter.  <a href="group__vars.html#ga53"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga54">stp_set_float_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a file parameter.  <a href="group__vars.html#g6f7816adbce50ca9e2fdacad35282e6a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf3a3283247deaad7d1ac19818aa4b796">stp_set_float_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a float parameter.  <a href="group__vars.html#ga54"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga55">stp_set_int_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a float parameter.  <a href="group__vars.html#gf3a3283247deaad7d1ac19818aa4b796"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g70eded5d0df4677dd4b357b4b934f75a">stp_set_int_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set an integer parameter.  <a href="group__vars.html#ga55"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga56">stp_set_dimension_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set an integer parameter.  <a href="group__vars.html#g70eded5d0df4677dd4b357b4b934f75a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6ca7898c212230cdbdc70ada2efb1417">stp_set_dimension_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a dimension parameter.  <a href="group__vars.html#ga56"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga57">stp_set_boolean_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a dimension parameter.  <a href="group__vars.html#g6ca7898c212230cdbdc70ada2efb1417"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g2167971895eea887eaaa656ed075beff">stp_set_boolean_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a boolean parameter.  <a href="group__vars.html#ga57"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga58">stp_set_curve_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a boolean parameter.  <a href="group__vars.html#g2167971895eea887eaaa656ed075beff"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gfe5f1f6364b89437664b2bbc55288025">stp_set_curve_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a curve parameter.  <a href="group__vars.html#ga58"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga59">stp_set_array_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#ga0">stp_array_t</a> *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a curve parameter.  <a href="group__vars.html#gfe5f1f6364b89437664b2bbc55288025"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g88f25e09f9a4b76aca7ba8316cbf9c8b">stp_set_array_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set an array parameter.  <a href="group__vars.html#ga59"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga60">stp_set_raw_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set an array parameter.  <a href="group__vars.html#g88f25e09f9a4b76aca7ba8316cbf9c8b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0155de75bf2aa95ab45a3319539cda56">stp_set_raw_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a raw parameter.  <a href="group__vars.html#ga60"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga61">stp_scale_float_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, double scale)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a raw parameter.  <a href="group__vars.html#g0155de75bf2aa95ab45a3319539cda56"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g227ec3e75a78a5c3dd01c85dbc1e7004">stp_scale_float_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double scale)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Multiply the value of a float parameter by a scaling factor.  <a href="group__vars.html#ga61"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga62">stp_set_default_string_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Multiply the value of a float parameter by a scaling factor.  <a href="group__vars.html#g227ec3e75a78a5c3dd01c85dbc1e7004"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf299bd0827a4d86aca59fb0d9015a866">stp_set_default_string_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default string parameter.  <a href="group__vars.html#ga62"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga63">stp_set_default_string_parameter_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default string parameter.  <a href="group__vars.html#gf299bd0827a4d86aca59fb0d9015a866"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5d6d8858b266517f5899196b062d00d">stp_set_default_string_parameter_n</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default string parameter.  <a href="group__vars.html#ga63"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga64">stp_set_default_file_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default string parameter.  <a href="group__vars.html#ga5d6d8858b266517f5899196b062d00d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf5e225475c66f966f4ba8d8c88374186">stp_set_default_file_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default file parameter.  <a href="group__vars.html#ga64"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga65">stp_set_default_file_parameter_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default file parameter.  <a href="group__vars.html#gf5e225475c66f966f4ba8d8c88374186"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g217eece123630113cfcf8181d475fb53">stp_set_default_file_parameter_n</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default file parameter.  <a href="group__vars.html#ga65"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga66">stp_set_default_float_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default file parameter.  <a href="group__vars.html#g217eece123630113cfcf8181d475fb53"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge52dbb466422a18dec110220c45fe64e">stp_set_default_float_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default float parameter.  <a href="group__vars.html#ga66"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga67">stp_set_default_int_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default float parameter.  <a href="group__vars.html#ge52dbb466422a18dec110220c45fe64e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3c0418772a82144f317dc973f01a8d55">stp_set_default_int_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default integer parameter.  <a href="group__vars.html#ga67"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga68">stp_set_default_dimension_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default integer parameter.  <a href="group__vars.html#g3c0418772a82144f317dc973f01a8d55"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb6f1820cadd75a4311bfc49b01de447b">stp_set_default_dimension_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default dimension parameter.  <a href="group__vars.html#ga68"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga69">stp_set_default_boolean_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default dimension parameter.  <a href="group__vars.html#gb6f1820cadd75a4311bfc49b01de447b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g81d5f09980407b4310dada2a68fc4b09">stp_set_default_boolean_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default boolean parameter.  <a href="group__vars.html#ga69"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga70">stp_set_default_curve_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default boolean parameter.  <a href="group__vars.html#g81d5f09980407b4310dada2a68fc4b09"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gfe38044cc067b2c2afa3da469d1cb860">stp_set_default_curve_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default curve parameter.  <a href="group__vars.html#ga70"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga71">stp_set_default_array_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#ga0">stp_array_t</a> *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default curve parameter.  <a href="group__vars.html#gfe38044cc067b2c2afa3da469d1cb860"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g63e7ff7b4c3e1d092f95c6234f21e39f">stp_set_default_array_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default array parameter.  <a href="group__vars.html#ga71"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga72">stp_set_default_raw_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default array parameter.  <a href="group__vars.html#g63e7ff7b4c3e1d092f95c6234f21e39f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8159b3f5bea06a99711921f0201f5e0f">stp_set_default_raw_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default raw parameter.  <a href="group__vars.html#ga72"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga73">stp_get_string_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default raw parameter.  <a href="group__vars.html#g8159b3f5bea06a99711921f0201f5e0f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb5b21e5606b8ca755c5eac7774260efa">stp_get_string_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a string parameter.  <a href="group__vars.html#ga73"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga74">stp_get_file_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a string parameter.  <a href="group__vars.html#gb5b21e5606b8ca755c5eac7774260efa"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g2021992d89c92b10138fb012a9554a08">stp_get_file_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a file parameter.  <a href="group__vars.html#ga74"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga75">stp_get_float_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a file parameter.  <a href="group__vars.html#g2021992d89c92b10138fb012a9554a08"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g365412d9c176fd3ac9375ded3f22ddb3">stp_get_float_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a float parameter.  <a href="group__vars.html#ga75"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga76">stp_get_int_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a float parameter.  <a href="group__vars.html#g365412d9c176fd3ac9375ded3f22ddb3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7c0d95ba35aba0786bfc5f918efa79fc">stp_get_int_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an integer parameter.  <a href="group__vars.html#ga76"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga77">stp_get_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an integer parameter.  <a href="group__vars.html#g7c0d95ba35aba0786bfc5f918efa79fc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3c8d1333086ca5a01a3439f94d9f94d3">stp_get_dimension_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a dimension parameter.  <a href="group__vars.html#ga77"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga78">stp_get_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a dimension parameter.  <a href="group__vars.html#g3c8d1333086ca5a01a3439f94d9f94d3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8a30b26fa842805384b6ad663cabaea2">stp_get_boolean_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a boolean parameter.  <a href="group__vars.html#ga78"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga79">stp_get_curve_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a boolean parameter.  <a href="group__vars.html#g8a30b26fa842805384b6ad663cabaea2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g553dec81dd8b3e5590d963ba72223557">stp_get_curve_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a curve parameter.  <a href="group__vars.html#ga79"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga80">stp_get_array_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a curve parameter.  <a href="group__vars.html#g553dec81dd8b3e5590d963ba72223557"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc50c216c2d5cd56a9704f48d4338b179">stp_get_array_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an array parameter.  <a href="group__vars.html#ga80"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga81">stp_get_raw_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an array parameter.  <a href="group__vars.html#gc50c216c2d5cd56a9704f48d4338b179"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9fff6c14a71f5f8ec28620ef64a92fd5">stp_get_raw_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a raw parameter.  <a href="group__vars.html#ga81"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga82">stp_clear_string_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a raw parameter.  <a href="group__vars.html#g9fff6c14a71f5f8ec28620ef64a92fd5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9e98ef9a9b1b84a0c0580fe024e35490">stp_clear_string_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a string parameter.  <a href="group__vars.html#ga82"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga83">stp_clear_file_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a string parameter.  <a href="group__vars.html#g9e98ef9a9b1b84a0c0580fe024e35490"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4fad48e3e6453842559bd872650cb88f">stp_clear_file_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a file parameter.  <a href="group__vars.html#ga83"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga84">stp_clear_float_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a file parameter.  <a href="group__vars.html#g4fad48e3e6453842559bd872650cb88f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4eccbbe421f8b0c9342b17cef40b263d">stp_clear_float_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a float parameter.  <a href="group__vars.html#ga84"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga85">stp_clear_int_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a float parameter.  <a href="group__vars.html#g4eccbbe421f8b0c9342b17cef40b263d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g2107c08f37e31f45253f7d75a3773d46">stp_clear_int_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) an integer parameter.  <a href="group__vars.html#ga85"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga86">stp_clear_dimension_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) an integer parameter.  <a href="group__vars.html#g2107c08f37e31f45253f7d75a3773d46"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g514a21602ae7a8ebe8e5072a5a4b6f89">stp_clear_dimension_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a dimension parameter.  <a href="group__vars.html#ga86"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga87">stp_clear_boolean_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a dimension parameter.  <a href="group__vars.html#g514a21602ae7a8ebe8e5072a5a4b6f89"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g42ebfed8dec2054799e4943a8ca84267">stp_clear_boolean_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a boolean parameter.  <a href="group__vars.html#ga87"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga88">stp_clear_curve_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a boolean parameter.  <a href="group__vars.html#g42ebfed8dec2054799e4943a8ca84267"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf52a0b0c3b0e0fee1fc46516b1bc0c4e">stp_clear_curve_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a curve parameter.  <a href="group__vars.html#ga88"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga89">stp_clear_array_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a curve parameter.  <a href="group__vars.html#gf52a0b0c3b0e0fee1fc46516b1bc0c4e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7c67cef38cead5f519fd04ae09265b53">stp_clear_array_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear an array parameter.  <a href="group__vars.html#ga89"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga90">stp_clear_raw_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear an array parameter.  <a href="group__vars.html#g7c67cef38cead5f519fd04ae09265b53"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g11b79add82faf23b0e3c758f9530d95c">stp_clear_raw_parameter</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a raw parameter.  <a href="group__vars.html#ga90"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga91">stp_set_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a raw parameter.  <a href="group__vars.html#g11b79add82faf23b0e3c758f9530d95c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6ed828e872f7678a89e1b065d377112e">stp_set_string_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="group__vars.html#ga91"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga92">stp_set_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="group__vars.html#g6ed828e872f7678a89e1b065d377112e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaecd310feb8bd9a2188a9b287656aa1a">stp_set_file_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="group__vars.html#ga92"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga93">stp_set_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="group__vars.html#gaecd310feb8bd9a2188a9b287656aa1a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g15a5458adea6ad4eecda3c990acbc6cb">stp_set_float_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="group__vars.html#ga93"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga94">stp_set_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="group__vars.html#g15a5458adea6ad4eecda3c990acbc6cb"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7487203059e7ccd71c4673656b3042b1">stp_set_int_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="group__vars.html#ga94"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga95">stp_set_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="group__vars.html#g7487203059e7ccd71c4673656b3042b1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0f6e91baac5e78703b162e9d23c0a65c">stp_set_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="group__vars.html#ga95"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga96">stp_set_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="group__vars.html#g0f6e91baac5e78703b162e9d23c0a65c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9ad15a73dd8c755a8b80edbe335285ee">stp_set_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="group__vars.html#ga96"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga97">stp_set_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="group__vars.html#g9ad15a73dd8c755a8b80edbe335285ee"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge7f21b118a8dfb5607334a6141d5dc5c">stp_set_curve_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="group__vars.html#ga97"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga98">stp_set_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="group__vars.html#ge7f21b118a8dfb5607334a6141d5dc5c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb78f4273798c6e3e720afe01680cf752">stp_set_array_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="group__vars.html#ga98"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga99">stp_set_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="group__vars.html#gb78f4273798c6e3e720afe01680cf752"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g364fcdb2e57b8ca99867c94954cf14cd">stp_set_raw_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="group__vars.html#ga99"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga100">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="group__vars.html#g364fcdb2e57b8ca99867c94954cf14cd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8189b61073bfcd0244d5d6f2a2c8ba86">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a string parameter is set.  <a href="group__vars.html#ga100"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga101">stp_check_file_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a string parameter is set.  <a href="group__vars.html#g8189b61073bfcd0244d5d6f2a2c8ba86"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7db6701be5d05e545c79db905e4c7eb">stp_check_file_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a file parameter is set.  <a href="group__vars.html#ga101"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga102">stp_check_float_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a file parameter is set.  <a href="group__vars.html#ga7db6701be5d05e545c79db905e4c7eb"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb12bebb419eb1ae8f323aa931e324389">stp_check_float_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a float parameter is set.  <a href="group__vars.html#ga102"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga103">stp_check_int_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a float parameter is set.  <a href="group__vars.html#gb12bebb419eb1ae8f323aa931e324389"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4fd7914c01e2e1b34797736dfd2c9b9c">stp_check_int_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an integer parameter is set.  <a href="group__vars.html#ga103"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga104">stp_check_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an integer parameter is set.  <a href="group__vars.html#g4fd7914c01e2e1b34797736dfd2c9b9c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc1f2b865c76da441b6c1bd9b5b93aa1f">stp_check_dimension_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a dimension parameter is set.  <a href="group__vars.html#ga104"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga105">stp_check_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a dimension parameter is set.  <a href="group__vars.html#gc1f2b865c76da441b6c1bd9b5b93aa1f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g23b9c17426210460618c4f95c5f34229">stp_check_boolean_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a boolean parameter is set.  <a href="group__vars.html#ga105"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga106">stp_check_curve_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a boolean parameter is set.  <a href="group__vars.html#g23b9c17426210460618c4f95c5f34229"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6c94a1df4388b142d00d5d30df904b47">stp_check_curve_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a curve parameter is set.  <a href="group__vars.html#ga106"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga107">stp_check_array_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a curve parameter is set.  <a href="group__vars.html#g6c94a1df4388b142d00d5d30df904b47"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5a629e6da1f5008f0db034191ad8b1d5">stp_check_array_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an array parameter is set.  <a href="group__vars.html#ga107"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga108">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an array parameter is set.  <a href="group__vars.html#g5a629e6da1f5008f0db034191ad8b1d5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g285f05c648724c80bf05af30f87120a3">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a raw parameter is set.  <a href="group__vars.html#ga108"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga109">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a raw parameter is set.  <a href="group__vars.html#g285f05c648724c80bf05af30f87120a3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0b7be7ba9f763be692dd833a434ed13d">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a string parameter.  <a href="group__vars.html#ga109"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga110">stp_get_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a string parameter.  <a href="group__vars.html#g0b7be7ba9f763be692dd833a434ed13d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g47e7a69ff8e23eed6188542c5c8bff4f">stp_get_file_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a file parameter.  <a href="group__vars.html#ga110"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga111">stp_get_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a file parameter.  <a href="group__vars.html#g47e7a69ff8e23eed6188542c5c8bff4f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4b8f9847f2eebfff53446a9bc235ab68">stp_get_float_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a float parameter.  <a href="group__vars.html#ga111"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga112">stp_get_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a float parameter.  <a href="group__vars.html#g4b8f9847f2eebfff53446a9bc235ab68"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb74fd69c4ef62af7b5ab33c6baf48b8b">stp_get_int_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an integer parameter.  <a href="group__vars.html#ga112"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga113">stp_get_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an integer parameter.  <a href="group__vars.html#gb74fd69c4ef62af7b5ab33c6baf48b8b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g45f9abd8ac6772ea850344c513f6c436">stp_get_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a dimension parameter.  <a href="group__vars.html#ga113"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga114">stp_get_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a dimension parameter.  <a href="group__vars.html#g45f9abd8ac6772ea850344c513f6c436"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb33cf5376adc63e826cd3dedae33e930">stp_get_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a boolean parameter.  <a href="group__vars.html#ga114"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga115">stp_get_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a boolean parameter.  <a href="group__vars.html#gb33cf5376adc63e826cd3dedae33e930"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge36bf982c52215f11fe8e392b4b3d705">stp_get_curve_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a curve parameter.  <a href="group__vars.html#ga115"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga116">stp_get_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a curve parameter.  <a href="group__vars.html#ge36bf982c52215f11fe8e392b4b3d705"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc9f85c3a8bf99e09150cbf4220e4b983">stp_get_array_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an array parameter.  <a href="group__vars.html#ga116"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga117">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an array parameter.  <a href="group__vars.html#gc9f85c3a8bf99e09150cbf4220e4b983"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb6e41a5edb7474ed7ac26e236e00c80c">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a raw parameter.  <a href="group__vars.html#ga117"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga118">stp_get_media_size</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *width, int *height)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a raw parameter.  <a href="group__vars.html#gb6e41a5edb7474ed7ac26e236e00c80c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc9e6d740ffc4cff5dc7d0bf106a3e7df">stp_get_media_size</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media (paper) size.  <a href="group__vars.html#ga118"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga119">stp_get_imageable_area</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media (paper) size.  <a href="group__vars.html#gc9e6d740ffc4cff5dc7d0bf106a3e7df"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g67d1e68ed47e5b554f2021fca1f01978">stp_get_imageable_area</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the imagable area of the page.  <a href="group__vars.html#ga119"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga120">stp_get_maximum_imageable_area</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the imagable area of the page.  <a href="group__vars.html#g67d1e68ed47e5b554f2021fca1f01978"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd17cadb7fd78bffb759f2213a1a90df6">stp_get_maximum_imageable_area</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the maximum imagable area of the page.  <a href="group__vars.html#ga120"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga121">stp_get_size_limit</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the maximum imagable area of the page.  <a href="group__vars.html#gd17cadb7fd78bffb759f2213a1a90df6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0c8ee62453baff3d2c00e0ccae67b049">stp_get_size_limit</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media size limits.  <a href="group__vars.html#ga121"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga122">stp_describe_resolution</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *x, int *y)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media size limits.  <a href="group__vars.html#g0c8ee62453baff3d2c00e0ccae67b049"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g88715b31fcec18778f769ffbc1b55384">stp_describe_resolution</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *x, int *y)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Retrieve the printing resolution of the selected resolution.  <a href="group__vars.html#ga122"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga123">stp_verify</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Retrieve the printing resolution of the selected resolution.  <a href="group__vars.html#g88715b31fcec18778f769ffbc1b55384"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb926417b2f601c78d85df44694cc6d38">stp_verify</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Verify parameters.  <a href="group__vars.html#ga123"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga124">stp_default_settings</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Verify parameters.  <a href="group__vars.html#gb926417b2f601c78d85df44694cc6d38"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf63982a6e44f8b62532346d9ceb3d91c">stp_default_settings</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get default global settings.  <a href="group__vars.html#ga124"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga125">stp_allocate_component_data</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a> freefunc, void *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get default global settings.  <a href="group__vars.html#gf63982a6e44f8b62532346d9ceb3d91c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gfd4f81ca2ad497bd21f005344844f9c4">stp_allocate_component_data</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="group__vars.html#g4541229554178e84408cccd89f532cb0">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#g7974f89cff4cbb5b225d0c4fbb92e9bb">stp_free_data_func_t</a> freefunc, void *data)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga126">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g151b7d922a3e1e5e9d9f0ea8de6ab70a">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga127">stp_get_component_data</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1666dd1571bdb866a85d4318858893be">stp_get_component_data</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga137">stp_parameter_verify_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga128">stp_verify_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int quiet)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gc061852de3627383cd415cd80a979e02">stp_parameter_verify_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gbfffe0d654de156874decdc0338216f4">stp_verify_parameter</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int quiet)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga129">stp_get_verified</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6d04a3c444753f11004ad6259a91e853">stp_get_verified</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga130">stp_set_verified</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1023ad18d2c97763137909b6191b0940">stp_set_verified</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int value)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga131">stp_copy_options</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *vd, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *vs)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf7d2d5a9897c9ce77bb16f4a1addaa62">stp_copy_options</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *vd, const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *vs)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga132">stp_fill_parameter_settings</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *param)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7f2c578ff7ae28a3db502476aa10137e">stp_fill_parameter_settings</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *param)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Print job functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/weave_8h.html b/doc/gutenprint/html/weave_8h.html
index ee16009..9da12cb 100644
--- a/doc/gutenprint/html/weave_8h.html
+++ b/doc/gutenprint/html/weave_8h.html
@@ -1,13 +1,26 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/weave.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>weave.h File Reference</h1>Softweave functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/weave.h File Reference</h1>Softweave functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -27,796 +40,628 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html">stp_linebounds_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a0">STP_MAX_WEAVE</a>&nbsp;&nbsp;&nbsp;(16)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#6e5fd9b98567e1fd3fde622fd42dec67">STP_MAX_WEAVE</a>&nbsp;&nbsp;&nbsp;(16)</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a1">stp_packfunc</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#e8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a2">stp_fillfunc</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int row, int subpass, int width, int missingstartrows, int color)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int row, int subpass, int width, int missingstartrows, int color)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a3">stp_flushfunc</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int passno, int vertical_subpass)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#d25d63c939f6ace90d029473ad33ce63">stp_flushfunc</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int passno, int vertical_subpass)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int n)</td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a26">stp_weave_strategy_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="weave_8h.html#a26a11">STP_WEAVE_ZIGZAG</a>, 
-<a class="el" href="weave_8h.html#a26a12">STP_WEAVE_ASCENDING</a>, 
-<a class="el" href="weave_8h.html#a26a13">STP_WEAVE_DESCENDING</a>, 
-<a class="el" href="weave_8h.html#a26a14">STP_WEAVE_ASCENDING_2X</a>, 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf38580991">stp_weave_strategy_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf385809916077c1fbd3cc6c79a1ac5f23d31bd2b3">STP_WEAVE_ZIGZAG</a>, 
+<a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf385809919b5dcc799a9afed0063f052196fa8d6b">STP_WEAVE_ASCENDING</a>, 
+<a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf38580991faf7b19bfde4be5241cb112835325797">STP_WEAVE_DESCENDING</a>, 
+<a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf385809917bfa24511bcbc811272e385372c61936">STP_WEAVE_ASCENDING_2X</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="weave_8h.html#a26a15">STP_WEAVE_STAGGERED</a>, 
-<a class="el" href="weave_8h.html#a26a16">STP_WEAVE_ASCENDING_3X</a>
+&nbsp;&nbsp;<a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf385809918e37ffcadb7b41a3276029206a80d5e6">STP_WEAVE_STAGGERED</a>, 
+<a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf38580991ecb24603379f9f3dd682bf692326a8e1">STP_WEAVE_ASCENDING_3X</a>
 <br>
  }</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a17">stp_initialize_weave</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int jets, int separation, int oversample, int horizontal, int vertical, int ncolors, int bitwidth, int linewidth, int line_count, int first_line, int page_height, const int *head_offset, <a class="el" href="weave_8h.html#a26">stp_weave_strategy_t</a>, <a class="el" href="weave_8h.html#a3">stp_flushfunc</a>, <a class="el" href="weave_8h.html#a2">stp_fillfunc</a>, <a class="el" href="weave_8h.html#a1">stp_packfunc</a>, <a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a>)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#5b4fc76c83f5408182f90fb139c06b50">stp_initialize_weave</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int jets, int separation, int oversample, int horizontal, int vertical, int ncolors, int bitwidth, int linewidth, int line_count, int first_line, int page_height, const int *head_offset, <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf38580991">stp_weave_strategy_t</a>, <a class="el" href="weave_8h.html#d25d63c939f6ace90d029473ad33ce63">stp_flushfunc</a>, <a class="el" href="weave_8h.html#3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a>, <a class="el" href="weave_8h.html#e8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a>, <a class="el" href="weave_8h.html#6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a>)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a18">stp_flush_all</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#b9694e4381a005efb70daea2429345a3">stp_flush_all</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a19">stp_write_weave</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, unsigned char *const cols[])</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#ea7e0ed7877aa1e98b2ce9c210ad9ff4">stp_write_weave</a> (<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned char *const cols[])</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a20">stp_get_lineoffsets_by_pass</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int pass)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#986bb835225820c68d85041e797cf2a5">stp_get_lineoffsets_by_pass</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int pass)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a21">stp_get_lineactive_by_pass</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int pass)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#4c7e67ed92ac3427c94fb0e6a85bfce9">stp_get_lineactive_by_pass</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int pass)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a22">stp_get_linecount_by_pass</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int pass)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#5acdf7cc603254e68b0ae39e45ea52f3">stp_get_linecount_by_pass</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int pass)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a23">stp_get_linebases_by_pass</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int pass)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#1ec75a70b7dad8a5d0e4c963d67677c3">stp_get_linebases_by_pass</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int pass)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__pass__t.html">stp_pass_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a24">stp_get_pass_by_pass</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int pass)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__pass__t.html">stp_pass_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#5412630e5a7ba809b6ef84ab4e6c9f09">stp_get_pass_by_pass</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int pass)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a25">stp_weave_parameters_by_row</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int row, int vertical_subpass, <a class="el" href="structstp__weave__t.html">stp_weave_t</a> *w)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#39d760951513fd171f9dc25b57daf229">stp_weave_parameters_by_row</a> (const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int row, int vertical_subpass, <a class="el" href="structstp__weave__t.html">stp_weave_t</a> *w)</td></tr>
 
 <tr><td colspan="2"><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#a1">stp_packfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a5">stp_pack_tiff</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#e8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#525feabe0775e573007678b2da863b24">stp_pack_tiff</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#a1">stp_packfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a6">stp_pack_uncompressed</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#e8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#561a5fd614c279fdc9ea9c14c7a5b540">stp_pack_uncompressed</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#a2">stp_fillfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a7">stp_fill_tiff</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#87a7e015e79b03ec26069ddf9ab64c50">stp_fill_tiff</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#a2">stp_fillfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a8">stp_fill_uncompressed</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#581ae80f8594763f27620d3338407fef">stp_fill_uncompressed</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a9">stp_compute_tiff_linewidth</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#9907d0fcce9e3c336fa7c6d66e1c91a5">stp_compute_tiff_linewidth</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a10">stp_compute_uncompressed_linewidth</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#4046c403128b61705309b05700120e41">stp_compute_uncompressed_linewidth</a></td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Softweave functions. 
 <p>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="a0"></a><!-- doxytag: member="weave.h::STP_MAX_WEAVE" ref="a0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="6e5fd9b98567e1fd3fde622fd42dec67"></a><!-- doxytag: member="weave.h::STP_MAX_WEAVE" ref="6e5fd9b98567e1fd3fde622fd42dec67" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STP_MAX_WEAVE&nbsp;&nbsp;&nbsp;(16)          </td>
+          <td class="memname">#define STP_MAX_WEAVE&nbsp;&nbsp;&nbsp;(16)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a4"></a><!-- doxytag: member="weave.h::stp_compute_linewidth_func" ref="a4" args="(stp_vars_t *v, int n)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="6e7058d252c95199e92f783d84775fa1"></a><!-- doxytag: member="weave.h::stp_compute_linewidth_func" ref="6e7058d252c95199e92f783d84775fa1" args="(stp_vars_t *v, int n)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef int <a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a>(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int n)          </td>
+          <td class="memname">typedef int <a class="el" href="weave_8h.html#6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a>(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int n)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="weave.h::stp_fillfunc" ref="a2" args="(stp_vars_t *v, int row, int subpass, int width, int missingstartrows, int color)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="3bb2000973de2f8a9a2b50a1b5e18097"></a><!-- doxytag: member="weave.h::stp_fillfunc" ref="3bb2000973de2f8a9a2b50a1b5e18097" args="(stp_vars_t *v, int row, int subpass, int width, int missingstartrows, int color)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef void <a class="el" href="weave_8h.html#a2">stp_fillfunc</a>(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int row, int subpass, int width, int missingstartrows, int color)          </td>
+          <td class="memname">typedef void <a class="el" href="weave_8h.html#3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a>(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int row, int subpass, int width, int missingstartrows, int color)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="weave.h::stp_flushfunc" ref="a3" args="(stp_vars_t *v, int passno, int vertical_subpass)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="d25d63c939f6ace90d029473ad33ce63"></a><!-- doxytag: member="weave.h::stp_flushfunc" ref="d25d63c939f6ace90d029473ad33ce63" args="(stp_vars_t *v, int passno, int vertical_subpass)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef void <a class="el" href="weave_8h.html#a3">stp_flushfunc</a>(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int passno, int vertical_subpass)          </td>
+          <td class="memname">typedef void <a class="el" href="weave_8h.html#d25d63c939f6ace90d029473ad33ce63">stp_flushfunc</a>(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int passno, int vertical_subpass)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a1"></a><!-- doxytag: member="weave.h::stp_packfunc" ref="a1" args="(stp_vars_t *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="e8aea6782f8e438961332cb7cc18bcdc"></a><!-- doxytag: member="weave.h::stp_packfunc" ref="e8aea6782f8e438961332cb7cc18bcdc" args="(stp_vars_t *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef int <a class="el" href="weave_8h.html#a1">stp_packfunc</a>(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)          </td>
+          <td class="memname">typedef int <a class="el" href="weave_8h.html#e8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a>(<a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="a26"></a><!-- doxytag: member="weave.h::stp_weave_strategy_t" ref="a26" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="059ef2763c95a5cc47d51dcf38580991"></a><!-- doxytag: member="weave.h::stp_weave_strategy_t" ref="059ef2763c95a5cc47d51dcf38580991" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="weave_8h.html#a26">stp_weave_strategy_t</a>          </td>
+          <td class="memname">enum <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf38580991">stp_weave_strategy_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="a26a11"></a><!-- doxytag: member="STP_WEAVE_ZIGZAG" ref="a26a11" args="" -->STP_WEAVE_ZIGZAG</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="059ef2763c95a5cc47d51dcf385809916077c1fbd3cc6c79a1ac5f23d31bd2b3"></a><!-- doxytag: member="STP_WEAVE_ZIGZAG" ref="059ef2763c95a5cc47d51dcf385809916077c1fbd3cc6c79a1ac5f23d31bd2b3" args="" -->STP_WEAVE_ZIGZAG</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a26a12"></a><!-- doxytag: member="STP_WEAVE_ASCENDING" ref="a26a12" args="" -->STP_WEAVE_ASCENDING</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="059ef2763c95a5cc47d51dcf385809919b5dcc799a9afed0063f052196fa8d6b"></a><!-- doxytag: member="STP_WEAVE_ASCENDING" ref="059ef2763c95a5cc47d51dcf385809919b5dcc799a9afed0063f052196fa8d6b" args="" -->STP_WEAVE_ASCENDING</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a26a13"></a><!-- doxytag: member="STP_WEAVE_DESCENDING" ref="a26a13" args="" -->STP_WEAVE_DESCENDING</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="059ef2763c95a5cc47d51dcf38580991faf7b19bfde4be5241cb112835325797"></a><!-- doxytag: member="STP_WEAVE_DESCENDING" ref="059ef2763c95a5cc47d51dcf38580991faf7b19bfde4be5241cb112835325797" args="" -->STP_WEAVE_DESCENDING</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a26a14"></a><!-- doxytag: member="STP_WEAVE_ASCENDING_2X" ref="a26a14" args="" -->STP_WEAVE_ASCENDING_2X</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="059ef2763c95a5cc47d51dcf385809917bfa24511bcbc811272e385372c61936"></a><!-- doxytag: member="STP_WEAVE_ASCENDING_2X" ref="059ef2763c95a5cc47d51dcf385809917bfa24511bcbc811272e385372c61936" args="" -->STP_WEAVE_ASCENDING_2X</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a26a15"></a><!-- doxytag: member="STP_WEAVE_STAGGERED" ref="a26a15" args="" -->STP_WEAVE_STAGGERED</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="059ef2763c95a5cc47d51dcf385809918e37ffcadb7b41a3276029206a80d5e6"></a><!-- doxytag: member="STP_WEAVE_STAGGERED" ref="059ef2763c95a5cc47d51dcf385809918e37ffcadb7b41a3276029206a80d5e6" args="" -->STP_WEAVE_STAGGERED</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a26a16"></a><!-- doxytag: member="STP_WEAVE_ASCENDING_3X" ref="a26a16" args="" -->STP_WEAVE_ASCENDING_3X</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="059ef2763c95a5cc47d51dcf38580991ecb24603379f9f3dd682bf692326a8e1"></a><!-- doxytag: member="STP_WEAVE_ASCENDING_3X" ref="059ef2763c95a5cc47d51dcf38580991ecb24603379f9f3dd682bf692326a8e1" args="" -->STP_WEAVE_ASCENDING_3X</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a18"></a><!-- doxytag: member="weave.h::stp_flush_all" ref="a18" args="(stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stp_flush_all           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<a class="anchor" name="b9694e4381a005efb70daea2429345a3"></a><!-- doxytag: member="weave.h::stp_flush_all" ref="b9694e4381a005efb70daea2429345a3" args="(stp_vars_t *v)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_flush_all           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a21"></a><!-- doxytag: member="weave.h::stp_get_lineactive_by_pass" ref="a21" args="(const stp_vars_t *v, int pass)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="4c7e67ed92ac3427c94fb0e6a85bfce9"></a><!-- doxytag: member="weave.h::stp_get_lineactive_by_pass" ref="4c7e67ed92ac3427c94fb0e6a85bfce9" args="(const stp_vars_t *v, int pass)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a>* stp_get_lineactive_by_pass           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname"><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a>* stp_get_lineactive_by_pass           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>pass</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>pass</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a23"></a><!-- doxytag: member="weave.h::stp_get_linebases_by_pass" ref="a23" args="(const stp_vars_t *v, int pass)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="1ec75a70b7dad8a5d0e4c963d67677c3"></a><!-- doxytag: member="weave.h::stp_get_linebases_by_pass" ref="1ec75a70b7dad8a5d0e4c963d67677c3" args="(const stp_vars_t *v, int pass)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a>* stp_get_linebases_by_pass           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">const <a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a>* stp_get_linebases_by_pass           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>pass</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>pass</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a22"></a><!-- doxytag: member="weave.h::stp_get_linecount_by_pass" ref="a22" args="(const stp_vars_t *v, int pass)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="5acdf7cc603254e68b0ae39e45ea52f3"></a><!-- doxytag: member="weave.h::stp_get_linecount_by_pass" ref="5acdf7cc603254e68b0ae39e45ea52f3" args="(const stp_vars_t *v, int pass)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a>* stp_get_linecount_by_pass           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname"><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a>* stp_get_linecount_by_pass           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>pass</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>pass</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a20"></a><!-- doxytag: member="weave.h::stp_get_lineoffsets_by_pass" ref="a20" args="(const stp_vars_t *v, int pass)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="986bb835225820c68d85041e797cf2a5"></a><!-- doxytag: member="weave.h::stp_get_lineoffsets_by_pass" ref="986bb835225820c68d85041e797cf2a5" args="(const stp_vars_t *v, int pass)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a>* stp_get_lineoffsets_by_pass           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname"><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a>* stp_get_lineoffsets_by_pass           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>pass</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>pass</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a24"></a><!-- doxytag: member="weave.h::stp_get_pass_by_pass" ref="a24" args="(const stp_vars_t *v, int pass)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="5412630e5a7ba809b6ef84ab4e6c9f09"></a><!-- doxytag: member="weave.h::stp_get_pass_by_pass" ref="5412630e5a7ba809b6ef84ab4e6c9f09" args="(const stp_vars_t *v, int pass)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__pass__t.html">stp_pass_t</a>* stp_get_pass_by_pass           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname"><a class="el" href="structstp__pass__t.html">stp_pass_t</a>* stp_get_pass_by_pass           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>pass</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>pass</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a17"></a><!-- doxytag: member="weave.h::stp_initialize_weave" ref="a17" args="(stp_vars_t *v, int jets, int separation, int oversample, int horizontal, int vertical, int ncolors, int bitwidth, int linewidth, int line_count, int first_line, int page_height, const int *head_offset, stp_weave_strategy_t, stp_flushfunc, stp_fillfunc, stp_packfunc, stp_compute_linewidth_func)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="5b4fc76c83f5408182f90fb139c06b50"></a><!-- doxytag: member="weave.h::stp_initialize_weave" ref="5b4fc76c83f5408182f90fb139c06b50" args="(stp_vars_t *v, int jets, int separation, int oversample, int horizontal, int vertical, int ncolors, int bitwidth, int linewidth, int line_count, int first_line, int page_height, const int *head_offset, stp_weave_strategy_t, stp_flushfunc, stp_fillfunc, stp_packfunc, stp_compute_linewidth_func)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_initialize_weave           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_initialize_weave           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>jets</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>jets</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>separation</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>separation</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>oversample</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>oversample</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>horizontal</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>horizontal</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>vertical</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>vertical</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>ncolors</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>ncolors</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>bitwidth</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>bitwidth</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>linewidth</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>linewidth</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>line_count</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>line_count</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>first_line</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>first_line</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>page_height</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>page_height</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const int *&nbsp;</td>
-          <td class="mdname" nowrap> <em>head_offset</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const int *&nbsp;</td>
+          <td class="paramname"> <em>head_offset</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="weave_8h.html#a26">stp_weave_strategy_t</a>&nbsp;</td>
-          <td class="mdname" nowrap>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf38580991">stp_weave_strategy_t</a>&nbsp;</td>
+          <td class="paramname">, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="weave_8h.html#a3">stp_flushfunc</a>&nbsp;</td>
-          <td class="mdname" nowrap>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="weave_8h.html#d25d63c939f6ace90d029473ad33ce63">stp_flushfunc</a>&nbsp;</td>
+          <td class="paramname">, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="weave_8h.html#a2">stp_fillfunc</a>&nbsp;</td>
-          <td class="mdname" nowrap>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="weave_8h.html#3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a>&nbsp;</td>
+          <td class="paramname">, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="weave_8h.html#a1">stp_packfunc</a>&nbsp;</td>
-          <td class="mdname" nowrap>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="weave_8h.html#e8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a>&nbsp;</td>
+          <td class="paramname">, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a>&nbsp;</td>
-          <td class="mdname" nowrap></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="weave_8h.html#6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a>&nbsp;</td>
+          <td class="paramname"></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a25"></a><!-- doxytag: member="weave.h::stp_weave_parameters_by_row" ref="a25" args="(const stp_vars_t *v, int row, int vertical_subpass, stp_weave_t *w)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="39d760951513fd171f9dc25b57daf229"></a><!-- doxytag: member="weave.h::stp_weave_parameters_by_row" ref="39d760951513fd171f9dc25b57daf229" args="(const stp_vars_t *v, int row, int vertical_subpass, stp_weave_t *w)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_weave_parameters_by_row           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_weave_parameters_by_row           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>row</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>row</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>vertical_subpass</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>vertical_subpass</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstp__weave__t.html">stp_weave_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>w</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstp__weave__t.html">stp_weave_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>w</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a19"></a><!-- doxytag: member="weave.h::stp_write_weave" ref="a19" args="(stp_vars_t *v, unsigned char *const cols[])" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ea7e0ed7877aa1e98b2ce9c210ad9ff4"></a><!-- doxytag: member="weave.h::stp_write_weave" ref="ea7e0ed7877aa1e98b2ce9c210ad9ff4" args="(stp_vars_t *v, unsigned char *const cols[])" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_write_weave           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>v</em>, </td>
+          <td class="memname">void stp_write_weave           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>v</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>unsigned char *const &nbsp;</td>
-          <td class="mdname" nowrap> <em>cols</em>[]</td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *const &nbsp;</td>
+          <td class="paramname"> <em>cols</em>[]</td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a9"></a><!-- doxytag: member="weave.h::stp_compute_tiff_linewidth" ref="a9" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="9907d0fcce9e3c336fa7c6d66e1c91a5"></a><!-- doxytag: member="weave.h::stp_compute_tiff_linewidth" ref="9907d0fcce9e3c336fa7c6d66e1c91a5" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a> <a class="el" href="weave_8h.html#a9">stp_compute_tiff_linewidth</a>          </td>
+          <td class="memname"><a class="el" href="weave_8h.html#6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a> <a class="el" href="weave_8h.html#9907d0fcce9e3c336fa7c6d66e1c91a5">stp_compute_tiff_linewidth</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="weave.h::stp_compute_uncompressed_linewidth" ref="a10" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="4046c403128b61705309b05700120e41"></a><!-- doxytag: member="weave.h::stp_compute_uncompressed_linewidth" ref="4046c403128b61705309b05700120e41" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a> <a class="el" href="weave_8h.html#a10">stp_compute_uncompressed_linewidth</a>          </td>
+          <td class="memname"><a class="el" href="weave_8h.html#6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a> <a class="el" href="weave_8h.html#4046c403128b61705309b05700120e41">stp_compute_uncompressed_linewidth</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a7"></a><!-- doxytag: member="weave.h::stp_fill_tiff" ref="a7" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="87a7e015e79b03ec26069ddf9ab64c50"></a><!-- doxytag: member="weave.h::stp_fill_tiff" ref="87a7e015e79b03ec26069ddf9ab64c50" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#a2">stp_fillfunc</a> <a class="el" href="weave_8h.html#a7">stp_fill_tiff</a>          </td>
+          <td class="memname"><a class="el" href="weave_8h.html#3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a> <a class="el" href="weave_8h.html#87a7e015e79b03ec26069ddf9ab64c50">stp_fill_tiff</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a8"></a><!-- doxytag: member="weave.h::stp_fill_uncompressed" ref="a8" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="581ae80f8594763f27620d3338407fef"></a><!-- doxytag: member="weave.h::stp_fill_uncompressed" ref="581ae80f8594763f27620d3338407fef" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#a2">stp_fillfunc</a> <a class="el" href="weave_8h.html#a8">stp_fill_uncompressed</a>          </td>
+          <td class="memname"><a class="el" href="weave_8h.html#3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a> <a class="el" href="weave_8h.html#581ae80f8594763f27620d3338407fef">stp_fill_uncompressed</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="weave.h::stp_pack_tiff" ref="a5" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="525feabe0775e573007678b2da863b24"></a><!-- doxytag: member="weave.h::stp_pack_tiff" ref="525feabe0775e573007678b2da863b24" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#a1">stp_packfunc</a> <a class="el" href="weave_8h.html#a5">stp_pack_tiff</a>          </td>
+          <td class="memname"><a class="el" href="weave_8h.html#e8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a> <a class="el" href="weave_8h.html#525feabe0775e573007678b2da863b24">stp_pack_tiff</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a6"></a><!-- doxytag: member="weave.h::stp_pack_uncompressed" ref="a6" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="561a5fd614c279fdc9ea9c14c7a5b540"></a><!-- doxytag: member="weave.h::stp_pack_uncompressed" ref="561a5fd614c279fdc9ea9c14c7a5b540" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#a1">stp_packfunc</a> <a class="el" href="weave_8h.html#a6">stp_pack_uncompressed</a>          </td>
+          <td class="memname"><a class="el" href="weave_8h.html#e8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a> <a class="el" href="weave_8h.html#561a5fd614c279fdc9ea9c14c7a5b540">stp_pack_uncompressed</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/xml_8h.html b/doc/gutenprint/html/xml_8h.html
index 6c675cb..f167c6e 100644
--- a/doc/gutenprint/html/xml_8h.html
+++ b/doc/gutenprint/html/xml_8h.html
@@ -1,700 +1,537 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprint API Reference: include/gutenprint/xml.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
-<h1>xml.h File Reference</h1>XML tree functions. <a href="#_details">More...</a>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprint/xml.h File Reference</h1>XML tree functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="mxml_8h.html">gutenprint/mxml.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a0">stp_xml_parse_func</a> )(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *file)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int(*)&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#68816020e4f2e76d9b87379fe5b5edb2">stp_xml_parse_func</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *file)</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a1">stp_register_xml_parser</a> (const char *name, <a class="el" href="xml_8h.html#a0">stp_xml_parse_func</a> parse_func)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#9082cdb0bef669a2c1cd463874d56cb3">stp_register_xml_parser</a> (const char *name, <a class="el" href="xml_8h.html#68816020e4f2e76d9b87379fe5b5edb2">stp_xml_parse_func</a> parse_func)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a2">stp_unregister_xml_parser</a> (const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#018dc99b4a78447b2e8cf66fec5a47b8">stp_unregister_xml_parser</a> (const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a3">stp_register_xml_preload</a> (const char *filename)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#8ce0a404da56d87db34ee50562f3154d">stp_register_xml_preload</a> (const char *filename)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a4">stp_unregister_xml_preload</a> (const char *filename)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#07bde9804f5e759aea971fea06e8cff7">stp_unregister_xml_preload</a> (const char *filename)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a5">stp_xml_init_defaults</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#3cfa9b65f1620621f0a0c6c7038fd316">stp_xml_init_defaults</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a6">stp_xml_parse_file</a> (const char *file)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#c18d19df318ec2e3b4c850c68f07fe8f">stp_xml_parse_file</a> (const char *file)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a7">stp_xmlstrtol</a> (const char *value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#28f6df53b5a7623b654dff6ec26db8c7">stp_xmlstrtol</a> (const char *value)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a8">stp_xmlstrtoul</a> (const char *value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#1c1ba2f2312544bda8b3ce2e919e4687">stp_xmlstrtoul</a> (const char *value)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a9">stp_xmlstrtod</a> (const char *textval)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#955626cb67a5067d67a116f8ab67007d">stp_xmlstrtod</a> (const char *textval)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a10">stp_xml_init</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#1a82a8dc830a6f7f81ec4e6f2344a5af">stp_xml_init</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a11">stp_xml_exit</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#b7b7abdceb4f1e6e6c6a607cd2eedead">stp_xml_exit</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a12">stp_xml_get_node</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *xmlroot,...)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#3f776c6582845b20c4f76b239d590ec6">stp_xml_get_node</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *xmlroot,...)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a13">stp_xmldoc_create_generic</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#31f7bc9f5f2b2ce79dcfc87d7f4630f2">stp_xmldoc_create_generic</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a14">stp_xml_preinit</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#57035ed4be23f4527c9515198bf37a9d">stp_xml_preinit</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a15">stp_sequence_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *da)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#fa6f69121eb86b2aee998635b79d21ac">stp_sequence_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *da)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a16">stp_xmltree_create_from_sequence</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *seq)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#d03ea12e2b0089daf469c6af120ef180">stp_xmltree_create_from_sequence</a> (const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *seq)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a17">stp_curve_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *da)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#112e57d9f022170ee00b0a66fea1770f">stp_curve_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *da)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a18">stp_xmltree_create_from_curve</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#e8c5f8944f4921f772eb12e52c7fb95d">stp_xmltree_create_from_curve</a> (const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a19">stp_array_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *array)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ce5ac81af291e43504d5c0200276e543">stp_array_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *array)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a20">stp_xmltree_create_from_array</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#e02d45dc8cae7bea5c4e378e121d6623">stp_xmltree_create_from_array</a> (const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a21">stp_xml_parse_file_named</a> (const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#c3ebefda15f3996388895a4408c3b030">stp_xml_parse_file_named</a> (const char *name)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 XML tree functions. 
 <p>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a0"></a><!-- doxytag: member="xml.h::stp_xml_parse_func" ref="a0" args=")(stp_mxml_node_t *node, const char *file)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="68816020e4f2e76d9b87379fe5b5edb2"></a><!-- doxytag: member="xml.h::stp_xml_parse_func" ref="68816020e4f2e76d9b87379fe5b5edb2" args="(stp_mxml_node_t *node, const char *file)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef int(* <a class="el" href="xml_8h.html#a0">stp_xml_parse_func</a>)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *file)          </td>
+          <td class="memname">typedef int(*) <a class="el" href="xml_8h.html#68816020e4f2e76d9b87379fe5b5edb2">stp_xml_parse_func</a>(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *file)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a19"></a><!-- doxytag: member="xml.h::stp_array_create_from_xmltree" ref="a19" args="(stp_mxml_node_t *array)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="ce5ac81af291e43504d5c0200276e543"></a><!-- doxytag: member="xml.h::stp_array_create_from_xmltree" ref="ce5ac81af291e43504d5c0200276e543" args="(stp_mxml_node_t *array)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a>* stp_array_create_from_xmltree           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>array</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a>* stp_array_create_from_xmltree           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>array</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a17"></a><!-- doxytag: member="xml.h::stp_curve_create_from_xmltree" ref="a17" args="(stp_mxml_node_t *da)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="112e57d9f022170ee00b0a66fea1770f"></a><!-- doxytag: member="xml.h::stp_curve_create_from_xmltree" ref="112e57d9f022170ee00b0a66fea1770f" args="(stp_mxml_node_t *da)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_curve_create_from_xmltree           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>da</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* stp_curve_create_from_xmltree           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>da</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a1"></a><!-- doxytag: member="xml.h::stp_register_xml_parser" ref="a1" args="(const char *name, stp_xml_parse_func parse_func)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="9082cdb0bef669a2c1cd463874d56cb3"></a><!-- doxytag: member="xml.h::stp_register_xml_parser" ref="9082cdb0bef669a2c1cd463874d56cb3" args="(const char *name, stp_xml_parse_func parse_func)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_register_xml_parser           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>name</em>, </td>
+          <td class="memname">void stp_register_xml_parser           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="xml_8h.html#a0">stp_xml_parse_func</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>parse_func</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="xml_8h.html#68816020e4f2e76d9b87379fe5b5edb2">stp_xml_parse_func</a>&nbsp;</td>
+          <td class="paramname"> <em>parse_func</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="xml.h::stp_register_xml_preload" ref="a3" args="(const char *filename)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="8ce0a404da56d87db34ee50562f3154d"></a><!-- doxytag: member="xml.h::stp_register_xml_preload" ref="8ce0a404da56d87db34ee50562f3154d" args="(const char *filename)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_register_xml_preload           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>filename</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void stp_register_xml_preload           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>filename</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a15"></a><!-- doxytag: member="xml.h::stp_sequence_create_from_xmltree" ref="a15" args="(stp_mxml_node_t *da)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="fa6f69121eb86b2aee998635b79d21ac"></a><!-- doxytag: member="xml.h::stp_sequence_create_from_xmltree" ref="fa6f69121eb86b2aee998635b79d21ac" args="(stp_mxml_node_t *da)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a>* stp_sequence_create_from_xmltree           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>da</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a>* stp_sequence_create_from_xmltree           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>da</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="xml.h::stp_unregister_xml_parser" ref="a2" args="(const char *name)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="018dc99b4a78447b2e8cf66fec5a47b8"></a><!-- doxytag: member="xml.h::stp_unregister_xml_parser" ref="018dc99b4a78447b2e8cf66fec5a47b8" args="(const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_unregister_xml_parser           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>name</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void stp_unregister_xml_parser           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="xml.h::stp_unregister_xml_preload" ref="a4" args="(const char *filename)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="07bde9804f5e759aea971fea06e8cff7"></a><!-- doxytag: member="xml.h::stp_unregister_xml_preload" ref="07bde9804f5e759aea971fea06e8cff7" args="(const char *filename)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_unregister_xml_preload           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>filename</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void stp_unregister_xml_preload           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>filename</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a11"></a><!-- doxytag: member="xml.h::stp_xml_exit" ref="a11" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="b7b7abdceb4f1e6e6c6a607cd2eedead"></a><!-- doxytag: member="xml.h::stp_xml_exit" ref="b7b7abdceb4f1e6e6c6a607cd2eedead" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_xml_exit           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void stp_xml_exit           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a12"></a><!-- doxytag: member="xml.h::stp_xml_get_node" ref="a12" args="(stp_mxml_node_t *xmlroot,...)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="3f776c6582845b20c4f76b239d590ec6"></a><!-- doxytag: member="xml.h::stp_xml_get_node" ref="3f776c6582845b20c4f76b239d590ec6" args="(stp_mxml_node_t *xmlroot,...)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xml_get_node           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>xmlroot</em>, </td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xml_get_node           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>xmlroot</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>&nbsp;</td>
-          <td class="mdname" nowrap> <em>...</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">&nbsp;</td>
+          <td class="paramname"> <em>...</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="xml.h::stp_xml_init" ref="a10" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="1a82a8dc830a6f7f81ec4e6f2344a5af"></a><!-- doxytag: member="xml.h::stp_xml_init" ref="1a82a8dc830a6f7f81ec4e6f2344a5af" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_xml_init           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void stp_xml_init           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="xml.h::stp_xml_init_defaults" ref="a5" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="3cfa9b65f1620621f0a0c6c7038fd316"></a><!-- doxytag: member="xml.h::stp_xml_init_defaults" ref="3cfa9b65f1620621f0a0c6c7038fd316" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_xml_init_defaults           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int stp_xml_init_defaults           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a6"></a><!-- doxytag: member="xml.h::stp_xml_parse_file" ref="a6" args="(const char *file)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="c18d19df318ec2e3b4c850c68f07fe8f"></a><!-- doxytag: member="xml.h::stp_xml_parse_file" ref="c18d19df318ec2e3b4c850c68f07fe8f" args="(const char *file)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stp_xml_parse_file           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>file</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">int stp_xml_parse_file           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>file</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a21"></a><!-- doxytag: member="xml.h::stp_xml_parse_file_named" ref="a21" args="(const char *name)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="c3ebefda15f3996388895a4408c3b030"></a><!-- doxytag: member="xml.h::stp_xml_parse_file_named" ref="c3ebefda15f3996388895a4408c3b030" args="(const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_xml_parse_file_named           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>name</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void stp_xml_parse_file_named           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a14"></a><!-- doxytag: member="xml.h::stp_xml_preinit" ref="a14" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="57035ed4be23f4527c9515198bf37a9d"></a><!-- doxytag: member="xml.h::stp_xml_preinit" ref="57035ed4be23f4527c9515198bf37a9d" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stp_xml_preinit           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">void stp_xml_preinit           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a13"></a><!-- doxytag: member="xml.h::stp_xmldoc_create_generic" ref="a13" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="31f7bc9f5f2b2ce79dcfc87d7f4630f2"></a><!-- doxytag: member="xml.h::stp_xmldoc_create_generic" ref="31f7bc9f5f2b2ce79dcfc87d7f4630f2" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xmldoc_create_generic           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xmldoc_create_generic           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a9"></a><!-- doxytag: member="xml.h::stp_xmlstrtod" ref="a9" args="(const char *textval)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="955626cb67a5067d67a116f8ab67007d"></a><!-- doxytag: member="xml.h::stp_xmlstrtod" ref="955626cb67a5067d67a116f8ab67007d" args="(const char *textval)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">double stp_xmlstrtod           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>textval</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">double stp_xmlstrtod           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>textval</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a7"></a><!-- doxytag: member="xml.h::stp_xmlstrtol" ref="a7" args="(const char *value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="28f6df53b5a7623b654dff6ec26db8c7"></a><!-- doxytag: member="xml.h::stp_xmlstrtol" ref="28f6df53b5a7623b654dff6ec26db8c7" args="(const char *value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">long stp_xmlstrtol           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>value</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">long stp_xmlstrtol           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>value</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a8"></a><!-- doxytag: member="xml.h::stp_xmlstrtoul" ref="a8" args="(const char *value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="1c1ba2f2312544bda8b3ce2e919e4687"></a><!-- doxytag: member="xml.h::stp_xmlstrtoul" ref="1c1ba2f2312544bda8b3ce2e919e4687" args="(const char *value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">unsigned long stp_xmlstrtoul           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>value</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">unsigned long stp_xmlstrtoul           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>value</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a20"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_array" ref="a20" args="(const stp_array_t *array)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="e02d45dc8cae7bea5c4e378e121d6623"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_array" ref="e02d45dc8cae7bea5c4e378e121d6623" args="(const stp_array_t *array)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xmltree_create_from_array           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>array</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xmltree_create_from_array           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>array</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a18"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_curve" ref="a18" args="(const stp_curve_t *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="e8c5f8944f4921f772eb12e52c7fb95d"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_curve" ref="e8c5f8944f4921f772eb12e52c7fb95d" args="(const stp_curve_t *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xmltree_create_from_curve           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xmltree_create_from_curve           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a16"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_sequence" ref="a16" args="(const stp_sequence_t *seq)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="d03ea12e2b0089daf469c6af120ef180"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_sequence" ref="d03ea12e2b0089daf469c6af120ef180" args="(const stp_sequence_t *seq)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xmltree_create_from_sequence           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>seq</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xmltree_create_from_sequence           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>seq</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:47 2006 for libgutenprint API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 11:45:11 2007 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/gutenprintui2.tag b/doc/gutenprintui2/gutenprintui2.tag
index 04d41ea..baa519e 100644
--- a/doc/gutenprintui2/gutenprintui2.tag
+++ b/doc/gutenprintui2/gutenprintui2.tag
@@ -2,7 +2,7 @@
 <tagfile>
   <compound kind="file">
     <name>curve.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprintui2/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprintui2/</path>
     <filename>curve_8h</filename>
     <class kind="struct">_StpuiCurve</class>
     <class kind="struct">_StpuiCurveClass</class>
@@ -10,138 +10,138 @@
       <type>#define</type>
       <name>STPUI_TYPE_CURVE</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>887bee281f88accbe674790e5e5b28e3</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_CURVE</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>03272c56621cf16c2caa378231c7fa43</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_CURVE_CLASS</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>d788bc4e6a85701756b28d972a64b7f8</anchor>
       <arglist>(klass)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_IS_CURVE</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>92f2038dd52d2b3af7c03bdeb5918567</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_IS_CURVE_CLASS</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>ee626496df16d25159b91982478b0df9</anchor>
       <arglist>(klass)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_CURVE_GET_CLASS</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>41b32938b1bfc087ca93b3655ef03ab6</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="typedef">
       <type>_StpuiCurve</type>
       <name>StpuiCurve</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>5c0213fede0b7d8a91b66e4679cc899a</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>_StpuiCurveClass</type>
       <name>StpuiCurveClass</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>057f1c40a70e84c7a187b423ebe4aada</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>StpuiCurveType</name>
-      <anchor>a19</anchor>
+      <anchor>59cb8817385039367325d6dbb4a0996b</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STPUI_CURVE_TYPE_LINEAR</name>
-      <anchor>a19a8</anchor>
+      <anchor>59cb8817385039367325d6dbb4a0996b741f86dc6dfb50a67dd621a287014de1</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STPUI_CURVE_TYPE_SPLINE</name>
-      <anchor>a19a9</anchor>
+      <anchor>59cb8817385039367325d6dbb4a0996b6cef8a118ee2829db63f812874a412c1</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STPUI_CURVE_TYPE_FREE</name>
-      <anchor>a19a10</anchor>
+      <anchor>59cb8817385039367325d6dbb4a0996b1a204ef2d450d762415a1c0c1c77db89</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>GType</type>
       <name>stpui_curve_get_type</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a11</anchor>
+      <anchor>233b21367f03cd5ba884d4e3c742c8d2</anchor>
       <arglist>(void) G_GNUC_CONST</arglist>
     </member>
     <member kind="function">
       <type>GtkWidget *</type>
       <name>stpui_curve_new</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a12</anchor>
+      <anchor>cbdc99aaef1f5672d0294d9742fdc398</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_curve_reset</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a13</anchor>
+      <anchor>466fe70debd1a7eca3988f91a109009f</anchor>
       <arglist>(StpuiCurve *curve)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_curve_set_gamma</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a14</anchor>
+      <anchor>956d80d857cf5927768a38103d8af705</anchor>
       <arglist>(StpuiCurve *curve, gfloat gamma_)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_curve_set_range</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a15</anchor>
+      <anchor>d4dcd042b1e50672781895d886adad66</anchor>
       <arglist>(StpuiCurve *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_curve_get_vector</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a16</anchor>
+      <anchor>43799d3f187018958cb78ece053dadda</anchor>
       <arglist>(StpuiCurve *curve, int veclen, gfloat vector[])</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_curve_set_vector</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a17</anchor>
+      <anchor>be1c943341872697e6219d7053db2804</anchor>
       <arglist>(StpuiCurve *curve, int veclen, const gfloat vector[])</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_curve_set_curve_type</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a18</anchor>
+      <anchor>196839b2b6e39ae4bd5ccc9aad4ff8f7</anchor>
       <arglist>(StpuiCurve *curve, StpuiCurveType type)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gammacurve.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprintui2/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprintui2/</path>
     <filename>gammacurve_8h</filename>
     <class kind="struct">_StpuiGammaCurve</class>
     <class kind="struct">_StpuiGammaCurveClass</class>
@@ -149,76 +149,76 @@
       <type>#define</type>
       <name>STPUI_TYPE_GAMMA_CURVE</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>9c72ddb3a35cadb3cc00b316cbb8e601</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_GAMMA_CURVE</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>1799655d0ba34bbf0f856411399f222e</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_GAMMA_CURVE_CLASS</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>45aa6ff6c9db14c6de371c1c9662483b</anchor>
       <arglist>(klass)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_IS_GAMMA_CURVE</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>9a10e0a1241d9f042e2e1a2cf14b70c3</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_IS_GAMMA_CURVE_CLASS</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>d5a762ee6059464c4d4d2f175d716c16</anchor>
       <arglist>(klass)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_GAMMA_CURVE_GET_CLASS</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>e0813a802c9f9ee0a8fa4d3ff372ef0f</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="typedef">
       <type>_StpuiGammaCurve</type>
       <name>StpuiGammaCurve</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>16a893a0c5c5908d5db1a36c91590d6c</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>_StpuiGammaCurveClass</type>
       <name>StpuiGammaCurveClass</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>ec66cf466c32b2ead30a56c3fb1a3e09</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>GType</type>
       <name>stpui_gamma_curve_get_type</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>e52edc31b54a94c1e4e106f1966af6e4</anchor>
       <arglist>(void) G_GNUC_CONST</arglist>
     </member>
     <member kind="function">
       <type>GtkWidget *</type>
       <name>stpui_gamma_curve_new</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>39433a30aa8d9b5a4e3fd1aa4176eb2f</anchor>
       <arglist>(void)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprintui.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprintui2/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprintui2/</path>
     <filename>gutenprintui_8h</filename>
     <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprintui2/curve.h</includes>
     <includes id="gammacurve_8h" name="gammacurve.h" local="no" imported="no">gutenprintui2/gammacurve.h</includes>
@@ -229,475 +229,475 @@
       <type>stpui_image</type>
       <name>stpui_image_t</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>195aac96c77c6de3925cd3d13c6ce2f1</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
-      <type>guchar *(*</type>
+      <type>guchar *(*)</type>
       <name>get_thumbnail_func_t</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a1</anchor>
-      <arglist>)(void *data, gint *width, gint *height, gint *bpp, gint page)</arglist>
+      <anchor>4ab1da499b20816c28d1b26c61652c1d</anchor>
+      <arglist>(void *data, gint *width, gint *height, gint *bpp, gint page)</arglist>
     </member>
     <member kind="enumeration">
       <name>orient_t</name>
-      <anchor>a62</anchor>
+      <anchor>c33232f845969eb04b32e1006c8240a0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_AUTO</name>
-      <anchor>a62a2</anchor>
+      <anchor>c33232f845969eb04b32e1006c8240a006af5eabe5d18a247c02641283fe4481</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_PORTRAIT</name>
-      <anchor>a62a3</anchor>
+      <anchor>c33232f845969eb04b32e1006c8240a0f81c23cf1763365fba8e36db87131ff5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_LANDSCAPE</name>
-      <anchor>a62a4</anchor>
+      <anchor>c33232f845969eb04b32e1006c8240a04dc9735e5b3e4c86b60141acc08e5db1</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_UPSIDEDOWN</name>
-      <anchor>a62a5</anchor>
+      <anchor>c33232f845969eb04b32e1006c8240a03ca76babc9953cc92305856ac00a2350</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_SEASCAPE</name>
-      <anchor>a62a6</anchor>
+      <anchor>c33232f845969eb04b32e1006c8240a07de33495add2d66cc743f2edcbb548e3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>command_t</name>
-      <anchor>a63</anchor>
+      <anchor>b31350eb38b009cbd282027630a1ee10</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>COMMAND_TYPE_DEFAULT</name>
-      <anchor>a63a7</anchor>
+      <anchor>b31350eb38b009cbd282027630a1ee10a6a7840c2276bfe38dd68b4fe3a8babf</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>COMMAND_TYPE_CUSTOM</name>
-      <anchor>a63a8</anchor>
+      <anchor>b31350eb38b009cbd282027630a1ee10cb7cf14821d9fcbaa983ee33d7b8e926</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>COMMAND_TYPE_FILE</name>
-      <anchor>a63a9</anchor>
+      <anchor>b31350eb38b009cbd282027630a1ee105e9a887a5dab88a425cb52c8b1e49a7f</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_name</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>f54293f58c474e133e4a60054779c9be</anchor>
       <arglist>(stpui_plist_t *p, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_name_n</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a11</anchor>
+      <anchor>90a9ed90e03acd443d08350a62aa3762</anchor>
       <arglist>(stpui_plist_t *p, const char *val, int n)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_plist_get_name</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a12</anchor>
+      <anchor>342817c9f4311f0ac827c94b0e62cbbb</anchor>
       <arglist>(const stpui_plist_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_queue_name</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a13</anchor>
+      <anchor>8a4fa7000900cb4813000048c322dcdb</anchor>
       <arglist>(stpui_plist_t *p, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_queue_name_n</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a14</anchor>
+      <anchor>ec75fb2ec25a5a69d270d70ea33c81eb</anchor>
       <arglist>(stpui_plist_t *p, const char *val, int n)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_plist_get_queue_name</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a15</anchor>
+      <anchor>acf031afbe7e9682f7367f1ae0ef1895</anchor>
       <arglist>(const stpui_plist_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_output_filename</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a16</anchor>
+      <anchor>248eae3ae0a96506fa8c92807f70d457</anchor>
       <arglist>(stpui_plist_t *p, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_output_filename_n</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a17</anchor>
+      <anchor>ea9ddb061703368f7ea1e3b861b8550d</anchor>
       <arglist>(stpui_plist_t *p, const char *val, int n)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_plist_get_output_filename</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a18</anchor>
+      <anchor>856c534e664748c9a419104357312dfd</anchor>
       <arglist>(const stpui_plist_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_extra_printer_options</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a19</anchor>
+      <anchor>72ee8e1bb9bee2e13c15a9aecd9582bd</anchor>
       <arglist>(stpui_plist_t *p, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_extra_printer_options_n</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a20</anchor>
+      <anchor>9899c88da60069b72d7ddb601bcad548</anchor>
       <arglist>(stpui_plist_t *p, const char *val, int n)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_plist_get_extra_printer_options</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a21</anchor>
+      <anchor>4956cdd55680ed20a92e991d4cf52ee8</anchor>
       <arglist>(const stpui_plist_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_custom_command</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a22</anchor>
+      <anchor>f127a39a7ea466ca73e5a511f36ae985</anchor>
       <arglist>(stpui_plist_t *p, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_custom_command_n</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a23</anchor>
+      <anchor>567c7c6c13930e398def69f2829bd038</anchor>
       <arglist>(stpui_plist_t *p, const char *val, int n)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_plist_get_custom_command</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a24</anchor>
+      <anchor>bc624051678aac91a2ffa6c7c5393b8d</anchor>
       <arglist>(const stpui_plist_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_copy_count</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a25</anchor>
+      <anchor>02092bb706d3770870ed5f64efb1ea2a</anchor>
       <arglist>(stpui_plist_t *p, gint count)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stpui_plist_get_copy_count</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a26</anchor>
+      <anchor>7d4511d9e9c69136fabf9f9c64734c51</anchor>
       <arglist>(const stpui_plist_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_current_standard_command</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a27</anchor>
+      <anchor>79e27ac73e0f082abcdde41ee76879ce</anchor>
       <arglist>(stpui_plist_t *p, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_current_standard_command_n</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a28</anchor>
+      <anchor>a405ef9e03818fedcff5746b9701c3c3</anchor>
       <arglist>(stpui_plist_t *p, const char *val, int n)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_plist_get_current_standard_command</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a29</anchor>
+      <anchor>fdc574a731f6697c3e48c6001a51b3af</anchor>
       <arglist>(const stpui_plist_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_command_type</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a30</anchor>
+      <anchor>a920697330124635ca464662caf975d5</anchor>
       <arglist>(stpui_plist_t *p, command_t val)</arglist>
     </member>
     <member kind="function">
       <type>command_t</type>
       <name>stpui_plist_get_command_type</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a31</anchor>
+      <anchor>3c9ed1191c6a03edba14f7b98d03ef55</anchor>
       <arglist>(const stpui_plist_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_global_parameter</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a32</anchor>
+      <anchor>eb3ea1fd028cb28211bac9e88f9ca8ac</anchor>
       <arglist>(const char *param, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_get_global_parameter</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a33</anchor>
+      <anchor>28c71e75188d60a243755deaab31b5fd</anchor>
       <arglist>(const char *param)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_copy</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a34</anchor>
+      <anchor>01db968552106a84a49f76d7203bd3f5</anchor>
       <arglist>(stpui_plist_t *vd, const stpui_plist_t *vs)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stpui_plist_add</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a35</anchor>
+      <anchor>b2e655748deab72a24c25bfaf4ee9052</anchor>
       <arglist>(const stpui_plist_t *key, int add_only)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_printer_initialize</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a36</anchor>
+      <anchor>54daa32f5d5d64c644131570eab01c2b</anchor>
       <arglist>(stpui_plist_t *printer)</arglist>
     </member>
     <member kind="function">
       <type>const stpui_plist_t *</type>
       <name>stpui_get_current_printer</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a37</anchor>
+      <anchor>26ebbd1948a457740cd75ff630969487</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stpui_build_standard_print_command</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a38</anchor>
+      <anchor>97f0f11c41859d80d9bb3803f81a671f</anchor>
       <arglist>(const stpui_plist_t *plist, const stp_printer_t *printer)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_printrc_file</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a39</anchor>
+      <anchor>443905f09bfd6cad7fd06aa029ac306c</anchor>
       <arglist>(const char *name)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_get_printrc_file</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a40</anchor>
+      <anchor>8faab74e1f9c2b372efa56ae6fea713e</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_printrc_load</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a41</anchor>
+      <anchor>54f67bb1819c7135a0ca1f005a22d28b</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_get_system_printers</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a42</anchor>
+      <anchor>da642fd5eeff02d4c6b84d3125ca2da2</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_printrc_save</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a43</anchor>
+      <anchor>8c4bddac236a6557ec126fd659ceade0</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_image_filename</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a44</anchor>
+      <anchor>701289a198a313c5b6758ab1cd678c58</anchor>
       <arglist>(const char *)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_get_image_filename</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a45</anchor>
+      <anchor>8bc64271197449021140ce2d17ad71e2</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_errfunc</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a46</anchor>
+      <anchor>cc06b85ae6af8ca0003584da411213fb</anchor>
       <arglist>(stp_outfunc_t wfunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_outfunc_t</type>
       <name>stpui_get_errfunc</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a47</anchor>
+      <anchor>da3d388496b4b7d689f4cf8a957c75b2</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_errdata</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a48</anchor>
+      <anchor>d013cb96f40b5da4bca5dd9485aaa213</anchor>
       <arglist>(void *errdata)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stpui_get_errdata</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a49</anchor>
+      <anchor>15368f674e52b511ad665cb2be45576c</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>gint</type>
       <name>stpui_do_print_dialog</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a50</anchor>
+      <anchor>ac1066fa59dc8a04b90415994587ec1a</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>gint</type>
       <name>stpui_compute_orientation</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a51</anchor>
+      <anchor>6932b380986d06d6dd7671439aaf93a0</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_image_dimensions</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a52</anchor>
+      <anchor>a52f1b5d60ea21d09cfbab998df7ff33</anchor>
       <arglist>(gint width, gint height)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_image_resolution</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a53</anchor>
+      <anchor>3fa4a6d1300a470016744badf81daa43</anchor>
       <arglist>(gdouble xres, gdouble yres)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_image_type</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a54</anchor>
+      <anchor>7b2f104989fb67ca20e1b9874e047293</anchor>
       <arglist>(const char *image_type)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_image_raw_channels</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a55</anchor>
+      <anchor>0d40ca93fed8c7d10dcc516e6fb61ea1</anchor>
       <arglist>(gint channels)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_image_channel_depth</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a56</anchor>
+      <anchor>845898656d91fbf462db9c9b3e7c976f</anchor>
       <arglist>(gint bit_depth)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_thumbnail_func</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a57</anchor>
+      <anchor>fcaf0ce6ff01c073cdfb2d2f80ede234</anchor>
       <arglist>(get_thumbnail_func_t)</arglist>
     </member>
     <member kind="function">
       <type>get_thumbnail_func_t</type>
       <name>stpui_get_thumbnail_func</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a58</anchor>
+      <anchor>74c1f441bf3fbb2198cf4cbaca8c23ef</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_thumbnail_data</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a59</anchor>
+      <anchor>965e5950073e3ef6775f3355556517f6</anchor>
       <arglist>(void *)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stpui_get_thumbnail_data</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a60</anchor>
+      <anchor>ee04dfc45b26093bd65d3025b817cfd5</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stpui_print</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a61</anchor>
+      <anchor>1ffdddfb6efd3353d403192b2b2c1e20</anchor>
       <arglist>(const stpui_plist_t *printer, stpui_image_t *im)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>typebuiltins.h</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprintui2/</path>
+    <path>/home/rlk/sandbox/print-5.0/include/gutenprintui2/</path>
     <filename>typebuiltins_8h</filename>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_TYPE_ORIENT_T</name>
       <anchorfile>typebuiltins_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>7c68a632b60b65d497e2933fa1b78a77</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_TYPE_COMMAND_T</name>
       <anchorfile>typebuiltins_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>b213314f887b8b4f48f9aa1531673a9c</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_TYPE_CURVE_TYPE</name>
       <anchorfile>typebuiltins_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>f0561b03a3bfb203b40c37f9bb373ffb</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>G_BEGIN_DECLS GType</type>
       <name>orient_t_orient_t_get_type</name>
       <anchorfile>typebuiltins_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>b05fb37a6c79f2b6b417ff107d9bb881</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>GType</type>
       <name>command_t_command_t_get_type</name>
       <anchorfile>typebuiltins_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>5e6b50173b88263be23734e76f4a39f2</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>GType</type>
       <name>stpui_curve_type_get_type</name>
       <anchorfile>typebuiltins_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>1252245c3967f9e655de3d62c3999230</anchor>
       <arglist>(void)</arglist>
     </member>
   </compound>
@@ -708,105 +708,105 @@
       <type>GtkDrawingArea</type>
       <name>graph</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>de1a0d11481ca5e94e31025b5815c88f</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>cursor_type</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>5a45de0c0dd843601eb678cf898b6588</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gfloat</type>
       <name>min_x</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>a2e971c049f0f314e9459b21d591dde2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gfloat</type>
       <name>max_x</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>873e40a32b9a0e863ecf5af33233819d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gfloat</type>
       <name>min_y</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>035fd7e1c773ea3291dc40f6c2a95f07</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gfloat</type>
       <name>max_y</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>a4fbc033c9dc17d11be58786f5bfe817</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GdkPixmap *</type>
       <name>pixmap</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>a1e237c2fafc8ce7b06f73b8af401de1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>StpuiCurveType</type>
       <name>curve_type</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o7</anchor>
+      <anchor>c88de71f409ac73ffe41489313cacff2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>height</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o8</anchor>
+      <anchor>c679cbbcaa013aa84ac1e799d7299479</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>grab_point</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o9</anchor>
+      <anchor>30591159410734580ff586f4c62ac622</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>last</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o10</anchor>
+      <anchor>4866f6481ca65da32e4beda66c71381b</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>num_points</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o11</anchor>
+      <anchor>d8005c397affa21ad090cd0868e4fb60</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GdkPoint *</type>
       <name>point</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o12</anchor>
+      <anchor>f7e80ace854c3b42cfcb419eacd7766f</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>num_ctlpoints</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o13</anchor>
+      <anchor>875906e982189427a2a3dda0e7cc38ed</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gfloat(*</type>
       <name>ctlpoint</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o14</anchor>
+      <anchor>05e34073df0ce5bf7575b2e7383577a8</anchor>
       <arglist>)[2]</arglist>
     </member>
   </compound>
@@ -817,42 +817,42 @@
       <type>GtkDrawingAreaClass</type>
       <name>parent_class</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>60fce1a46ad405750d42c7aff83707bb</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>curve_type_changed</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>3098d1e480ba77e57785667ccf0b1c9f</anchor>
       <arglist>)(StpuiCurve *curve)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved1</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>97e1aa40263796ab3dada695e40193cb</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved2</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>053157829bb7c073427955e16c93c863</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved3</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>64b1fa1cf35f409932139752569ca1f9</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved4</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>f1b28ac82d8fa56fbc0a84f17d26d7b0</anchor>
       <arglist>)(void)</arglist>
     </member>
   </compound>
@@ -863,49 +863,49 @@
       <type>GtkVBox</type>
       <name>vbox</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>07e6d5e4479cbca4a927635cc6d02f26</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GtkWidget *</type>
       <name>table</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>f4a067c4f9e19c57d080b07aca9252b3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GtkWidget *</type>
       <name>curve</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>ef8d7f12bd9a16784147cc3841d966c6</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GtkWidget *</type>
       <name>button</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>6ec3a772b95ebde518266e23d2c6d351</anchor>
       <arglist>[5]</arglist>
     </member>
     <member kind="variable">
       <type>gfloat</type>
       <name>gamma</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>7783842531471a1605b5d38c7a02a52e</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GtkWidget *</type>
       <name>gamma_dialog</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>ef9135d931e5a99a0d35c40a8fc79b5b</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GtkWidget *</type>
       <name>gamma_text</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>abe5eae4e5aa05c6a62aab34d236c26b</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -916,35 +916,35 @@
       <type>GtkVBoxClass</type>
       <name>parent_class</name>
       <anchorfile>struct__StpuiGammaCurveClass.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>e784cb24d21ce7c707727c5996fed405</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved1</name>
       <anchorfile>struct__StpuiGammaCurveClass.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>11f61971dbf7791712b4ea447b00518d</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved2</name>
       <anchorfile>struct__StpuiGammaCurveClass.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>f471d7067cff6f4f8908c147f4d7c99c</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved3</name>
       <anchorfile>struct__StpuiGammaCurveClass.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>337220ca7c1966c911dd856d8377c66d</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved4</name>
       <anchorfile>struct__StpuiGammaCurveClass.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>d6007664d93b51b3f533998dfc836634</anchor>
       <arglist>)(void)</arglist>
     </member>
   </compound>
@@ -955,56 +955,56 @@
       <type>stp_image_t</type>
       <name>im</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>00862540482f307175e9fbf252751320</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>transpose</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>5f2a75c7187c6abcf20e15e2aad22549</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>hflip</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>f2733a318654d50214c94fccd9a018b7</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>vflip</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>c378339fe87fa21d5f117fc11b3f5b6c</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>rotate_ccw</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>0a31280def8cd739184192dbe8d34fa8</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>rotate_cw</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>e111082f0f23096d89e024c4fde9c0d6</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>rotate_180</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>aaae08fdabffb3d31ac761dfe0624506</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>crop</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>o7</anchor>
+      <anchor>96e6cc155230793c8aa847e5a7cd7255</anchor>
       <arglist>)(struct stpui_image *image, int left, int top, int right, int bottom)</arglist>
     </member>
   </compound>
@@ -1015,107 +1015,92 @@
       <type>char *</type>
       <name>name</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>95d5e51f00ae03f4ca085120fc7b88e6</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>command_t</type>
       <name>command_type</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>c1243181065442af4c72c24c0d3901f3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>queue_name</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>34155aeda35a97423a70071478a94469</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>extra_printer_options</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>ff2ab5a8193a99dc8014d804281173c6</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>custom_command</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>783211034ef118e102c9c07eb9f9a4fa</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>current_standard_command</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>dde7851705ff38bb9b14c1ec11bb53cb</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>output_filename</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>ee538bc59fd77730a5f73d3ea7d51d18</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>float</type>
       <name>scaling</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o7</anchor>
+      <anchor>7325ec55acf12db60e799b4532d50d0d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>orient_t</type>
       <name>orientation</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o8</anchor>
+      <anchor>394eafe3058457db432eeecb49addf07</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>unit</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o9</anchor>
+      <anchor>55bd8ba78e4f839d2897100cabd1c62f</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>auto_size_roll_feed_paper</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o10</anchor>
+      <anchor>9f02a46dd284eeaf56a643e0e4b17ffb</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>invalid_mask</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o11</anchor>
+      <anchor>49e854e792c73fee7bebcfb4de9ac78a</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_vars_t *</type>
       <name>v</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o12</anchor>
+      <anchor>fbdf87548a3132b7270aa88ffcf52a8a</anchor>
       <arglist></arglist>
     </member>
   </compound>
-  <compound kind="dir">
-    <name>include/gutenprintui2/</name>
-    <path>/home/rlk/sandbox/print-4.3/include/gutenprintui2/</path>
-    <filename>dir_000001.html</filename>
-    <file>curve.h</file>
-    <file>gammacurve.h</file>
-    <file>gutenprintui.h</file>
-    <file>typebuiltins.h</file>
-  </compound>
-  <compound kind="dir">
-    <name>include/</name>
-    <path>/home/rlk/sandbox/print-4.3/include/</path>
-    <filename>dir_000000.html</filename>
-    <dir>include/gutenprintui2/</dir>
-  </compound>
 </tagfile>
diff --git a/doc/gutenprintui2/html/annotated.html b/doc/gutenprintui2/html/annotated.html
index 6ecab33..d535beb 100644
--- a/doc/gutenprintui2/html/annotated.html
+++ b/doc/gutenprintui2/html/annotated.html
@@ -1,10 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: Data Structures</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindexHL" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li class="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>libgutenprintui2 API Reference Data Structures</h1>Here are the data structures with brief descriptions:<table>
   <tr><td class="indexkey"><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a></td><td class="indexvalue"></td></tr>
@@ -13,8 +27,8 @@
   <tr><td class="indexkey"><a class="el" href="structstpui__image.html">stpui_image</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a></td><td class="indexvalue"></td></tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/classes.html b/doc/gutenprintui2/html/classes.html
index 1f4a791..857ab0c 100644
--- a/doc/gutenprintui2/html/classes.html
+++ b/doc/gutenprintui2/html/classes.html
@@ -1,17 +1,31 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: Alphabetical List</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindexHL" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>libgutenprintui2 API Reference Data Structure Index</h1><p><div class="qindex"><a class="qindex" href="#letter__">_</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a></div><p>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
+<h1>libgutenprintui2 API Reference Data Structure Index</h1><p><div class="qindex"><a class="qindex" href="#letter_S">S</a>&nbsp;|&nbsp;<a class="qindex" href="#letter__">_</a></div><p>
 <table align="center" width="95%" border="0" cellspacing="0" cellpadding="0">
-<tr><td><a name="letter__"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;_&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstpui__image.html">stpui_image</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;S&nbsp;&nbsp;</div></td></tr></table>
-</td></tr></table><p><div class="qindex"><a class="qindex" href="#letter__">_</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a></div><p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+<tr><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;S&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstpui__image.html">stpui_image</a>&nbsp;&nbsp;&nbsp;</td><td><a name="letter__"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;_&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&nbsp;&nbsp;&nbsp;</td></tr></table><p><div class="qindex"><a class="qindex" href="#letter_S">S</a>&nbsp;|&nbsp;<a class="qindex" href="#letter__">_</a></div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/curve_8h.html b/doc/gutenprintui2/html/curve_8h.html
index 6d35ca1..6737a96 100644
--- a/doc/gutenprintui2/html/curve_8h.html
+++ b/doc/gutenprintui2/html/curve_8h.html
@@ -1,13 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: include/gutenprintui2/curve.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprintui2</a></div>
-<h1>curve.h File Reference</h1><code>#include &lt;gdk/gdk.h&gt;</code><br>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprintui2/curve.h File Reference</h1><code>#include &lt;gdk/gdk.h&gt;</code><br>
 <code>#include &lt;gtk/gtkdrawingarea.h&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -17,594 +28,458 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a0">STPUI_TYPE_CURVE</a>&nbsp;&nbsp;&nbsp;(stpui_curve_get_type ())</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#887bee281f88accbe674790e5e5b28e3">STPUI_TYPE_CURVE</a>&nbsp;&nbsp;&nbsp;(stpui_curve_get_type ())</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a1">STPUI_CURVE</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurve.html">StpuiCurve</a>))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#03272c56621cf16c2caa378231c7fa43">STPUI_CURVE</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurve.html">StpuiCurve</a>))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a2">STPUI_CURVE_CLASS</a>(klass)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#d788bc4e6a85701756b28d972a64b7f8">STPUI_CURVE_CLASS</a>(klass)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a3">STPUI_IS_CURVE</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_CURVE))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#92f2038dd52d2b3af7c03bdeb5918567">STPUI_IS_CURVE</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_CURVE))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a4">STPUI_IS_CURVE_CLASS</a>(klass)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_CURVE))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#ee626496df16d25159b91982478b0df9">STPUI_IS_CURVE_CLASS</a>(klass)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_CURVE))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a5">STPUI_CURVE_GET_CLASS</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#41b32938b1bfc087ca93b3655ef03ab6">STPUI_CURVE_GET_CLASS</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a6">StpuiCurve</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a7">StpuiCurveClass</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#057f1c40a70e84c7a187b423ebe4aada">StpuiCurveClass</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a19">StpuiCurveType</a> { <a class="el" href="curve_8h.html#a19a8">STPUI_CURVE_TYPE_LINEAR</a>, 
-<a class="el" href="curve_8h.html#a19a9">STPUI_CURVE_TYPE_SPLINE</a>, 
-<a class="el" href="curve_8h.html#a19a10">STPUI_CURVE_TYPE_FREE</a>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a> { <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b741f86dc6dfb50a67dd621a287014de1">STPUI_CURVE_TYPE_LINEAR</a>, 
+<a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b6cef8a118ee2829db63f812874a412c1">STPUI_CURVE_TYPE_SPLINE</a>, 
+<a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b1a204ef2d450d762415a1c0c1c77db89">STPUI_CURVE_TYPE_FREE</a>
  }</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a11">stpui_curve_get_type</a> (void) G_GNUC_CONST</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#233b21367f03cd5ba884d4e3c742c8d2">stpui_curve_get_type</a> (void) G_GNUC_CONST</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a12">stpui_curve_new</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#cbdc99aaef1f5672d0294d9742fdc398">stpui_curve_new</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a13">stpui_curve_reset</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#466fe70debd1a7eca3988f91a109009f">stpui_curve_reset</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a14">stpui_curve_set_gamma</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, gfloat gamma_)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#956d80d857cf5927768a38103d8af705">stpui_curve_set_gamma</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, gfloat gamma_)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a15">stpui_curve_set_range</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#d4dcd042b1e50672781895d886adad66">stpui_curve_set_range</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a16">stpui_curve_get_vector</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, int veclen, gfloat vector[])</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#43799d3f187018958cb78ece053dadda">stpui_curve_get_vector</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, int veclen, gfloat vector[])</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a17">stpui_curve_set_vector</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, int veclen, const gfloat vector[])</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#be1c943341872697e6219d7053db2804">stpui_curve_set_vector</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, int veclen, const gfloat vector[])</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a18">stpui_curve_set_curve_type</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, <a class="el" href="curve_8h.html#a19">StpuiCurveType</a> type)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#196839b2b6e39ae4bd5ccc9aad4ff8f7">stpui_curve_set_curve_type</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a> type)</td></tr>
 
 </table>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="a1"></a><!-- doxytag: member="curve.h::STPUI_CURVE" ref="a1" args="(obj)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">#define STPUI_CURVE          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">obj&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurve.html">StpuiCurve</a>))</td>
+<a class="anchor" name="03272c56621cf16c2caa378231c7fa43"></a><!-- doxytag: member="curve.h::STPUI_CURVE" ref="03272c56621cf16c2caa378231c7fa43" args="(obj)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define STPUI_CURVE          </td>
+          <td>(</td>
+          <td class="paramtype">obj&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurve.html">StpuiCurve</a>))</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="curve.h::STPUI_CURVE_CLASS" ref="a2" args="(klass)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">#define STPUI_CURVE_CLASS          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">klass&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td>
+
+</div>
+</div><p>
+<a class="anchor" name="d788bc4e6a85701756b28d972a64b7f8"></a><!-- doxytag: member="curve.h::STPUI_CURVE_CLASS" ref="d788bc4e6a85701756b28d972a64b7f8" args="(klass)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define STPUI_CURVE_CLASS          </td>
+          <td>(</td>
+          <td class="paramtype">klass&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="curve.h::STPUI_CURVE_GET_CLASS" ref="a5" args="(obj)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">#define STPUI_CURVE_GET_CLASS          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">obj&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td>
+
+</div>
+</div><p>
+<a class="anchor" name="41b32938b1bfc087ca93b3655ef03ab6"></a><!-- doxytag: member="curve.h::STPUI_CURVE_GET_CLASS" ref="41b32938b1bfc087ca93b3655ef03ab6" args="(obj)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define STPUI_CURVE_GET_CLASS          </td>
+          <td>(</td>
+          <td class="paramtype">obj&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="curve.h::STPUI_IS_CURVE" ref="a3" args="(obj)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">#define STPUI_IS_CURVE          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">obj&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_CURVE))</td>
+
+</div>
+</div><p>
+<a class="anchor" name="92f2038dd52d2b3af7c03bdeb5918567"></a><!-- doxytag: member="curve.h::STPUI_IS_CURVE" ref="92f2038dd52d2b3af7c03bdeb5918567" args="(obj)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define STPUI_IS_CURVE          </td>
+          <td>(</td>
+          <td class="paramtype">obj&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_CURVE))</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="curve.h::STPUI_IS_CURVE_CLASS" ref="a4" args="(klass)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">#define STPUI_IS_CURVE_CLASS          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">klass&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_CURVE))</td>
+
+</div>
+</div><p>
+<a class="anchor" name="ee626496df16d25159b91982478b0df9"></a><!-- doxytag: member="curve.h::STPUI_IS_CURVE_CLASS" ref="ee626496df16d25159b91982478b0df9" args="(klass)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define STPUI_IS_CURVE_CLASS          </td>
+          <td>(</td>
+          <td class="paramtype">klass&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_CURVE))</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="curve.h::STPUI_TYPE_CURVE" ref="a0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="887bee281f88accbe674790e5e5b28e3"></a><!-- doxytag: member="curve.h::STPUI_TYPE_CURVE" ref="887bee281f88accbe674790e5e5b28e3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STPUI_TYPE_CURVE&nbsp;&nbsp;&nbsp;(stpui_curve_get_type ())          </td>
+          <td class="memname">#define STPUI_TYPE_CURVE&nbsp;&nbsp;&nbsp;(stpui_curve_get_type ())          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a6"></a><!-- doxytag: member="curve.h::StpuiCurve" ref="a6" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="5c0213fede0b7d8a91b66e4679cc899a"></a><!-- doxytag: member="curve.h::StpuiCurve" ref="5c0213fede0b7d8a91b66e4679cc899a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a> <a class="el" href="struct__StpuiCurve.html">StpuiCurve</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a> <a class="el" href="struct__StpuiCurve.html">StpuiCurve</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a7"></a><!-- doxytag: member="curve.h::StpuiCurveClass" ref="a7" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="057f1c40a70e84c7a187b423ebe4aada"></a><!-- doxytag: member="curve.h::StpuiCurveClass" ref="057f1c40a70e84c7a187b423ebe4aada" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a> <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a> <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="a19"></a><!-- doxytag: member="curve.h::StpuiCurveType" ref="a19" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="59cb8817385039367325d6dbb4a0996b"></a><!-- doxytag: member="curve.h::StpuiCurveType" ref="59cb8817385039367325d6dbb4a0996b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="curve_8h.html#a19">StpuiCurveType</a>          </td>
+          <td class="memname">enum <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="a19a8"></a><!-- doxytag: member="STPUI_CURVE_TYPE_LINEAR" ref="a19a8" args="" -->STPUI_CURVE_TYPE_LINEAR</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="59cb8817385039367325d6dbb4a0996b741f86dc6dfb50a67dd621a287014de1"></a><!-- doxytag: member="STPUI_CURVE_TYPE_LINEAR" ref="59cb8817385039367325d6dbb4a0996b741f86dc6dfb50a67dd621a287014de1" args="" -->STPUI_CURVE_TYPE_LINEAR</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a19a9"></a><!-- doxytag: member="STPUI_CURVE_TYPE_SPLINE" ref="a19a9" args="" -->STPUI_CURVE_TYPE_SPLINE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="59cb8817385039367325d6dbb4a0996b6cef8a118ee2829db63f812874a412c1"></a><!-- doxytag: member="STPUI_CURVE_TYPE_SPLINE" ref="59cb8817385039367325d6dbb4a0996b6cef8a118ee2829db63f812874a412c1" args="" -->STPUI_CURVE_TYPE_SPLINE</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a19a10"></a><!-- doxytag: member="STPUI_CURVE_TYPE_FREE" ref="a19a10" args="" -->STPUI_CURVE_TYPE_FREE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="59cb8817385039367325d6dbb4a0996b1a204ef2d450d762415a1c0c1c77db89"></a><!-- doxytag: member="STPUI_CURVE_TYPE_FREE" ref="59cb8817385039367325d6dbb4a0996b1a204ef2d450d762415a1c0c1c77db89" args="" -->STPUI_CURVE_TYPE_FREE</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a11"></a><!-- doxytag: member="curve.h::stpui_curve_get_type" ref="a11" args="(void) G_GNUC_CONST" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">GType stpui_curve_get_type           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+<a class="anchor" name="233b21367f03cd5ba884d4e3c742c8d2"></a><!-- doxytag: member="curve.h::stpui_curve_get_type" ref="233b21367f03cd5ba884d4e3c742c8d2" args="(void) G_GNUC_CONST" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">GType stpui_curve_get_type           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a16"></a><!-- doxytag: member="curve.h::stpui_curve_get_vector" ref="a16" args="(StpuiCurve *curve, int veclen, gfloat vector[])" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="43799d3f187018958cb78ece053dadda"></a><!-- doxytag: member="curve.h::stpui_curve_get_vector" ref="43799d3f187018958cb78ece053dadda" args="(StpuiCurve *curve, int veclen, gfloat vector[])" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_curve_get_vector           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">void stpui_curve_get_vector           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>veclen</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>veclen</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>gfloat&nbsp;</td>
-          <td class="mdname" nowrap> <em>vector</em>[]</td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">gfloat&nbsp;</td>
+          <td class="paramname"> <em>vector</em>[]</td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a12"></a><!-- doxytag: member="curve.h::stpui_curve_new" ref="a12" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">GtkWidget* stpui_curve_new           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="cbdc99aaef1f5672d0294d9742fdc398"></a><!-- doxytag: member="curve.h::stpui_curve_new" ref="cbdc99aaef1f5672d0294d9742fdc398" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">GtkWidget* stpui_curve_new           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a13"></a><!-- doxytag: member="curve.h::stpui_curve_reset" ref="a13" args="(StpuiCurve *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stpui_curve_reset           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="466fe70debd1a7eca3988f91a109009f"></a><!-- doxytag: member="curve.h::stpui_curve_reset" ref="466fe70debd1a7eca3988f91a109009f" args="(StpuiCurve *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stpui_curve_reset           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a18"></a><!-- doxytag: member="curve.h::stpui_curve_set_curve_type" ref="a18" args="(StpuiCurve *curve, StpuiCurveType type)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="196839b2b6e39ae4bd5ccc9aad4ff8f7"></a><!-- doxytag: member="curve.h::stpui_curve_set_curve_type" ref="196839b2b6e39ae4bd5ccc9aad4ff8f7" args="(StpuiCurve *curve, StpuiCurveType type)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_curve_set_curve_type           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">void stpui_curve_set_curve_type           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="curve_8h.html#a19">StpuiCurveType</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>type</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a>&nbsp;</td>
+          <td class="paramname"> <em>type</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a14"></a><!-- doxytag: member="curve.h::stpui_curve_set_gamma" ref="a14" args="(StpuiCurve *curve, gfloat gamma_)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="956d80d857cf5927768a38103d8af705"></a><!-- doxytag: member="curve.h::stpui_curve_set_gamma" ref="956d80d857cf5927768a38103d8af705" args="(StpuiCurve *curve, gfloat gamma_)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_curve_set_gamma           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">void stpui_curve_set_gamma           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>gfloat&nbsp;</td>
-          <td class="mdname" nowrap> <em>gamma_</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">gfloat&nbsp;</td>
+          <td class="paramname"> <em>gamma_</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a15"></a><!-- doxytag: member="curve.h::stpui_curve_set_range" ref="a15" args="(StpuiCurve *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="d4dcd042b1e50672781895d886adad66"></a><!-- doxytag: member="curve.h::stpui_curve_set_range" ref="d4dcd042b1e50672781895d886adad66" args="(StpuiCurve *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_curve_set_range           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">void stpui_curve_set_range           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>gfloat&nbsp;</td>
-          <td class="mdname" nowrap> <em>min_x</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">gfloat&nbsp;</td>
+          <td class="paramname"> <em>min_x</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>gfloat&nbsp;</td>
-          <td class="mdname" nowrap> <em>max_x</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">gfloat&nbsp;</td>
+          <td class="paramname"> <em>max_x</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>gfloat&nbsp;</td>
-          <td class="mdname" nowrap> <em>min_y</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">gfloat&nbsp;</td>
+          <td class="paramname"> <em>min_y</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>gfloat&nbsp;</td>
-          <td class="mdname" nowrap> <em>max_y</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">gfloat&nbsp;</td>
+          <td class="paramname"> <em>max_y</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a17"></a><!-- doxytag: member="curve.h::stpui_curve_set_vector" ref="a17" args="(StpuiCurve *curve, int veclen, const gfloat vector[])" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="be1c943341872697e6219d7053db2804"></a><!-- doxytag: member="curve.h::stpui_curve_set_vector" ref="be1c943341872697e6219d7053db2804" args="(StpuiCurve *curve, int veclen, const gfloat vector[])" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_curve_set_vector           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>curve</em>, </td>
+          <td class="memname">void stpui_curve_set_vector           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&nbsp;</td>
+          <td class="paramname"> <em>curve</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>veclen</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>veclen</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const gfloat&nbsp;</td>
-          <td class="mdname" nowrap> <em>vector</em>[]</td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const gfloat&nbsp;</td>
+          <td class="paramname"> <em>vector</em>[]</td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/dir_000000.html b/doc/gutenprintui2/html/dir_000000.html
deleted file mode 100644
index 213b38e..0000000
--- a/doc/gutenprintui2/html/dir_000000.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-<title>libgutenprintui2 API Reference: include/ Directory Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a></div>
-<h1>include Directory Reference</h1><table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Directories</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">directory &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dir_000001.html">gutenprintui2</a></td></tr>
-
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprintui2/html/dir_000001.html b/doc/gutenprintui2/html/dir_000001.html
deleted file mode 100644
index 71482db..0000000
--- a/doc/gutenprintui2/html/dir_000001.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-<title>libgutenprintui2 API Reference: include/gutenprintui2/ Directory Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprintui2</a></div>
-<h1>gutenprintui2 Directory Reference</h1><table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Files</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html">curve.h</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html">gammacurve.h</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html">typebuiltins.h</a></td></tr>
-
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprintui2/html/dirs.html b/doc/gutenprintui2/html/dirs.html
deleted file mode 100644
index 1c1d725..0000000
--- a/doc/gutenprintui2/html/dirs.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-<title>libgutenprintui2 API Reference: Directory Hierarchy</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindexHL" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>libgutenprintui2 API Reference Directories</h1>This directory hierarchy is sorted roughly, but not completely, alphabetically:<ul>
-<li><a class="el" href="dir_000000.html">include</a>
-<ul>
-<li><a class="el" href="dir_000001.html">gutenprintui2</a>
-</ul>
-</ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprintui2/html/doxygen.css b/doc/gutenprintui2/html/doxygen.css
index decae9e..c7db1a8 100644
--- a/doc/gutenprintui2/html/doxygen.css
+++ b/doc/gutenprintui2/html/doxygen.css
@@ -17,8 +17,8 @@ H3 {
 CAPTION { font-weight: bold }
 DIV.qindex {
 	width: 100%;
-	background-color: #eeeeff;
-	border: 1px solid #b0b0b0;
+	background-color: #e8eef2;
+	border: 1px solid #84b0c7;
 	text-align: center;
 	margin: 2px;
 	padding: 2px;
@@ -26,16 +26,16 @@ DIV.qindex {
 }
 DIV.nav {
 	width: 100%;
-	background-color: #eeeeff;
-	border: 1px solid #b0b0b0;
+	background-color: #e8eef2;
+	border: 1px solid #84b0c7;
 	text-align: center;
 	margin: 2px;
 	padding: 2px;
 	line-height: 140%;
 }
 DIV.navtab {
-       background-color: #eeeeff;
-       border: 1px solid #b0b0b0;
+       background-color: #e8eef2;
+       border: 1px solid #84b0c7;
        text-align: center;
        margin: 2px;
        margin-right: 15px;
@@ -80,7 +80,7 @@ A.codeRef:visited { font-weight: normal; color: #0000FF}
 A:hover { text-decoration: none; background-color: #f2f2ff }
 DL.el { margin-left: -1cm }
 .fragment {
-       font-family: Fixed, monospace;
+       font-family: monospace, fixed;
        font-size: 95%;
 }
 PRE.fragment {
@@ -96,14 +96,7 @@ PRE.fragment {
 	padding-bottom: 4px;
 }
 DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px }
-TD.md { background-color: #F4F4FB; font-weight: bold; }
-TD.mdPrefix {
-       background-color: #F4F4FB;
-       color: #606060;
-	font-size: 80%;
-}
-TD.mdname1 { background-color: #F4F4FB; font-weight: bold; color: #602020; }
-TD.mdname { background-color: #F4F4FB; font-weight: bold; color: #602020; width: 600px; }
+
 DIV.groupHeader {
        margin-left: 16px;
        margin-top: 12px;
@@ -118,7 +111,7 @@ BODY {
 	margin-left: 20px;
 }
 TD.indexkey {
-	background-color: #eeeeff;
+	background-color: #e8eef2;
 	font-weight: bold;
 	padding-right  : 10px;
 	padding-top    : 2px;
@@ -131,7 +124,7 @@ TD.indexkey {
 	border: 1px solid #CCCCCC;
 }
 TD.indexvalue {
-	background-color: #eeeeff;
+	background-color: #e8eef2;
 	font-style: italic;
 	padding-right  : 10px;
 	padding-top    : 2px;
@@ -156,13 +149,6 @@ SPAN.comment       { color: #800000 }
 SPAN.preprocessor  { color: #806020 }
 SPAN.stringliteral { color: #002080 }
 SPAN.charliteral   { color: #008080 }
-.mdTable {
-	border: 1px solid #868686;
-	background-color: #F4F4FB;
-}
-.mdRow {
-	padding: 8px 10px;
-}
 .mdescLeft {
        padding: 0px 8px 4px 8px;
 	font-size: 80%;
@@ -286,24 +272,87 @@ FORM.search {
 INPUT.search { font-size: 75%;
                color: #000080;
                font-weight: normal;
-               background-color: #eeeeff;
+               background-color: #e8eef2;
 }
 TD.tiny      { font-size: 75%;
 }
 a {
-	color: #252E78;
+	color: #1A41A8;
 }
 a:visited {
-	color: #3D2185;
+	color: #2A3798;
 }
 .dirtab { padding: 4px;
           border-collapse: collapse;
-          border: 1px solid #b0b0b0;
+          border: 1px solid #84b0c7;
 }
-TH.dirtab { background: #eeeeff;
+TH.dirtab { background: #e8eef2;
             font-weight: bold;
 }
 HR { height: 1px;
      border: none;
      border-top: 1px solid black;
 }
+
+/* Style for detailed member documentation */
+.memtemplate {
+  font-size: 80%;
+  color: #606060;
+  font-weight: normal;
+} 
+.memnav { 
+  background-color: #e8eef2;
+  border: 1px solid #84b0c7;
+  text-align: center;
+  margin: 2px;
+  margin-right: 15px;
+  padding: 2px;
+}
+.memitem {
+  padding: 4px;
+  background-color: #eef3f5;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #dedeee;
+  -moz-border-radius: 8px 8px 8px 8px;
+}
+.memname {
+  white-space: nowrap;
+  font-weight: bold;
+}
+.memdoc{
+  padding-left: 10px;
+}
+.memproto {
+  background-color: #d5e1e8;
+  width: 100%;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #84b0c7;
+  font-weight: bold;
+  -moz-border-radius: 8px 8px 8px 8px;
+}
+.paramkey {
+  text-align: right;
+}
+.paramtype {
+  white-space: nowrap;
+}
+.paramname {
+  color: #602020;
+  font-style: italic;
+  white-space: nowrap;
+}
+/* End Styling for detailed member documentation */
+
+/* for the tree view */
+.ftvtree {
+	font-family: sans-serif;
+	margin:0.5em;
+}
+.directory { font-size: 9pt; font-weight: bold; }
+.directory h3 { margin: 0px; margin-top: 1em; font-size: 11pt; }
+.directory > h3 { margin-top: 0; }
+.directory p { margin: 0px; white-space: nowrap; }
+.directory div { display: none; margin: 0px; }
+.directory img { vertical-align: -30%; }
diff --git a/doc/gutenprintui2/html/files.html b/doc/gutenprintui2/html/files.html
index 6b43d6e..d275bce 100644
--- a/doc/gutenprintui2/html/files.html
+++ b/doc/gutenprintui2/html/files.html
@@ -1,18 +1,31 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: File Index</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindexHL" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
 <h1>libgutenprintui2 API Reference File List</h1>Here is a list of all files with brief descriptions:<table>
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="curve_8h.html">curve.h</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="gammacurve_8h.html">gammacurve.h</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="typebuiltins_8h.html">typebuiltins.h</a></td><td class="indexvalue"></td></tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/functions.html b/doc/gutenprintui2/html/functions.html
index b627e8d..ccf1dd3 100644
--- a/doc/gutenprintui2/html/functions.html
+++ b/doc/gutenprintui2/html/functions.html
@@ -1,105 +1,200 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindexHL" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindexHL" href="functions.html">All</a> | <a class="qindex" href="functions_vars.html">Variables</a></div>
-<div class="qindex"><a class="qindex" href="#index__">_</a> | <a class="qindex" href="#index_a">a</a> | <a class="qindex" href="#index_b">b</a> | <a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_e">e</a> | <a class="qindex" href="#index_g">g</a> | <a class="qindex" href="#index_h">h</a> | <a class="qindex" href="#index_i">i</a> | <a class="qindex" href="#index_l">l</a> | <a class="qindex" href="#index_m">m</a> | <a class="qindex" href="#index_n">n</a> | <a class="qindex" href="#index_o">o</a> | <a class="qindex" href="#index_p">p</a> | <a class="qindex" href="#index_q">q</a> | <a class="qindex" href="#index_r">r</a> | <a class="qindex" href="#index_s">s</a> | <a class="qindex" href="#index_t">t</a> | <a class="qindex" href="#index_u">u</a> | <a class="qindex" href="#index_v">v</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="functions.html"><span>All</span></a></li>
+    <li><a href="functions_vars.html"><span>Variables</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index__"><span>_</span></a></li>
+    <li><a href="#index_a"><span>a</span></a></li>
+    <li><a href="#index_b"><span>b</span></a></li>
+    <li><a href="#index_c"><span>c</span></a></li>
+    <li><a href="#index_e"><span>e</span></a></li>
+    <li><a href="#index_g"><span>g</span></a></li>
+    <li><a href="#index_h"><span>h</span></a></li>
+    <li><a href="#index_i"><span>i</span></a></li>
+    <li><a href="#index_l"><span>l</span></a></li>
+    <li><a href="#index_m"><span>m</span></a></li>
+    <li><a href="#index_n"><span>n</span></a></li>
+    <li><a href="#index_o"><span>o</span></a></li>
+    <li><a href="#index_p"><span>p</span></a></li>
+    <li><a href="#index_q"><span>q</span></a></li>
+    <li><a href="#index_r"><span>r</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+    <li><a href="#index_t"><span>t</span></a></li>
+    <li><a href="#index_u"><span>u</span></a></li>
+    <li><a href="#index_v"><span>v</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all struct and union fields with links to the structures/unions they belong to:
 <p>
 <h3><a class="anchor" name="index__">- _ -</a></h3><ul>
 <li>_gtk_reserved1
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o1">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o2">_StpuiCurveClass</a><li>_gtk_reserved2
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o2">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o3">_StpuiCurveClass</a><li>_gtk_reserved3
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o3">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o4">_StpuiCurveClass</a><li>_gtk_reserved4
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o4">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o5">_StpuiCurveClass</a></ul>
+: <a class="el" href="struct__StpuiCurveClass.html#97e1aa40263796ab3dada695e40193cb">_StpuiCurveClass</a>
+, <a class="el" href="struct__StpuiGammaCurveClass.html#11f61971dbf7791712b4ea447b00518d">_StpuiGammaCurveClass</a>
+<li>_gtk_reserved2
+: <a class="el" href="struct__StpuiCurveClass.html#053157829bb7c073427955e16c93c863">_StpuiCurveClass</a>
+, <a class="el" href="struct__StpuiGammaCurveClass.html#f471d7067cff6f4f8908c147f4d7c99c">_StpuiGammaCurveClass</a>
+<li>_gtk_reserved3
+: <a class="el" href="struct__StpuiGammaCurveClass.html#337220ca7c1966c911dd856d8377c66d">_StpuiGammaCurveClass</a>
+, <a class="el" href="struct__StpuiCurveClass.html#64b1fa1cf35f409932139752569ca1f9">_StpuiCurveClass</a>
+<li>_gtk_reserved4
+: <a class="el" href="struct__StpuiCurveClass.html#f1b28ac82d8fa56fbc0a84f17d26d7b0">_StpuiCurveClass</a>
+, <a class="el" href="struct__StpuiGammaCurveClass.html#d6007664d93b51b3f533998dfc836634">_StpuiGammaCurveClass</a>
+</ul>
 <h3><a class="anchor" name="index_a">- a -</a></h3><ul>
 <li>auto_size_roll_feed_paper
-: <a class="el" href="structstpui__plist__t.html#o10">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#9f02a46dd284eeaf56a643e0e4b17ffb">stpui_plist_t</a>
+</ul>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>button
-: <a class="el" href="struct__StpuiGammaCurve.html#o3">_StpuiGammaCurve</a></ul>
+: <a class="el" href="struct__StpuiGammaCurve.html#6ec3a772b95ebde518266e23d2c6d351">_StpuiGammaCurve</a>
+</ul>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>command_type
-: <a class="el" href="structstpui__plist__t.html#o1">stpui_plist_t</a><li>crop
-: <a class="el" href="structstpui__image.html#o7">stpui_image</a><li>ctlpoint
-: <a class="el" href="struct__StpuiCurve.html#o14">_StpuiCurve</a><li>current_standard_command
-: <a class="el" href="structstpui__plist__t.html#o5">stpui_plist_t</a><li>cursor_type
-: <a class="el" href="struct__StpuiCurve.html#o1">_StpuiCurve</a><li>curve
-: <a class="el" href="struct__StpuiGammaCurve.html#o2">_StpuiGammaCurve</a><li>curve_type
-: <a class="el" href="struct__StpuiCurve.html#o7">_StpuiCurve</a><li>curve_type_changed
-: <a class="el" href="struct__StpuiCurveClass.html#o1">_StpuiCurveClass</a><li>custom_command
-: <a class="el" href="structstpui__plist__t.html#o4">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#c1243181065442af4c72c24c0d3901f3">stpui_plist_t</a>
+<li>crop
+: <a class="el" href="structstpui__image.html#96e6cc155230793c8aa847e5a7cd7255">stpui_image</a>
+<li>ctlpoint
+: <a class="el" href="struct__StpuiCurve.html#05e34073df0ce5bf7575b2e7383577a8">_StpuiCurve</a>
+<li>current_standard_command
+: <a class="el" href="structstpui__plist__t.html#dde7851705ff38bb9b14c1ec11bb53cb">stpui_plist_t</a>
+<li>cursor_type
+: <a class="el" href="struct__StpuiCurve.html#5a45de0c0dd843601eb678cf898b6588">_StpuiCurve</a>
+<li>curve
+: <a class="el" href="struct__StpuiGammaCurve.html#ef8d7f12bd9a16784147cc3841d966c6">_StpuiGammaCurve</a>
+<li>curve_type
+: <a class="el" href="struct__StpuiCurve.html#c88de71f409ac73ffe41489313cacff2">_StpuiCurve</a>
+<li>curve_type_changed
+: <a class="el" href="struct__StpuiCurveClass.html#3098d1e480ba77e57785667ccf0b1c9f">_StpuiCurveClass</a>
+<li>custom_command
+: <a class="el" href="structstpui__plist__t.html#783211034ef118e102c9c07eb9f9a4fa">stpui_plist_t</a>
+</ul>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>extra_printer_options
-: <a class="el" href="structstpui__plist__t.html#o3">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#ff2ab5a8193a99dc8014d804281173c6">stpui_plist_t</a>
+</ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>gamma
-: <a class="el" href="struct__StpuiGammaCurve.html#o4">_StpuiGammaCurve</a><li>gamma_dialog
-: <a class="el" href="struct__StpuiGammaCurve.html#o5">_StpuiGammaCurve</a><li>gamma_text
-: <a class="el" href="struct__StpuiGammaCurve.html#o6">_StpuiGammaCurve</a><li>grab_point
-: <a class="el" href="struct__StpuiCurve.html#o9">_StpuiCurve</a><li>graph
-: <a class="el" href="struct__StpuiCurve.html#o0">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiGammaCurve.html#7783842531471a1605b5d38c7a02a52e">_StpuiGammaCurve</a>
+<li>gamma_dialog
+: <a class="el" href="struct__StpuiGammaCurve.html#ef9135d931e5a99a0d35c40a8fc79b5b">_StpuiGammaCurve</a>
+<li>gamma_text
+: <a class="el" href="struct__StpuiGammaCurve.html#abe5eae4e5aa05c6a62aab34d236c26b">_StpuiGammaCurve</a>
+<li>grab_point
+: <a class="el" href="struct__StpuiCurve.html#30591159410734580ff586f4c62ac622">_StpuiCurve</a>
+<li>graph
+: <a class="el" href="struct__StpuiCurve.html#de1a0d11481ca5e94e31025b5815c88f">_StpuiCurve</a>
+</ul>
 <h3><a class="anchor" name="index_h">- h -</a></h3><ul>
 <li>height
-: <a class="el" href="struct__StpuiCurve.html#o8">_StpuiCurve</a><li>hflip
-: <a class="el" href="structstpui__image.html#o2">stpui_image</a></ul>
+: <a class="el" href="struct__StpuiCurve.html#c679cbbcaa013aa84ac1e799d7299479">_StpuiCurve</a>
+<li>hflip
+: <a class="el" href="structstpui__image.html#f2733a318654d50214c94fccd9a018b7">stpui_image</a>
+</ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
 <li>im
-: <a class="el" href="structstpui__image.html#o0">stpui_image</a><li>invalid_mask
-: <a class="el" href="structstpui__plist__t.html#o11">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__image.html#00862540482f307175e9fbf252751320">stpui_image</a>
+<li>invalid_mask
+: <a class="el" href="structstpui__plist__t.html#49e854e792c73fee7bebcfb4de9ac78a">stpui_plist_t</a>
+</ul>
 <h3><a class="anchor" name="index_l">- l -</a></h3><ul>
 <li>last
-: <a class="el" href="struct__StpuiCurve.html#o10">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiCurve.html#4866f6481ca65da32e4beda66c71381b">_StpuiCurve</a>
+</ul>
 <h3><a class="anchor" name="index_m">- m -</a></h3><ul>
 <li>max_x
-: <a class="el" href="struct__StpuiCurve.html#o3">_StpuiCurve</a><li>max_y
-: <a class="el" href="struct__StpuiCurve.html#o5">_StpuiCurve</a><li>min_x
-: <a class="el" href="struct__StpuiCurve.html#o2">_StpuiCurve</a><li>min_y
-: <a class="el" href="struct__StpuiCurve.html#o4">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiCurve.html#873e40a32b9a0e863ecf5af33233819d">_StpuiCurve</a>
+<li>max_y
+: <a class="el" href="struct__StpuiCurve.html#a4fbc033c9dc17d11be58786f5bfe817">_StpuiCurve</a>
+<li>min_x
+: <a class="el" href="struct__StpuiCurve.html#a2e971c049f0f314e9459b21d591dde2">_StpuiCurve</a>
+<li>min_y
+: <a class="el" href="struct__StpuiCurve.html#035fd7e1c773ea3291dc40f6c2a95f07">_StpuiCurve</a>
+</ul>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>name
-: <a class="el" href="structstpui__plist__t.html#o0">stpui_plist_t</a><li>num_ctlpoints
-: <a class="el" href="struct__StpuiCurve.html#o13">_StpuiCurve</a><li>num_points
-: <a class="el" href="struct__StpuiCurve.html#o11">_StpuiCurve</a></ul>
+: <a class="el" href="structstpui__plist__t.html#95d5e51f00ae03f4ca085120fc7b88e6">stpui_plist_t</a>
+<li>num_ctlpoints
+: <a class="el" href="struct__StpuiCurve.html#875906e982189427a2a3dda0e7cc38ed">_StpuiCurve</a>
+<li>num_points
+: <a class="el" href="struct__StpuiCurve.html#d8005c397affa21ad090cd0868e4fb60">_StpuiCurve</a>
+</ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>orientation
-: <a class="el" href="structstpui__plist__t.html#o8">stpui_plist_t</a><li>output_filename
-: <a class="el" href="structstpui__plist__t.html#o6">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#394eafe3058457db432eeecb49addf07">stpui_plist_t</a>
+<li>output_filename
+: <a class="el" href="structstpui__plist__t.html#ee538bc59fd77730a5f73d3ea7d51d18">stpui_plist_t</a>
+</ul>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>parent_class
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o0">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o0">_StpuiCurveClass</a><li>pixmap
-: <a class="el" href="struct__StpuiCurve.html#o6">_StpuiCurve</a><li>point
-: <a class="el" href="struct__StpuiCurve.html#o12">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiCurveClass.html#60fce1a46ad405750d42c7aff83707bb">_StpuiCurveClass</a>
+, <a class="el" href="struct__StpuiGammaCurveClass.html#e784cb24d21ce7c707727c5996fed405">_StpuiGammaCurveClass</a>
+<li>pixmap
+: <a class="el" href="struct__StpuiCurve.html#a1e237c2fafc8ce7b06f73b8af401de1">_StpuiCurve</a>
+<li>point
+: <a class="el" href="struct__StpuiCurve.html#f7e80ace854c3b42cfcb419eacd7766f">_StpuiCurve</a>
+</ul>
 <h3><a class="anchor" name="index_q">- q -</a></h3><ul>
 <li>queue_name
-: <a class="el" href="structstpui__plist__t.html#o2">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#34155aeda35a97423a70071478a94469">stpui_plist_t</a>
+</ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
 <li>rotate_180
-: <a class="el" href="structstpui__image.html#o6">stpui_image</a><li>rotate_ccw
-: <a class="el" href="structstpui__image.html#o4">stpui_image</a><li>rotate_cw
-: <a class="el" href="structstpui__image.html#o5">stpui_image</a></ul>
+: <a class="el" href="structstpui__image.html#aaae08fdabffb3d31ac761dfe0624506">stpui_image</a>
+<li>rotate_ccw
+: <a class="el" href="structstpui__image.html#0a31280def8cd739184192dbe8d34fa8">stpui_image</a>
+<li>rotate_cw
+: <a class="el" href="structstpui__image.html#e111082f0f23096d89e024c4fde9c0d6">stpui_image</a>
+</ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>scaling
-: <a class="el" href="structstpui__plist__t.html#o7">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#7325ec55acf12db60e799b4532d50d0d">stpui_plist_t</a>
+</ul>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>table
-: <a class="el" href="struct__StpuiGammaCurve.html#o1">_StpuiGammaCurve</a><li>transpose
-: <a class="el" href="structstpui__image.html#o1">stpui_image</a></ul>
+: <a class="el" href="struct__StpuiGammaCurve.html#f4a067c4f9e19c57d080b07aca9252b3">_StpuiGammaCurve</a>
+<li>transpose
+: <a class="el" href="structstpui__image.html#5f2a75c7187c6abcf20e15e2aad22549">stpui_image</a>
+</ul>
 <h3><a class="anchor" name="index_u">- u -</a></h3><ul>
 <li>unit
-: <a class="el" href="structstpui__plist__t.html#o9">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#55bd8ba78e4f839d2897100cabd1c62f">stpui_plist_t</a>
+</ul>
 <h3><a class="anchor" name="index_v">- v -</a></h3><ul>
 <li>v
-: <a class="el" href="structstpui__plist__t.html#o12">stpui_plist_t</a><li>vbox
-: <a class="el" href="struct__StpuiGammaCurve.html#o0">_StpuiGammaCurve</a><li>vflip
-: <a class="el" href="structstpui__image.html#o3">stpui_image</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+: <a class="el" href="structstpui__plist__t.html#fbdf87548a3132b7270aa88ffcf52a8a">stpui_plist_t</a>
+<li>vbox
+: <a class="el" href="struct__StpuiGammaCurve.html#07e6d5e4479cbca4a927635cc6d02f26">_StpuiGammaCurve</a>
+<li>vflip
+: <a class="el" href="structstpui__image.html#c378339fe87fa21d5f117fc11b3f5b6c">stpui_image</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/functions_vars.html b/doc/gutenprintui2/html/functions_vars.html
index 63899e4..98eeb60 100644
--- a/doc/gutenprintui2/html/functions_vars.html
+++ b/doc/gutenprintui2/html/functions_vars.html
@@ -1,105 +1,200 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: Data Fields - Variables</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindexHL" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="functions.html">All</a> | <a class="qindexHL" href="functions_vars.html">Variables</a></div>
-<div class="qindex"><a class="qindex" href="#index__">_</a> | <a class="qindex" href="#index_a">a</a> | <a class="qindex" href="#index_b">b</a> | <a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_e">e</a> | <a class="qindex" href="#index_g">g</a> | <a class="qindex" href="#index_h">h</a> | <a class="qindex" href="#index_i">i</a> | <a class="qindex" href="#index_l">l</a> | <a class="qindex" href="#index_m">m</a> | <a class="qindex" href="#index_n">n</a> | <a class="qindex" href="#index_o">o</a> | <a class="qindex" href="#index_p">p</a> | <a class="qindex" href="#index_q">q</a> | <a class="qindex" href="#index_r">r</a> | <a class="qindex" href="#index_s">s</a> | <a class="qindex" href="#index_t">t</a> | <a class="qindex" href="#index_u">u</a> | <a class="qindex" href="#index_v">v</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="functions.html"><span>All</span></a></li>
+    <li class="current"><a href="functions_vars.html"><span>Variables</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index__"><span>_</span></a></li>
+    <li><a href="#index_a"><span>a</span></a></li>
+    <li><a href="#index_b"><span>b</span></a></li>
+    <li><a href="#index_c"><span>c</span></a></li>
+    <li><a href="#index_e"><span>e</span></a></li>
+    <li><a href="#index_g"><span>g</span></a></li>
+    <li><a href="#index_h"><span>h</span></a></li>
+    <li><a href="#index_i"><span>i</span></a></li>
+    <li><a href="#index_l"><span>l</span></a></li>
+    <li><a href="#index_m"><span>m</span></a></li>
+    <li><a href="#index_n"><span>n</span></a></li>
+    <li><a href="#index_o"><span>o</span></a></li>
+    <li><a href="#index_p"><span>p</span></a></li>
+    <li><a href="#index_q"><span>q</span></a></li>
+    <li><a href="#index_r"><span>r</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+    <li><a href="#index_t"><span>t</span></a></li>
+    <li><a href="#index_u"><span>u</span></a></li>
+    <li><a href="#index_v"><span>v</span></a></li>
+  </ul>
+</div>
 
 <p>
-
+&nbsp;
 <p>
 <h3><a class="anchor" name="index__">- _ -</a></h3><ul>
 <li>_gtk_reserved1
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o1">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o2">_StpuiCurveClass</a><li>_gtk_reserved2
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o2">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o3">_StpuiCurveClass</a><li>_gtk_reserved3
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o3">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o4">_StpuiCurveClass</a><li>_gtk_reserved4
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o4">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o5">_StpuiCurveClass</a></ul>
+: <a class="el" href="struct__StpuiCurveClass.html#97e1aa40263796ab3dada695e40193cb">_StpuiCurveClass</a>
+, <a class="el" href="struct__StpuiGammaCurveClass.html#11f61971dbf7791712b4ea447b00518d">_StpuiGammaCurveClass</a>
+<li>_gtk_reserved2
+: <a class="el" href="struct__StpuiCurveClass.html#053157829bb7c073427955e16c93c863">_StpuiCurveClass</a>
+, <a class="el" href="struct__StpuiGammaCurveClass.html#f471d7067cff6f4f8908c147f4d7c99c">_StpuiGammaCurveClass</a>
+<li>_gtk_reserved3
+: <a class="el" href="struct__StpuiGammaCurveClass.html#337220ca7c1966c911dd856d8377c66d">_StpuiGammaCurveClass</a>
+, <a class="el" href="struct__StpuiCurveClass.html#64b1fa1cf35f409932139752569ca1f9">_StpuiCurveClass</a>
+<li>_gtk_reserved4
+: <a class="el" href="struct__StpuiCurveClass.html#f1b28ac82d8fa56fbc0a84f17d26d7b0">_StpuiCurveClass</a>
+, <a class="el" href="struct__StpuiGammaCurveClass.html#d6007664d93b51b3f533998dfc836634">_StpuiGammaCurveClass</a>
+</ul>
 <h3><a class="anchor" name="index_a">- a -</a></h3><ul>
 <li>auto_size_roll_feed_paper
-: <a class="el" href="structstpui__plist__t.html#o10">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#9f02a46dd284eeaf56a643e0e4b17ffb">stpui_plist_t</a>
+</ul>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>button
-: <a class="el" href="struct__StpuiGammaCurve.html#o3">_StpuiGammaCurve</a></ul>
+: <a class="el" href="struct__StpuiGammaCurve.html#6ec3a772b95ebde518266e23d2c6d351">_StpuiGammaCurve</a>
+</ul>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>command_type
-: <a class="el" href="structstpui__plist__t.html#o1">stpui_plist_t</a><li>crop
-: <a class="el" href="structstpui__image.html#o7">stpui_image</a><li>ctlpoint
-: <a class="el" href="struct__StpuiCurve.html#o14">_StpuiCurve</a><li>current_standard_command
-: <a class="el" href="structstpui__plist__t.html#o5">stpui_plist_t</a><li>cursor_type
-: <a class="el" href="struct__StpuiCurve.html#o1">_StpuiCurve</a><li>curve
-: <a class="el" href="struct__StpuiGammaCurve.html#o2">_StpuiGammaCurve</a><li>curve_type
-: <a class="el" href="struct__StpuiCurve.html#o7">_StpuiCurve</a><li>curve_type_changed
-: <a class="el" href="struct__StpuiCurveClass.html#o1">_StpuiCurveClass</a><li>custom_command
-: <a class="el" href="structstpui__plist__t.html#o4">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#c1243181065442af4c72c24c0d3901f3">stpui_plist_t</a>
+<li>crop
+: <a class="el" href="structstpui__image.html#96e6cc155230793c8aa847e5a7cd7255">stpui_image</a>
+<li>ctlpoint
+: <a class="el" href="struct__StpuiCurve.html#05e34073df0ce5bf7575b2e7383577a8">_StpuiCurve</a>
+<li>current_standard_command
+: <a class="el" href="structstpui__plist__t.html#dde7851705ff38bb9b14c1ec11bb53cb">stpui_plist_t</a>
+<li>cursor_type
+: <a class="el" href="struct__StpuiCurve.html#5a45de0c0dd843601eb678cf898b6588">_StpuiCurve</a>
+<li>curve
+: <a class="el" href="struct__StpuiGammaCurve.html#ef8d7f12bd9a16784147cc3841d966c6">_StpuiGammaCurve</a>
+<li>curve_type
+: <a class="el" href="struct__StpuiCurve.html#c88de71f409ac73ffe41489313cacff2">_StpuiCurve</a>
+<li>curve_type_changed
+: <a class="el" href="struct__StpuiCurveClass.html#3098d1e480ba77e57785667ccf0b1c9f">_StpuiCurveClass</a>
+<li>custom_command
+: <a class="el" href="structstpui__plist__t.html#783211034ef118e102c9c07eb9f9a4fa">stpui_plist_t</a>
+</ul>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>extra_printer_options
-: <a class="el" href="structstpui__plist__t.html#o3">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#ff2ab5a8193a99dc8014d804281173c6">stpui_plist_t</a>
+</ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>gamma
-: <a class="el" href="struct__StpuiGammaCurve.html#o4">_StpuiGammaCurve</a><li>gamma_dialog
-: <a class="el" href="struct__StpuiGammaCurve.html#o5">_StpuiGammaCurve</a><li>gamma_text
-: <a class="el" href="struct__StpuiGammaCurve.html#o6">_StpuiGammaCurve</a><li>grab_point
-: <a class="el" href="struct__StpuiCurve.html#o9">_StpuiCurve</a><li>graph
-: <a class="el" href="struct__StpuiCurve.html#o0">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiGammaCurve.html#7783842531471a1605b5d38c7a02a52e">_StpuiGammaCurve</a>
+<li>gamma_dialog
+: <a class="el" href="struct__StpuiGammaCurve.html#ef9135d931e5a99a0d35c40a8fc79b5b">_StpuiGammaCurve</a>
+<li>gamma_text
+: <a class="el" href="struct__StpuiGammaCurve.html#abe5eae4e5aa05c6a62aab34d236c26b">_StpuiGammaCurve</a>
+<li>grab_point
+: <a class="el" href="struct__StpuiCurve.html#30591159410734580ff586f4c62ac622">_StpuiCurve</a>
+<li>graph
+: <a class="el" href="struct__StpuiCurve.html#de1a0d11481ca5e94e31025b5815c88f">_StpuiCurve</a>
+</ul>
 <h3><a class="anchor" name="index_h">- h -</a></h3><ul>
 <li>height
-: <a class="el" href="struct__StpuiCurve.html#o8">_StpuiCurve</a><li>hflip
-: <a class="el" href="structstpui__image.html#o2">stpui_image</a></ul>
+: <a class="el" href="struct__StpuiCurve.html#c679cbbcaa013aa84ac1e799d7299479">_StpuiCurve</a>
+<li>hflip
+: <a class="el" href="structstpui__image.html#f2733a318654d50214c94fccd9a018b7">stpui_image</a>
+</ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
 <li>im
-: <a class="el" href="structstpui__image.html#o0">stpui_image</a><li>invalid_mask
-: <a class="el" href="structstpui__plist__t.html#o11">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__image.html#00862540482f307175e9fbf252751320">stpui_image</a>
+<li>invalid_mask
+: <a class="el" href="structstpui__plist__t.html#49e854e792c73fee7bebcfb4de9ac78a">stpui_plist_t</a>
+</ul>
 <h3><a class="anchor" name="index_l">- l -</a></h3><ul>
 <li>last
-: <a class="el" href="struct__StpuiCurve.html#o10">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiCurve.html#4866f6481ca65da32e4beda66c71381b">_StpuiCurve</a>
+</ul>
 <h3><a class="anchor" name="index_m">- m -</a></h3><ul>
 <li>max_x
-: <a class="el" href="struct__StpuiCurve.html#o3">_StpuiCurve</a><li>max_y
-: <a class="el" href="struct__StpuiCurve.html#o5">_StpuiCurve</a><li>min_x
-: <a class="el" href="struct__StpuiCurve.html#o2">_StpuiCurve</a><li>min_y
-: <a class="el" href="struct__StpuiCurve.html#o4">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiCurve.html#873e40a32b9a0e863ecf5af33233819d">_StpuiCurve</a>
+<li>max_y
+: <a class="el" href="struct__StpuiCurve.html#a4fbc033c9dc17d11be58786f5bfe817">_StpuiCurve</a>
+<li>min_x
+: <a class="el" href="struct__StpuiCurve.html#a2e971c049f0f314e9459b21d591dde2">_StpuiCurve</a>
+<li>min_y
+: <a class="el" href="struct__StpuiCurve.html#035fd7e1c773ea3291dc40f6c2a95f07">_StpuiCurve</a>
+</ul>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>name
-: <a class="el" href="structstpui__plist__t.html#o0">stpui_plist_t</a><li>num_ctlpoints
-: <a class="el" href="struct__StpuiCurve.html#o13">_StpuiCurve</a><li>num_points
-: <a class="el" href="struct__StpuiCurve.html#o11">_StpuiCurve</a></ul>
+: <a class="el" href="structstpui__plist__t.html#95d5e51f00ae03f4ca085120fc7b88e6">stpui_plist_t</a>
+<li>num_ctlpoints
+: <a class="el" href="struct__StpuiCurve.html#875906e982189427a2a3dda0e7cc38ed">_StpuiCurve</a>
+<li>num_points
+: <a class="el" href="struct__StpuiCurve.html#d8005c397affa21ad090cd0868e4fb60">_StpuiCurve</a>
+</ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>orientation
-: <a class="el" href="structstpui__plist__t.html#o8">stpui_plist_t</a><li>output_filename
-: <a class="el" href="structstpui__plist__t.html#o6">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#394eafe3058457db432eeecb49addf07">stpui_plist_t</a>
+<li>output_filename
+: <a class="el" href="structstpui__plist__t.html#ee538bc59fd77730a5f73d3ea7d51d18">stpui_plist_t</a>
+</ul>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>parent_class
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o0">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o0">_StpuiCurveClass</a><li>pixmap
-: <a class="el" href="struct__StpuiCurve.html#o6">_StpuiCurve</a><li>point
-: <a class="el" href="struct__StpuiCurve.html#o12">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiCurveClass.html#60fce1a46ad405750d42c7aff83707bb">_StpuiCurveClass</a>
+, <a class="el" href="struct__StpuiGammaCurveClass.html#e784cb24d21ce7c707727c5996fed405">_StpuiGammaCurveClass</a>
+<li>pixmap
+: <a class="el" href="struct__StpuiCurve.html#a1e237c2fafc8ce7b06f73b8af401de1">_StpuiCurve</a>
+<li>point
+: <a class="el" href="struct__StpuiCurve.html#f7e80ace854c3b42cfcb419eacd7766f">_StpuiCurve</a>
+</ul>
 <h3><a class="anchor" name="index_q">- q -</a></h3><ul>
 <li>queue_name
-: <a class="el" href="structstpui__plist__t.html#o2">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#34155aeda35a97423a70071478a94469">stpui_plist_t</a>
+</ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
 <li>rotate_180
-: <a class="el" href="structstpui__image.html#o6">stpui_image</a><li>rotate_ccw
-: <a class="el" href="structstpui__image.html#o4">stpui_image</a><li>rotate_cw
-: <a class="el" href="structstpui__image.html#o5">stpui_image</a></ul>
+: <a class="el" href="structstpui__image.html#aaae08fdabffb3d31ac761dfe0624506">stpui_image</a>
+<li>rotate_ccw
+: <a class="el" href="structstpui__image.html#0a31280def8cd739184192dbe8d34fa8">stpui_image</a>
+<li>rotate_cw
+: <a class="el" href="structstpui__image.html#e111082f0f23096d89e024c4fde9c0d6">stpui_image</a>
+</ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>scaling
-: <a class="el" href="structstpui__plist__t.html#o7">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#7325ec55acf12db60e799b4532d50d0d">stpui_plist_t</a>
+</ul>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>table
-: <a class="el" href="struct__StpuiGammaCurve.html#o1">_StpuiGammaCurve</a><li>transpose
-: <a class="el" href="structstpui__image.html#o1">stpui_image</a></ul>
+: <a class="el" href="struct__StpuiGammaCurve.html#f4a067c4f9e19c57d080b07aca9252b3">_StpuiGammaCurve</a>
+<li>transpose
+: <a class="el" href="structstpui__image.html#5f2a75c7187c6abcf20e15e2aad22549">stpui_image</a>
+</ul>
 <h3><a class="anchor" name="index_u">- u -</a></h3><ul>
 <li>unit
-: <a class="el" href="structstpui__plist__t.html#o9">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#55bd8ba78e4f839d2897100cabd1c62f">stpui_plist_t</a>
+</ul>
 <h3><a class="anchor" name="index_v">- v -</a></h3><ul>
 <li>v
-: <a class="el" href="structstpui__plist__t.html#o12">stpui_plist_t</a><li>vbox
-: <a class="el" href="struct__StpuiGammaCurve.html#o0">_StpuiGammaCurve</a><li>vflip
-: <a class="el" href="structstpui__image.html#o3">stpui_image</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+: <a class="el" href="structstpui__plist__t.html#fbdf87548a3132b7270aa88ffcf52a8a">stpui_plist_t</a>
+<li>vbox
+: <a class="el" href="struct__StpuiGammaCurve.html#07e6d5e4479cbca4a927635cc6d02f26">_StpuiGammaCurve</a>
+<li>vflip
+: <a class="el" href="structstpui__image.html#c378339fe87fa21d5f117fc11b3f5b6c">stpui_image</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/gammacurve_8h.html b/doc/gutenprintui2/html/gammacurve_8h.html
index a8d5989..69bacb5 100644
--- a/doc/gutenprintui2/html/gammacurve_8h.html
+++ b/doc/gutenprintui2/html/gammacurve_8h.html
@@ -1,13 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: include/gutenprintui2/gammacurve.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprintui2</a></div>
-<h1>gammacurve.h File Reference</h1><code>#include &lt;gdk/gdk.h&gt;</code><br>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprintui2/gammacurve.h File Reference</h1><code>#include &lt;gdk/gdk.h&gt;</code><br>
 <code>#include &lt;gtk/gtkvbox.h&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -17,299 +28,219 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a0">STPUI_TYPE_GAMMA_CURVE</a>&nbsp;&nbsp;&nbsp;(stpui_gamma_curve_get_type ())</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#9c72ddb3a35cadb3cc00b316cbb8e601">STPUI_TYPE_GAMMA_CURVE</a>&nbsp;&nbsp;&nbsp;(stpui_gamma_curve_get_type ())</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a1">STPUI_GAMMA_CURVE</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurve.html">StpuiGammaCurve</a>))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#1799655d0ba34bbf0f856411399f222e">STPUI_GAMMA_CURVE</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurve.html">StpuiGammaCurve</a>))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a2">STPUI_GAMMA_CURVE_CLASS</a>(klass)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#45aa6ff6c9db14c6de371c1c9662483b">STPUI_GAMMA_CURVE_CLASS</a>(klass)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a3">STPUI_IS_GAMMA_CURVE</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_GAMMA_CURVE))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#9a10e0a1241d9f042e2e1a2cf14b70c3">STPUI_IS_GAMMA_CURVE</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_GAMMA_CURVE))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a4">STPUI_IS_GAMMA_CURVE_CLASS</a>(klass)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_GAMMA_CURVE))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#d5a762ee6059464c4d4d2f175d716c16">STPUI_IS_GAMMA_CURVE_CLASS</a>(klass)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_GAMMA_CURVE))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a5">STPUI_GAMMA_CURVE_GET_CLASS</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#e0813a802c9f9ee0a8fa4d3ff372ef0f">STPUI_GAMMA_CURVE_GET_CLASS</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a6">StpuiGammaCurve</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#16a893a0c5c5908d5db1a36c91590d6c">StpuiGammaCurve</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a7">StpuiGammaCurveClass</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#ec66cf466c32b2ead30a56c3fb1a3e09">StpuiGammaCurveClass</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a8">stpui_gamma_curve_get_type</a> (void) G_GNUC_CONST</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#e52edc31b54a94c1e4e106f1966af6e4">stpui_gamma_curve_get_type</a> (void) G_GNUC_CONST</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a9">stpui_gamma_curve_new</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#39433a30aa8d9b5a4e3fd1aa4176eb2f">stpui_gamma_curve_new</a> (void)</td></tr>
 
 </table>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="a1"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE" ref="a1" args="(obj)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="1799655d0ba34bbf0f856411399f222e"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE" ref="1799655d0ba34bbf0f856411399f222e" args="(obj)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STPUI_GAMMA_CURVE          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">obj&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurve.html">StpuiGammaCurve</a>))</td>
+          <td class="memname">#define STPUI_GAMMA_CURVE          </td>
+          <td>(</td>
+          <td class="paramtype">obj&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurve.html">StpuiGammaCurve</a>))</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE_CLASS" ref="a2" args="(klass)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="45aa6ff6c9db14c6de371c1c9662483b"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE_CLASS" ref="45aa6ff6c9db14c6de371c1c9662483b" args="(klass)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STPUI_GAMMA_CURVE_CLASS          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">klass&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td>
+          <td class="memname">#define STPUI_GAMMA_CURVE_CLASS          </td>
+          <td>(</td>
+          <td class="paramtype">klass&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE_GET_CLASS" ref="a5" args="(obj)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="e0813a802c9f9ee0a8fa4d3ff372ef0f"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE_GET_CLASS" ref="e0813a802c9f9ee0a8fa4d3ff372ef0f" args="(obj)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STPUI_GAMMA_CURVE_GET_CLASS          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">obj&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td>
+          <td class="memname">#define STPUI_GAMMA_CURVE_GET_CLASS          </td>
+          <td>(</td>
+          <td class="paramtype">obj&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="gammacurve.h::STPUI_IS_GAMMA_CURVE" ref="a3" args="(obj)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="9a10e0a1241d9f042e2e1a2cf14b70c3"></a><!-- doxytag: member="gammacurve.h::STPUI_IS_GAMMA_CURVE" ref="9a10e0a1241d9f042e2e1a2cf14b70c3" args="(obj)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STPUI_IS_GAMMA_CURVE          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">obj&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_GAMMA_CURVE))</td>
+          <td class="memname">#define STPUI_IS_GAMMA_CURVE          </td>
+          <td>(</td>
+          <td class="paramtype">obj&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_GAMMA_CURVE))</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="gammacurve.h::STPUI_IS_GAMMA_CURVE_CLASS" ref="a4" args="(klass)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="d5a762ee6059464c4d4d2f175d716c16"></a><!-- doxytag: member="gammacurve.h::STPUI_IS_GAMMA_CURVE_CLASS" ref="d5a762ee6059464c4d4d2f175d716c16" args="(klass)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STPUI_IS_GAMMA_CURVE_CLASS          </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">klass&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap>&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_GAMMA_CURVE))</td>
+          <td class="memname">#define STPUI_IS_GAMMA_CURVE_CLASS          </td>
+          <td>(</td>
+          <td class="paramtype">klass&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_GAMMA_CURVE))</td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="gammacurve.h::STPUI_TYPE_GAMMA_CURVE" ref="a0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="9c72ddb3a35cadb3cc00b316cbb8e601"></a><!-- doxytag: member="gammacurve.h::STPUI_TYPE_GAMMA_CURVE" ref="9c72ddb3a35cadb3cc00b316cbb8e601" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STPUI_TYPE_GAMMA_CURVE&nbsp;&nbsp;&nbsp;(stpui_gamma_curve_get_type ())          </td>
+          <td class="memname">#define STPUI_TYPE_GAMMA_CURVE&nbsp;&nbsp;&nbsp;(stpui_gamma_curve_get_type ())          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a6"></a><!-- doxytag: member="gammacurve.h::StpuiGammaCurve" ref="a6" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="16a893a0c5c5908d5db1a36c91590d6c"></a><!-- doxytag: member="gammacurve.h::StpuiGammaCurve" ref="16a893a0c5c5908d5db1a36c91590d6c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a> <a class="el" href="struct__StpuiGammaCurve.html">StpuiGammaCurve</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a> <a class="el" href="struct__StpuiGammaCurve.html">StpuiGammaCurve</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a7"></a><!-- doxytag: member="gammacurve.h::StpuiGammaCurveClass" ref="a7" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ec66cf466c32b2ead30a56c3fb1a3e09"></a><!-- doxytag: member="gammacurve.h::StpuiGammaCurveClass" ref="ec66cf466c32b2ead30a56c3fb1a3e09" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a> <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a> <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a8"></a><!-- doxytag: member="gammacurve.h::stpui_gamma_curve_get_type" ref="a8" args="(void) G_GNUC_CONST" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="e52edc31b54a94c1e4e106f1966af6e4"></a><!-- doxytag: member="gammacurve.h::stpui_gamma_curve_get_type" ref="e52edc31b54a94c1e4e106f1966af6e4" args="(void) G_GNUC_CONST" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">GType stpui_gamma_curve_get_type           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">GType stpui_gamma_curve_get_type           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a9"></a><!-- doxytag: member="gammacurve.h::stpui_gamma_curve_new" ref="a9" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="39433a30aa8d9b5a4e3fd1aa4176eb2f"></a><!-- doxytag: member="gammacurve.h::stpui_gamma_curve_new" ref="39433a30aa8d9b5a4e3fd1aa4176eb2f" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">GtkWidget* stpui_gamma_curve_new           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">GtkWidget* stpui_gamma_curve_new           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals.html b/doc/gutenprintui2/html/globals.html
index adf0dc1..f9498ca 100644
--- a/doc/gutenprintui2/html/globals.html
+++ b/doc/gutenprintui2/html/globals.html
@@ -1,126 +1,255 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_g">g</a> | <a class="qindex" href="#index_o">o</a> | <a class="qindex" href="#index_s">s</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index_c"><span>c</span></a></li>
+    <li><a href="#index_g"><span>g</span></a></li>
+    <li><a href="#index_o"><span>o</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>command_t
-: <a class="el" href="gutenprintui_8h.html#a63">gutenprintui.h</a><li>command_t_command_t_get_type()
-: <a class="el" href="typebuiltins_8h.html#a4">typebuiltins.h</a><li>COMMAND_TYPE_CUSTOM
-: <a class="el" href="gutenprintui_8h.html#a63a8">gutenprintui.h</a><li>COMMAND_TYPE_DEFAULT
-: <a class="el" href="gutenprintui_8h.html#a63a7">gutenprintui.h</a><li>COMMAND_TYPE_FILE
-: <a class="el" href="gutenprintui_8h.html#a63a9">gutenprintui.h</a></ul>
+: <a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10">gutenprintui.h</a>
+<li>command_t_command_t_get_type()
+: <a class="el" href="typebuiltins_8h.html#5e6b50173b88263be23734e76f4a39f2">typebuiltins.h</a>
+<li>COMMAND_TYPE_CUSTOM
+: <a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10cb7cf14821d9fcbaa983ee33d7b8e926">gutenprintui.h</a>
+<li>COMMAND_TYPE_DEFAULT
+: <a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10a6a7840c2276bfe38dd68b4fe3a8babf">gutenprintui.h</a>
+<li>COMMAND_TYPE_FILE
+: <a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee105e9a887a5dab88a425cb52c8b1e49a7f">gutenprintui.h</a>
+</ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>get_thumbnail_func_t
-: <a class="el" href="gutenprintui_8h.html#a1">gutenprintui.h</a></ul>
+: <a class="el" href="gutenprintui_8h.html#4ab1da499b20816c28d1b26c61652c1d">gutenprintui.h</a>
+</ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>ORIENT_AUTO
-: <a class="el" href="gutenprintui_8h.html#a62a2">gutenprintui.h</a><li>ORIENT_LANDSCAPE
-: <a class="el" href="gutenprintui_8h.html#a62a4">gutenprintui.h</a><li>ORIENT_PORTRAIT
-: <a class="el" href="gutenprintui_8h.html#a62a3">gutenprintui.h</a><li>ORIENT_SEASCAPE
-: <a class="el" href="gutenprintui_8h.html#a62a6">gutenprintui.h</a><li>orient_t
-: <a class="el" href="gutenprintui_8h.html#a62">gutenprintui.h</a><li>orient_t_orient_t_get_type()
-: <a class="el" href="typebuiltins_8h.html#a3">typebuiltins.h</a><li>ORIENT_UPSIDEDOWN
-: <a class="el" href="gutenprintui_8h.html#a62a5">gutenprintui.h</a></ul>
+: <a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a006af5eabe5d18a247c02641283fe4481">gutenprintui.h</a>
+<li>ORIENT_LANDSCAPE
+: <a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a04dc9735e5b3e4c86b60141acc08e5db1">gutenprintui.h</a>
+<li>ORIENT_PORTRAIT
+: <a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a0f81c23cf1763365fba8e36db87131ff5">gutenprintui.h</a>
+<li>ORIENT_SEASCAPE
+: <a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a07de33495add2d66cc743f2edcbb548e3">gutenprintui.h</a>
+<li>orient_t
+: <a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a0">gutenprintui.h</a>
+<li>orient_t_orient_t_get_type()
+: <a class="el" href="typebuiltins_8h.html#b05fb37a6c79f2b6b417ff107d9bb881">typebuiltins.h</a>
+<li>ORIENT_UPSIDEDOWN
+: <a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a03ca76babc9953cc92305856ac00a2350">gutenprintui.h</a>
+</ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>stpui_build_standard_print_command()
-: <a class="el" href="gutenprintui_8h.html#a38">gutenprintui.h</a><li>stpui_compute_orientation()
-: <a class="el" href="gutenprintui_8h.html#a51">gutenprintui.h</a><li>STPUI_CURVE
-: <a class="el" href="curve_8h.html#a1">curve.h</a><li>STPUI_CURVE_CLASS
-: <a class="el" href="curve_8h.html#a2">curve.h</a><li>STPUI_CURVE_GET_CLASS
-: <a class="el" href="curve_8h.html#a5">curve.h</a><li>stpui_curve_get_type()
-: <a class="el" href="curve_8h.html#a11">curve.h</a><li>stpui_curve_get_vector()
-: <a class="el" href="curve_8h.html#a16">curve.h</a><li>stpui_curve_new()
-: <a class="el" href="curve_8h.html#a12">curve.h</a><li>stpui_curve_reset()
-: <a class="el" href="curve_8h.html#a13">curve.h</a><li>stpui_curve_set_curve_type()
-: <a class="el" href="curve_8h.html#a18">curve.h</a><li>stpui_curve_set_gamma()
-: <a class="el" href="curve_8h.html#a14">curve.h</a><li>stpui_curve_set_range()
-: <a class="el" href="curve_8h.html#a15">curve.h</a><li>stpui_curve_set_vector()
-: <a class="el" href="curve_8h.html#a17">curve.h</a><li>STPUI_CURVE_TYPE_FREE
-: <a class="el" href="curve_8h.html#a19a10">curve.h</a><li>stpui_curve_type_get_type()
-: <a class="el" href="typebuiltins_8h.html#a5">typebuiltins.h</a><li>STPUI_CURVE_TYPE_LINEAR
-: <a class="el" href="curve_8h.html#a19a8">curve.h</a><li>STPUI_CURVE_TYPE_SPLINE
-: <a class="el" href="curve_8h.html#a19a9">curve.h</a><li>stpui_do_print_dialog()
-: <a class="el" href="gutenprintui_8h.html#a50">gutenprintui.h</a><li>STPUI_GAMMA_CURVE
-: <a class="el" href="gammacurve_8h.html#a1">gammacurve.h</a><li>STPUI_GAMMA_CURVE_CLASS
-: <a class="el" href="gammacurve_8h.html#a2">gammacurve.h</a><li>STPUI_GAMMA_CURVE_GET_CLASS
-: <a class="el" href="gammacurve_8h.html#a5">gammacurve.h</a><li>stpui_gamma_curve_get_type()
-: <a class="el" href="gammacurve_8h.html#a8">gammacurve.h</a><li>stpui_gamma_curve_new()
-: <a class="el" href="gammacurve_8h.html#a9">gammacurve.h</a><li>stpui_get_current_printer()
-: <a class="el" href="gutenprintui_8h.html#a37">gutenprintui.h</a><li>stpui_get_errdata()
-: <a class="el" href="gutenprintui_8h.html#a49">gutenprintui.h</a><li>stpui_get_errfunc()
-: <a class="el" href="gutenprintui_8h.html#a47">gutenprintui.h</a><li>stpui_get_global_parameter()
-: <a class="el" href="gutenprintui_8h.html#a33">gutenprintui.h</a><li>stpui_get_image_filename()
-: <a class="el" href="gutenprintui_8h.html#a45">gutenprintui.h</a><li>stpui_get_printrc_file()
-: <a class="el" href="gutenprintui_8h.html#a40">gutenprintui.h</a><li>stpui_get_system_printers()
-: <a class="el" href="gutenprintui_8h.html#a42">gutenprintui.h</a><li>stpui_get_thumbnail_data()
-: <a class="el" href="gutenprintui_8h.html#a60">gutenprintui.h</a><li>stpui_get_thumbnail_func()
-: <a class="el" href="gutenprintui_8h.html#a58">gutenprintui.h</a><li>stpui_image_t
-: <a class="el" href="gutenprintui_8h.html#a0">gutenprintui.h</a><li>STPUI_IS_CURVE
-: <a class="el" href="curve_8h.html#a3">curve.h</a><li>STPUI_IS_CURVE_CLASS
-: <a class="el" href="curve_8h.html#a4">curve.h</a><li>STPUI_IS_GAMMA_CURVE
-: <a class="el" href="gammacurve_8h.html#a3">gammacurve.h</a><li>STPUI_IS_GAMMA_CURVE_CLASS
-: <a class="el" href="gammacurve_8h.html#a4">gammacurve.h</a><li>stpui_plist_add()
-: <a class="el" href="gutenprintui_8h.html#a35">gutenprintui.h</a><li>stpui_plist_copy()
-: <a class="el" href="gutenprintui_8h.html#a34">gutenprintui.h</a><li>stpui_plist_get_command_type()
-: <a class="el" href="gutenprintui_8h.html#a31">gutenprintui.h</a><li>stpui_plist_get_copy_count()
-: <a class="el" href="gutenprintui_8h.html#a26">gutenprintui.h</a><li>stpui_plist_get_current_standard_command()
-: <a class="el" href="gutenprintui_8h.html#a29">gutenprintui.h</a><li>stpui_plist_get_custom_command()
-: <a class="el" href="gutenprintui_8h.html#a24">gutenprintui.h</a><li>stpui_plist_get_extra_printer_options()
-: <a class="el" href="gutenprintui_8h.html#a21">gutenprintui.h</a><li>stpui_plist_get_name()
-: <a class="el" href="gutenprintui_8h.html#a12">gutenprintui.h</a><li>stpui_plist_get_output_filename()
-: <a class="el" href="gutenprintui_8h.html#a18">gutenprintui.h</a><li>stpui_plist_get_queue_name()
-: <a class="el" href="gutenprintui_8h.html#a15">gutenprintui.h</a><li>stpui_plist_set_command_type()
-: <a class="el" href="gutenprintui_8h.html#a30">gutenprintui.h</a><li>stpui_plist_set_copy_count()
-: <a class="el" href="gutenprintui_8h.html#a25">gutenprintui.h</a><li>stpui_plist_set_current_standard_command()
-: <a class="el" href="gutenprintui_8h.html#a27">gutenprintui.h</a><li>stpui_plist_set_current_standard_command_n()
-: <a class="el" href="gutenprintui_8h.html#a28">gutenprintui.h</a><li>stpui_plist_set_custom_command()
-: <a class="el" href="gutenprintui_8h.html#a22">gutenprintui.h</a><li>stpui_plist_set_custom_command_n()
-: <a class="el" href="gutenprintui_8h.html#a23">gutenprintui.h</a><li>stpui_plist_set_extra_printer_options()
-: <a class="el" href="gutenprintui_8h.html#a19">gutenprintui.h</a><li>stpui_plist_set_extra_printer_options_n()
-: <a class="el" href="gutenprintui_8h.html#a20">gutenprintui.h</a><li>stpui_plist_set_name()
-: <a class="el" href="gutenprintui_8h.html#a10">gutenprintui.h</a><li>stpui_plist_set_name_n()
-: <a class="el" href="gutenprintui_8h.html#a11">gutenprintui.h</a><li>stpui_plist_set_output_filename()
-: <a class="el" href="gutenprintui_8h.html#a16">gutenprintui.h</a><li>stpui_plist_set_output_filename_n()
-: <a class="el" href="gutenprintui_8h.html#a17">gutenprintui.h</a><li>stpui_plist_set_queue_name()
-: <a class="el" href="gutenprintui_8h.html#a13">gutenprintui.h</a><li>stpui_plist_set_queue_name_n()
-: <a class="el" href="gutenprintui_8h.html#a14">gutenprintui.h</a><li>stpui_print()
-: <a class="el" href="gutenprintui_8h.html#a61">gutenprintui.h</a><li>stpui_printer_initialize()
-: <a class="el" href="gutenprintui_8h.html#a36">gutenprintui.h</a><li>stpui_printrc_load()
-: <a class="el" href="gutenprintui_8h.html#a41">gutenprintui.h</a><li>stpui_printrc_save()
-: <a class="el" href="gutenprintui_8h.html#a43">gutenprintui.h</a><li>stpui_set_errdata()
-: <a class="el" href="gutenprintui_8h.html#a48">gutenprintui.h</a><li>stpui_set_errfunc()
-: <a class="el" href="gutenprintui_8h.html#a46">gutenprintui.h</a><li>stpui_set_global_parameter()
-: <a class="el" href="gutenprintui_8h.html#a32">gutenprintui.h</a><li>stpui_set_image_channel_depth()
-: <a class="el" href="gutenprintui_8h.html#a56">gutenprintui.h</a><li>stpui_set_image_dimensions()
-: <a class="el" href="gutenprintui_8h.html#a52">gutenprintui.h</a><li>stpui_set_image_filename()
-: <a class="el" href="gutenprintui_8h.html#a44">gutenprintui.h</a><li>stpui_set_image_raw_channels()
-: <a class="el" href="gutenprintui_8h.html#a55">gutenprintui.h</a><li>stpui_set_image_resolution()
-: <a class="el" href="gutenprintui_8h.html#a53">gutenprintui.h</a><li>stpui_set_image_type()
-: <a class="el" href="gutenprintui_8h.html#a54">gutenprintui.h</a><li>stpui_set_printrc_file()
-: <a class="el" href="gutenprintui_8h.html#a39">gutenprintui.h</a><li>stpui_set_thumbnail_data()
-: <a class="el" href="gutenprintui_8h.html#a59">gutenprintui.h</a><li>stpui_set_thumbnail_func()
-: <a class="el" href="gutenprintui_8h.html#a57">gutenprintui.h</a><li>STPUI_TYPE_COMMAND_T
-: <a class="el" href="typebuiltins_8h.html#a1">typebuiltins.h</a><li>STPUI_TYPE_CURVE
-: <a class="el" href="curve_8h.html#a0">curve.h</a><li>STPUI_TYPE_CURVE_TYPE
-: <a class="el" href="typebuiltins_8h.html#a2">typebuiltins.h</a><li>STPUI_TYPE_GAMMA_CURVE
-: <a class="el" href="gammacurve_8h.html#a0">gammacurve.h</a><li>STPUI_TYPE_ORIENT_T
-: <a class="el" href="typebuiltins_8h.html#a0">typebuiltins.h</a><li>StpuiCurve
-: <a class="el" href="curve_8h.html#a6">curve.h</a><li>StpuiCurveClass
-: <a class="el" href="curve_8h.html#a7">curve.h</a><li>StpuiCurveType
-: <a class="el" href="curve_8h.html#a19">curve.h</a><li>StpuiGammaCurve
-: <a class="el" href="gammacurve_8h.html#a6">gammacurve.h</a><li>StpuiGammaCurveClass
-: <a class="el" href="gammacurve_8h.html#a7">gammacurve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+: <a class="el" href="gutenprintui_8h.html#97f0f11c41859d80d9bb3803f81a671f">gutenprintui.h</a>
+<li>stpui_compute_orientation()
+: <a class="el" href="gutenprintui_8h.html#6932b380986d06d6dd7671439aaf93a0">gutenprintui.h</a>
+<li>STPUI_CURVE
+: <a class="el" href="curve_8h.html#03272c56621cf16c2caa378231c7fa43">curve.h</a>
+<li>STPUI_CURVE_CLASS
+: <a class="el" href="curve_8h.html#d788bc4e6a85701756b28d972a64b7f8">curve.h</a>
+<li>STPUI_CURVE_GET_CLASS
+: <a class="el" href="curve_8h.html#41b32938b1bfc087ca93b3655ef03ab6">curve.h</a>
+<li>stpui_curve_get_type()
+: <a class="el" href="curve_8h.html#233b21367f03cd5ba884d4e3c742c8d2">curve.h</a>
+<li>stpui_curve_get_vector()
+: <a class="el" href="curve_8h.html#43799d3f187018958cb78ece053dadda">curve.h</a>
+<li>stpui_curve_new()
+: <a class="el" href="curve_8h.html#cbdc99aaef1f5672d0294d9742fdc398">curve.h</a>
+<li>stpui_curve_reset()
+: <a class="el" href="curve_8h.html#466fe70debd1a7eca3988f91a109009f">curve.h</a>
+<li>stpui_curve_set_curve_type()
+: <a class="el" href="curve_8h.html#196839b2b6e39ae4bd5ccc9aad4ff8f7">curve.h</a>
+<li>stpui_curve_set_gamma()
+: <a class="el" href="curve_8h.html#956d80d857cf5927768a38103d8af705">curve.h</a>
+<li>stpui_curve_set_range()
+: <a class="el" href="curve_8h.html#d4dcd042b1e50672781895d886adad66">curve.h</a>
+<li>stpui_curve_set_vector()
+: <a class="el" href="curve_8h.html#be1c943341872697e6219d7053db2804">curve.h</a>
+<li>STPUI_CURVE_TYPE_FREE
+: <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b1a204ef2d450d762415a1c0c1c77db89">curve.h</a>
+<li>stpui_curve_type_get_type()
+: <a class="el" href="typebuiltins_8h.html#1252245c3967f9e655de3d62c3999230">typebuiltins.h</a>
+<li>STPUI_CURVE_TYPE_LINEAR
+: <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b741f86dc6dfb50a67dd621a287014de1">curve.h</a>
+<li>STPUI_CURVE_TYPE_SPLINE
+: <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b6cef8a118ee2829db63f812874a412c1">curve.h</a>
+<li>stpui_do_print_dialog()
+: <a class="el" href="gutenprintui_8h.html#ac1066fa59dc8a04b90415994587ec1a">gutenprintui.h</a>
+<li>STPUI_GAMMA_CURVE
+: <a class="el" href="gammacurve_8h.html#1799655d0ba34bbf0f856411399f222e">gammacurve.h</a>
+<li>STPUI_GAMMA_CURVE_CLASS
+: <a class="el" href="gammacurve_8h.html#45aa6ff6c9db14c6de371c1c9662483b">gammacurve.h</a>
+<li>STPUI_GAMMA_CURVE_GET_CLASS
+: <a class="el" href="gammacurve_8h.html#e0813a802c9f9ee0a8fa4d3ff372ef0f">gammacurve.h</a>
+<li>stpui_gamma_curve_get_type()
+: <a class="el" href="gammacurve_8h.html#e52edc31b54a94c1e4e106f1966af6e4">gammacurve.h</a>
+<li>stpui_gamma_curve_new()
+: <a class="el" href="gammacurve_8h.html#39433a30aa8d9b5a4e3fd1aa4176eb2f">gammacurve.h</a>
+<li>stpui_get_current_printer()
+: <a class="el" href="gutenprintui_8h.html#26ebbd1948a457740cd75ff630969487">gutenprintui.h</a>
+<li>stpui_get_errdata()
+: <a class="el" href="gutenprintui_8h.html#15368f674e52b511ad665cb2be45576c">gutenprintui.h</a>
+<li>stpui_get_errfunc()
+: <a class="el" href="gutenprintui_8h.html#da3d388496b4b7d689f4cf8a957c75b2">gutenprintui.h</a>
+<li>stpui_get_global_parameter()
+: <a class="el" href="gutenprintui_8h.html#28c71e75188d60a243755deaab31b5fd">gutenprintui.h</a>
+<li>stpui_get_image_filename()
+: <a class="el" href="gutenprintui_8h.html#8bc64271197449021140ce2d17ad71e2">gutenprintui.h</a>
+<li>stpui_get_printrc_file()
+: <a class="el" href="gutenprintui_8h.html#8faab74e1f9c2b372efa56ae6fea713e">gutenprintui.h</a>
+<li>stpui_get_system_printers()
+: <a class="el" href="gutenprintui_8h.html#da642fd5eeff02d4c6b84d3125ca2da2">gutenprintui.h</a>
+<li>stpui_get_thumbnail_data()
+: <a class="el" href="gutenprintui_8h.html#ee04dfc45b26093bd65d3025b817cfd5">gutenprintui.h</a>
+<li>stpui_get_thumbnail_func()
+: <a class="el" href="gutenprintui_8h.html#74c1f441bf3fbb2198cf4cbaca8c23ef">gutenprintui.h</a>
+<li>stpui_image_t
+: <a class="el" href="gutenprintui_8h.html#195aac96c77c6de3925cd3d13c6ce2f1">gutenprintui.h</a>
+<li>STPUI_IS_CURVE
+: <a class="el" href="curve_8h.html#92f2038dd52d2b3af7c03bdeb5918567">curve.h</a>
+<li>STPUI_IS_CURVE_CLASS
+: <a class="el" href="curve_8h.html#ee626496df16d25159b91982478b0df9">curve.h</a>
+<li>STPUI_IS_GAMMA_CURVE
+: <a class="el" href="gammacurve_8h.html#9a10e0a1241d9f042e2e1a2cf14b70c3">gammacurve.h</a>
+<li>STPUI_IS_GAMMA_CURVE_CLASS
+: <a class="el" href="gammacurve_8h.html#d5a762ee6059464c4d4d2f175d716c16">gammacurve.h</a>
+<li>stpui_plist_add()
+: <a class="el" href="gutenprintui_8h.html#b2e655748deab72a24c25bfaf4ee9052">gutenprintui.h</a>
+<li>stpui_plist_copy()
+: <a class="el" href="gutenprintui_8h.html#01db968552106a84a49f76d7203bd3f5">gutenprintui.h</a>
+<li>stpui_plist_get_command_type()
+: <a class="el" href="gutenprintui_8h.html#3c9ed1191c6a03edba14f7b98d03ef55">gutenprintui.h</a>
+<li>stpui_plist_get_copy_count()
+: <a class="el" href="gutenprintui_8h.html#7d4511d9e9c69136fabf9f9c64734c51">gutenprintui.h</a>
+<li>stpui_plist_get_current_standard_command()
+: <a class="el" href="gutenprintui_8h.html#fdc574a731f6697c3e48c6001a51b3af">gutenprintui.h</a>
+<li>stpui_plist_get_custom_command()
+: <a class="el" href="gutenprintui_8h.html#bc624051678aac91a2ffa6c7c5393b8d">gutenprintui.h</a>
+<li>stpui_plist_get_extra_printer_options()
+: <a class="el" href="gutenprintui_8h.html#4956cdd55680ed20a92e991d4cf52ee8">gutenprintui.h</a>
+<li>stpui_plist_get_name()
+: <a class="el" href="gutenprintui_8h.html#342817c9f4311f0ac827c94b0e62cbbb">gutenprintui.h</a>
+<li>stpui_plist_get_output_filename()
+: <a class="el" href="gutenprintui_8h.html#856c534e664748c9a419104357312dfd">gutenprintui.h</a>
+<li>stpui_plist_get_queue_name()
+: <a class="el" href="gutenprintui_8h.html#acf031afbe7e9682f7367f1ae0ef1895">gutenprintui.h</a>
+<li>stpui_plist_set_command_type()
+: <a class="el" href="gutenprintui_8h.html#a920697330124635ca464662caf975d5">gutenprintui.h</a>
+<li>stpui_plist_set_copy_count()
+: <a class="el" href="gutenprintui_8h.html#02092bb706d3770870ed5f64efb1ea2a">gutenprintui.h</a>
+<li>stpui_plist_set_current_standard_command()
+: <a class="el" href="gutenprintui_8h.html#79e27ac73e0f082abcdde41ee76879ce">gutenprintui.h</a>
+<li>stpui_plist_set_current_standard_command_n()
+: <a class="el" href="gutenprintui_8h.html#a405ef9e03818fedcff5746b9701c3c3">gutenprintui.h</a>
+<li>stpui_plist_set_custom_command()
+: <a class="el" href="gutenprintui_8h.html#f127a39a7ea466ca73e5a511f36ae985">gutenprintui.h</a>
+<li>stpui_plist_set_custom_command_n()
+: <a class="el" href="gutenprintui_8h.html#567c7c6c13930e398def69f2829bd038">gutenprintui.h</a>
+<li>stpui_plist_set_extra_printer_options()
+: <a class="el" href="gutenprintui_8h.html#72ee8e1bb9bee2e13c15a9aecd9582bd">gutenprintui.h</a>
+<li>stpui_plist_set_extra_printer_options_n()
+: <a class="el" href="gutenprintui_8h.html#9899c88da60069b72d7ddb601bcad548">gutenprintui.h</a>
+<li>stpui_plist_set_name()
+: <a class="el" href="gutenprintui_8h.html#f54293f58c474e133e4a60054779c9be">gutenprintui.h</a>
+<li>stpui_plist_set_name_n()
+: <a class="el" href="gutenprintui_8h.html#90a9ed90e03acd443d08350a62aa3762">gutenprintui.h</a>
+<li>stpui_plist_set_output_filename()
+: <a class="el" href="gutenprintui_8h.html#248eae3ae0a96506fa8c92807f70d457">gutenprintui.h</a>
+<li>stpui_plist_set_output_filename_n()
+: <a class="el" href="gutenprintui_8h.html#ea9ddb061703368f7ea1e3b861b8550d">gutenprintui.h</a>
+<li>stpui_plist_set_queue_name()
+: <a class="el" href="gutenprintui_8h.html#8a4fa7000900cb4813000048c322dcdb">gutenprintui.h</a>
+<li>stpui_plist_set_queue_name_n()
+: <a class="el" href="gutenprintui_8h.html#ec75fb2ec25a5a69d270d70ea33c81eb">gutenprintui.h</a>
+<li>stpui_print()
+: <a class="el" href="gutenprintui_8h.html#1ffdddfb6efd3353d403192b2b2c1e20">gutenprintui.h</a>
+<li>stpui_printer_initialize()
+: <a class="el" href="gutenprintui_8h.html#54daa32f5d5d64c644131570eab01c2b">gutenprintui.h</a>
+<li>stpui_printrc_load()
+: <a class="el" href="gutenprintui_8h.html#54f67bb1819c7135a0ca1f005a22d28b">gutenprintui.h</a>
+<li>stpui_printrc_save()
+: <a class="el" href="gutenprintui_8h.html#8c4bddac236a6557ec126fd659ceade0">gutenprintui.h</a>
+<li>stpui_set_errdata()
+: <a class="el" href="gutenprintui_8h.html#d013cb96f40b5da4bca5dd9485aaa213">gutenprintui.h</a>
+<li>stpui_set_errfunc()
+: <a class="el" href="gutenprintui_8h.html#cc06b85ae6af8ca0003584da411213fb">gutenprintui.h</a>
+<li>stpui_set_global_parameter()
+: <a class="el" href="gutenprintui_8h.html#eb3ea1fd028cb28211bac9e88f9ca8ac">gutenprintui.h</a>
+<li>stpui_set_image_channel_depth()
+: <a class="el" href="gutenprintui_8h.html#845898656d91fbf462db9c9b3e7c976f">gutenprintui.h</a>
+<li>stpui_set_image_dimensions()
+: <a class="el" href="gutenprintui_8h.html#a52f1b5d60ea21d09cfbab998df7ff33">gutenprintui.h</a>
+<li>stpui_set_image_filename()
+: <a class="el" href="gutenprintui_8h.html#701289a198a313c5b6758ab1cd678c58">gutenprintui.h</a>
+<li>stpui_set_image_raw_channels()
+: <a class="el" href="gutenprintui_8h.html#0d40ca93fed8c7d10dcc516e6fb61ea1">gutenprintui.h</a>
+<li>stpui_set_image_resolution()
+: <a class="el" href="gutenprintui_8h.html#3fa4a6d1300a470016744badf81daa43">gutenprintui.h</a>
+<li>stpui_set_image_type()
+: <a class="el" href="gutenprintui_8h.html#7b2f104989fb67ca20e1b9874e047293">gutenprintui.h</a>
+<li>stpui_set_printrc_file()
+: <a class="el" href="gutenprintui_8h.html#443905f09bfd6cad7fd06aa029ac306c">gutenprintui.h</a>
+<li>stpui_set_thumbnail_data()
+: <a class="el" href="gutenprintui_8h.html#965e5950073e3ef6775f3355556517f6">gutenprintui.h</a>
+<li>stpui_set_thumbnail_func()
+: <a class="el" href="gutenprintui_8h.html#fcaf0ce6ff01c073cdfb2d2f80ede234">gutenprintui.h</a>
+<li>STPUI_TYPE_COMMAND_T
+: <a class="el" href="typebuiltins_8h.html#b213314f887b8b4f48f9aa1531673a9c">typebuiltins.h</a>
+<li>STPUI_TYPE_CURVE
+: <a class="el" href="curve_8h.html#887bee281f88accbe674790e5e5b28e3">curve.h</a>
+<li>STPUI_TYPE_CURVE_TYPE
+: <a class="el" href="typebuiltins_8h.html#f0561b03a3bfb203b40c37f9bb373ffb">typebuiltins.h</a>
+<li>STPUI_TYPE_GAMMA_CURVE
+: <a class="el" href="gammacurve_8h.html#9c72ddb3a35cadb3cc00b316cbb8e601">gammacurve.h</a>
+<li>STPUI_TYPE_ORIENT_T
+: <a class="el" href="typebuiltins_8h.html#7c68a632b60b65d497e2933fa1b78a77">typebuiltins.h</a>
+<li>StpuiCurve
+: <a class="el" href="curve_8h.html#5c0213fede0b7d8a91b66e4679cc899a">curve.h</a>
+<li>StpuiCurveClass
+: <a class="el" href="curve_8h.html#057f1c40a70e84c7a187b423ebe4aada">curve.h</a>
+<li>StpuiCurveType
+: <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b">curve.h</a>
+<li>StpuiGammaCurve
+: <a class="el" href="gammacurve_8h.html#16a893a0c5c5908d5db1a36c91590d6c">gammacurve.h</a>
+<li>StpuiGammaCurveClass
+: <a class="el" href="gammacurve_8h.html#ec66cf466c32b2ead30a56c3fb1a3e09">gammacurve.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_defs.html b/doc/gutenprintui2/html/globals_defs.html
index ba1718a..0deeff4 100644
--- a/doc/gutenprintui2/html/globals_defs.html
+++ b/doc/gutenprintui2/html/globals_defs.html
@@ -1,32 +1,69 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindexHL" href="globals_defs.html">Defines</a></div>
-
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li class="current"><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+&nbsp;
 <p>
 <ul>
 <li>STPUI_CURVE
-: <a class="el" href="curve_8h.html#a1">curve.h</a><li>STPUI_CURVE_CLASS
-: <a class="el" href="curve_8h.html#a2">curve.h</a><li>STPUI_CURVE_GET_CLASS
-: <a class="el" href="curve_8h.html#a5">curve.h</a><li>STPUI_GAMMA_CURVE
-: <a class="el" href="gammacurve_8h.html#a1">gammacurve.h</a><li>STPUI_GAMMA_CURVE_CLASS
-: <a class="el" href="gammacurve_8h.html#a2">gammacurve.h</a><li>STPUI_GAMMA_CURVE_GET_CLASS
-: <a class="el" href="gammacurve_8h.html#a5">gammacurve.h</a><li>STPUI_IS_CURVE
-: <a class="el" href="curve_8h.html#a3">curve.h</a><li>STPUI_IS_CURVE_CLASS
-: <a class="el" href="curve_8h.html#a4">curve.h</a><li>STPUI_IS_GAMMA_CURVE
-: <a class="el" href="gammacurve_8h.html#a3">gammacurve.h</a><li>STPUI_IS_GAMMA_CURVE_CLASS
-: <a class="el" href="gammacurve_8h.html#a4">gammacurve.h</a><li>STPUI_TYPE_COMMAND_T
-: <a class="el" href="typebuiltins_8h.html#a1">typebuiltins.h</a><li>STPUI_TYPE_CURVE
-: <a class="el" href="curve_8h.html#a0">curve.h</a><li>STPUI_TYPE_CURVE_TYPE
-: <a class="el" href="typebuiltins_8h.html#a2">typebuiltins.h</a><li>STPUI_TYPE_GAMMA_CURVE
-: <a class="el" href="gammacurve_8h.html#a0">gammacurve.h</a><li>STPUI_TYPE_ORIENT_T
-: <a class="el" href="typebuiltins_8h.html#a0">typebuiltins.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+: <a class="el" href="curve_8h.html#03272c56621cf16c2caa378231c7fa43">curve.h</a>
+<li>STPUI_CURVE_CLASS
+: <a class="el" href="curve_8h.html#d788bc4e6a85701756b28d972a64b7f8">curve.h</a>
+<li>STPUI_CURVE_GET_CLASS
+: <a class="el" href="curve_8h.html#41b32938b1bfc087ca93b3655ef03ab6">curve.h</a>
+<li>STPUI_GAMMA_CURVE
+: <a class="el" href="gammacurve_8h.html#1799655d0ba34bbf0f856411399f222e">gammacurve.h</a>
+<li>STPUI_GAMMA_CURVE_CLASS
+: <a class="el" href="gammacurve_8h.html#45aa6ff6c9db14c6de371c1c9662483b">gammacurve.h</a>
+<li>STPUI_GAMMA_CURVE_GET_CLASS
+: <a class="el" href="gammacurve_8h.html#e0813a802c9f9ee0a8fa4d3ff372ef0f">gammacurve.h</a>
+<li>STPUI_IS_CURVE
+: <a class="el" href="curve_8h.html#92f2038dd52d2b3af7c03bdeb5918567">curve.h</a>
+<li>STPUI_IS_CURVE_CLASS
+: <a class="el" href="curve_8h.html#ee626496df16d25159b91982478b0df9">curve.h</a>
+<li>STPUI_IS_GAMMA_CURVE
+: <a class="el" href="gammacurve_8h.html#9a10e0a1241d9f042e2e1a2cf14b70c3">gammacurve.h</a>
+<li>STPUI_IS_GAMMA_CURVE_CLASS
+: <a class="el" href="gammacurve_8h.html#d5a762ee6059464c4d4d2f175d716c16">gammacurve.h</a>
+<li>STPUI_TYPE_COMMAND_T
+: <a class="el" href="typebuiltins_8h.html#b213314f887b8b4f48f9aa1531673a9c">typebuiltins.h</a>
+<li>STPUI_TYPE_CURVE
+: <a class="el" href="curve_8h.html#887bee281f88accbe674790e5e5b28e3">curve.h</a>
+<li>STPUI_TYPE_CURVE_TYPE
+: <a class="el" href="typebuiltins_8h.html#f0561b03a3bfb203b40c37f9bb373ffb">typebuiltins.h</a>
+<li>STPUI_TYPE_GAMMA_CURVE
+: <a class="el" href="gammacurve_8h.html#9c72ddb3a35cadb3cc00b316cbb8e601">gammacurve.h</a>
+<li>STPUI_TYPE_ORIENT_T
+: <a class="el" href="typebuiltins_8h.html#7c68a632b60b65d497e2933fa1b78a77">typebuiltins.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_enum.html b/doc/gutenprintui2/html/globals_enum.html
index fb8fc83..4f369d1 100644
--- a/doc/gutenprintui2/html/globals_enum.html
+++ b/doc/gutenprintui2/html/globals_enum.html
@@ -1,20 +1,45 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindexHL" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li class="current"><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+&nbsp;
 <p>
 <ul>
 <li>command_t
-: <a class="el" href="gutenprintui_8h.html#a63">gutenprintui.h</a><li>orient_t
-: <a class="el" href="gutenprintui_8h.html#a62">gutenprintui.h</a><li>StpuiCurveType
-: <a class="el" href="curve_8h.html#a19">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+: <a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10">gutenprintui.h</a>
+<li>orient_t
+: <a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a0">gutenprintui.h</a>
+<li>StpuiCurveType
+: <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b">curve.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_eval.html b/doc/gutenprintui2/html/globals_eval.html
index 443806c..c7ff9e7 100644
--- a/doc/gutenprintui2/html/globals_eval.html
+++ b/doc/gutenprintui2/html/globals_eval.html
@@ -1,28 +1,61 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindexHL" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li class="current"><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+&nbsp;
 <p>
 <ul>
 <li>COMMAND_TYPE_CUSTOM
-: <a class="el" href="gutenprintui_8h.html#a63a8">gutenprintui.h</a><li>COMMAND_TYPE_DEFAULT
-: <a class="el" href="gutenprintui_8h.html#a63a7">gutenprintui.h</a><li>COMMAND_TYPE_FILE
-: <a class="el" href="gutenprintui_8h.html#a63a9">gutenprintui.h</a><li>ORIENT_AUTO
-: <a class="el" href="gutenprintui_8h.html#a62a2">gutenprintui.h</a><li>ORIENT_LANDSCAPE
-: <a class="el" href="gutenprintui_8h.html#a62a4">gutenprintui.h</a><li>ORIENT_PORTRAIT
-: <a class="el" href="gutenprintui_8h.html#a62a3">gutenprintui.h</a><li>ORIENT_SEASCAPE
-: <a class="el" href="gutenprintui_8h.html#a62a6">gutenprintui.h</a><li>ORIENT_UPSIDEDOWN
-: <a class="el" href="gutenprintui_8h.html#a62a5">gutenprintui.h</a><li>STPUI_CURVE_TYPE_FREE
-: <a class="el" href="curve_8h.html#a19a10">curve.h</a><li>STPUI_CURVE_TYPE_LINEAR
-: <a class="el" href="curve_8h.html#a19a8">curve.h</a><li>STPUI_CURVE_TYPE_SPLINE
-: <a class="el" href="curve_8h.html#a19a9">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+: <a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10cb7cf14821d9fcbaa983ee33d7b8e926">gutenprintui.h</a>
+<li>COMMAND_TYPE_DEFAULT
+: <a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10a6a7840c2276bfe38dd68b4fe3a8babf">gutenprintui.h</a>
+<li>COMMAND_TYPE_FILE
+: <a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee105e9a887a5dab88a425cb52c8b1e49a7f">gutenprintui.h</a>
+<li>ORIENT_AUTO
+: <a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a006af5eabe5d18a247c02641283fe4481">gutenprintui.h</a>
+<li>ORIENT_LANDSCAPE
+: <a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a04dc9735e5b3e4c86b60141acc08e5db1">gutenprintui.h</a>
+<li>ORIENT_PORTRAIT
+: <a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a0f81c23cf1763365fba8e36db87131ff5">gutenprintui.h</a>
+<li>ORIENT_SEASCAPE
+: <a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a07de33495add2d66cc743f2edcbb548e3">gutenprintui.h</a>
+<li>ORIENT_UPSIDEDOWN
+: <a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a03ca76babc9953cc92305856ac00a2350">gutenprintui.h</a>
+<li>STPUI_CURVE_TYPE_FREE
+: <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b1a204ef2d450d762415a1c0c1c77db89">curve.h</a>
+<li>STPUI_CURVE_TYPE_LINEAR
+: <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b741f86dc6dfb50a67dd621a287014de1">curve.h</a>
+<li>STPUI_CURVE_TYPE_SPLINE
+: <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b6cef8a118ee2829db63f812874a412c1">curve.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_func.html b/doc/gutenprintui2/html/globals_func.html
index 0b9edef..451c7ab 100644
--- a/doc/gutenprintui2/html/globals_func.html
+++ b/doc/gutenprintui2/html/globals_func.html
@@ -1,89 +1,182 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindexHL" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_o">o</a> | <a class="qindex" href="#index_s">s</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li class="current"><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index_c"><span>c</span></a></li>
+    <li><a href="#index_o"><span>o</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+  </ul>
+</div>
 
 <p>
-
+&nbsp;
 <p>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>command_t_command_t_get_type()
-: <a class="el" href="typebuiltins_8h.html#a4">typebuiltins.h</a></ul>
+: <a class="el" href="typebuiltins_8h.html#5e6b50173b88263be23734e76f4a39f2">typebuiltins.h</a>
+</ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>orient_t_orient_t_get_type()
-: <a class="el" href="typebuiltins_8h.html#a3">typebuiltins.h</a></ul>
+: <a class="el" href="typebuiltins_8h.html#b05fb37a6c79f2b6b417ff107d9bb881">typebuiltins.h</a>
+</ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>stpui_build_standard_print_command()
-: <a class="el" href="gutenprintui_8h.html#a38">gutenprintui.h</a><li>stpui_compute_orientation()
-: <a class="el" href="gutenprintui_8h.html#a51">gutenprintui.h</a><li>stpui_curve_get_type()
-: <a class="el" href="curve_8h.html#a11">curve.h</a><li>stpui_curve_get_vector()
-: <a class="el" href="curve_8h.html#a16">curve.h</a><li>stpui_curve_new()
-: <a class="el" href="curve_8h.html#a12">curve.h</a><li>stpui_curve_reset()
-: <a class="el" href="curve_8h.html#a13">curve.h</a><li>stpui_curve_set_curve_type()
-: <a class="el" href="curve_8h.html#a18">curve.h</a><li>stpui_curve_set_gamma()
-: <a class="el" href="curve_8h.html#a14">curve.h</a><li>stpui_curve_set_range()
-: <a class="el" href="curve_8h.html#a15">curve.h</a><li>stpui_curve_set_vector()
-: <a class="el" href="curve_8h.html#a17">curve.h</a><li>stpui_curve_type_get_type()
-: <a class="el" href="typebuiltins_8h.html#a5">typebuiltins.h</a><li>stpui_do_print_dialog()
-: <a class="el" href="gutenprintui_8h.html#a50">gutenprintui.h</a><li>stpui_gamma_curve_get_type()
-: <a class="el" href="gammacurve_8h.html#a8">gammacurve.h</a><li>stpui_gamma_curve_new()
-: <a class="el" href="gammacurve_8h.html#a9">gammacurve.h</a><li>stpui_get_current_printer()
-: <a class="el" href="gutenprintui_8h.html#a37">gutenprintui.h</a><li>stpui_get_errdata()
-: <a class="el" href="gutenprintui_8h.html#a49">gutenprintui.h</a><li>stpui_get_errfunc()
-: <a class="el" href="gutenprintui_8h.html#a47">gutenprintui.h</a><li>stpui_get_global_parameter()
-: <a class="el" href="gutenprintui_8h.html#a33">gutenprintui.h</a><li>stpui_get_image_filename()
-: <a class="el" href="gutenprintui_8h.html#a45">gutenprintui.h</a><li>stpui_get_printrc_file()
-: <a class="el" href="gutenprintui_8h.html#a40">gutenprintui.h</a><li>stpui_get_system_printers()
-: <a class="el" href="gutenprintui_8h.html#a42">gutenprintui.h</a><li>stpui_get_thumbnail_data()
-: <a class="el" href="gutenprintui_8h.html#a60">gutenprintui.h</a><li>stpui_get_thumbnail_func()
-: <a class="el" href="gutenprintui_8h.html#a58">gutenprintui.h</a><li>stpui_plist_add()
-: <a class="el" href="gutenprintui_8h.html#a35">gutenprintui.h</a><li>stpui_plist_copy()
-: <a class="el" href="gutenprintui_8h.html#a34">gutenprintui.h</a><li>stpui_plist_get_command_type()
-: <a class="el" href="gutenprintui_8h.html#a31">gutenprintui.h</a><li>stpui_plist_get_copy_count()
-: <a class="el" href="gutenprintui_8h.html#a26">gutenprintui.h</a><li>stpui_plist_get_current_standard_command()
-: <a class="el" href="gutenprintui_8h.html#a29">gutenprintui.h</a><li>stpui_plist_get_custom_command()
-: <a class="el" href="gutenprintui_8h.html#a24">gutenprintui.h</a><li>stpui_plist_get_extra_printer_options()
-: <a class="el" href="gutenprintui_8h.html#a21">gutenprintui.h</a><li>stpui_plist_get_name()
-: <a class="el" href="gutenprintui_8h.html#a12">gutenprintui.h</a><li>stpui_plist_get_output_filename()
-: <a class="el" href="gutenprintui_8h.html#a18">gutenprintui.h</a><li>stpui_plist_get_queue_name()
-: <a class="el" href="gutenprintui_8h.html#a15">gutenprintui.h</a><li>stpui_plist_set_command_type()
-: <a class="el" href="gutenprintui_8h.html#a30">gutenprintui.h</a><li>stpui_plist_set_copy_count()
-: <a class="el" href="gutenprintui_8h.html#a25">gutenprintui.h</a><li>stpui_plist_set_current_standard_command()
-: <a class="el" href="gutenprintui_8h.html#a27">gutenprintui.h</a><li>stpui_plist_set_current_standard_command_n()
-: <a class="el" href="gutenprintui_8h.html#a28">gutenprintui.h</a><li>stpui_plist_set_custom_command()
-: <a class="el" href="gutenprintui_8h.html#a22">gutenprintui.h</a><li>stpui_plist_set_custom_command_n()
-: <a class="el" href="gutenprintui_8h.html#a23">gutenprintui.h</a><li>stpui_plist_set_extra_printer_options()
-: <a class="el" href="gutenprintui_8h.html#a19">gutenprintui.h</a><li>stpui_plist_set_extra_printer_options_n()
-: <a class="el" href="gutenprintui_8h.html#a20">gutenprintui.h</a><li>stpui_plist_set_name()
-: <a class="el" href="gutenprintui_8h.html#a10">gutenprintui.h</a><li>stpui_plist_set_name_n()
-: <a class="el" href="gutenprintui_8h.html#a11">gutenprintui.h</a><li>stpui_plist_set_output_filename()
-: <a class="el" href="gutenprintui_8h.html#a16">gutenprintui.h</a><li>stpui_plist_set_output_filename_n()
-: <a class="el" href="gutenprintui_8h.html#a17">gutenprintui.h</a><li>stpui_plist_set_queue_name()
-: <a class="el" href="gutenprintui_8h.html#a13">gutenprintui.h</a><li>stpui_plist_set_queue_name_n()
-: <a class="el" href="gutenprintui_8h.html#a14">gutenprintui.h</a><li>stpui_print()
-: <a class="el" href="gutenprintui_8h.html#a61">gutenprintui.h</a><li>stpui_printer_initialize()
-: <a class="el" href="gutenprintui_8h.html#a36">gutenprintui.h</a><li>stpui_printrc_load()
-: <a class="el" href="gutenprintui_8h.html#a41">gutenprintui.h</a><li>stpui_printrc_save()
-: <a class="el" href="gutenprintui_8h.html#a43">gutenprintui.h</a><li>stpui_set_errdata()
-: <a class="el" href="gutenprintui_8h.html#a48">gutenprintui.h</a><li>stpui_set_errfunc()
-: <a class="el" href="gutenprintui_8h.html#a46">gutenprintui.h</a><li>stpui_set_global_parameter()
-: <a class="el" href="gutenprintui_8h.html#a32">gutenprintui.h</a><li>stpui_set_image_channel_depth()
-: <a class="el" href="gutenprintui_8h.html#a56">gutenprintui.h</a><li>stpui_set_image_dimensions()
-: <a class="el" href="gutenprintui_8h.html#a52">gutenprintui.h</a><li>stpui_set_image_filename()
-: <a class="el" href="gutenprintui_8h.html#a44">gutenprintui.h</a><li>stpui_set_image_raw_channels()
-: <a class="el" href="gutenprintui_8h.html#a55">gutenprintui.h</a><li>stpui_set_image_resolution()
-: <a class="el" href="gutenprintui_8h.html#a53">gutenprintui.h</a><li>stpui_set_image_type()
-: <a class="el" href="gutenprintui_8h.html#a54">gutenprintui.h</a><li>stpui_set_printrc_file()
-: <a class="el" href="gutenprintui_8h.html#a39">gutenprintui.h</a><li>stpui_set_thumbnail_data()
-: <a class="el" href="gutenprintui_8h.html#a59">gutenprintui.h</a><li>stpui_set_thumbnail_func()
-: <a class="el" href="gutenprintui_8h.html#a57">gutenprintui.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+: <a class="el" href="gutenprintui_8h.html#97f0f11c41859d80d9bb3803f81a671f">gutenprintui.h</a>
+<li>stpui_compute_orientation()
+: <a class="el" href="gutenprintui_8h.html#6932b380986d06d6dd7671439aaf93a0">gutenprintui.h</a>
+<li>stpui_curve_get_type()
+: <a class="el" href="curve_8h.html#233b21367f03cd5ba884d4e3c742c8d2">curve.h</a>
+<li>stpui_curve_get_vector()
+: <a class="el" href="curve_8h.html#43799d3f187018958cb78ece053dadda">curve.h</a>
+<li>stpui_curve_new()
+: <a class="el" href="curve_8h.html#cbdc99aaef1f5672d0294d9742fdc398">curve.h</a>
+<li>stpui_curve_reset()
+: <a class="el" href="curve_8h.html#466fe70debd1a7eca3988f91a109009f">curve.h</a>
+<li>stpui_curve_set_curve_type()
+: <a class="el" href="curve_8h.html#196839b2b6e39ae4bd5ccc9aad4ff8f7">curve.h</a>
+<li>stpui_curve_set_gamma()
+: <a class="el" href="curve_8h.html#956d80d857cf5927768a38103d8af705">curve.h</a>
+<li>stpui_curve_set_range()
+: <a class="el" href="curve_8h.html#d4dcd042b1e50672781895d886adad66">curve.h</a>
+<li>stpui_curve_set_vector()
+: <a class="el" href="curve_8h.html#be1c943341872697e6219d7053db2804">curve.h</a>
+<li>stpui_curve_type_get_type()
+: <a class="el" href="typebuiltins_8h.html#1252245c3967f9e655de3d62c3999230">typebuiltins.h</a>
+<li>stpui_do_print_dialog()
+: <a class="el" href="gutenprintui_8h.html#ac1066fa59dc8a04b90415994587ec1a">gutenprintui.h</a>
+<li>stpui_gamma_curve_get_type()
+: <a class="el" href="gammacurve_8h.html#e52edc31b54a94c1e4e106f1966af6e4">gammacurve.h</a>
+<li>stpui_gamma_curve_new()
+: <a class="el" href="gammacurve_8h.html#39433a30aa8d9b5a4e3fd1aa4176eb2f">gammacurve.h</a>
+<li>stpui_get_current_printer()
+: <a class="el" href="gutenprintui_8h.html#26ebbd1948a457740cd75ff630969487">gutenprintui.h</a>
+<li>stpui_get_errdata()
+: <a class="el" href="gutenprintui_8h.html#15368f674e52b511ad665cb2be45576c">gutenprintui.h</a>
+<li>stpui_get_errfunc()
+: <a class="el" href="gutenprintui_8h.html#da3d388496b4b7d689f4cf8a957c75b2">gutenprintui.h</a>
+<li>stpui_get_global_parameter()
+: <a class="el" href="gutenprintui_8h.html#28c71e75188d60a243755deaab31b5fd">gutenprintui.h</a>
+<li>stpui_get_image_filename()
+: <a class="el" href="gutenprintui_8h.html#8bc64271197449021140ce2d17ad71e2">gutenprintui.h</a>
+<li>stpui_get_printrc_file()
+: <a class="el" href="gutenprintui_8h.html#8faab74e1f9c2b372efa56ae6fea713e">gutenprintui.h</a>
+<li>stpui_get_system_printers()
+: <a class="el" href="gutenprintui_8h.html#da642fd5eeff02d4c6b84d3125ca2da2">gutenprintui.h</a>
+<li>stpui_get_thumbnail_data()
+: <a class="el" href="gutenprintui_8h.html#ee04dfc45b26093bd65d3025b817cfd5">gutenprintui.h</a>
+<li>stpui_get_thumbnail_func()
+: <a class="el" href="gutenprintui_8h.html#74c1f441bf3fbb2198cf4cbaca8c23ef">gutenprintui.h</a>
+<li>stpui_plist_add()
+: <a class="el" href="gutenprintui_8h.html#b2e655748deab72a24c25bfaf4ee9052">gutenprintui.h</a>
+<li>stpui_plist_copy()
+: <a class="el" href="gutenprintui_8h.html#01db968552106a84a49f76d7203bd3f5">gutenprintui.h</a>
+<li>stpui_plist_get_command_type()
+: <a class="el" href="gutenprintui_8h.html#3c9ed1191c6a03edba14f7b98d03ef55">gutenprintui.h</a>
+<li>stpui_plist_get_copy_count()
+: <a class="el" href="gutenprintui_8h.html#7d4511d9e9c69136fabf9f9c64734c51">gutenprintui.h</a>
+<li>stpui_plist_get_current_standard_command()
+: <a class="el" href="gutenprintui_8h.html#fdc574a731f6697c3e48c6001a51b3af">gutenprintui.h</a>
+<li>stpui_plist_get_custom_command()
+: <a class="el" href="gutenprintui_8h.html#bc624051678aac91a2ffa6c7c5393b8d">gutenprintui.h</a>
+<li>stpui_plist_get_extra_printer_options()
+: <a class="el" href="gutenprintui_8h.html#4956cdd55680ed20a92e991d4cf52ee8">gutenprintui.h</a>
+<li>stpui_plist_get_name()
+: <a class="el" href="gutenprintui_8h.html#342817c9f4311f0ac827c94b0e62cbbb">gutenprintui.h</a>
+<li>stpui_plist_get_output_filename()
+: <a class="el" href="gutenprintui_8h.html#856c534e664748c9a419104357312dfd">gutenprintui.h</a>
+<li>stpui_plist_get_queue_name()
+: <a class="el" href="gutenprintui_8h.html#acf031afbe7e9682f7367f1ae0ef1895">gutenprintui.h</a>
+<li>stpui_plist_set_command_type()
+: <a class="el" href="gutenprintui_8h.html#a920697330124635ca464662caf975d5">gutenprintui.h</a>
+<li>stpui_plist_set_copy_count()
+: <a class="el" href="gutenprintui_8h.html#02092bb706d3770870ed5f64efb1ea2a">gutenprintui.h</a>
+<li>stpui_plist_set_current_standard_command()
+: <a class="el" href="gutenprintui_8h.html#79e27ac73e0f082abcdde41ee76879ce">gutenprintui.h</a>
+<li>stpui_plist_set_current_standard_command_n()
+: <a class="el" href="gutenprintui_8h.html#a405ef9e03818fedcff5746b9701c3c3">gutenprintui.h</a>
+<li>stpui_plist_set_custom_command()
+: <a class="el" href="gutenprintui_8h.html#f127a39a7ea466ca73e5a511f36ae985">gutenprintui.h</a>
+<li>stpui_plist_set_custom_command_n()
+: <a class="el" href="gutenprintui_8h.html#567c7c6c13930e398def69f2829bd038">gutenprintui.h</a>
+<li>stpui_plist_set_extra_printer_options()
+: <a class="el" href="gutenprintui_8h.html#72ee8e1bb9bee2e13c15a9aecd9582bd">gutenprintui.h</a>
+<li>stpui_plist_set_extra_printer_options_n()
+: <a class="el" href="gutenprintui_8h.html#9899c88da60069b72d7ddb601bcad548">gutenprintui.h</a>
+<li>stpui_plist_set_name()
+: <a class="el" href="gutenprintui_8h.html#f54293f58c474e133e4a60054779c9be">gutenprintui.h</a>
+<li>stpui_plist_set_name_n()
+: <a class="el" href="gutenprintui_8h.html#90a9ed90e03acd443d08350a62aa3762">gutenprintui.h</a>
+<li>stpui_plist_set_output_filename()
+: <a class="el" href="gutenprintui_8h.html#248eae3ae0a96506fa8c92807f70d457">gutenprintui.h</a>
+<li>stpui_plist_set_output_filename_n()
+: <a class="el" href="gutenprintui_8h.html#ea9ddb061703368f7ea1e3b861b8550d">gutenprintui.h</a>
+<li>stpui_plist_set_queue_name()
+: <a class="el" href="gutenprintui_8h.html#8a4fa7000900cb4813000048c322dcdb">gutenprintui.h</a>
+<li>stpui_plist_set_queue_name_n()
+: <a class="el" href="gutenprintui_8h.html#ec75fb2ec25a5a69d270d70ea33c81eb">gutenprintui.h</a>
+<li>stpui_print()
+: <a class="el" href="gutenprintui_8h.html#1ffdddfb6efd3353d403192b2b2c1e20">gutenprintui.h</a>
+<li>stpui_printer_initialize()
+: <a class="el" href="gutenprintui_8h.html#54daa32f5d5d64c644131570eab01c2b">gutenprintui.h</a>
+<li>stpui_printrc_load()
+: <a class="el" href="gutenprintui_8h.html#54f67bb1819c7135a0ca1f005a22d28b">gutenprintui.h</a>
+<li>stpui_printrc_save()
+: <a class="el" href="gutenprintui_8h.html#8c4bddac236a6557ec126fd659ceade0">gutenprintui.h</a>
+<li>stpui_set_errdata()
+: <a class="el" href="gutenprintui_8h.html#d013cb96f40b5da4bca5dd9485aaa213">gutenprintui.h</a>
+<li>stpui_set_errfunc()
+: <a class="el" href="gutenprintui_8h.html#cc06b85ae6af8ca0003584da411213fb">gutenprintui.h</a>
+<li>stpui_set_global_parameter()
+: <a class="el" href="gutenprintui_8h.html#eb3ea1fd028cb28211bac9e88f9ca8ac">gutenprintui.h</a>
+<li>stpui_set_image_channel_depth()
+: <a class="el" href="gutenprintui_8h.html#845898656d91fbf462db9c9b3e7c976f">gutenprintui.h</a>
+<li>stpui_set_image_dimensions()
+: <a class="el" href="gutenprintui_8h.html#a52f1b5d60ea21d09cfbab998df7ff33">gutenprintui.h</a>
+<li>stpui_set_image_filename()
+: <a class="el" href="gutenprintui_8h.html#701289a198a313c5b6758ab1cd678c58">gutenprintui.h</a>
+<li>stpui_set_image_raw_channels()
+: <a class="el" href="gutenprintui_8h.html#0d40ca93fed8c7d10dcc516e6fb61ea1">gutenprintui.h</a>
+<li>stpui_set_image_resolution()
+: <a class="el" href="gutenprintui_8h.html#3fa4a6d1300a470016744badf81daa43">gutenprintui.h</a>
+<li>stpui_set_image_type()
+: <a class="el" href="gutenprintui_8h.html#7b2f104989fb67ca20e1b9874e047293">gutenprintui.h</a>
+<li>stpui_set_printrc_file()
+: <a class="el" href="gutenprintui_8h.html#443905f09bfd6cad7fd06aa029ac306c">gutenprintui.h</a>
+<li>stpui_set_thumbnail_data()
+: <a class="el" href="gutenprintui_8h.html#965e5950073e3ef6775f3355556517f6">gutenprintui.h</a>
+<li>stpui_set_thumbnail_func()
+: <a class="el" href="gutenprintui_8h.html#fcaf0ce6ff01c073cdfb2d2f80ede234">gutenprintui.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_type.html b/doc/gutenprintui2/html/globals_type.html
index 0c48088..6f2dad0 100644
--- a/doc/gutenprintui2/html/globals_type.html
+++ b/doc/gutenprintui2/html/globals_type.html
@@ -1,23 +1,51 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindexHL" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li class="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li class="current"><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+&nbsp;
 <p>
 <ul>
 <li>get_thumbnail_func_t
-: <a class="el" href="gutenprintui_8h.html#a1">gutenprintui.h</a><li>stpui_image_t
-: <a class="el" href="gutenprintui_8h.html#a0">gutenprintui.h</a><li>StpuiCurve
-: <a class="el" href="curve_8h.html#a6">curve.h</a><li>StpuiCurveClass
-: <a class="el" href="curve_8h.html#a7">curve.h</a><li>StpuiGammaCurve
-: <a class="el" href="gammacurve_8h.html#a6">gammacurve.h</a><li>StpuiGammaCurveClass
-: <a class="el" href="gammacurve_8h.html#a7">gammacurve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+: <a class="el" href="gutenprintui_8h.html#4ab1da499b20816c28d1b26c61652c1d">gutenprintui.h</a>
+<li>stpui_image_t
+: <a class="el" href="gutenprintui_8h.html#195aac96c77c6de3925cd3d13c6ce2f1">gutenprintui.h</a>
+<li>StpuiCurve
+: <a class="el" href="curve_8h.html#5c0213fede0b7d8a91b66e4679cc899a">curve.h</a>
+<li>StpuiCurveClass
+: <a class="el" href="curve_8h.html#057f1c40a70e84c7a187b423ebe4aada">curve.h</a>
+<li>StpuiGammaCurve
+: <a class="el" href="gammacurve_8h.html#16a893a0c5c5908d5db1a36c91590d6c">gammacurve.h</a>
+<li>StpuiGammaCurveClass
+: <a class="el" href="gammacurve_8h.html#ec66cf466c32b2ead30a56c3fb1a3e09">gammacurve.h</a>
+</ul>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/gutenprintui_8h.html b/doc/gutenprintui2/html/gutenprintui_8h.html
index 178e3cf..ced8f34 100644
--- a/doc/gutenprintui2/html/gutenprintui_8h.html
+++ b/doc/gutenprintui2/html/gutenprintui_8h.html
@@ -1,13 +1,24 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: include/gutenprintui2/gutenprintui.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprintui2</a></div>
-<h1>gutenprintui.h File Reference</h1><code>#include &lt;gtk/gtk.h&gt;</code><br>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprintui2/gutenprintui.h File Reference</h1><code>#include &lt;gtk/gtk.h&gt;</code><br>
 <code>#include &lt;gutenprint/gutenprint.h&gt;</code><br>
 <code>#include &lt;<a class="el" href="curve_8h.html">gutenprintui2/curve.h</a>&gt;</code><br>
 <code>#include &lt;<a class="el" href="gammacurve_8h.html">gutenprintui2/gammacurve.h</a>&gt;</code><br>
@@ -20,1934 +31,1486 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html">stpui_image</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstpui__image.html">stpui_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a0">stpui_image_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstpui__image.html">stpui_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#195aac96c77c6de3925cd3d13c6ce2f1">stpui_image_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef guchar *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a1">get_thumbnail_func_t</a> )(void *data, gint *width, gint *height, gint *bpp, gint page)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef guchar *(*)&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#4ab1da499b20816c28d1b26c61652c1d">get_thumbnail_func_t</a> (void *data, gint *width, gint *height, gint *bpp, gint page)</td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a62">orient_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="gutenprintui_8h.html#a62a2">ORIENT_AUTO</a> =  -1, 
-<a class="el" href="gutenprintui_8h.html#a62a3">ORIENT_PORTRAIT</a> =  0, 
-<a class="el" href="gutenprintui_8h.html#a62a4">ORIENT_LANDSCAPE</a> =  1, 
-<a class="el" href="gutenprintui_8h.html#a62a5">ORIENT_UPSIDEDOWN</a> =  2, 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a0">orient_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a006af5eabe5d18a247c02641283fe4481">ORIENT_AUTO</a> =  -1, 
+<a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a0f81c23cf1763365fba8e36db87131ff5">ORIENT_PORTRAIT</a> =  0, 
+<a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a04dc9735e5b3e4c86b60141acc08e5db1">ORIENT_LANDSCAPE</a> =  1, 
+<a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a03ca76babc9953cc92305856ac00a2350">ORIENT_UPSIDEDOWN</a> =  2, 
 <br>
-&nbsp;&nbsp;<a class="el" href="gutenprintui_8h.html#a62a6">ORIENT_SEASCAPE</a> =  3
+&nbsp;&nbsp;<a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a07de33495add2d66cc743f2edcbb548e3">ORIENT_SEASCAPE</a> =  3
 <br>
  }</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a63">command_t</a> { <a class="el" href="gutenprintui_8h.html#a63a7">COMMAND_TYPE_DEFAULT</a>, 
-<a class="el" href="gutenprintui_8h.html#a63a8">COMMAND_TYPE_CUSTOM</a>, 
-<a class="el" href="gutenprintui_8h.html#a63a9">COMMAND_TYPE_FILE</a>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10">command_t</a> { <a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10a6a7840c2276bfe38dd68b4fe3a8babf">COMMAND_TYPE_DEFAULT</a>, 
+<a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10cb7cf14821d9fcbaa983ee33d7b8e926">COMMAND_TYPE_CUSTOM</a>, 
+<a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee105e9a887a5dab88a425cb52c8b1e49a7f">COMMAND_TYPE_FILE</a>
  }</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a10">stpui_plist_set_name</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#f54293f58c474e133e4a60054779c9be">stpui_plist_set_name</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a11">stpui_plist_set_name_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#90a9ed90e03acd443d08350a62aa3762">stpui_plist_set_name_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a12">stpui_plist_get_name</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#342817c9f4311f0ac827c94b0e62cbbb">stpui_plist_get_name</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a13">stpui_plist_set_queue_name</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#8a4fa7000900cb4813000048c322dcdb">stpui_plist_set_queue_name</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a14">stpui_plist_set_queue_name_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ec75fb2ec25a5a69d270d70ea33c81eb">stpui_plist_set_queue_name_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a15">stpui_plist_get_queue_name</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#acf031afbe7e9682f7367f1ae0ef1895">stpui_plist_get_queue_name</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a16">stpui_plist_set_output_filename</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#248eae3ae0a96506fa8c92807f70d457">stpui_plist_set_output_filename</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a17">stpui_plist_set_output_filename_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ea9ddb061703368f7ea1e3b861b8550d">stpui_plist_set_output_filename_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a18">stpui_plist_get_output_filename</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#856c534e664748c9a419104357312dfd">stpui_plist_get_output_filename</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a19">stpui_plist_set_extra_printer_options</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#72ee8e1bb9bee2e13c15a9aecd9582bd">stpui_plist_set_extra_printer_options</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a20">stpui_plist_set_extra_printer_options_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#9899c88da60069b72d7ddb601bcad548">stpui_plist_set_extra_printer_options_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a21">stpui_plist_get_extra_printer_options</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#4956cdd55680ed20a92e991d4cf52ee8">stpui_plist_get_extra_printer_options</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a22">stpui_plist_set_custom_command</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#f127a39a7ea466ca73e5a511f36ae985">stpui_plist_set_custom_command</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a23">stpui_plist_set_custom_command_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#567c7c6c13930e398def69f2829bd038">stpui_plist_set_custom_command_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a24">stpui_plist_get_custom_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#bc624051678aac91a2ffa6c7c5393b8d">stpui_plist_get_custom_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a25">stpui_plist_set_copy_count</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, gint count)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#02092bb706d3770870ed5f64efb1ea2a">stpui_plist_set_copy_count</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, gint count)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a26">stpui_plist_get_copy_count</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#7d4511d9e9c69136fabf9f9c64734c51">stpui_plist_get_copy_count</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a27">stpui_plist_set_current_standard_command</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#79e27ac73e0f082abcdde41ee76879ce">stpui_plist_set_current_standard_command</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a28">stpui_plist_set_current_standard_command_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a405ef9e03818fedcff5746b9701c3c3">stpui_plist_set_current_standard_command_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a29">stpui_plist_get_current_standard_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#fdc574a731f6697c3e48c6001a51b3af">stpui_plist_get_current_standard_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a30">stpui_plist_set_command_type</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, <a class="el" href="gutenprintui_8h.html#a63">command_t</a> val)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a920697330124635ca464662caf975d5">stpui_plist_set_command_type</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, <a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10">command_t</a> val)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="gutenprintui_8h.html#a63">command_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a31">stpui_plist_get_command_type</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10">command_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#3c9ed1191c6a03edba14f7b98d03ef55">stpui_plist_get_command_type</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a32">stpui_set_global_parameter</a> (const char *param, const char *value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#eb3ea1fd028cb28211bac9e88f9ca8ac">stpui_set_global_parameter</a> (const char *param, const char *value)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a33">stpui_get_global_parameter</a> (const char *param)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#28c71e75188d60a243755deaab31b5fd">stpui_get_global_parameter</a> (const char *param)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a34">stpui_plist_copy</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *vd, const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *vs)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#01db968552106a84a49f76d7203bd3f5">stpui_plist_copy</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *vd, const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *vs)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a35">stpui_plist_add</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *key, int add_only)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#b2e655748deab72a24c25bfaf4ee9052">stpui_plist_add</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *key, int add_only)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a36">stpui_printer_initialize</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *printer)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#54daa32f5d5d64c644131570eab01c2b">stpui_printer_initialize</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *printer)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a37">stpui_get_current_printer</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#26ebbd1948a457740cd75ff630969487">stpui_get_current_printer</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a38">stpui_build_standard_print_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *plist, const stp_printer_t *printer)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#97f0f11c41859d80d9bb3803f81a671f">stpui_build_standard_print_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *plist, const stp_printer_t *printer)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a39">stpui_set_printrc_file</a> (const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#443905f09bfd6cad7fd06aa029ac306c">stpui_set_printrc_file</a> (const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a40">stpui_get_printrc_file</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#8faab74e1f9c2b372efa56ae6fea713e">stpui_get_printrc_file</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a41">stpui_printrc_load</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#54f67bb1819c7135a0ca1f005a22d28b">stpui_printrc_load</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a42">stpui_get_system_printers</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#da642fd5eeff02d4c6b84d3125ca2da2">stpui_get_system_printers</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a43">stpui_printrc_save</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#8c4bddac236a6557ec126fd659ceade0">stpui_printrc_save</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a44">stpui_set_image_filename</a> (const char *)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#701289a198a313c5b6758ab1cd678c58">stpui_set_image_filename</a> (const char *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a45">stpui_get_image_filename</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#8bc64271197449021140ce2d17ad71e2">stpui_get_image_filename</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a46">stpui_set_errfunc</a> (stp_outfunc_t wfunc)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#cc06b85ae6af8ca0003584da411213fb">stpui_set_errfunc</a> (stp_outfunc_t wfunc)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">stp_outfunc_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a47">stpui_get_errfunc</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">stp_outfunc_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#da3d388496b4b7d689f4cf8a957c75b2">stpui_get_errfunc</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a48">stpui_set_errdata</a> (void *errdata)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#d013cb96f40b5da4bca5dd9485aaa213">stpui_set_errdata</a> (void *errdata)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a49">stpui_get_errdata</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#15368f674e52b511ad665cb2be45576c">stpui_get_errdata</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a50">stpui_do_print_dialog</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ac1066fa59dc8a04b90415994587ec1a">stpui_do_print_dialog</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a51">stpui_compute_orientation</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#6932b380986d06d6dd7671439aaf93a0">stpui_compute_orientation</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a52">stpui_set_image_dimensions</a> (gint width, gint height)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a52f1b5d60ea21d09cfbab998df7ff33">stpui_set_image_dimensions</a> (gint width, gint height)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a53">stpui_set_image_resolution</a> (gdouble xres, gdouble yres)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#3fa4a6d1300a470016744badf81daa43">stpui_set_image_resolution</a> (gdouble xres, gdouble yres)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a54">stpui_set_image_type</a> (const char *image_type)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#7b2f104989fb67ca20e1b9874e047293">stpui_set_image_type</a> (const char *image_type)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a55">stpui_set_image_raw_channels</a> (gint channels)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#0d40ca93fed8c7d10dcc516e6fb61ea1">stpui_set_image_raw_channels</a> (gint channels)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a56">stpui_set_image_channel_depth</a> (gint bit_depth)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#845898656d91fbf462db9c9b3e7c976f">stpui_set_image_channel_depth</a> (gint bit_depth)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a57">stpui_set_thumbnail_func</a> (<a class="el" href="gutenprintui_8h.html#a1">get_thumbnail_func_t</a>)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#fcaf0ce6ff01c073cdfb2d2f80ede234">stpui_set_thumbnail_func</a> (<a class="el" href="gutenprintui_8h.html#4ab1da499b20816c28d1b26c61652c1d">get_thumbnail_func_t</a>)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="gutenprintui_8h.html#a1">get_thumbnail_func_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a58">stpui_get_thumbnail_func</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="gutenprintui_8h.html#4ab1da499b20816c28d1b26c61652c1d">get_thumbnail_func_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#74c1f441bf3fbb2198cf4cbaca8c23ef">stpui_get_thumbnail_func</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a59">stpui_set_thumbnail_data</a> (void *)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#965e5950073e3ef6775f3355556517f6">stpui_set_thumbnail_data</a> (void *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a60">stpui_get_thumbnail_data</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ee04dfc45b26093bd65d3025b817cfd5">stpui_get_thumbnail_data</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a61">stpui_print</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *printer, <a class="el" href="structstpui__image.html">stpui_image_t</a> *im)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#1ffdddfb6efd3353d403192b2b2c1e20">stpui_print</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *printer, <a class="el" href="structstpui__image.html">stpui_image_t</a> *im)</td></tr>
 
 </table>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a1"></a><!-- doxytag: member="gutenprintui.h::get_thumbnail_func_t" ref="a1" args=")(void *data, gint *width, gint *height, gint *bpp, gint page)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="4ab1da499b20816c28d1b26c61652c1d"></a><!-- doxytag: member="gutenprintui.h::get_thumbnail_func_t" ref="4ab1da499b20816c28d1b26c61652c1d" args="(void *data, gint *width, gint *height, gint *bpp, gint page)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef guchar*(* <a class="el" href="gutenprintui_8h.html#a1">get_thumbnail_func_t</a>)(void *data, gint *width, gint *height, gint *bpp, gint page)          </td>
+          <td class="memname">typedef guchar*(*) <a class="el" href="gutenprintui_8h.html#4ab1da499b20816c28d1b26c61652c1d">get_thumbnail_func_t</a>(void *data, gint *width, gint *height, gint *bpp, gint page)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="gutenprintui.h::stpui_image_t" ref="a0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="195aac96c77c6de3925cd3d13c6ce2f1"></a><!-- doxytag: member="gutenprintui.h::stpui_image_t" ref="195aac96c77c6de3925cd3d13c6ce2f1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct <a class="el" href="structstpui__image.html">stpui_image</a>  <a class="el" href="structstpui__image.html">stpui_image_t</a>          </td>
+          <td class="memname">typedef struct <a class="el" href="structstpui__image.html">stpui_image</a>  <a class="el" href="structstpui__image.html">stpui_image_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="a63"></a><!-- doxytag: member="gutenprintui.h::command_t" ref="a63" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="b31350eb38b009cbd282027630a1ee10"></a><!-- doxytag: member="gutenprintui.h::command_t" ref="b31350eb38b009cbd282027630a1ee10" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="gutenprintui_8h.html#a63">command_t</a>          </td>
+          <td class="memname">enum <a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10">command_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="a63a7"></a><!-- doxytag: member="COMMAND_TYPE_DEFAULT" ref="a63a7" args="" -->COMMAND_TYPE_DEFAULT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="b31350eb38b009cbd282027630a1ee10a6a7840c2276bfe38dd68b4fe3a8babf"></a><!-- doxytag: member="COMMAND_TYPE_DEFAULT" ref="b31350eb38b009cbd282027630a1ee10a6a7840c2276bfe38dd68b4fe3a8babf" args="" -->COMMAND_TYPE_DEFAULT</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a63a8"></a><!-- doxytag: member="COMMAND_TYPE_CUSTOM" ref="a63a8" args="" -->COMMAND_TYPE_CUSTOM</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="b31350eb38b009cbd282027630a1ee10cb7cf14821d9fcbaa983ee33d7b8e926"></a><!-- doxytag: member="COMMAND_TYPE_CUSTOM" ref="b31350eb38b009cbd282027630a1ee10cb7cf14821d9fcbaa983ee33d7b8e926" args="" -->COMMAND_TYPE_CUSTOM</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a63a9"></a><!-- doxytag: member="COMMAND_TYPE_FILE" ref="a63a9" args="" -->COMMAND_TYPE_FILE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="b31350eb38b009cbd282027630a1ee105e9a887a5dab88a425cb52c8b1e49a7f"></a><!-- doxytag: member="COMMAND_TYPE_FILE" ref="b31350eb38b009cbd282027630a1ee105e9a887a5dab88a425cb52c8b1e49a7f" args="" -->COMMAND_TYPE_FILE</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a62"></a><!-- doxytag: member="gutenprintui.h::orient_t" ref="a62" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="c33232f845969eb04b32e1006c8240a0"></a><!-- doxytag: member="gutenprintui.h::orient_t" ref="c33232f845969eb04b32e1006c8240a0" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="gutenprintui_8h.html#a62">orient_t</a>          </td>
+          <td class="memname">enum <a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a0">orient_t</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="a62a2"></a><!-- doxytag: member="ORIENT_AUTO" ref="a62a2" args="" -->ORIENT_AUTO</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="c33232f845969eb04b32e1006c8240a006af5eabe5d18a247c02641283fe4481"></a><!-- doxytag: member="ORIENT_AUTO" ref="c33232f845969eb04b32e1006c8240a006af5eabe5d18a247c02641283fe4481" args="" -->ORIENT_AUTO</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a62a3"></a><!-- doxytag: member="ORIENT_PORTRAIT" ref="a62a3" args="" -->ORIENT_PORTRAIT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="c33232f845969eb04b32e1006c8240a0f81c23cf1763365fba8e36db87131ff5"></a><!-- doxytag: member="ORIENT_PORTRAIT" ref="c33232f845969eb04b32e1006c8240a0f81c23cf1763365fba8e36db87131ff5" args="" -->ORIENT_PORTRAIT</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a62a4"></a><!-- doxytag: member="ORIENT_LANDSCAPE" ref="a62a4" args="" -->ORIENT_LANDSCAPE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="c33232f845969eb04b32e1006c8240a04dc9735e5b3e4c86b60141acc08e5db1"></a><!-- doxytag: member="ORIENT_LANDSCAPE" ref="c33232f845969eb04b32e1006c8240a04dc9735e5b3e4c86b60141acc08e5db1" args="" -->ORIENT_LANDSCAPE</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a62a5"></a><!-- doxytag: member="ORIENT_UPSIDEDOWN" ref="a62a5" args="" -->ORIENT_UPSIDEDOWN</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="c33232f845969eb04b32e1006c8240a03ca76babc9953cc92305856ac00a2350"></a><!-- doxytag: member="ORIENT_UPSIDEDOWN" ref="c33232f845969eb04b32e1006c8240a03ca76babc9953cc92305856ac00a2350" args="" -->ORIENT_UPSIDEDOWN</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a62a6"></a><!-- doxytag: member="ORIENT_SEASCAPE" ref="a62a6" args="" -->ORIENT_SEASCAPE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="c33232f845969eb04b32e1006c8240a07de33495add2d66cc743f2edcbb548e3"></a><!-- doxytag: member="ORIENT_SEASCAPE" ref="c33232f845969eb04b32e1006c8240a07de33495add2d66cc743f2edcbb548e3" args="" -->ORIENT_SEASCAPE</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a38"></a><!-- doxytag: member="gutenprintui.h::stpui_build_standard_print_command" ref="a38" args="(const stpui_plist_t *plist, const stp_printer_t *printer)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="97f0f11c41859d80d9bb3803f81a671f"></a><!-- doxytag: member="gutenprintui.h::stpui_build_standard_print_command" ref="97f0f11c41859d80d9bb3803f81a671f" args="(const stpui_plist_t *plist, const stp_printer_t *printer)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* stpui_build_standard_print_command           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>plist</em>, </td>
+          <td class="memname">char* stpui_build_standard_print_command           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>plist</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const stp_printer_t *&nbsp;</td>
-          <td class="mdname" nowrap> <em>printer</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const stp_printer_t *&nbsp;</td>
+          <td class="paramname"> <em>printer</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a51"></a><!-- doxytag: member="gutenprintui.h::stpui_compute_orientation" ref="a51" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">gint stpui_compute_orientation           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="6932b380986d06d6dd7671439aaf93a0"></a><!-- doxytag: member="gutenprintui.h::stpui_compute_orientation" ref="6932b380986d06d6dd7671439aaf93a0" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">gint stpui_compute_orientation           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a50"></a><!-- doxytag: member="gutenprintui.h::stpui_do_print_dialog" ref="a50" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">gint stpui_do_print_dialog           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="ac1066fa59dc8a04b90415994587ec1a"></a><!-- doxytag: member="gutenprintui.h::stpui_do_print_dialog" ref="ac1066fa59dc8a04b90415994587ec1a" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">gint stpui_do_print_dialog           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a37"></a><!-- doxytag: member="gutenprintui.h::stpui_get_current_printer" ref="a37" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a>* stpui_get_current_printer           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="26ebbd1948a457740cd75ff630969487"></a><!-- doxytag: member="gutenprintui.h::stpui_get_current_printer" ref="26ebbd1948a457740cd75ff630969487" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a>* stpui_get_current_printer           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a49"></a><!-- doxytag: member="gutenprintui.h::stpui_get_errdata" ref="a49" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void* stpui_get_errdata           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="15368f674e52b511ad665cb2be45576c"></a><!-- doxytag: member="gutenprintui.h::stpui_get_errdata" ref="15368f674e52b511ad665cb2be45576c" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void* stpui_get_errdata           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a47"></a><!-- doxytag: member="gutenprintui.h::stpui_get_errfunc" ref="a47" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">stp_outfunc_t stpui_get_errfunc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="da3d388496b4b7d689f4cf8a957c75b2"></a><!-- doxytag: member="gutenprintui.h::stpui_get_errfunc" ref="da3d388496b4b7d689f4cf8a957c75b2" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">stp_outfunc_t stpui_get_errfunc           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a33"></a><!-- doxytag: member="gutenprintui.h::stpui_get_global_parameter" ref="a33" args="(const char *param)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stpui_get_global_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>param</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="28c71e75188d60a243755deaab31b5fd"></a><!-- doxytag: member="gutenprintui.h::stpui_get_global_parameter" ref="28c71e75188d60a243755deaab31b5fd" args="(const char *param)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stpui_get_global_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>param</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a45"></a><!-- doxytag: member="gutenprintui.h::stpui_get_image_filename" ref="a45" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stpui_get_image_filename           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="8bc64271197449021140ce2d17ad71e2"></a><!-- doxytag: member="gutenprintui.h::stpui_get_image_filename" ref="8bc64271197449021140ce2d17ad71e2" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stpui_get_image_filename           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a40"></a><!-- doxytag: member="gutenprintui.h::stpui_get_printrc_file" ref="a40" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stpui_get_printrc_file           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="8faab74e1f9c2b372efa56ae6fea713e"></a><!-- doxytag: member="gutenprintui.h::stpui_get_printrc_file" ref="8faab74e1f9c2b372efa56ae6fea713e" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stpui_get_printrc_file           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a42"></a><!-- doxytag: member="gutenprintui.h::stpui_get_system_printers" ref="a42" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stpui_get_system_printers           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="da642fd5eeff02d4c6b84d3125ca2da2"></a><!-- doxytag: member="gutenprintui.h::stpui_get_system_printers" ref="da642fd5eeff02d4c6b84d3125ca2da2" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stpui_get_system_printers           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a60"></a><!-- doxytag: member="gutenprintui.h::stpui_get_thumbnail_data" ref="a60" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void* stpui_get_thumbnail_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="ee04dfc45b26093bd65d3025b817cfd5"></a><!-- doxytag: member="gutenprintui.h::stpui_get_thumbnail_data" ref="ee04dfc45b26093bd65d3025b817cfd5" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void* stpui_get_thumbnail_data           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a58"></a><!-- doxytag: member="gutenprintui.h::stpui_get_thumbnail_func" ref="a58" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="gutenprintui_8h.html#a1">get_thumbnail_func_t</a> stpui_get_thumbnail_func           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="74c1f441bf3fbb2198cf4cbaca8c23ef"></a><!-- doxytag: member="gutenprintui.h::stpui_get_thumbnail_func" ref="74c1f441bf3fbb2198cf4cbaca8c23ef" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="gutenprintui_8h.html#4ab1da499b20816c28d1b26c61652c1d">get_thumbnail_func_t</a> stpui_get_thumbnail_func           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a35"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_add" ref="a35" args="(const stpui_plist_t *key, int add_only)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="b2e655748deab72a24c25bfaf4ee9052"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_add" ref="b2e655748deab72a24c25bfaf4ee9052" args="(const stpui_plist_t *key, int add_only)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stpui_plist_add           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>key</em>, </td>
+          <td class="memname">int stpui_plist_add           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>key</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>add_only</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>add_only</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a34"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_copy" ref="a34" args="(stpui_plist_t *vd, const stpui_plist_t *vs)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="01db968552106a84a49f76d7203bd3f5"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_copy" ref="01db968552106a84a49f76d7203bd3f5" args="(stpui_plist_t *vd, const stpui_plist_t *vs)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_plist_copy           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>vd</em>, </td>
+          <td class="memname">void stpui_plist_copy           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>vd</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>vs</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>vs</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a31"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_command_type" ref="a31" args="(const stpui_plist_t *p)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="gutenprintui_8h.html#a63">command_t</a> stpui_plist_get_command_type           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="3c9ed1191c6a03edba14f7b98d03ef55"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_command_type" ref="3c9ed1191c6a03edba14f7b98d03ef55" args="(const stpui_plist_t *p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10">command_t</a> stpui_plist_get_command_type           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a26"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_copy_count" ref="a26" args="(const stpui_plist_t *p)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int stpui_plist_get_copy_count           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="7d4511d9e9c69136fabf9f9c64734c51"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_copy_count" ref="7d4511d9e9c69136fabf9f9c64734c51" args="(const stpui_plist_t *p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int stpui_plist_get_copy_count           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a29"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_current_standard_command" ref="a29" args="(const stpui_plist_t *p)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stpui_plist_get_current_standard_command           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="fdc574a731f6697c3e48c6001a51b3af"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_current_standard_command" ref="fdc574a731f6697c3e48c6001a51b3af" args="(const stpui_plist_t *p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stpui_plist_get_current_standard_command           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a24"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_custom_command" ref="a24" args="(const stpui_plist_t *p)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stpui_plist_get_custom_command           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="bc624051678aac91a2ffa6c7c5393b8d"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_custom_command" ref="bc624051678aac91a2ffa6c7c5393b8d" args="(const stpui_plist_t *p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stpui_plist_get_custom_command           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a21"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_extra_printer_options" ref="a21" args="(const stpui_plist_t *p)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stpui_plist_get_extra_printer_options           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="4956cdd55680ed20a92e991d4cf52ee8"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_extra_printer_options" ref="4956cdd55680ed20a92e991d4cf52ee8" args="(const stpui_plist_t *p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stpui_plist_get_extra_printer_options           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a12"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_name" ref="a12" args="(const stpui_plist_t *p)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stpui_plist_get_name           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="342817c9f4311f0ac827c94b0e62cbbb"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_name" ref="342817c9f4311f0ac827c94b0e62cbbb" args="(const stpui_plist_t *p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stpui_plist_get_name           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a18"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_output_filename" ref="a18" args="(const stpui_plist_t *p)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stpui_plist_get_output_filename           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="856c534e664748c9a419104357312dfd"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_output_filename" ref="856c534e664748c9a419104357312dfd" args="(const stpui_plist_t *p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stpui_plist_get_output_filename           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a15"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_queue_name" ref="a15" args="(const stpui_plist_t *p)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* stpui_plist_get_queue_name           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="acf031afbe7e9682f7367f1ae0ef1895"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_queue_name" ref="acf031afbe7e9682f7367f1ae0ef1895" args="(const stpui_plist_t *p)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">const char* stpui_plist_get_queue_name           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a30"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_command_type" ref="a30" args="(stpui_plist_t *p, command_t val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="a920697330124635ca464662caf975d5"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_command_type" ref="a920697330124635ca464662caf975d5" args="(stpui_plist_t *p, command_t val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_plist_set_command_type           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em>, </td>
+          <td class="memname">void stpui_plist_set_command_type           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="gutenprintui_8h.html#a63">command_t</a>&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10">command_t</a>&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a25"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_copy_count" ref="a25" args="(stpui_plist_t *p, gint count)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="02092bb706d3770870ed5f64efb1ea2a"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_copy_count" ref="02092bb706d3770870ed5f64efb1ea2a" args="(stpui_plist_t *p, gint count)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_plist_set_copy_count           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em>, </td>
+          <td class="memname">void stpui_plist_set_copy_count           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>gint&nbsp;</td>
-          <td class="mdname" nowrap> <em>count</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">gint&nbsp;</td>
+          <td class="paramname"> <em>count</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a27"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_current_standard_command" ref="a27" args="(stpui_plist_t *p, const char *val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="79e27ac73e0f082abcdde41ee76879ce"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_current_standard_command" ref="79e27ac73e0f082abcdde41ee76879ce" args="(stpui_plist_t *p, const char *val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_plist_set_current_standard_command           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em>, </td>
+          <td class="memname">void stpui_plist_set_current_standard_command           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a28"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_current_standard_command_n" ref="a28" args="(stpui_plist_t *p, const char *val, int n)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="a405ef9e03818fedcff5746b9701c3c3"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_current_standard_command_n" ref="a405ef9e03818fedcff5746b9701c3c3" args="(stpui_plist_t *p, const char *val, int n)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_plist_set_current_standard_command_n           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em>, </td>
+          <td class="memname">void stpui_plist_set_current_standard_command_n           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>val</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>n</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>n</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a22"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_custom_command" ref="a22" args="(stpui_plist_t *p, const char *val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f127a39a7ea466ca73e5a511f36ae985"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_custom_command" ref="f127a39a7ea466ca73e5a511f36ae985" args="(stpui_plist_t *p, const char *val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_plist_set_custom_command           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em>, </td>
+          <td class="memname">void stpui_plist_set_custom_command           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a23"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_custom_command_n" ref="a23" args="(stpui_plist_t *p, const char *val, int n)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="567c7c6c13930e398def69f2829bd038"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_custom_command_n" ref="567c7c6c13930e398def69f2829bd038" args="(stpui_plist_t *p, const char *val, int n)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_plist_set_custom_command_n           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em>, </td>
+          <td class="memname">void stpui_plist_set_custom_command_n           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>val</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>n</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>n</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a19"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_extra_printer_options" ref="a19" args="(stpui_plist_t *p, const char *val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="72ee8e1bb9bee2e13c15a9aecd9582bd"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_extra_printer_options" ref="72ee8e1bb9bee2e13c15a9aecd9582bd" args="(stpui_plist_t *p, const char *val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_plist_set_extra_printer_options           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em>, </td>
+          <td class="memname">void stpui_plist_set_extra_printer_options           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a20"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_extra_printer_options_n" ref="a20" args="(stpui_plist_t *p, const char *val, int n)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="9899c88da60069b72d7ddb601bcad548"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_extra_printer_options_n" ref="9899c88da60069b72d7ddb601bcad548" args="(stpui_plist_t *p, const char *val, int n)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_plist_set_extra_printer_options_n           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em>, </td>
+          <td class="memname">void stpui_plist_set_extra_printer_options_n           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>val</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>n</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>n</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_name" ref="a10" args="(stpui_plist_t *p, const char *val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f54293f58c474e133e4a60054779c9be"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_name" ref="f54293f58c474e133e4a60054779c9be" args="(stpui_plist_t *p, const char *val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_plist_set_name           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em>, </td>
+          <td class="memname">void stpui_plist_set_name           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a11"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_name_n" ref="a11" args="(stpui_plist_t *p, const char *val, int n)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="90a9ed90e03acd443d08350a62aa3762"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_name_n" ref="90a9ed90e03acd443d08350a62aa3762" args="(stpui_plist_t *p, const char *val, int n)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_plist_set_name_n           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em>, </td>
+          <td class="memname">void stpui_plist_set_name_n           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>val</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>n</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>n</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a16"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_output_filename" ref="a16" args="(stpui_plist_t *p, const char *val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="248eae3ae0a96506fa8c92807f70d457"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_output_filename" ref="248eae3ae0a96506fa8c92807f70d457" args="(stpui_plist_t *p, const char *val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_plist_set_output_filename           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em>, </td>
+          <td class="memname">void stpui_plist_set_output_filename           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a17"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_output_filename_n" ref="a17" args="(stpui_plist_t *p, const char *val, int n)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ea9ddb061703368f7ea1e3b861b8550d"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_output_filename_n" ref="ea9ddb061703368f7ea1e3b861b8550d" args="(stpui_plist_t *p, const char *val, int n)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_plist_set_output_filename_n           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em>, </td>
+          <td class="memname">void stpui_plist_set_output_filename_n           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>val</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>n</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>n</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a13"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_queue_name" ref="a13" args="(stpui_plist_t *p, const char *val)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="8a4fa7000900cb4813000048c322dcdb"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_queue_name" ref="8a4fa7000900cb4813000048c322dcdb" args="(stpui_plist_t *p, const char *val)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_plist_set_queue_name           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em>, </td>
+          <td class="memname">void stpui_plist_set_queue_name           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>val</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a14"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_queue_name_n" ref="a14" args="(stpui_plist_t *p, const char *val, int n)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ec75fb2ec25a5a69d270d70ea33c81eb"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_queue_name_n" ref="ec75fb2ec25a5a69d270d70ea33c81eb" args="(stpui_plist_t *p, const char *val, int n)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_plist_set_queue_name_n           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>p</em>, </td>
+          <td class="memname">void stpui_plist_set_queue_name_n           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>p</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>val</em>, </td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>val</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>int&nbsp;</td>
-          <td class="mdname" nowrap> <em>n</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>n</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a61"></a><!-- doxytag: member="gutenprintui.h::stpui_print" ref="a61" args="(const stpui_plist_t *printer, stpui_image_t *im)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="1ffdddfb6efd3353d403192b2b2c1e20"></a><!-- doxytag: member="gutenprintui.h::stpui_print" ref="1ffdddfb6efd3353d403192b2b2c1e20" args="(const stpui_plist_t *printer, stpui_image_t *im)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int stpui_print           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>printer</em>, </td>
+          <td class="memname">int stpui_print           </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>printer</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="structstpui__image.html">stpui_image_t</a> *&nbsp;</td>
-          <td class="mdname" nowrap> <em>im</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="structstpui__image.html">stpui_image_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>im</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a36"></a><!-- doxytag: member="gutenprintui.h::stpui_printer_initialize" ref="a36" args="(stpui_plist_t *printer)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stpui_printer_initialize           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>printer</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="54daa32f5d5d64c644131570eab01c2b"></a><!-- doxytag: member="gutenprintui.h::stpui_printer_initialize" ref="54daa32f5d5d64c644131570eab01c2b" args="(stpui_plist_t *printer)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stpui_printer_initialize           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
+          <td class="paramname"> <em>printer</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a41"></a><!-- doxytag: member="gutenprintui.h::stpui_printrc_load" ref="a41" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stpui_printrc_load           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="54f67bb1819c7135a0ca1f005a22d28b"></a><!-- doxytag: member="gutenprintui.h::stpui_printrc_load" ref="54f67bb1819c7135a0ca1f005a22d28b" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stpui_printrc_load           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a43"></a><!-- doxytag: member="gutenprintui.h::stpui_printrc_save" ref="a43" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stpui_printrc_save           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="8c4bddac236a6557ec126fd659ceade0"></a><!-- doxytag: member="gutenprintui.h::stpui_printrc_save" ref="8c4bddac236a6557ec126fd659ceade0" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stpui_printrc_save           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a48"></a><!-- doxytag: member="gutenprintui.h::stpui_set_errdata" ref="a48" args="(void *errdata)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stpui_set_errdata           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>errdata</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="d013cb96f40b5da4bca5dd9485aaa213"></a><!-- doxytag: member="gutenprintui.h::stpui_set_errdata" ref="d013cb96f40b5da4bca5dd9485aaa213" args="(void *errdata)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stpui_set_errdata           </td>
+          <td>(</td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname"> <em>errdata</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a46"></a><!-- doxytag: member="gutenprintui.h::stpui_set_errfunc" ref="a46" args="(stp_outfunc_t wfunc)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stpui_set_errfunc           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">stp_outfunc_t&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>wfunc</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="cc06b85ae6af8ca0003584da411213fb"></a><!-- doxytag: member="gutenprintui.h::stpui_set_errfunc" ref="cc06b85ae6af8ca0003584da411213fb" args="(stp_outfunc_t wfunc)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stpui_set_errfunc           </td>
+          <td>(</td>
+          <td class="paramtype">stp_outfunc_t&nbsp;</td>
+          <td class="paramname"> <em>wfunc</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a32"></a><!-- doxytag: member="gutenprintui.h::stpui_set_global_parameter" ref="a32" args="(const char *param, const char *value)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="eb3ea1fd028cb28211bac9e88f9ca8ac"></a><!-- doxytag: member="gutenprintui.h::stpui_set_global_parameter" ref="eb3ea1fd028cb28211bac9e88f9ca8ac" args="(const char *param, const char *value)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_set_global_parameter           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>param</em>, </td>
+          <td class="memname">void stpui_set_global_parameter           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>param</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>const char *&nbsp;</td>
-          <td class="mdname" nowrap> <em>value</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a56"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_channel_depth" ref="a56" args="(gint bit_depth)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stpui_set_image_channel_depth           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">gint&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>bit_depth</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="845898656d91fbf462db9c9b3e7c976f"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_channel_depth" ref="845898656d91fbf462db9c9b3e7c976f" args="(gint bit_depth)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stpui_set_image_channel_depth           </td>
+          <td>(</td>
+          <td class="paramtype">gint&nbsp;</td>
+          <td class="paramname"> <em>bit_depth</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a52"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_dimensions" ref="a52" args="(gint width, gint height)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="a52f1b5d60ea21d09cfbab998df7ff33"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_dimensions" ref="a52f1b5d60ea21d09cfbab998df7ff33" args="(gint width, gint height)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_set_image_dimensions           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">gint&nbsp;</td>
-          <td class="mdname" nowrap> <em>width</em>, </td>
+          <td class="memname">void stpui_set_image_dimensions           </td>
+          <td>(</td>
+          <td class="paramtype">gint&nbsp;</td>
+          <td class="paramname"> <em>width</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>gint&nbsp;</td>
-          <td class="mdname" nowrap> <em>height</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">gint&nbsp;</td>
+          <td class="paramname"> <em>height</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a44"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_filename" ref="a44" args="(const char *)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stpui_set_image_filename           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="701289a198a313c5b6758ab1cd678c58"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_filename" ref="701289a198a313c5b6758ab1cd678c58" args="(const char *)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stpui_set_image_filename           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a55"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_raw_channels" ref="a55" args="(gint channels)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stpui_set_image_raw_channels           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">gint&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>channels</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="0d40ca93fed8c7d10dcc516e6fb61ea1"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_raw_channels" ref="0d40ca93fed8c7d10dcc516e6fb61ea1" args="(gint channels)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stpui_set_image_raw_channels           </td>
+          <td>(</td>
+          <td class="paramtype">gint&nbsp;</td>
+          <td class="paramname"> <em>channels</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a53"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_resolution" ref="a53" args="(gdouble xres, gdouble yres)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="3fa4a6d1300a470016744badf81daa43"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_resolution" ref="3fa4a6d1300a470016744badf81daa43" args="(gdouble xres, gdouble yres)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void stpui_set_image_resolution           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">gdouble&nbsp;</td>
-          <td class="mdname" nowrap> <em>xres</em>, </td>
+          <td class="memname">void stpui_set_image_resolution           </td>
+          <td>(</td>
+          <td class="paramtype">gdouble&nbsp;</td>
+          <td class="paramname"> <em>xres</em>, </td>
         </tr>
         <tr>
-          <td class="md" nowrap align="right"></td>
-          <td class="md"></td>
-          <td class="md" nowrap>gdouble&nbsp;</td>
-          <td class="mdname" nowrap> <em>yres</em></td>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">gdouble&nbsp;</td>
+          <td class="paramname"> <em>yres</em></td><td>&nbsp;</td>
         </tr>
         <tr>
-          <td class="md"></td>
-          <td class="md">)&nbsp;</td>
-          <td class="md" colspan="2"></td>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a54"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_type" ref="a54" args="(const char *image_type)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stpui_set_image_type           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>image_type</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="7b2f104989fb67ca20e1b9874e047293"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_type" ref="7b2f104989fb67ca20e1b9874e047293" args="(const char *image_type)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stpui_set_image_type           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>image_type</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a39"></a><!-- doxytag: member="gutenprintui.h::stpui_set_printrc_file" ref="a39" args="(const char *name)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stpui_set_printrc_file           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const char *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap> <em>name</em>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="443905f09bfd6cad7fd06aa029ac306c"></a><!-- doxytag: member="gutenprintui.h::stpui_set_printrc_file" ref="443905f09bfd6cad7fd06aa029ac306c" args="(const char *name)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stpui_set_printrc_file           </td>
+          <td>(</td>
+          <td class="paramtype">const char *&nbsp;</td>
+          <td class="paramname"> <em>name</em>          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a59"></a><!-- doxytag: member="gutenprintui.h::stpui_set_thumbnail_data" ref="a59" args="(void *)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stpui_set_thumbnail_data           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void *&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="965e5950073e3ef6775f3355556517f6"></a><!-- doxytag: member="gutenprintui.h::stpui_set_thumbnail_data" ref="965e5950073e3ef6775f3355556517f6" args="(void *)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stpui_set_thumbnail_data           </td>
+          <td>(</td>
+          <td class="paramtype">void *&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a57"></a><!-- doxytag: member="gutenprintui.h::stpui_set_thumbnail_func" ref="a57" args="(get_thumbnail_func_t)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void stpui_set_thumbnail_func           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="gutenprintui_8h.html#a1">get_thumbnail_func_t</a>&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+
+</div>
+</div><p>
+<a class="anchor" name="fcaf0ce6ff01c073cdfb2d2f80ede234"></a><!-- doxytag: member="gutenprintui.h::stpui_set_thumbnail_func" ref="fcaf0ce6ff01c073cdfb2d2f80ede234" args="(get_thumbnail_func_t)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stpui_set_thumbnail_func           </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="gutenprintui_8h.html#4ab1da499b20816c28d1b26c61652c1d">get_thumbnail_func_t</a>&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/index.html b/doc/gutenprintui2/html/index.html
index 71df013..22719f6 100644
--- a/doc/gutenprintui2/html/index.html
+++ b/doc/gutenprintui2/html/index.html
@@ -1,14 +1,21 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: Main Page</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindexHL" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li class="current"><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
 <h1>libgutenprintui2 API Reference Documentation</h1>
 <p>
-<h3 align="center">5.0.0 </h3><hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+<h3 align="center">5.0.1 </h3><hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurve.html b/doc/gutenprintui2/html/struct__StpuiCurve.html
index 7333407..8812210 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurve.html
@@ -1,396 +1,290 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: _StpuiCurve Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>_StpuiCurve Struct Reference</h1><!-- doxytag: class="_StpuiCurve" --><code>#include &lt;curve.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkDrawingArea&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o0">graph</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkDrawingArea&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#de1a0d11481ca5e94e31025b5815c88f">graph</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o1">cursor_type</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#5a45de0c0dd843601eb678cf898b6588">cursor_type</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o2">min_x</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a2e971c049f0f314e9459b21d591dde2">min_x</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o3">max_x</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#873e40a32b9a0e863ecf5af33233819d">max_x</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o4">min_y</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#035fd7e1c773ea3291dc40f6c2a95f07">min_y</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o5">max_y</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a4fbc033c9dc17d11be58786f5bfe817">max_y</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GdkPixmap *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o6">pixmap</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GdkPixmap *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a1e237c2fafc8ce7b06f73b8af401de1">pixmap</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="curve_8h.html#a19">StpuiCurveType</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o7">curve_type</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#c88de71f409ac73ffe41489313cacff2">curve_type</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o8">height</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#c679cbbcaa013aa84ac1e799d7299479">height</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o9">grab_point</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#30591159410734580ff586f4c62ac622">grab_point</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o10">last</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#4866f6481ca65da32e4beda66c71381b">last</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o11">num_points</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#d8005c397affa21ad090cd0868e4fb60">num_points</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GdkPoint *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o12">point</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GdkPoint *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#f7e80ace854c3b42cfcb419eacd7766f">point</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o13">num_ctlpoints</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#875906e982189427a2a3dda0e7cc38ed">num_ctlpoints</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o14">ctlpoint</a> )[2]</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#05e34073df0ce5bf7575b2e7383577a8">ctlpoint</a> )[2]</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o14"></a><!-- doxytag: member="_StpuiCurve::ctlpoint" ref="o14" args=")[2]" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="de1a0d11481ca5e94e31025b5815c88f"></a><!-- doxytag: member="_StpuiCurve::graph" ref="de1a0d11481ca5e94e31025b5815c88f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">gfloat(* <a class="el" href="struct__StpuiCurve.html#o14">_StpuiCurve::ctlpoint</a>)[2]          </td>
+          <td class="memname">GtkDrawingArea <a class="el" href="struct__StpuiCurve.html#de1a0d11481ca5e94e31025b5815c88f">_StpuiCurve::graph</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="_StpuiCurve::cursor_type" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="5a45de0c0dd843601eb678cf898b6588"></a><!-- doxytag: member="_StpuiCurve::cursor_type" ref="5a45de0c0dd843601eb678cf898b6588" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o1">_StpuiCurve::cursor_type</a>          </td>
+          <td class="memname">gint <a class="el" href="struct__StpuiCurve.html#5a45de0c0dd843601eb678cf898b6588">_StpuiCurve::cursor_type</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o7"></a><!-- doxytag: member="_StpuiCurve::curve_type" ref="o7" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="a2e971c049f0f314e9459b21d591dde2"></a><!-- doxytag: member="_StpuiCurve::min_x" ref="a2e971c049f0f314e9459b21d591dde2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="curve_8h.html#a19">StpuiCurveType</a> <a class="el" href="struct__StpuiCurve.html#o7">_StpuiCurve::curve_type</a>          </td>
+          <td class="memname">gfloat <a class="el" href="struct__StpuiCurve.html#a2e971c049f0f314e9459b21d591dde2">_StpuiCurve::min_x</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o9"></a><!-- doxytag: member="_StpuiCurve::grab_point" ref="o9" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="873e40a32b9a0e863ecf5af33233819d"></a><!-- doxytag: member="_StpuiCurve::max_x" ref="873e40a32b9a0e863ecf5af33233819d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o9">_StpuiCurve::grab_point</a>          </td>
+          <td class="memname">gfloat <a class="el" href="struct__StpuiCurve.html#873e40a32b9a0e863ecf5af33233819d">_StpuiCurve::max_x</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="_StpuiCurve::graph" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="035fd7e1c773ea3291dc40f6c2a95f07"></a><!-- doxytag: member="_StpuiCurve::min_y" ref="035fd7e1c773ea3291dc40f6c2a95f07" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">GtkDrawingArea <a class="el" href="struct__StpuiCurve.html#o0">_StpuiCurve::graph</a>          </td>
+          <td class="memname">gfloat <a class="el" href="struct__StpuiCurve.html#035fd7e1c773ea3291dc40f6c2a95f07">_StpuiCurve::min_y</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o8"></a><!-- doxytag: member="_StpuiCurve::height" ref="o8" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="a4fbc033c9dc17d11be58786f5bfe817"></a><!-- doxytag: member="_StpuiCurve::max_y" ref="a4fbc033c9dc17d11be58786f5bfe817" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o8">_StpuiCurve::height</a>          </td>
+          <td class="memname">gfloat <a class="el" href="struct__StpuiCurve.html#a4fbc033c9dc17d11be58786f5bfe817">_StpuiCurve::max_y</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o10"></a><!-- doxytag: member="_StpuiCurve::last" ref="o10" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="a1e237c2fafc8ce7b06f73b8af401de1"></a><!-- doxytag: member="_StpuiCurve::pixmap" ref="a1e237c2fafc8ce7b06f73b8af401de1" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o10">_StpuiCurve::last</a>          </td>
+          <td class="memname">GdkPixmap* <a class="el" href="struct__StpuiCurve.html#a1e237c2fafc8ce7b06f73b8af401de1">_StpuiCurve::pixmap</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="_StpuiCurve::max_x" ref="o3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="c88de71f409ac73ffe41489313cacff2"></a><!-- doxytag: member="_StpuiCurve::curve_type" ref="c88de71f409ac73ffe41489313cacff2" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiCurve.html#o3">_StpuiCurve::max_x</a>          </td>
+          <td class="memname"><a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a> <a class="el" href="struct__StpuiCurve.html#c88de71f409ac73ffe41489313cacff2">_StpuiCurve::curve_type</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="_StpuiCurve::max_y" ref="o5" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="c679cbbcaa013aa84ac1e799d7299479"></a><!-- doxytag: member="_StpuiCurve::height" ref="c679cbbcaa013aa84ac1e799d7299479" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiCurve.html#o5">_StpuiCurve::max_y</a>          </td>
+          <td class="memname">gint <a class="el" href="struct__StpuiCurve.html#c679cbbcaa013aa84ac1e799d7299479">_StpuiCurve::height</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="_StpuiCurve::min_x" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="30591159410734580ff586f4c62ac622"></a><!-- doxytag: member="_StpuiCurve::grab_point" ref="30591159410734580ff586f4c62ac622" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiCurve.html#o2">_StpuiCurve::min_x</a>          </td>
+          <td class="memname">gint <a class="el" href="struct__StpuiCurve.html#30591159410734580ff586f4c62ac622">_StpuiCurve::grab_point</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="_StpuiCurve::min_y" ref="o4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="4866f6481ca65da32e4beda66c71381b"></a><!-- doxytag: member="_StpuiCurve::last" ref="4866f6481ca65da32e4beda66c71381b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiCurve.html#o4">_StpuiCurve::min_y</a>          </td>
+          <td class="memname">gint <a class="el" href="struct__StpuiCurve.html#4866f6481ca65da32e4beda66c71381b">_StpuiCurve::last</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o13"></a><!-- doxytag: member="_StpuiCurve::num_ctlpoints" ref="o13" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="d8005c397affa21ad090cd0868e4fb60"></a><!-- doxytag: member="_StpuiCurve::num_points" ref="d8005c397affa21ad090cd0868e4fb60" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o13">_StpuiCurve::num_ctlpoints</a>          </td>
+          <td class="memname">gint <a class="el" href="struct__StpuiCurve.html#d8005c397affa21ad090cd0868e4fb60">_StpuiCurve::num_points</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o11"></a><!-- doxytag: member="_StpuiCurve::num_points" ref="o11" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f7e80ace854c3b42cfcb419eacd7766f"></a><!-- doxytag: member="_StpuiCurve::point" ref="f7e80ace854c3b42cfcb419eacd7766f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o11">_StpuiCurve::num_points</a>          </td>
+          <td class="memname">GdkPoint* <a class="el" href="struct__StpuiCurve.html#f7e80ace854c3b42cfcb419eacd7766f">_StpuiCurve::point</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="_StpuiCurve::pixmap" ref="o6" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="875906e982189427a2a3dda0e7cc38ed"></a><!-- doxytag: member="_StpuiCurve::num_ctlpoints" ref="875906e982189427a2a3dda0e7cc38ed" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">GdkPixmap* <a class="el" href="struct__StpuiCurve.html#o6">_StpuiCurve::pixmap</a>          </td>
+          <td class="memname">gint <a class="el" href="struct__StpuiCurve.html#875906e982189427a2a3dda0e7cc38ed">_StpuiCurve::num_ctlpoints</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o12"></a><!-- doxytag: member="_StpuiCurve::point" ref="o12" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="05e34073df0ce5bf7575b2e7383577a8"></a><!-- doxytag: member="_StpuiCurve::ctlpoint" ref="05e34073df0ce5bf7575b2e7383577a8" args=")[2]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">GdkPoint* <a class="el" href="struct__StpuiCurve.html#o12">_StpuiCurve::point</a>          </td>
+          <td class="memname">gfloat(* <a class="el" href="struct__StpuiCurve.html#05e34073df0ce5bf7575b2e7383577a8">_StpuiCurve::ctlpoint</a>)[2]          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="curve_8h.html">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurveClass.html b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
index ef2dfea..8942d63 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
@@ -1,171 +1,137 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: _StpuiCurveClass Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>_StpuiCurveClass Struct Reference</h1><!-- doxytag: class="_StpuiCurveClass" --><code>#include &lt;curve.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkDrawingAreaClass&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#o0">parent_class</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkDrawingAreaClass&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#60fce1a46ad405750d42c7aff83707bb">parent_class</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#o1">curve_type_changed</a> )(<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#3098d1e480ba77e57785667ccf0b1c9f">curve_type_changed</a> )(<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#o2">_gtk_reserved1</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#97e1aa40263796ab3dada695e40193cb">_gtk_reserved1</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#o3">_gtk_reserved2</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#053157829bb7c073427955e16c93c863">_gtk_reserved2</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#o4">_gtk_reserved3</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#64b1fa1cf35f409932139752569ca1f9">_gtk_reserved3</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#o5">_gtk_reserved4</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#f1b28ac82d8fa56fbc0a84f17d26d7b0">_gtk_reserved4</a> )(void)</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved1" ref="o2" args=")(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="60fce1a46ad405750d42c7aff83707bb"></a><!-- doxytag: member="_StpuiCurveClass::parent_class" ref="60fce1a46ad405750d42c7aff83707bb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiCurveClass.html#o2">_StpuiCurveClass::_gtk_reserved1</a>)(void)          </td>
+          <td class="memname">GtkDrawingAreaClass <a class="el" href="struct__StpuiCurveClass.html#60fce1a46ad405750d42c7aff83707bb">_StpuiCurveClass::parent_class</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved2" ref="o3" args=")(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="3098d1e480ba77e57785667ccf0b1c9f"></a><!-- doxytag: member="_StpuiCurveClass::curve_type_changed" ref="3098d1e480ba77e57785667ccf0b1c9f" args=")(StpuiCurve *curve)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiCurveClass.html#o3">_StpuiCurveClass::_gtk_reserved2</a>)(void)          </td>
+          <td class="memname">void(*  <a class="el" href="struct__StpuiCurveClass.html#3098d1e480ba77e57785667ccf0b1c9f">_StpuiCurveClass::curve_type_changed</a>)(<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved3" ref="o4" args=")(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="97e1aa40263796ab3dada695e40193cb"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved1" ref="97e1aa40263796ab3dada695e40193cb" args=")(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiCurveClass.html#o4">_StpuiCurveClass::_gtk_reserved3</a>)(void)          </td>
+          <td class="memname">void(* <a class="el" href="struct__StpuiCurveClass.html#97e1aa40263796ab3dada695e40193cb">_StpuiCurveClass::_gtk_reserved1</a>)(void)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved4" ref="o5" args=")(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="053157829bb7c073427955e16c93c863"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved2" ref="053157829bb7c073427955e16c93c863" args=")(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiCurveClass.html#o5">_StpuiCurveClass::_gtk_reserved4</a>)(void)          </td>
+          <td class="memname">void(* <a class="el" href="struct__StpuiCurveClass.html#053157829bb7c073427955e16c93c863">_StpuiCurveClass::_gtk_reserved2</a>)(void)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="_StpuiCurveClass::curve_type_changed" ref="o1" args=")(StpuiCurve *curve)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="64b1fa1cf35f409932139752569ca1f9"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved3" ref="64b1fa1cf35f409932139752569ca1f9" args=")(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(*  <a class="el" href="struct__StpuiCurveClass.html#o1">_StpuiCurveClass::curve_type_changed</a>)(<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve)          </td>
+          <td class="memname">void(* <a class="el" href="struct__StpuiCurveClass.html#64b1fa1cf35f409932139752569ca1f9">_StpuiCurveClass::_gtk_reserved3</a>)(void)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="_StpuiCurveClass::parent_class" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f1b28ac82d8fa56fbc0a84f17d26d7b0"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved4" ref="f1b28ac82d8fa56fbc0a84f17d26d7b0" args=")(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">GtkDrawingAreaClass <a class="el" href="struct__StpuiCurveClass.html#o0">_StpuiCurveClass::parent_class</a>          </td>
+          <td class="memname">void(* <a class="el" href="struct__StpuiCurveClass.html#f1b28ac82d8fa56fbc0a84f17d26d7b0">_StpuiCurveClass::_gtk_reserved4</a>)(void)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="curve_8h.html">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
index c0396c3..c4741f9 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
@@ -1,196 +1,154 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: _StpuiGammaCurve Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>_StpuiGammaCurve Struct Reference</h1><!-- doxytag: class="_StpuiGammaCurve" --><code>#include &lt;gammacurve.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkVBox&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#o0">vbox</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkVBox&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#07e6d5e4479cbca4a927635cc6d02f26">vbox</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#o1">table</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#f4a067c4f9e19c57d080b07aca9252b3">table</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#o2">curve</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#ef8d7f12bd9a16784147cc3841d966c6">curve</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#o3">button</a> [5]</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#6ec3a772b95ebde518266e23d2c6d351">button</a> [5]</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#o4">gamma</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#7783842531471a1605b5d38c7a02a52e">gamma</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#o5">gamma_dialog</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#ef9135d931e5a99a0d35c40a8fc79b5b">gamma_dialog</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#o6">gamma_text</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#abe5eae4e5aa05c6a62aab34d236c26b">gamma_text</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o3"></a><!-- doxytag: member="_StpuiGammaCurve::button" ref="o3" args="[5]" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="07e6d5e4479cbca4a927635cc6d02f26"></a><!-- doxytag: member="_StpuiGammaCurve::vbox" ref="07e6d5e4479cbca4a927635cc6d02f26" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#o3">_StpuiGammaCurve::button</a>[5]          </td>
+          <td class="memname">GtkVBox <a class="el" href="struct__StpuiGammaCurve.html#07e6d5e4479cbca4a927635cc6d02f26">_StpuiGammaCurve::vbox</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="_StpuiGammaCurve::curve" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f4a067c4f9e19c57d080b07aca9252b3"></a><!-- doxytag: member="_StpuiGammaCurve::table" ref="f4a067c4f9e19c57d080b07aca9252b3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#o2">_StpuiGammaCurve::curve</a>          </td>
+          <td class="memname">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#f4a067c4f9e19c57d080b07aca9252b3">_StpuiGammaCurve::table</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="_StpuiGammaCurve::gamma" ref="o4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ef8d7f12bd9a16784147cc3841d966c6"></a><!-- doxytag: member="_StpuiGammaCurve::curve" ref="ef8d7f12bd9a16784147cc3841d966c6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiGammaCurve.html#o4">_StpuiGammaCurve::gamma</a>          </td>
+          <td class="memname">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#ef8d7f12bd9a16784147cc3841d966c6">_StpuiGammaCurve::curve</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="_StpuiGammaCurve::gamma_dialog" ref="o5" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="6ec3a772b95ebde518266e23d2c6d351"></a><!-- doxytag: member="_StpuiGammaCurve::button" ref="6ec3a772b95ebde518266e23d2c6d351" args="[5]" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#o5">_StpuiGammaCurve::gamma_dialog</a>          </td>
+          <td class="memname">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#6ec3a772b95ebde518266e23d2c6d351">_StpuiGammaCurve::button</a>[5]          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="_StpuiGammaCurve::gamma_text" ref="o6" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="7783842531471a1605b5d38c7a02a52e"></a><!-- doxytag: member="_StpuiGammaCurve::gamma" ref="7783842531471a1605b5d38c7a02a52e" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#o6">_StpuiGammaCurve::gamma_text</a>          </td>
+          <td class="memname">gfloat <a class="el" href="struct__StpuiGammaCurve.html#7783842531471a1605b5d38c7a02a52e">_StpuiGammaCurve::gamma</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="_StpuiGammaCurve::table" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ef9135d931e5a99a0d35c40a8fc79b5b"></a><!-- doxytag: member="_StpuiGammaCurve::gamma_dialog" ref="ef9135d931e5a99a0d35c40a8fc79b5b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#o1">_StpuiGammaCurve::table</a>          </td>
+          <td class="memname">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#ef9135d931e5a99a0d35c40a8fc79b5b">_StpuiGammaCurve::gamma_dialog</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="_StpuiGammaCurve::vbox" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="abe5eae4e5aa05c6a62aab34d236c26b"></a><!-- doxytag: member="_StpuiGammaCurve::gamma_text" ref="abe5eae4e5aa05c6a62aab34d236c26b" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">GtkVBox <a class="el" href="struct__StpuiGammaCurve.html#o0">_StpuiGammaCurve::vbox</a>          </td>
+          <td class="memname">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#abe5eae4e5aa05c6a62aab34d236c26b">_StpuiGammaCurve::gamma_text</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="gammacurve_8h.html">gammacurve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
index efba469..f256b1d 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
@@ -1,146 +1,120 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: _StpuiGammaCurveClass Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>_StpuiGammaCurveClass Struct Reference</h1><!-- doxytag: class="_StpuiGammaCurveClass" --><code>#include &lt;gammacurve.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkVBoxClass&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#o0">parent_class</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkVBoxClass&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#e784cb24d21ce7c707727c5996fed405">parent_class</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#o1">_gtk_reserved1</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#11f61971dbf7791712b4ea447b00518d">_gtk_reserved1</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#o2">_gtk_reserved2</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#f471d7067cff6f4f8908c147f4d7c99c">_gtk_reserved2</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#o3">_gtk_reserved3</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#337220ca7c1966c911dd856d8377c66d">_gtk_reserved3</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#o4">_gtk_reserved4</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#d6007664d93b51b3f533998dfc836634">_gtk_reserved4</a> )(void)</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o1"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved1" ref="o1" args=")(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="e784cb24d21ce7c707727c5996fed405"></a><!-- doxytag: member="_StpuiGammaCurveClass::parent_class" ref="e784cb24d21ce7c707727c5996fed405" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#o1">_StpuiGammaCurveClass::_gtk_reserved1</a>)(void)          </td>
+          <td class="memname">GtkVBoxClass <a class="el" href="struct__StpuiGammaCurveClass.html#e784cb24d21ce7c707727c5996fed405">_StpuiGammaCurveClass::parent_class</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved2" ref="o2" args=")(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="11f61971dbf7791712b4ea447b00518d"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved1" ref="11f61971dbf7791712b4ea447b00518d" args=")(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#o2">_StpuiGammaCurveClass::_gtk_reserved2</a>)(void)          </td>
+          <td class="memname">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#11f61971dbf7791712b4ea447b00518d">_StpuiGammaCurveClass::_gtk_reserved1</a>)(void)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved3" ref="o3" args=")(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f471d7067cff6f4f8908c147f4d7c99c"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved2" ref="f471d7067cff6f4f8908c147f4d7c99c" args=")(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#o3">_StpuiGammaCurveClass::_gtk_reserved3</a>)(void)          </td>
+          <td class="memname">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#f471d7067cff6f4f8908c147f4d7c99c">_StpuiGammaCurveClass::_gtk_reserved2</a>)(void)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved4" ref="o4" args=")(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="337220ca7c1966c911dd856d8377c66d"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved3" ref="337220ca7c1966c911dd856d8377c66d" args=")(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#o4">_StpuiGammaCurveClass::_gtk_reserved4</a>)(void)          </td>
+          <td class="memname">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#337220ca7c1966c911dd856d8377c66d">_StpuiGammaCurveClass::_gtk_reserved3</a>)(void)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="_StpuiGammaCurveClass::parent_class" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="d6007664d93b51b3f533998dfc836634"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved4" ref="d6007664d93b51b3f533998dfc836634" args=")(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">GtkVBoxClass <a class="el" href="struct__StpuiGammaCurveClass.html#o0">_StpuiGammaCurveClass::parent_class</a>          </td>
+          <td class="memname">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#d6007664d93b51b3f533998dfc836634">_StpuiGammaCurveClass::_gtk_reserved4</a>)(void)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="gammacurve_8h.html">gammacurve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/structstpui__image.html b/doc/gutenprintui2/html/structstpui__image.html
index 9b6b9d7..19202bf 100644
--- a/doc/gutenprintui2/html/structstpui__image.html
+++ b/doc/gutenprintui2/html/structstpui__image.html
@@ -1,221 +1,171 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: stpui_image Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stpui_image Struct Reference</h1><!-- doxytag: class="stpui_image" --><code>#include &lt;gutenprintui.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">stp_image_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#o0">im</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">stp_image_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#00862540482f307175e9fbf252751320">im</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#o1">transpose</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#5f2a75c7187c6abcf20e15e2aad22549">transpose</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#o2">hflip</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#f2733a318654d50214c94fccd9a018b7">hflip</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#o3">vflip</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#c378339fe87fa21d5f117fc11b3f5b6c">vflip</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#o4">rotate_ccw</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#0a31280def8cd739184192dbe8d34fa8">rotate_ccw</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#o5">rotate_cw</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#e111082f0f23096d89e024c4fde9c0d6">rotate_cw</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#o6">rotate_180</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#aaae08fdabffb3d31ac761dfe0624506">rotate_180</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#o7">crop</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image, int left, int top, int right, int bottom)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#96e6cc155230793c8aa847e5a7cd7255">crop</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image, int left, int top, int right, int bottom)</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o7"></a><!-- doxytag: member="stpui_image::crop" ref="o7" args=")(struct stpui_image *image, int left, int top, int right, int bottom)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="00862540482f307175e9fbf252751320"></a><!-- doxytag: member="stpui_image::im" ref="00862540482f307175e9fbf252751320" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#o7">stpui_image::crop</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image, int left, int top, int right, int bottom)          </td>
+          <td class="memname">stp_image_t <a class="el" href="structstpui__image.html#00862540482f307175e9fbf252751320">stpui_image::im</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stpui_image::hflip" ref="o2" args=")(struct stpui_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="5f2a75c7187c6abcf20e15e2aad22549"></a><!-- doxytag: member="stpui_image::transpose" ref="5f2a75c7187c6abcf20e15e2aad22549" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#o2">stpui_image::hflip</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+          <td class="memname">void(* <a class="el" href="structstpui__image.html#5f2a75c7187c6abcf20e15e2aad22549">stpui_image::transpose</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stpui_image::im" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f2733a318654d50214c94fccd9a018b7"></a><!-- doxytag: member="stpui_image::hflip" ref="f2733a318654d50214c94fccd9a018b7" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">stp_image_t <a class="el" href="structstpui__image.html#o0">stpui_image::im</a>          </td>
+          <td class="memname">void(* <a class="el" href="structstpui__image.html#f2733a318654d50214c94fccd9a018b7">stpui_image::hflip</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stpui_image::rotate_180" ref="o6" args=")(struct stpui_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="c378339fe87fa21d5f117fc11b3f5b6c"></a><!-- doxytag: member="stpui_image::vflip" ref="c378339fe87fa21d5f117fc11b3f5b6c" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#o6">stpui_image::rotate_180</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+          <td class="memname">void(* <a class="el" href="structstpui__image.html#c378339fe87fa21d5f117fc11b3f5b6c">stpui_image::vflip</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stpui_image::rotate_ccw" ref="o4" args=")(struct stpui_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="0a31280def8cd739184192dbe8d34fa8"></a><!-- doxytag: member="stpui_image::rotate_ccw" ref="0a31280def8cd739184192dbe8d34fa8" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#o4">stpui_image::rotate_ccw</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+          <td class="memname">void(* <a class="el" href="structstpui__image.html#0a31280def8cd739184192dbe8d34fa8">stpui_image::rotate_ccw</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stpui_image::rotate_cw" ref="o5" args=")(struct stpui_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="e111082f0f23096d89e024c4fde9c0d6"></a><!-- doxytag: member="stpui_image::rotate_cw" ref="e111082f0f23096d89e024c4fde9c0d6" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#o5">stpui_image::rotate_cw</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+          <td class="memname">void(* <a class="el" href="structstpui__image.html#e111082f0f23096d89e024c4fde9c0d6">stpui_image::rotate_cw</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stpui_image::transpose" ref="o1" args=")(struct stpui_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="aaae08fdabffb3d31ac761dfe0624506"></a><!-- doxytag: member="stpui_image::rotate_180" ref="aaae08fdabffb3d31ac761dfe0624506" args=")(struct stpui_image *image)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#o1">stpui_image::transpose</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+          <td class="memname">void(* <a class="el" href="structstpui__image.html#aaae08fdabffb3d31ac761dfe0624506">stpui_image::rotate_180</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stpui_image::vflip" ref="o3" args=")(struct stpui_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="96e6cc155230793c8aa847e5a7cd7255"></a><!-- doxytag: member="stpui_image::crop" ref="96e6cc155230793c8aa847e5a7cd7255" args=")(struct stpui_image *image, int left, int top, int right, int bottom)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#o3">stpui_image::vflip</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+          <td class="memname">void(* <a class="el" href="structstpui__image.html#96e6cc155230793c8aa847e5a7cd7255">stpui_image::crop</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image, int left, int top, int right, int bottom)          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/structstpui__plist__t.html b/doc/gutenprintui2/html/structstpui__plist__t.html
index 58cf74b..80595b9 100644
--- a/doc/gutenprintui2/html/structstpui__plist__t.html
+++ b/doc/gutenprintui2/html/structstpui__plist__t.html
@@ -1,346 +1,256 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: stpui_plist_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li class="current"><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul>
+</div>
 <h1>stpui_plist_t Struct Reference</h1><!-- doxytag: class="stpui_plist_t" --><code>#include &lt;gutenprintui.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o0">name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#95d5e51f00ae03f4ca085120fc7b88e6">name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="gutenprintui_8h.html#a63">command_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o1">command_type</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10">command_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#c1243181065442af4c72c24c0d3901f3">command_type</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o2">queue_name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#34155aeda35a97423a70071478a94469">queue_name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o3">extra_printer_options</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#ff2ab5a8193a99dc8014d804281173c6">extra_printer_options</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o4">custom_command</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#783211034ef118e102c9c07eb9f9a4fa">custom_command</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o5">current_standard_command</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#dde7851705ff38bb9b14c1ec11bb53cb">current_standard_command</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o6">output_filename</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#ee538bc59fd77730a5f73d3ea7d51d18">output_filename</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">float&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o7">scaling</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">float&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#7325ec55acf12db60e799b4532d50d0d">scaling</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="gutenprintui_8h.html#a62">orient_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o8">orientation</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a0">orient_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#394eafe3058457db432eeecb49addf07">orientation</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o9">unit</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#55bd8ba78e4f839d2897100cabd1c62f">unit</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o10">auto_size_roll_feed_paper</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#9f02a46dd284eeaf56a643e0e4b17ffb">auto_size_roll_feed_paper</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o11">invalid_mask</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#49e854e792c73fee7bebcfb4de9ac78a">invalid_mask</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">stp_vars_t *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o12">v</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">stp_vars_t *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#fbdf87548a3132b7270aa88ffcf52a8a">v</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o10"></a><!-- doxytag: member="stpui_plist_t::auto_size_roll_feed_paper" ref="o10" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="95d5e51f00ae03f4ca085120fc7b88e6"></a><!-- doxytag: member="stpui_plist_t::name" ref="95d5e51f00ae03f4ca085120fc7b88e6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstpui__plist__t.html#o10">stpui_plist_t::auto_size_roll_feed_paper</a>          </td>
+          <td class="memname">char* <a class="el" href="structstpui__plist__t.html#95d5e51f00ae03f4ca085120fc7b88e6">stpui_plist_t::name</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stpui_plist_t::command_type" ref="o1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="c1243181065442af4c72c24c0d3901f3"></a><!-- doxytag: member="stpui_plist_t::command_type" ref="c1243181065442af4c72c24c0d3901f3" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="gutenprintui_8h.html#a63">command_t</a> <a class="el" href="structstpui__plist__t.html#o1">stpui_plist_t::command_type</a>          </td>
+          <td class="memname"><a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10">command_t</a> <a class="el" href="structstpui__plist__t.html#c1243181065442af4c72c24c0d3901f3">stpui_plist_t::command_type</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stpui_plist_t::current_standard_command" ref="o5" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="34155aeda35a97423a70071478a94469"></a><!-- doxytag: member="stpui_plist_t::queue_name" ref="34155aeda35a97423a70071478a94469" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o5">stpui_plist_t::current_standard_command</a>          </td>
+          <td class="memname">char* <a class="el" href="structstpui__plist__t.html#34155aeda35a97423a70071478a94469">stpui_plist_t::queue_name</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stpui_plist_t::custom_command" ref="o4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ff2ab5a8193a99dc8014d804281173c6"></a><!-- doxytag: member="stpui_plist_t::extra_printer_options" ref="ff2ab5a8193a99dc8014d804281173c6" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o4">stpui_plist_t::custom_command</a>          </td>
+          <td class="memname">char* <a class="el" href="structstpui__plist__t.html#ff2ab5a8193a99dc8014d804281173c6">stpui_plist_t::extra_printer_options</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stpui_plist_t::extra_printer_options" ref="o3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="783211034ef118e102c9c07eb9f9a4fa"></a><!-- doxytag: member="stpui_plist_t::custom_command" ref="783211034ef118e102c9c07eb9f9a4fa" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o3">stpui_plist_t::extra_printer_options</a>          </td>
+          <td class="memname">char* <a class="el" href="structstpui__plist__t.html#783211034ef118e102c9c07eb9f9a4fa">stpui_plist_t::custom_command</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o11"></a><!-- doxytag: member="stpui_plist_t::invalid_mask" ref="o11" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="dde7851705ff38bb9b14c1ec11bb53cb"></a><!-- doxytag: member="stpui_plist_t::current_standard_command" ref="dde7851705ff38bb9b14c1ec11bb53cb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstpui__plist__t.html#o11">stpui_plist_t::invalid_mask</a>          </td>
+          <td class="memname">char* <a class="el" href="structstpui__plist__t.html#dde7851705ff38bb9b14c1ec11bb53cb">stpui_plist_t::current_standard_command</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stpui_plist_t::name" ref="o0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="ee538bc59fd77730a5f73d3ea7d51d18"></a><!-- doxytag: member="stpui_plist_t::output_filename" ref="ee538bc59fd77730a5f73d3ea7d51d18" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o0">stpui_plist_t::name</a>          </td>
+          <td class="memname">char* <a class="el" href="structstpui__plist__t.html#ee538bc59fd77730a5f73d3ea7d51d18">stpui_plist_t::output_filename</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o8"></a><!-- doxytag: member="stpui_plist_t::orientation" ref="o8" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="7325ec55acf12db60e799b4532d50d0d"></a><!-- doxytag: member="stpui_plist_t::scaling" ref="7325ec55acf12db60e799b4532d50d0d" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="gutenprintui_8h.html#a62">orient_t</a> <a class="el" href="structstpui__plist__t.html#o8">stpui_plist_t::orientation</a>          </td>
+          <td class="memname">float <a class="el" href="structstpui__plist__t.html#7325ec55acf12db60e799b4532d50d0d">stpui_plist_t::scaling</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stpui_plist_t::output_filename" ref="o6" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="394eafe3058457db432eeecb49addf07"></a><!-- doxytag: member="stpui_plist_t::orientation" ref="394eafe3058457db432eeecb49addf07" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o6">stpui_plist_t::output_filename</a>          </td>
+          <td class="memname"><a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a0">orient_t</a> <a class="el" href="structstpui__plist__t.html#394eafe3058457db432eeecb49addf07">stpui_plist_t::orientation</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stpui_plist_t::queue_name" ref="o2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="55bd8ba78e4f839d2897100cabd1c62f"></a><!-- doxytag: member="stpui_plist_t::unit" ref="55bd8ba78e4f839d2897100cabd1c62f" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o2">stpui_plist_t::queue_name</a>          </td>
+          <td class="memname">int <a class="el" href="structstpui__plist__t.html#55bd8ba78e4f839d2897100cabd1c62f">stpui_plist_t::unit</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o7"></a><!-- doxytag: member="stpui_plist_t::scaling" ref="o7" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="9f02a46dd284eeaf56a643e0e4b17ffb"></a><!-- doxytag: member="stpui_plist_t::auto_size_roll_feed_paper" ref="9f02a46dd284eeaf56a643e0e4b17ffb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">float <a class="el" href="structstpui__plist__t.html#o7">stpui_plist_t::scaling</a>          </td>
+          <td class="memname">int <a class="el" href="structstpui__plist__t.html#9f02a46dd284eeaf56a643e0e4b17ffb">stpui_plist_t::auto_size_roll_feed_paper</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o9"></a><!-- doxytag: member="stpui_plist_t::unit" ref="o9" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="49e854e792c73fee7bebcfb4de9ac78a"></a><!-- doxytag: member="stpui_plist_t::invalid_mask" ref="49e854e792c73fee7bebcfb4de9ac78a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstpui__plist__t.html#o9">stpui_plist_t::unit</a>          </td>
+          <td class="memname">int <a class="el" href="structstpui__plist__t.html#49e854e792c73fee7bebcfb4de9ac78a">stpui_plist_t::invalid_mask</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="o12"></a><!-- doxytag: member="stpui_plist_t::v" ref="o12" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="fbdf87548a3132b7270aa88ffcf52a8a"></a><!-- doxytag: member="stpui_plist_t::v" ref="fbdf87548a3132b7270aa88ffcf52a8a" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">stp_vars_t* <a class="el" href="structstpui__plist__t.html#o12">stpui_plist_t::v</a>          </td>
+          <td class="memname">stp_vars_t* <a class="el" href="structstpui__plist__t.html#fbdf87548a3132b7270aa88ffcf52a8a">stpui_plist_t::v</a>          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/tab_b.gif b/doc/gutenprintui2/html/tab_b.gif
new file mode 100644
index 0000000..0d62348
--- /dev/null
+++ b/doc/gutenprintui2/html/tab_b.gif
diff --git a/doc/gutenprintui2/html/tab_l.gif b/doc/gutenprintui2/html/tab_l.gif
new file mode 100644
index 0000000..9b1e633
--- /dev/null
+++ b/doc/gutenprintui2/html/tab_l.gif
diff --git a/doc/gutenprintui2/html/tab_r.gif b/doc/gutenprintui2/html/tab_r.gif
new file mode 100644
index 0000000..ce9dd9f
--- /dev/null
+++ b/doc/gutenprintui2/html/tab_r.gif
diff --git a/doc/gutenprintui2/html/tabs.css b/doc/gutenprintui2/html/tabs.css
new file mode 100644
index 0000000..c37faaf
--- /dev/null
+++ b/doc/gutenprintui2/html/tabs.css
@@ -0,0 +1,102 @@
+/* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */
+
+DIV.tabs
+{
+   float            : left;
+   width            : 100%;
+   background       : url("tab_b.gif") repeat-x bottom;
+   margin-bottom    : 4px;
+}
+
+DIV.tabs UL
+{
+   margin           : 0px;
+   padding-left     : 10px;
+   list-style       : none;
+}
+
+DIV.tabs LI, DIV.tabs FORM
+{
+   display          : inline;
+   margin           : 0px;
+   padding          : 0px;
+}
+
+DIV.tabs FORM
+{
+   float            : right;
+}
+
+DIV.tabs A
+{
+   float            : left;
+   background       : url("tab_r.gif") no-repeat right top;
+   border-bottom    : 1px solid #84B0C7;
+   font-size        : x-small;
+   font-weight      : bold;
+   text-decoration  : none;
+}
+
+DIV.tabs A:hover
+{
+   background-position: 100% -150px;
+}
+
+DIV.tabs A:link, DIV.tabs A:visited,
+DIV.tabs A:active, DIV.tabs A:hover
+{
+       color: #1A419D;
+}
+
+DIV.tabs SPAN
+{
+   float            : left;
+   display          : block;
+   background       : url("tab_l.gif") no-repeat left top;
+   padding          : 5px 9px;
+   white-space      : nowrap;
+}
+
+DIV.tabs INPUT
+{
+   float            : right;
+   display          : inline;
+   font-size        : 1em;
+}
+
+DIV.tabs TD
+{
+   font-size        : x-small;
+   font-weight      : bold;
+   text-decoration  : none;
+}
+
+
+
+/* Commented Backslash Hack hides rule from IE5-Mac \*/
+DIV.tabs SPAN {float : none;}
+/* End IE5-Mac hack */
+
+DIV.tabs A:hover SPAN
+{
+   background-position: 0% -150px;
+}
+
+DIV.tabs LI.current A
+{
+   background-position: 100% -150px;
+   border-width     : 0px;
+}
+
+DIV.tabs LI.current SPAN
+{
+   background-position: 0% -150px;
+   padding-bottom   : 6px;
+}
+
+DIV.nav
+{
+   background       : none;
+   border           : none;
+   border-bottom    : 1px solid #84B0C7;
+}
diff --git a/doc/gutenprintui2/html/typebuiltins_8h.html b/doc/gutenprintui2/html/typebuiltins_8h.html
index 4b51f32..9d2fee6 100644
--- a/doc/gutenprintui2/html/typebuiltins_8h.html
+++ b/doc/gutenprintui2/html/typebuiltins_8h.html
@@ -1,187 +1,150 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 <title>libgutenprintui2 API Reference: include/gutenprintui2/typebuiltins.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprintui2</a></div>
-<h1>typebuiltins.h File Reference</h1><code>#include &lt;glib-object.h&gt;</code><br>
+<!-- Generated by Doxygen 1.5.2 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+    <li class="current"><a href="files.html"><span>Files</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul>
+</div>
+<h1>include/gutenprintui2/typebuiltins.h File Reference</h1><code>#include &lt;glib-object.h&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a0">STPUI_TYPE_ORIENT_T</a>&nbsp;&nbsp;&nbsp;(orient_t_orient_t_get_type())</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#7c68a632b60b65d497e2933fa1b78a77">STPUI_TYPE_ORIENT_T</a>&nbsp;&nbsp;&nbsp;(orient_t_orient_t_get_type())</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a1">STPUI_TYPE_COMMAND_T</a>&nbsp;&nbsp;&nbsp;(command_t_command_t_get_type())</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#b213314f887b8b4f48f9aa1531673a9c">STPUI_TYPE_COMMAND_T</a>&nbsp;&nbsp;&nbsp;(command_t_command_t_get_type())</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a2">STPUI_TYPE_CURVE_TYPE</a>&nbsp;&nbsp;&nbsp;(stpui_curve_type_get_type())</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#f0561b03a3bfb203b40c37f9bb373ffb">STPUI_TYPE_CURVE_TYPE</a>&nbsp;&nbsp;&nbsp;(stpui_curve_type_get_type())</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">G_BEGIN_DECLS GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a3">orient_t_orient_t_get_type</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">G_BEGIN_DECLS GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#b05fb37a6c79f2b6b417ff107d9bb881">orient_t_orient_t_get_type</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a4">command_t_command_t_get_type</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#5e6b50173b88263be23734e76f4a39f2">command_t_command_t_get_type</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a5">stpui_curve_type_get_type</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#1252245c3967f9e655de3d62c3999230">stpui_curve_type_get_type</a> (void)</td></tr>
 
 </table>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="a1"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_COMMAND_T" ref="a1" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="b213314f887b8b4f48f9aa1531673a9c"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_COMMAND_T" ref="b213314f887b8b4f48f9aa1531673a9c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STPUI_TYPE_COMMAND_T&nbsp;&nbsp;&nbsp;(command_t_command_t_get_type())          </td>
+          <td class="memname">#define STPUI_TYPE_COMMAND_T&nbsp;&nbsp;&nbsp;(command_t_command_t_get_type())          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_CURVE_TYPE" ref="a2" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="f0561b03a3bfb203b40c37f9bb373ffb"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_CURVE_TYPE" ref="f0561b03a3bfb203b40c37f9bb373ffb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STPUI_TYPE_CURVE_TYPE&nbsp;&nbsp;&nbsp;(stpui_curve_type_get_type())          </td>
+          <td class="memname">#define STPUI_TYPE_CURVE_TYPE&nbsp;&nbsp;&nbsp;(stpui_curve_type_get_type())          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_ORIENT_T" ref="a0" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="7c68a632b60b65d497e2933fa1b78a77"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_ORIENT_T" ref="7c68a632b60b65d497e2933fa1b78a77" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">#define STPUI_TYPE_ORIENT_T&nbsp;&nbsp;&nbsp;(orient_t_orient_t_get_type())          </td>
+          <td class="memname">#define STPUI_TYPE_ORIENT_T&nbsp;&nbsp;&nbsp;(orient_t_orient_t_get_type())          </td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
+
+</div>
+</div><p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a4"></a><!-- doxytag: member="typebuiltins.h::command_t_command_t_get_type" ref="a4" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+<a class="anchor" name="5e6b50173b88263be23734e76f4a39f2"></a><!-- doxytag: member="typebuiltins.h::command_t_command_t_get_type" ref="5e6b50173b88263be23734e76f4a39f2" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">GType command_t_command_t_get_type           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">GType command_t_command_t_get_type           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="typebuiltins.h::orient_t_orient_t_get_type" ref="a3" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="b05fb37a6c79f2b6b417ff107d9bb881"></a><!-- doxytag: member="typebuiltins.h::orient_t_orient_t_get_type" ref="b05fb37a6c79f2b6b417ff107d9bb881" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">G_BEGIN_DECLS GType orient_t_orient_t_get_type           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">G_BEGIN_DECLS GType orient_t_orient_t_get_type           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="typebuiltins.h::stpui_curve_type_get_type" ref="a5" args="(void)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
+
+</div>
+</div><p>
+<a class="anchor" name="1252245c3967f9e655de3d62c3999230"></a><!-- doxytag: member="typebuiltins.h::stpui_curve_type_get_type" ref="1252245c3967f9e655de3d62c3999230" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="md" nowrap valign="top">GType stpui_curve_type_get_type           </td>
-          <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">void&nbsp;</td>
-          <td class="mdname1" valign="top" nowrap>          </td>
-          <td class="md" valign="top">&nbsp;)&nbsp;</td>
-          <td class="md" nowrap></td>
+          <td class="memname">GType stpui_curve_type_get_type           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td width="100%"></td>
         </tr>
       </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
+</div>
+<div class="memdoc">
 
 <p>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Jul 22 16:39:48 2006 for libgutenprintui2 API Reference by&nbsp;
+
+</div>
+</div><p>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jun 17 10:14:45 2007 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.2 </small></address>
 </body>
 </html>
diff --git a/include/Makefile.in b/include/Makefile.in
index b008f17..750baa6 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -46,18 +46,17 @@ subdir = include
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-depcomp =
-am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -72,13 +71,18 @@ DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -104,6 +108,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -111,6 +117,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -123,12 +130,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -163,6 +172,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -258,14 +268,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -282,6 +295,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -299,17 +315,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -329,9 +349,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps include/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps include/Makefile
+	  $(AUTOMAKE) --gnu  include/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in
index de24e93..dc8850a 100644
--- a/include/gutenprint/Makefile.in
+++ b/include/gutenprint/Makefile.in
@@ -49,18 +49,17 @@ subdir = include/gutenprint
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = gutenprint-version.h
-depcomp =
-am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -80,13 +79,18 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -112,6 +116,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -119,6 +125,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -131,12 +138,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -171,6 +180,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -266,14 +276,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -290,6 +303,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -307,17 +323,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -366,9 +386,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps include/gutenprint/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/gutenprint/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps include/gutenprint/Makefile
+	  $(AUTOMAKE) --gnu  include/gutenprint/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/include/gutenprint/bit-ops.h b/include/gutenprint/bit-ops.h
index 877c191..d779b74 100644
--- a/include/gutenprint/bit-ops.h
+++ b/include/gutenprint/bit-ops.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: bit-ops.h,v 1.2 2005/06/29 01:42:34 rlk Exp $"
+ * "$Id: bit-ops.h,v 1.2.14.1 2007/05/12 19:14:27 faust3 Exp $"
  *
  *   Softweave calculator for gimp-print.
  *
@@ -32,7 +32,16 @@
 extern "C" {
 #endif
 
-extern void	stp_fold(const unsigned char *line, int single_height,
+extern void	stp_fold(const unsigned char *line, int single_length,
+			 unsigned char *outbuf);
+
+extern void	stp_fold_3bit(const unsigned char *line, int single_length,
+			 unsigned char *outbuf);
+
+extern void	stp_fold_3bit_323(const unsigned char *line, int single_length,
+			 unsigned char *outbuf);
+
+extern void	stp_fold_4bit(const unsigned char *line, int single_length,
 			 unsigned char *outbuf);
 
 extern void	stp_split_2(int height, int bits, const unsigned char *in,
diff --git a/include/gutenprint/util.h b/include/gutenprint/util.h
index a0fb793..a146af4 100644
--- a/include/gutenprint/util.h
+++ b/include/gutenprint/util.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.h,v 1.2 2005/04/10 23:15:16 rlk Exp $"
+ * "$Id: util.h,v 1.3.2.1 2007/03/02 12:01:13 rlk Exp $"
  *
  *   libgimpprint utility and miscellaneous functions.
  *
@@ -36,6 +36,10 @@
 extern "C" {
 #endif
 
+#if !defined(__GNUC__) && !defined(__attribute__)
+#  define __attribute__(x)
+#endif /* !__GNUC__ && !__attribute__ */
+
 /**
  * Utility functions.
  *
@@ -88,6 +92,7 @@ extern void stp_put16_be(unsigned short sh, const stp_vars_t *v);
 extern void stp_put32_le(unsigned int sh, const stp_vars_t *v);
 extern void stp_put32_be(unsigned int sh, const stp_vars_t *v);
 extern void stp_puts(const char *s, const stp_vars_t *v);
+extern void stp_putraw(const stp_raw_t *r, const stp_vars_t *v);
 extern void stp_send_command(const stp_vars_t *v, const char *command,
 			     const char *format, ...);
 
@@ -173,5 +178,5 @@ extern const char *stp_get_release_version(void);
 
 #endif /* GUTENPRINT_UTIL_H */
 /*
- * End of "$Id: util.h,v 1.2 2005/04/10 23:15:16 rlk Exp $".
+ * End of "$Id: util.h,v 1.3.2.1 2007/03/02 12:01:13 rlk Exp $".
  */
diff --git a/include/gutenprint/vars.h b/include/gutenprint/vars.h
index aacdbc1..de6eb25 100644
--- a/include/gutenprint/vars.h
+++ b/include/gutenprint/vars.h
@@ -129,6 +129,9 @@ typedef struct
   const void *data; /*!< Raw data. */
 } stp_raw_t;
 
+#define STP_RAW(x) { sizeof((x)), (x) }
+#define STP_RAW_STRING(x) { sizeof((x)) - 1, (x) }
+
 /** double_bound (range) parameter. */
 typedef struct
 {
@@ -1380,5 +1383,5 @@ stp_fill_parameter_settings(stp_parameter_t *desc,
 
 #endif /* GUTENPRINT_VARS_H */
 /*
- * End of "$Id: vars.h,v 1.3 2006/04/17 02:06:18 rlk Exp $".
+ * End of "$Id: vars.h,v 1.3.8.1 2007/03/02 12:01:14 rlk Exp $".
  */
diff --git a/include/gutenprint/xml.h b/include/gutenprint/xml.h
index 7be3235..5f88686 100644
--- a/include/gutenprint/xml.h
+++ b/include/gutenprint/xml.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: xml.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $"
+ * "$Id: xml.h,v 1.2 2006/08/07 09:52:41 rleigh Exp $"
  *
  *   Gutenprint module loader header
  *
@@ -70,7 +70,11 @@ extern stp_array_t *stp_array_create_from_xmltree(stp_mxml_node_t *array);
 extern stp_mxml_node_t *stp_xmltree_create_from_array(const stp_array_t *array);
 extern void stp_xml_parse_file_named(const char *name);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* GUTENPRINT_XML_H */
 /*
- * End of "$Id: xml.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $".
+ * End of "$Id: xml.h,v 1.2 2006/08/07 09:52:41 rleigh Exp $".
  */
diff --git a/include/gutenprintui/Makefile.in b/include/gutenprintui/Makefile.in
index d2889dc..e2e82d1 100644
--- a/include/gutenprintui/Makefile.in
+++ b/include/gutenprintui/Makefile.in
@@ -46,18 +46,17 @@ subdir = include/gutenprintui
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-depcomp =
-am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 am__pkginclude_HEADERS_DIST = gutenprintui.h
@@ -76,13 +75,18 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 pkgincludedir = $(includedir)/gutenprintui
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -108,6 +112,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -115,6 +121,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -127,12 +134,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -167,6 +176,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -262,14 +272,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -286,6 +299,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -303,17 +319,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -335,9 +355,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps include/gutenprintui/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/gutenprintui/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps include/gutenprintui/Makefile
+	  $(AUTOMAKE) --gnu  include/gutenprintui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/include/gutenprintui2/Makefile.in b/include/gutenprintui2/Makefile.in
index 18d7446..6c7412f 100644
--- a/include/gutenprintui2/Makefile.in
+++ b/include/gutenprintui2/Makefile.in
@@ -46,18 +46,17 @@ subdir = include/gutenprintui2
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-depcomp =
-am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 am__pkginclude_HEADERS_DIST = gutenprintui.h curve.h gammacurve.h \
@@ -77,13 +76,18 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 pkgincludedir = $(includedir)/gutenprintui2
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -109,6 +113,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -116,6 +122,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -128,12 +135,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -168,6 +177,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -263,14 +273,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -287,6 +300,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -304,17 +320,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -346,9 +366,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps include/gutenprintui2/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/gutenprintui2/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps include/gutenprintui2/Makefile
+	  $(AUTOMAKE) --gnu  include/gutenprintui2/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/m4/stp_option.m4 b/m4/stp_option.m4
index 32a4466..0ff5646 100644
--- a/m4/stp_option.m4
+++ b/m4/stp_option.m4
@@ -141,8 +141,9 @@ AC_DEFUN([STP_ADD_COMPILER_ARG],[
   CFLAGS="${m4_ifval([$3], [$3], [CFLAGS])} $1"
   AC_TRY_COMPILE(,,
       [ AC_MSG_RESULT(yes);
-        stp_newCFLAGS="${m4_ifval([$3], [$3], [CFLAGS])} $1"],
-      [ AC_MSG_RESULT(no);])
+        stp_newCFLAGS="$CFLAGS"],
+      [ AC_MSG_RESULT(no);
+	stp_newCFLAGS="$stp_acOLDCFLAGS"])
   CFLAGS="$stp_acOLDCFLAGS"
   m4_ifval([$3], [$3], [CFLAGS])="${stp_newCFLAGS}"
 ])
diff --git a/m4/stp_release.m4 b/m4/stp_release.m4
index ce2b785..561c04a 100644
--- a/m4/stp_release.m4
+++ b/m4/stp_release.m4
@@ -24,6 +24,6 @@
 # Makefiles.
 AC_DEFUN([STP_RELEASE_DATE],
 [dnl Set package release date
-RELEASE_DATE="22 Jul 2006"
+RELEASE_DATE="17 Jun 2007"
 AC_DEFINE_UNQUOTED(RELEASE_DATE, "${RELEASE_DATE}", [Package release date.])
 AC_SUBST(RELEASE_DATE)])
diff --git a/man/Makefile.in b/man/Makefile.in
index fd110f0..cc384cc 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -49,11 +49,12 @@ subdir = man
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
@@ -61,8 +62,6 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = cups-calibrate.8 cups-genppd.8 \
 	cups-genppdconfig.8 cups-genppdupdate.8 escputil.1 \
 	ijsgutenprint.1
-depcomp =
-am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 man1dir = $(mandir)/man1
@@ -73,13 +72,18 @@ MANS = $(man_MANS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -105,6 +109,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -112,6 +118,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -124,12 +131,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -164,6 +173,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -259,14 +269,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -283,6 +296,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -300,17 +316,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -349,9 +369,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps man/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  man/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps man/Makefile
+	  $(AUTOMAKE) --gnu  man/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/po/cs.gmo b/po/cs.gmo
index 6b2a932..26720bf 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 36c264c..3d6f4a7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 4.2.6-pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\n"
 "PO-Revision-Date: 2006-05-04 07:18-0400\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -18,7 +18,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 #, fuzzy
 msgid "Default"
 msgstr "Nastavit implicitní"
@@ -83,18 +83,18 @@ msgstr ""
 msgid "Density"
 msgstr "Hustota:"
 
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -145,503 +145,316 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmus rozkladu barev"
 
-#: src/main/print-canon.c:1382
-#, fuzzy
-msgid "90x90 DPI"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1382
-#, fuzzy
-msgid "90x90 DPI DMT"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI"
-msgstr "150×150 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI DMT"
-msgstr "150×150 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI"
-msgstr "300×300 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI DMT"
-msgstr "600×600 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI"
-msgstr "720 x 360 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI DMT"
-msgstr "720 x 360 DPI MW2"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI DMT"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI"
-msgstr "1440 x 720 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI DMT"
-msgstr "1440 x 720 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI DMT"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI DMT"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr "150×150 DPI"
-
-#: src/main/print-canon.c:1390
-#, fuzzy
-msgid "150x150 DPI DMT"
-msgstr "150×150 DPI"
-
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
-msgstr "300×300 DPI"
-
-#: src/main/print-canon.c:1391
-#, fuzzy
-msgid "300x300 DPI DMT"
-msgstr "300×300 DPI"
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr "600×300 DPI"
-
-#: src/main/print-canon.c:1392
-#, fuzzy
-msgid "600x300 DPI DMT"
-msgstr "600×300 DPI"
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr "600×600 DPI"
-
-#: src/main/print-canon.c:1393
-#, fuzzy
-msgid "600x600 DPI DMT"
-msgstr "600×600 DPI"
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr "1200×600 DPI"
-
-#: src/main/print-canon.c:1394
-#, fuzzy
-msgid "1200x600 DPI DMT"
-msgstr "1200×600 DPI"
-
-#: src/main/print-canon.c:1395
-#, fuzzy
-msgid "1200x1200 DPI"
-msgstr "1200×600 DPI"
-
-#: src/main/print-canon.c:1395
-#, fuzzy
-msgid "1200x1200 DPI DMT"
-msgstr "1200×600 DPI"
-
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI"
-msgstr "2400×600 DPI"
-
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI DMT"
-msgstr "2400×600 DPI"
-
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-msgid "Plain Paper"
-msgstr "Normální papír"
-
-#: src/main/print-canon.c:1448
-#, fuzzy
-msgid "Plain Paper PIXMA"
-msgstr "Normální papír"
-
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-msgid "Transparencies"
-msgstr "Fólie"
-
-#: src/main/print-canon.c:1450
-msgid "Back Print Film"
-msgstr ""
-
-#: src/main/print-canon.c:1451
-msgid "Fabric Sheets"
-msgstr "Listy tkaniny"
-
-#: src/main/print-canon.c:1452
-msgid "Envelope"
-msgstr "Obálka"
-
-#: src/main/print-canon.c:1453
-msgid "High Resolution Paper"
-msgstr "Papír pro vysoká rozlišení"
-
-#: src/main/print-canon.c:1454
-msgid "T-Shirt Transfers"
-msgstr "Obtisk na tri�ko"
-
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
-msgstr "Potah s vysokým leskem"
-
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
-msgstr "Lesklý fotopapír"
-
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
-msgstr "Lesklé foto karty"
-
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
-msgstr "Profesionální fotopapír"
-
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
-msgstr "Jiný"
-
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
 msgid "Page Size"
 msgstr "Velikost"
 
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Název tiskárny:"
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Velikost papíru, na který chcete tisknout"
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
 msgid "Media Type"
 msgstr "Typ média"
 
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
 msgid "Media Source"
 msgstr "Zdroj média"
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Zdroj (vstupní otvor) média, na které tisknete"
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
+msgstr ""
+
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr ""
+
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
+msgstr ""
+
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
+
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+msgid "CD Hub Size (Custom)"
+msgstr ""
+
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#, fuzzy
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "Upravit tisk na velikost stránky"
+
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
+msgstr ""
+
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr ""
+
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
 msgstr "Rozlišení"
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
 msgstr "Rozlišení a kvalita tisku"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Typ inkoustu"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr ""
-
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Typ inkoustu v tiskárně"
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Model tiskárny:"
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Papír ColorLife"
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Fialová"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Světle fialová"
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
-msgid "Short Edge (Flip)"
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-msgid "Auto Sheet Feeder"
-msgstr "Automatický podava� listů"
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+msgid "Short Edge (Flip)"
+msgstr ""
 
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-msgid "Manual with Pause"
-msgstr "Ru�ní s přestávkou"
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
+msgstr ""
 
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
-msgstr "Ru�ní bez přestávky"
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
+msgstr ""
 
-#: src/main/print-canon.c:1923
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
 #, fuzzy
-msgid "Cassette"
-msgstr "Matný papír"
+msgid "CD - Custom"
+msgstr "Vlastní"
 
-#: src/main/print-canon.c:1924
-msgid "CD tray"
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:2049
-msgid "Photo CcMmYK Color"
-msgstr "Fotografické barvy CcMmYK"
-
-#: src/main/print-canon.c:2052
-msgid "Photo CcMmY Color"
-msgstr "Fotografické barvy CcMmY"
-
-#: src/main/print-canon.c:2055
-msgid "CMYK Color"
-msgstr "Barvy CMYK"
-
-#: src/main/print-canon.c:2058
-msgid "CMY Color"
-msgstr "Barvy CMY"
-
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
-msgstr "Černá"
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#, fuzzy
+msgid "Print To Hub"
+msgstr "Tisknout do souboru?"
 
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
 msgstr "Barva"
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
@@ -681,9 +494,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Vytisknout"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
 msgstr "Odstíny šedi"
 
@@ -713,11 +526,6 @@ msgstr ""
 msgid "Channel "
 msgstr "Zrušit"
 
-#: src/main/print-color.c:165
-#, fuzzy
-msgid " Gamma"
-msgstr "Gama:"
-
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
 #: src/main/print-color.c:266 src/main/print-color.c:274
@@ -775,7 +583,7 @@ msgid "Output image type"
 msgstr "Typ výstupu:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
 msgstr ""
 
@@ -843,13 +651,13 @@ msgstr "Gama:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
@@ -860,13 +668,13 @@ msgstr "Modrozelená"
 msgid "Adjust the cyan gamma"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 msgid "Magenta"
@@ -877,13 +685,13 @@ msgstr "Fialová"
 msgid "Adjust the magenta gamma"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
@@ -894,9 +702,9 @@ msgstr "Žlutá"
 msgid "Adjust the yellow gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
 msgstr ""
@@ -906,8 +714,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
 msgstr ""
 
@@ -916,9 +724,9 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
 msgstr ""
@@ -928,12 +736,24 @@ msgstr ""
 msgid "Adjust the blue gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr "Černá"
+
 #: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
 msgstr ""
 
@@ -948,7 +768,7 @@ msgstr "Odstíny šedi"
 msgid "Adjust the cyan gray balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Fialová"
@@ -958,7 +778,7 @@ msgstr "Fialová"
 msgid "Adjust the magenta gray balance"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Žlutá"
@@ -989,9 +809,9 @@ msgstr "Typ inkoustu"
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 msgid "Advanced Output Control"
 msgstr ""
 
@@ -1023,11 +843,6 @@ msgstr ""
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:446
-#, fuzzy
-msgid " Curve"
-msgstr "Černá"
-
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
@@ -1158,582 +973,387 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:516 src/main/printers.c:521
+#: src/main/printers.c:519 src/main/printers.c:524
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s není platný parametr typu %s\n"
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:673
+#: src/main/printers.c:676
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Neznámá tiskárna %s\n"
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s mimo rozsah (hodnota %d, min %d, max %d)\n"
 
-#: src/main/printers.c:755
+#: src/main/printers.c:761
 #, fuzzy
 msgid "Page size is not valid\n"
 msgstr "Velikost obrázku není platná\n"
 
-#: src/main/printers.c:776
+#: src/main/printers.c:782
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Horní okraj nesmí být méně než nula\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:788
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Levý okraj nesmí být méně než nula\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:794
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Levý okraj nesmí být méně než nula\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:800
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Horní okraj nesmí být méně než nula\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr "Standardní"
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-msgid "Roll Feed"
-msgstr "Podávací válec"
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr "Podávací válec (odříznout každou stranu)"
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr "Podávací válec (neodřezávat)"
-
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-#, fuzzy
-msgid "Manual Feed"
-msgstr "Ru�ní"
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-#, fuzzy
-msgid "Print to CD"
-msgstr "Tisknout do souboru?"
-
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-#, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Ru�ní výběr"
-
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-#, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Ru�ní"
-
-#: src/main/print-escp2-data.c:554
-#, fuzzy
-msgid "Rear Tray"
-msgstr "Podava�"
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr ""
-
-#: src/main/print-escp2-data.c:581
-#, fuzzy
-msgid "Photo Board"
-msgstr "Fotopapír"
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr "Přihrádka řezaných listů 1"
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr "Přihrádka řezaných listů 2"
-
-#: src/main/print-escp2-data.c:638
-msgid "Cut Sheet Autoselect"
-msgstr "Automatický výběr řezaných listů"
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr "Ru�ní výběr"
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr ""
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-#, fuzzy
-msgid "High"
-msgstr "Výška:"
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-#, fuzzy
-msgid "Photo"
-msgstr "Fotografie"
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-#, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
-
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-#, fuzzy
-msgid "Ultra Photo"
-msgstr "Å est barev foto"
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-#, fuzzy
-msgid "Light Cyan"
-msgstr "Světle modrozelená"
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-#, fuzzy
-msgid "Light Magenta"
-msgstr "Světle fialová"
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-#, fuzzy
-msgid "Light Black"
-msgstr "Černá"
-
-#: src/main/print-escp2-data.c:811
-#, fuzzy
-msgid "Dark Yellow"
-msgstr "Černá/tmavá žlutá"
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-#, fuzzy
-msgid "Matte Black"
-msgstr "Matný papír"
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-#, fuzzy
-msgid "Photo Black"
-msgstr "Fotopapír"
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-#, fuzzy
-msgid "Gloss Optimizer"
-msgstr "Lesklý potah"
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-#, fuzzy
-msgid "Light Light Black"
-msgstr "Černá"
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 #, fuzzy
 msgid "Print Quality"
 msgstr "720 DPI Nejvyšší kvalita"
 
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr ""
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr ""
-
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr ""
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:214
+#: src/main/print-escp2.c:228
 #, fuzzy
 msgid "Resolution of the print"
 msgstr "Rozlišení a kvalita tisku"
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:236
+#: src/main/print-escp2.c:250
 #, fuzzy
 msgid "Ink Set"
 msgstr "Typ inkoustu"
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 #, fuzzy
 msgid "Output Order"
 msgstr "Typ výstupu:"
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 #, fuzzy
 msgid "Ink change command"
 msgstr "Nerozpoznaný příkaz.\n"
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Opakuji proces zarovnávání.\n"
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 #, fuzzy
 msgid "Channel Names"
 msgstr "Zrušit"
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:346
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Modrozelená"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:347
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:352
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Fialová"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:358
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Žlutá"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:364
 #, fuzzy
 msgid "Blue Map"
 msgstr "Černobíle"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:447
+#: src/main/print-escp2.c:464
 #, fuzzy
 msgid "Red Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:448
+#: src/main/print-escp2.c:465
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:455
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Blue Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:456
+#: src/main/print-escp2.c:473
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-escp2.c:463
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Lesklý potah"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:481
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:527
+#: src/main/print-escp2.c:544
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:528
+#: src/main/print-escp2.c:545
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr ""
-
-#: src/main/print-escp2.c:1564
-#, fuzzy
-msgid "Print To Hub"
-msgstr "Tisknout do souboru?"
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Ru�ní"
 
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr "Standardní"
+
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 #, fuzzy
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/main/print-escp2.c:1701
+#: src/main/print-escp2.c:1829
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:1703
+#: src/main/print-escp2.c:1831
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2168
+#: src/main/print-escp2.c:2313
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Tiskárna nepodporuje barevný výstup\n"
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1787,255 +1407,308 @@ msgid "test print"
 msgstr "testovací tisk"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
 msgstr "Čtyři barvy standardní"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
 msgstr "Tři barvy kompozitní"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
 msgstr "Å est barev foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
 msgstr "Pět barev foto kompozitní"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+msgid "Plain Paper"
+msgstr "Normální papír"
+
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
 msgstr "Lesklý potah"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+msgid "Transparencies"
+msgstr "Fólie"
+
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 msgid "Envelopes"
 msgstr "Obálky"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 msgid "Matte Paper"
 msgstr "Matný papír"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
 msgstr "Papír pro inkoustové tiskárny"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papír pro inkoustové tiskárny ve foto kvalitě"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 msgid "Photo Paper"
 msgstr "Fotopapír"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
 msgstr "Extra lesklý fotopapír"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
 msgstr "Lesklý papír ve foto kvalitě"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-olympus.c:265
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr "Jiný"
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr "Automatický podava� listů"
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr "Ru�ní s přestávkou"
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr "Ru�ní bez přestávky"
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 #, fuzzy
 msgid "Glossy"
 msgstr "Lesklý potah"
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:861
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 #, fuzzy
 msgid "Matte"
 msgstr "Matný papír"
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1331
+#: src/main/print-olympus.c:1627
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-olympus.c:1339
+#: src/main/print-olympus.c:1635
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-olympus.c:1347
+#: src/main/print-olympus.c:1643
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-olympus.c:1354
+#: src/main/print-olympus.c:1650
 #, fuzzy
 msgid "Black Balance"
 msgstr "Černobíle"
 
-#: src/main/print-olympus.c:1355
+#: src/main/print-olympus.c:1651
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 msgid "Plain"
 msgstr "Normální"
 
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 msgid "Bond"
 msgstr ""
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 msgid "Premium"
 msgstr "Prémiový"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
 msgstr "Lesklý foto"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 msgid "Transparency"
 msgstr "Fólie"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
 msgstr "Rychleschnoucí foto"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 msgid "Quick-dry Transparency"
 msgstr "Rychleschnoucí fólie"
 
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
 msgstr "Ru�ní"
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 msgid "Tray 1"
 msgstr "Podava� 1"
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 msgid "Tray 2"
 msgstr "Podava� 2"
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 msgid "Tray 3"
 msgstr "Podava� 3"
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 msgid "Tray 4"
 msgstr "Podava� 4"
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
 msgstr "Přenosný podava� papíru"
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 msgid "Desktop Sheet Feeder"
 msgstr "Podava� papíru na stole"
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 msgid "Tray"
 msgstr "Podava�"
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 msgid "Optional Source"
 msgstr "Nepovinný zdroj"
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 msgid "Autoselect"
 msgstr "Automaticky vybrat"
 
 #: src/main/print-pcl.c:256
+msgid "150x150 DPI"
+msgstr "150×150 DPI"
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr "300×300 DPI"
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
+msgstr "600×300 DPI"
+
+#: src/main/print-pcl.c:259
 msgid "600x600 DPI monochrome"
 msgstr "600×600 DPI �ernobíle"
 
-#: src/main/print-pcl.c:259
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr "600×600 DPI"
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr "1200×600 DPI"
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
 msgstr "Barevná a �erná cartridge"
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
 msgstr "Barevná a foto cartridge"
 
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr ""
-
 #: src/main/print-ps.c:97
 #, fuzzy
 msgid "PPDFile"
 msgstr "Soubor PPD:"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 #, fuzzy
 msgid "PPD File"
 msgstr "Soubor PPD?"
@@ -2044,181 +1717,298 @@ msgstr "Soubor PPD?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 msgid "Two Level Grayscale"
 msgstr "Dva úrovně stupňů šedi"
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 #, fuzzy
 msgid "Three Level Grayscale"
 msgstr "Dva úrovně stupňů šedi"
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
 msgstr "Šet barev rozšířené kompozitní"
 
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 msgid "Seven Color Photo"
 msgstr "Sedm barev foto"
 
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 msgid "Seven Color Enhanced"
 msgstr "Sedm barev rozšířené"
 
-#: src/main/escp2-channels.c:1535
+#: src/main/escp2-channels.c:1649
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Å est barev foto"
 
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 msgid "One Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1695
+#: src/main/escp2-channels.c:1809
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Sedm barev rozšířené"
 
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 msgid "Two Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Tři barvy kompozitní"
 
-#: src/main/escp2-channels.c:1762
+#: src/main/escp2-channels.c:1876
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Tři barvy kompozitní"
 
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Čtyři barvy standardní"
 
-#: src/main/escp2-channels.c:1884
+#: src/main/escp2-channels.c:2017
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Čtyři barvy standardní"
 
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Å est barev foto"
 
-#: src/main/escp2-channels.c:1962
+#: src/main/escp2-channels.c:2109
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Šet barev rozšířené kompozitní"
 
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Sedm barev foto"
 
-#: src/main/escp2-channels.c:2024
+#: src/main/escp2-channels.c:2187
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sedm barev rozšířené"
 
-#: src/main/escp2-channels.c:2042
+#: src/main/escp2-channels.c:2205
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Å est barev foto"
 
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Å est barev foto"
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#, fuzzy
+msgid "Photo Black"
+msgstr "Fotopapír"
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+#, fuzzy
+msgid "Matte Black"
+msgstr "Matný papír"
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+#, fuzzy
+msgid "Light Cyan"
+msgstr "Světle modrozelená"
+
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+#, fuzzy
+msgid "Light Magenta"
+msgstr "Světle fialová"
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+#, fuzzy
+msgid "Light Black"
+msgstr "Černá"
+
+#: src/main/escp2-channels.c:2981
+#, fuzzy
+msgid "Dark Yellow"
+msgstr "Černá/tmavá žlutá"
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#, fuzzy
+msgid "Gloss Optimizer"
+msgstr "Lesklý potah"
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Černá"
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 msgid "Plain Paper Fast Load"
 msgstr "Rychlé podávání normálního papíru"
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Pohlednice"
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Matný papír"
 
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Extra lesklý fotopapír"
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Papír ColorLife"
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matný papír"
 
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+msgid "Roll Feed"
+msgstr "Podávací válec"
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr "Podávací válec (odříznout každou stranu)"
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr "Podávací válec (neodřezávat)"
+
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#, fuzzy
+msgid "Manual Feed"
+msgstr "Ru�ní"
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+#, fuzzy
+msgid "Print to CD"
+msgstr "Tisknout do souboru?"
+
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Ru�ní výběr"
+
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Ru�ní"
+
+#: src/main/escp2-papers.c:1859
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Podava�"
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/escp2-papers.c:1886
+#, fuzzy
+msgid "Photo Board"
+msgstr "Fotopapír"
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr "Přihrádka řezaných listů 1"
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr "Přihrádka řezaných listů 2"
+
+#: src/main/escp2-papers.c:1943
+msgid "Cut Sheet Autoselect"
+msgstr "Automatický výběr řezaných listů"
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr "Ru�ní výběr"
+
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
@@ -2258,144 +2048,168 @@ msgstr "600 DPI"
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:94
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 #, fuzzy
 msgid "720 DPI High Quality"
 msgstr "1200 DPI vysoká kvalita"
 
-#: src/main/escp2-resolutions.c:97
+#: src/main/escp2-resolutions.c:103
 #, fuzzy
 msgid "720 DPI Highest Quality"
 msgstr "1200 DPI nejvyšší kvalita"
 
-#: src/main/escp2-resolutions.c:100
+#: src/main/escp2-resolutions.c:106
 #, fuzzy
 msgid "720 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1200 DPI nejvyšší kvalita"
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:129
+#: src/main/escp2-resolutions.c:135
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1200 DPI nejvyšší kvalita"
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
+#: src/main/escp2-resolutions.c:145
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:142
-#, fuzzy
-msgid "1440 x 1440"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/escp2-resolutions.c:145
-#, fuzzy
-msgid "1440 x 1440 DPI High Quality"
-msgstr "1200 DPI nejvyšší kvalita"
-
-#: src/main/escp2-resolutions.c:148
-#, fuzzy
-msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1200 DPI nejvyšší kvalita"
-
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:158
+#: src/main/escp2-resolutions.c:155
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:164
-#, fuzzy
-msgid "2880 x 1440 DPI High Quality"
-msgstr "1200 DPI nejvyšší kvalita"
-
-#: src/main/escp2-resolutions.c:167
-#, fuzzy
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr "1200 DPI nejvyšší kvalita"
-
-#: src/main/escp2-resolutions.c:171
+#: src/main/escp2-resolutions.c:162
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 #, fuzzy
 msgid "Interleave"
 msgstr "Název tiskárny:"
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Název tiskárny:"
 
-#: src/main/escp2-resolutions.c:584
+#: src/main/escp2-resolutions.c:594
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jas:"
 
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+#, fuzzy
+msgid "High"
+msgstr "Výška:"
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografie"
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+#, fuzzy
+msgid "Super Photo"
+msgstr "Stylus Photo"
+
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+#, fuzzy
+msgid "Ultra Photo"
+msgstr "Å est barev foto"
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr ""
+
 #: src/main/generic-options.c:46
 msgid "Text"
 msgstr ""
@@ -2470,3861 +2284,4185 @@ msgstr "Tabloid"
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
 msgstr "3×5"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
 msgstr "4×6"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/main/xmli18n-tmp.h:11
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson fotopapír 4×6"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
 msgstr "5×7"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
 msgstr "5×8"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
 msgstr "6×8"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
 msgstr "8×10"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
 msgstr "12×18"
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
 msgstr "Super B 13×19"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
 msgstr "8×12"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
 msgstr "11×14"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
 msgstr "16×20"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
 msgstr "16×24"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
 msgstr "20×24"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
 msgstr "20×30"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/main/xmli18n-tmp.h:26
 msgid "22x30"
 msgstr "22×30"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
 msgstr "24×30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
 msgstr "30×40"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/main/xmli18n-tmp.h:32
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
 msgstr "A4"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/main/xmli18n-tmp.h:67
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 #, fuzzy
 msgid "ArchA transposed"
 msgstr "ArchA pří�ně"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 #, fuzzy
 msgid "ArchB transposed"
 msgstr "ArchB pří�ně"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 #, fuzzy
 msgid "ArchC transposed"
 msgstr "ArchC pří�ně"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 #, fuzzy
 msgid "ArchD transposed"
 msgstr "ArchD pří�ně"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 #, fuzzy
 msgid "ArchE transposed"
 msgstr "ArchE pří�ně"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 msgid "American foolscap"
 msgstr "Americký foolscap"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 msgid "European foolscap"
 msgstr "Evropský foolscap"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/main/xmli18n-tmp.h:109
 #, fuzzy
 msgid "ISO A4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 msgid "Small paperback"
 msgstr "Malá brožura"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 msgid "Penguin small paperback"
 msgstr "Malá brožura Penguin"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 msgid "Penguin large paperback"
 msgstr "Velká brožura Penguin"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 msgid "Hagaki Card"
 msgstr "Karta Hagaki"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
 msgstr "Karta Oufuku"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
 msgstr "Japonská dlouhá obálka #3"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
 msgstr "Japonská dlouhá obálka #4"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 msgid "Japanese Kaku envelope #4"
 msgstr "Japonská obálka Kaku #4"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 msgid "A2 Invitation"
 msgstr "Pozvánka A2"
 
-#: src/main/xmli18n-tmp.h:125
+#: src/main/xmli18n-tmp.h:126
 msgid "Monarch Envelope"
 msgstr "Obálka Monarch"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:127
+#: src/main/xmli18n-tmp.h:128
 #, fuzzy
 msgid "4x7"
 msgstr "5×7"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:130
+#: src/main/xmli18n-tmp.h:131
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Pohlednice"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 msgid "Custom"
 msgstr "Vlastní"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
 msgstr "Rolovaný papír 89 mm"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
 msgstr "Rolovaný papír 4 palce"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
 msgstr "Rolovaný papír 5 palců"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
 msgstr "Rolovaný papír 210 mm"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
 msgstr "Rolovaný papír 13 palců"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
 msgstr "Rolovaný papír 22 palce"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
 msgstr "Rolovaný papír 24 palce"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
 msgstr "Rolovaný papír 36 palců"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
 msgstr "Rolovaný papír 44 palce"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:145
+#: src/main/xmli18n-tmp.h:146
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:146
+#: src/main/xmli18n-tmp.h:147
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:147
+#: src/main/xmli18n-tmp.h:148
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/main/xmli18n-tmp.h:149
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:149
+#: src/main/xmli18n-tmp.h:150
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/main/xmli18n-tmp.h:151
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/main/xmli18n-tmp.h:152
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:152
+#: src/main/xmli18n-tmp.h:153
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/main/xmli18n-tmp.h:154
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/main/xmli18n-tmp.h:155
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
+#: src/main/xmli18n-tmp.h:156
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:156
+#: src/main/xmli18n-tmp.h:157
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:157
+#: src/main/xmli18n-tmp.h:158
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:158
+#: src/main/xmli18n-tmp.h:159
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:159
+#: src/main/xmli18n-tmp.h:160
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:160
+#: src/main/xmli18n-tmp.h:161
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:161
+#: src/main/xmli18n-tmp.h:162
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:162
+#: src/main/xmli18n-tmp.h:163
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:163
+#: src/main/xmli18n-tmp.h:164
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:164
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:173
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
-msgid "Canon iP4000"
+#: src/main/xmli18n-tmp.h:181
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:182
+msgid "Canon PIXMA iP3000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:183
+msgid "Canon PIXMA iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:184
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:185
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:186
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:187
+#, fuzzy
+msgid "Canon PIXMA iP4300"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:188
+#, fuzzy
+msgid "Canon PIXMA iP5000"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
+#, fuzzy
+msgid "Canon PIXMA iP6700"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA MP150"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:192
+#, fuzzy
+msgid "Canon PIXMA MP500"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:193
+#, fuzzy
+msgid "Canon PIXMA MP700"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA MP730"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:195
+#, fuzzy
+msgid "Canon PIXMA MP750"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA MP760"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA MP770"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA MP780"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:199
+#, fuzzy
+msgid "Canon PIXMA MP790"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP830"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:201
+msgid "Canon PIXUS iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:202
+msgid "Canon PIXUS iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:203
+msgid "Canon i560"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:204
+msgid "Canon i850"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:205
+msgid "Canon i860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:206
+msgid "Canon i865"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C61"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C62"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:238
+#, fuzzy
+msgid "Epson Stylus C79"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C82"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:245
+#, fuzzy
+msgid "Epson Stylus C87"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "Epson Stylus Photo 1400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "Epson Stylus Photo 1410"
+msgstr "Stylus Photo 810"
+
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:314
+#, fuzzy
+msgid "Epson Stylus Photo R230"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:315
+#, fuzzy
+msgid "Epson Stylus Photo R240"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "Epson Stylus Photo R245"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:317
+#, fuzzy
+msgid "Epson Stylus Photo R260"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Epson Stylus Photo R265"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "Epson Stylus Photo R270"
+msgstr "Stylus Photo 1270"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "Epson Stylus Photo R350"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "Epson Stylus Photo R360"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "Epson Stylus Photo R380"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "Epson Stylus Photo R390"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Epson Stylus Photo RX560"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:335
+#, fuzzy
+msgid "Epson Stylus Photo RX580"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:336
+#, fuzzy
+msgid "Epson Stylus Photo RX590"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:340
+#, fuzzy
+msgid "Epson Stylus Photo RX640"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:353
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:372
+#, fuzzy
+msgid "Epson Stylus CX5000"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:373
+#, fuzzy
+msgid "Epson Stylus CX5000F"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:380
+#, fuzzy
+msgid "Epson Stylus CX6000"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX7000F"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:397
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:399
+msgid "Epson PictureMate Flash"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:400
+msgid "Epson PictureMate Pal"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:401
+msgid "Epson PictureMate Snap"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:402
+#, fuzzy
+msgid "Epson PictureMate 200"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:403
+#, fuzzy
+msgid "Epson PictureMate 210"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:404
+#, fuzzy
+msgid "Epson PictureMate 240"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:405
+#, fuzzy
+msgid "Epson PictureMate 250"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson PictureMate 280"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:411
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:414
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:417
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:426
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:427
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:428
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:429
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:430
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:448
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:451
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:454
+#, fuzzy
+msgid "Epson PM A820"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:456
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:459
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:460
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:462
+#, fuzzy
+msgid "Epson PM D870"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:463
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:464
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:465
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:467
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:468
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
+#, fuzzy
+msgid "Epson PM G850"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:470
+#, fuzzy
+msgid "Epson PM G4500"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:471
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:472
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:473
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:474
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:475
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:478
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:549
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:550
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:551
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:552
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:802
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Název tiskárny:"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+msgid "Lexmark Optra E220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:913
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Nastavit tiskárnu"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:924
+msgid "Xerox WorkCentre M118"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:926
+msgid "Lexmark X73"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+msgid "Olympus P-S100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:942
+msgid "Canon CP-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:943
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:953
+msgid "Sony DPP-EX5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:957
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:960
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Inch"
 msgstr "Palec"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
 msgstr "Nastavit základní jednotku měření na palce"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Nastavit základní jednotku měření na centimetry"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Points"
 msgstr "Vytisknout"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Nastavit základní jednotku měření na palce"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Nastavit základní jednotku měření na centimetry"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Nastavit základní jednotku měření na palce"
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color output"
 msgstr "Barevný výstup"
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
 msgstr "Tisknout v odstínech šedi pomocí �erného inkoustu"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 #, fuzzy
 msgid "Standard Command"
 msgstr "Standardní"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Custom Command"
 msgstr "Příkaz:"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
 msgstr "Soubor"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Print to a file"
 msgstr "Tisknout do souboru?"
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 #, fuzzy
 msgid "Set Default"
 msgstr "Nastavit implicitní"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
 msgstr "Budiž"
 
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Tisk v%s"
 
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
 msgstr "O programu"
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6332,7 +6470,7 @@ msgstr ""
 "Vytisknout a\n"
 "uložit nastavení"
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 msgid ""
 "Save\n"
 "Settings"
@@ -6340,15 +6478,15 @@ msgstr ""
 "Uložit\n"
 "nastavení"
 
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
 msgstr "Vytisknout"
 
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
 msgstr "Náhled"
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6372,74 +6510,74 @@ msgstr ""
 "Pokud při tažení myší klikněte jiným tla�ítkem, obrázek se vrátí na svou "
 "původní pozici."
 
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 msgid "Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
 msgstr "Rozměry:"
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
 msgstr "Šířka:"
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 msgid "Width of the paper that you wish to print to"
 msgstr "Šířka papíru, na který chcete tisknout"
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
 msgstr "Výška:"
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 msgid "Height of the paper that you wish to print to"
 msgstr "Výška papíru, na který chcete tisknout"
 
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 msgid "Automatic Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 #, fuzzy
 msgid "Image Position"
 msgstr "Pozice"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
 msgstr "Automaticky"
 
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
 msgstr "Na výšku"
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
 msgstr "Na šířku"
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 msgid "Upside down"
 msgstr "Vzhůru nohama"
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
 msgstr "Na stranu"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -6447,124 +6585,125 @@ msgstr ""
 "Vyberte orientaci: na výšku, na šířku, vzhůru nohama nebo na stranu (na "
 "šířku vzhůru nohama)"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 msgid "Orientation:"
 msgstr "Orientace:"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
 msgstr "Levý:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
 msgstr "Vzdálenost od levého okraje papíru k obrázku"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
 msgstr "Pravý:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Vzdálenost od levého okraje papíru k pravému okraji obrázku"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
 msgstr "Vzdálenost od pravého okraje papíru k obrázku"
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
 msgstr "Horní:"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
 msgstr "Vzdálenost od horního okraje papíru k obrázku"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
 msgstr "Spodní:"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Vzdálenost od horního okraje papíru k spodnímu okraji obrázku"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Vzdálenost od spodního okraje papíru k obrázku"
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Center:"
 msgstr "Vycentrovat:"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horizontálně"
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
 msgstr "Vycentrovat obrázek na papíře horizontálně"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
 msgstr "Obojí"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image on the paper"
 msgstr "Vycentrovat obrázek na papíře"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 #, fuzzy
 msgid "Vertical"
 msgstr "Vertikálně"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Center the image vertically on the paper"
 msgstr "Vycentrovat obrázek na papíře vertikálně"
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
 msgstr "Nastavit tiskárnu"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Název tiskárny:"
 
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Vyberte model své tiskárny"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 msgid "Printer Model:"
 msgstr "Model tiskárny:"
 
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 msgid "Select your printer model"
 msgstr "Vyberte model své tiskárny"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 msgid "PPD File:"
 msgstr "Soubor PPD:"
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Zadejte správný název souboru PPD pro svou tiskárnu"
 
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
 msgstr "Procházet"
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Zvolte správný název souboru PPD pro svou tiskárnu"
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -6573,103 +6712,58 @@ msgstr ""
 "Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete "
 "tisknout"
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Název tiskárny:"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Zadejte správný název souboru PPD pro svou tiskárnu"
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 #, fuzzy
 msgid "File to print to"
 msgstr "testovací tisk"
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 #, fuzzy
 msgid "Print To File"
 msgstr "Tisknout do souboru?"
 
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 msgid "Define New Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 msgid "Printer Name:"
 msgstr "Název tiskárny:"
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Zadejte název, který chcete dát této logické tiskárně"
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "O Gimp-Print "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Verze Gimp-Print "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
-"\n"
-"\n"
-"Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz\n"
-"a zbytek vývojového týmu Gimp-Print.\n"
-"\n"
-"Navštivte prosím naši WWW stránku na http://gimp-print.sourceforge.net.\n"
-"\n"
-"Tento program je free software; můžete jej dále šířit a/nebo modifikovat\n"
-"za podmínek GNU General Public License publikované Free Software\n"
-"Foundation; a to bu� verze 2 licence, nebo (podle vašeho uvážení)\n"
-"libovolné pozdější verze.\n"
-"\n"
-"Tento program je rozšiřován v naději, že bude, užite�ný, ale BEZ JAKÉKOLI\n"
-"Z�RUKY; ani bez předpokládané záruky PRODEJNOSTI nebo VHODNOSTI PRO NĚJAK�\n"
-"KONKRÉTN� ÚČEL. Pro další podrobnosti si pře�těte GNU General Public\n"
-"License.\n"
-"\n"
-"Kopii GNU General Public License jste měli dostat s tímto programem;\n"
-"pokud se tak nestalo, napište Free Software Foundation, Inc., 59 Temple\n"
-"Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 msgid "Printer Settings"
 msgstr "Nastavení tiskárny"
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6677,11 +6771,11 @@ msgstr ""
 "Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete "
 "tisknout"
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 msgid "Setup Printer..."
 msgstr "Nastavit tiskárnu..."
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -6689,11 +6783,11 @@ msgstr ""
 "Zvolte model tiskárny, soubor PPD a příkaz, který se používá pro tisk na "
 "tuto tiskárnu"
 
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 msgid "New Printer..."
 msgstr "Nová tiskárna..."
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6701,24 +6795,24 @@ msgstr ""
 "Definovat novou logickou tiskárnu. Toto může být použito pro pojmenování "
 "sady nastavení, které si chcete zapamatovat pro budoucí použití."
 
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 #, fuzzy
 msgid "Image Size"
 msgstr "Typ obrázku"
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 msgid "Scaling:"
 msgstr "Měřítko:"
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 msgid "Set the scale (size) of the image"
 msgstr "Nastavte měřítko (velikost) obrázku"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6726,31 +6820,31 @@ msgstr ""
 "Vyberte, jestli je měřítko měřeno jako procenta dostupné velikosti stránky "
 "nebo po�et výstupních bodů na palec"
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
 msgstr "Procenta"
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 msgid "Scale the print to the size of the page"
 msgstr "Upravit tisk na velikost stránky"
 
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
 msgstr "Upravit tisk na po�et bodů na palec"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 msgid "Set the width of the print"
 msgstr "Nastavit šířku tisku"
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 msgid "Set the height of the print"
 msgstr "Nastavit výšku tisku"
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6758,105 +6852,105 @@ msgstr ""
 "Použít původní\n"
 "velikost obrázku"
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the print size to the size of the image"
 msgstr "Nastavit velikost tisku na velikost obrázku"
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 msgid "Print Color Adjust"
 msgstr "Úprava barvy tisku"
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 msgid "Set Defaults"
 msgstr "Nastavit implicitní"
 
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
 msgstr "Zavřít"
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 msgid "Image preview"
 msgstr "Náhled obrázku"
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 #, fuzzy
 msgid "Output"
 msgstr "Typ výstupu:"
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 msgid "Output Type:"
 msgstr "Typ výstupu:"
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 msgid "Select the desired output type"
 msgstr "Zvolte požadovaný typ výstupu"
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
 msgstr "Upravit výstup..."
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr "Upravit vyrovnání barev, jask, kontrast, sytost a algoritmus rozkladu"
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 #, fuzzy
 msgid "Size Units:"
 msgstr "Jednotky:"
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 msgid "Units:"
 msgstr "Jednotky:"
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 msgid "Select the base unit of measurement for printing"
 msgstr "Vyberte základní jednotku měření pro tisk"
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
 msgstr ""
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
 msgstr ""
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
 msgstr ""
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 #, fuzzy
 msgid "Printer"
 msgstr "Vytisknout"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Nastavit tiskárnu"
@@ -6906,65 +7000,89 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:133
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Printer Features"
 msgstr "Název tiskárny:"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:139
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Common"
 msgstr "Příkaz:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:153
 #, fuzzy
 msgid "Extra 1"
 msgstr "Podava� 1"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Extra 2"
 msgstr "Podava� 2"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Extra 3"
 msgstr "Podava� 3"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:156
 #, fuzzy
 msgid "Extra 4"
 msgstr "Podava� 4"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr "Czech"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 msgid "ISOLatin1"
 msgstr "UTF-8"
 
-#: src/cups/genppd.c:1465
+#: src/cups/genppd.c:1613
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1717
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1719
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1497
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1756
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -6972,19 +7090,6 @@ msgstr ""
 msgid "Escputil version "
 msgstr "Verze escputil "
 
-#: src/escputil/escputil.c:71
-#, fuzzy
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-", Copyright (C) 2000-2001 Robert Krawitz\n"
-"Escputil je dodáván ABSOLUTNĚ BEZ Z�RUKY; pro detaily napište 'escputil -l'\n"
-"Toto je svobodný software, a můžete jej dále šířit za ur�itých podmínek;\n"
-"pro detaily napište 'escputil -l'.\n"
-
 #: src/escputil/escputil.c:76
 #, fuzzy
 msgid ""
@@ -7972,6 +8077,243 @@ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Získání dalšího řádku selhalo na %.0f\n"
 
 #, fuzzy
+#~ msgid "Model Name"
+#~ msgstr "Zrušit"
+
+#, fuzzy
+#~ msgid "Cassette"
+#~ msgstr "Matný papír"
+
+#, fuzzy
+#~ msgid " Gamma"
+#~ msgstr "Gama:"
+
+#, fuzzy
+#~ msgid " Curve"
+#~ msgstr "Černá"
+
+#, fuzzy
+#~ msgid "1440 x 1440"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI High Quality"
+#~ msgstr "1200 DPI nejvyšší kvalita"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI Highest Quality"
+#~ msgstr "1200 DPI nejvyšší kvalita"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI High Quality"
+#~ msgstr "1200 DPI nejvyšší kvalita"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI Highest Quality"
+#~ msgstr "1200 DPI nejvyšší kvalita"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "and the rest of the Gutenprint Development Team.\n"
+#~ "\n"
+#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz\n"
+#~ "a zbytek vývojového týmu Gimp-Print.\n"
+#~ "\n"
+#~ "Navštivte prosím naši WWW stránku na http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "Tento program je free software; můžete jej dále šířit a/nebo modifikovat\n"
+#~ "za podmínek GNU General Public License publikované Free Software\n"
+#~ "Foundation; a to bu� verze 2 licence, nebo (podle vašeho uvážení)\n"
+#~ "libovolné pozdější verze.\n"
+#~ "\n"
+#~ "Tento program je rozšiřován v naději, že bude, užite�ný, ale BEZ "
+#~ "JAKÉKOLI\n"
+#~ "Z�RUKY; ani bez předpokládané záruky PRODEJNOSTI nebo VHODNOSTI PRO "
+#~ "NĚJAK�\n"
+#~ "KONKRÉTN� ÚČEL. Pro další podrobnosti si pře�těte GNU General Public\n"
+#~ "License.\n"
+#~ "\n"
+#~ "Kopii GNU General Public License jste měli dostat s tímto programem;\n"
+#~ "pokud se tak nestalo, napište Free Software Foundation, Inc., 59 Temple\n"
+#~ "Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
+#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
+#~ "l'\n"
+#~ "This is free software, and you are welcome to redistribute it\n"
+#~ "under certain conditions; type 'escputil -l' for details.\n"
+#~ msgstr ""
+#~ ", Copyright (C) 2000-2001 Robert Krawitz\n"
+#~ "Escputil je dodáván ABSOLUTNĚ BEZ Z�RUKY; pro detaily napište 'escputil -"
+#~ "l'\n"
+#~ "Toto je svobodný software, a můžete jej dále šířit za ur�itých podmínek;\n"
+#~ "pro detaily napište 'escputil -l'.\n"
+
+#, fuzzy
+#~ msgid "90x90 DPI"
+#~ msgstr "600 DPI"
+
+#, fuzzy
+#~ msgid "90x90 DPI DMT"
+#~ msgstr "600 DPI"
+
+#, fuzzy
+#~ msgid "180x180 DPI"
+#~ msgstr "150×150 DPI"
+
+#, fuzzy
+#~ msgid "180x180 DPI DMT"
+#~ msgstr "150×150 DPI"
+
+#, fuzzy
+#~ msgid "360x360 DPI"
+#~ msgstr "300×300 DPI"
+
+#, fuzzy
+#~ msgid "360x360 DPI DMT"
+#~ msgstr "600×600 DPI"
+
+#, fuzzy
+#~ msgid "720x360 DPI"
+#~ msgstr "720 x 360 DPI"
+
+#, fuzzy
+#~ msgid "720x360 DPI DMT"
+#~ msgstr "720 x 360 DPI MW2"
+
+#, fuzzy
+#~ msgid "720x720 DPI"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "720x720 DPI DMT"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x720 DPI"
+#~ msgstr "1440 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x720 DPI DMT"
+#~ msgstr "1440 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI DMT"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI DMT"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "150x150 DPI DMT"
+#~ msgstr "150×150 DPI"
+
+#, fuzzy
+#~ msgid "300x300 DPI DMT"
+#~ msgstr "300×300 DPI"
+
+#, fuzzy
+#~ msgid "600x300 DPI DMT"
+#~ msgstr "600×300 DPI"
+
+#, fuzzy
+#~ msgid "600x600 DPI DMT"
+#~ msgstr "600×600 DPI"
+
+#, fuzzy
+#~ msgid "1200x600 DPI DMT"
+#~ msgstr "1200×600 DPI"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI"
+#~ msgstr "1200×600 DPI"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI DMT"
+#~ msgstr "1200×600 DPI"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI"
+#~ msgstr "2400×600 DPI"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI DMT"
+#~ msgstr "2400×600 DPI"
+
+#, fuzzy
+#~ msgid "Plain Paper PIXMA"
+#~ msgstr "Normální papír"
+
+#~ msgid "Fabric Sheets"
+#~ msgstr "Listy tkaniny"
+
+#~ msgid "Envelope"
+#~ msgstr "Obálka"
+
+#~ msgid "High Resolution Paper"
+#~ msgstr "Papír pro vysoká rozlišení"
+
+#~ msgid "T-Shirt Transfers"
+#~ msgstr "Obtisk na tri�ko"
+
+#~ msgid "High Gloss Film"
+#~ msgstr "Potah s vysokým leskem"
+
+#~ msgid "Glossy Photo Paper"
+#~ msgstr "Lesklý fotopapír"
+
+#~ msgid "Glossy Photo Cards"
+#~ msgstr "Lesklé foto karty"
+
+#~ msgid "Photo Paper Pro"
+#~ msgstr "Profesionální fotopapír"
+
+#~ msgid "Photo CcMmYK Color"
+#~ msgstr "Fotografické barvy CcMmYK"
+
+#~ msgid "Photo CcMmY Color"
+#~ msgstr "Fotografické barvy CcMmY"
+
+#~ msgid "CMYK Color"
+#~ msgstr "Barvy CMYK"
+
+#~ msgid "CMY Color"
+#~ msgstr "Barvy CMY"
+
+#, fuzzy
 #~ msgid "Gutenprint"
 #~ msgstr "testovací tisk"
 
diff --git a/po/da.gmo b/po/da.gmo
index 12a9131..47e6380 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 4cc0a8f..abeabbe 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint 5.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\n"
 "PO-Revision-Date: 2006-07-20 12:56+0200\n"
 "Last-Translator: Mogens Jaeger <mogens@jaeger.tf>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -22,7 +22,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 msgid "Default"
 msgstr "Standard"
 
@@ -81,18 +81,18 @@ msgstr "Forud dithered inddata"
 msgid "Density"
 msgstr "Tæthed"
 
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
 msgstr "Udskrifts niveaujustering"
 
@@ -150,459 +150,299 @@ msgstr "Farveomsætningsmodul"
 msgid "Dither algorithm"
 msgstr "Dither-algoritme"
 
-#: src/main/print-canon.c:1382
-msgid "90x90 DPI"
-msgstr "90x90 DPI"
-
-#: src/main/print-canon.c:1382
-msgid "90x90 DPI DMT"
-msgstr "90x90 DPI DMT"
-
-#: src/main/print-canon.c:1383
-msgid "180x180 DPI"
-msgstr "180x180 DPI"
-
-#: src/main/print-canon.c:1383
-msgid "180x180 DPI DMT"
-msgstr "180x180 DPI DMT"
-
-#: src/main/print-canon.c:1384
-msgid "360x360 DPI"
-msgstr "360x360 DPI"
-
-#: src/main/print-canon.c:1384
-msgid "360x360 DPI DMT"
-msgstr "360x360 DPI DMT"
-
-#: src/main/print-canon.c:1385
-msgid "720x360 DPI"
-msgstr "720x360 DPI"
-
-#: src/main/print-canon.c:1385
-msgid "720x360 DPI DMT"
-msgstr "720x360 DPI DMT"
-
-#: src/main/print-canon.c:1386
-msgid "720x720 DPI"
-msgstr "720x720 DPI"
-
-#: src/main/print-canon.c:1386
-msgid "720x720 DPI DMT"
-msgstr "720x720 DPI DMT"
-
-#: src/main/print-canon.c:1387
-msgid "1440x720 DPI"
-msgstr "1440x720 DPI"
-
-#: src/main/print-canon.c:1387
-msgid "1440x720 DPI DMT"
-msgstr "1440x720 DPI DMT"
-
-#: src/main/print-canon.c:1388
-msgid "1440x1440 DPI"
-msgstr "1440x1440 DPI"
-
-#: src/main/print-canon.c:1388
-msgid "1440x1440 DPI DMT"
-msgstr "1440x1440 DPI DMT"
-
-#: src/main/print-canon.c:1389
-msgid "2880x2880 DPI"
-msgstr "2880x2880 DPI"
-
-#: src/main/print-canon.c:1389
-msgid "2880x2880 DPI DMT"
-msgstr "2880x2880 DPI DMT"
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1390
-msgid "150x150 DPI DMT"
-msgstr "150x150 DPI DMT"
-
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1391
-msgid "300x300 DPI DMT"
-msgstr "300x300 DPI DMT"
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1392
-msgid "600x300 DPI DMT"
-msgstr "600x300 DPI DMT"
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1393
-msgid "600x600 DPI DMT"
-msgstr "600x600 DPI DMT"
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1394
-msgid "1200x600 DPI DMT"
-msgstr "1200x600 DPI DMT"
-
-#: src/main/print-canon.c:1395
-msgid "1200x1200 DPI"
-msgstr "1200x1200 DPI"
-
-#: src/main/print-canon.c:1395
-msgid "1200x1200 DPI DMT"
-msgstr "1200x1200 DPI DMT"
-
-#: src/main/print-canon.c:1396
-msgid "2400x2400 DPI"
-msgstr "2400x2400 DPI"
-
-#: src/main/print-canon.c:1396
-msgid "2400x2400 DPI DMT"
-msgstr "2400x2400 DPI DMT"
-
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-msgid "Plain Paper"
-msgstr "Almindeligt papir"
-
-#: src/main/print-canon.c:1448
-msgid "Plain Paper PIXMA"
-msgstr "Almindeligt papir PIXMA"
-
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-msgid "Transparencies"
-msgstr "Transparenter"
-
-#: src/main/print-canon.c:1450
-msgid "Back Print Film"
-msgstr "Bagside-printfilm"
-
-#: src/main/print-canon.c:1451
-msgid "Fabric Sheets"
-msgstr "Stofark"
-
-#: src/main/print-canon.c:1452
-msgid "Envelope"
-msgstr "Kuvert"
-
-#: src/main/print-canon.c:1453
-msgid "High Resolution Paper"
-msgstr "Højopløsningspapir"
-
-#: src/main/print-canon.c:1454
-msgid "T-Shirt Transfers"
-msgstr "T-shirt overføring"
-
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
-msgstr "Højglansfilm"
-
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
-msgstr "Blankt fotopapir"
-
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
-msgstr "Blanke fotokort"
-
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
-msgstr "Prof. fotopapir"
-
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
-msgstr "Andet"
-
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 msgid "Page Size"
 msgstr "Papirstørrelse"
 
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
 msgid "Basic Printer Setup"
 msgstr "Basis printerindstillinger"
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 msgid "Size of the paper being printed to"
 msgstr "Størrelse på det papir der skal udskrives på"
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
 msgid "Media Type"
 msgstr "Medietype"
 
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Medietype (almindeligt papir, fotopapir, o.s.v.)"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
 msgid "Media Source"
 msgstr "Mediekilde"
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
 msgid "Source (input slot) of the media"
 msgstr "I hvilken bakke er mediet"
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
+msgstr "Cd center størrelse"
+
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr "Print kun udenfor centeret af Cd-en, eller helt ind til hullet"
+
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
+msgstr ""
+
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
+
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#, fuzzy
+msgid "CD Hub Size (Custom)"
+msgstr "Cd center størrelse"
+
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#, fuzzy
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "Skalér udskriften til arkstørrelsen"
+
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
+msgstr "Cd vandret finjustering"
+
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
+msgstr "Avanceret printeropsætning"
+
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr "Finjustering i vandret plan til printning på Cd"
+
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
+msgstr "Cd lodret finjustering"
+
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
 msgstr "Opløsning"
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
 msgstr "Opløsning og kvalitet af udskriften"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Blæktype"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr "Avanceret printeropsætning"
-
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Blæktype i printeren"
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr "Blækkanaler"
 
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr "Avanceret printerfunktionalitet"
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Printningstilstand"
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Kerneparameter"
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Printnings udskriftstilstand"
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr "Tosidet printning"
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr "Duplex/Tumble indstilling"
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 msgid "Cyan Density"
 msgstr "Tæthed for cyan"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 msgid "Adjust the cyan density"
 msgstr "Justér tæthed for cyan"
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 msgid "Magenta Density"
 msgstr "Tæthed for magenta"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 msgid "Adjust the magenta density"
 msgstr "Justér tæthed for magenta"
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 msgid "Yellow Density"
 msgstr "Tæthed for gul"
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 msgid "Adjust the yellow density"
 msgstr "Justér tæthed for gul"
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 msgid "Black Density"
 msgstr "Tæthed for sort"
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 msgid "Adjust the black density"
 msgstr "Justér tæthed for sort"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 msgid "Light Cyan Transition"
 msgstr "Lys cyan overgang"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr "Avanceret blækjustering"
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 msgid "Light Magenta Transition"
 msgstr "Lys cyan overgang"
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 msgid "Light Yellow Transition"
 msgstr "Lys gul overgang"
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
 msgstr "Afbrudt"
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
+msgstr "Lang kant (standard)"
+
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr "Kort kant (vend)"
 
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-msgid "Auto Sheet Feeder"
-msgstr "Automatisk arkføder"
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
+msgstr "Cd - 12 cm"
 
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-msgid "Manual with Pause"
-msgstr "Manuel fødning med pause"
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
+msgstr "Cd - 8 cm"
 
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
-msgstr "Manuel fødning uden pause"
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
+#, fuzzy
+msgid "CD - Custom"
+msgstr "Egendefineret"
 
-#: src/main/print-canon.c:1923
-msgid "Cassette"
-msgstr "Kassette"
-
-#: src/main/print-canon.c:1924
-msgid "CD tray"
-msgstr "CD skuffe"
-
-#: src/main/print-canon.c:2049
-msgid "Photo CcMmYK Color"
-msgstr "Foto CcMmYK farver"
-
-#: src/main/print-canon.c:2052
-msgid "Photo CcMmY Color"
-msgstr "Foto CcMmY farver"
-
-#: src/main/print-canon.c:2055
-msgid "CMYK Color"
-msgstr "CMYK farver"
-
-#: src/main/print-canon.c:2058
-msgid "CMY Color"
-msgstr "CMY farver"
-
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
-msgstr "Sort"
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
+msgstr "Normal"
 
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+msgid "Print To Hub"
+msgstr "Print til center"
+
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
 msgstr "Farver"
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Sort og hvid"
@@ -639,9 +479,9 @@ msgstr "Ingen korrektioner"
 msgid "Pre-Dithered"
 msgstr "Forud dithered"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
 msgstr "Gråtone"
 
@@ -669,10 +509,6 @@ msgstr "KCMY"
 msgid "Channel "
 msgstr "Kanal "
 
-#: src/main/print-color.c:165
-msgid " Gamma"
-msgstr "Gamma"
-
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
 #: src/main/print-color.c:266 src/main/print-color.c:274
@@ -725,7 +561,7 @@ msgid "Output image type"
 msgstr "Udskrifts billedtype"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
 msgstr "Ufiltrerede kanaler"
 
@@ -785,13 +621,13 @@ msgstr "Program gamma"
 msgid "Gamma value assumed by application"
 msgstr "Gammaværdi som formodet af program"
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
@@ -801,13 +637,13 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Justér gamma for cyan"
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 msgid "Magenta"
@@ -817,13 +653,13 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Justér gamma for magenta"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
@@ -833,9 +669,9 @@ msgstr "Gul"
 msgid "Adjust the yellow gamma"
 msgstr "Justér gamma for gul"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
 msgstr "Rød"
@@ -844,8 +680,8 @@ msgstr "Rød"
 msgid "Adjust the red gamma"
 msgstr "Justér gamma for rød"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
 msgstr "Grøn"
 
@@ -853,9 +689,9 @@ msgstr "Grøn"
 msgid "Adjust the green gamma"
 msgstr "Justér gamma for grøn"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
 msgstr "Blå"
@@ -864,11 +700,23 @@ msgstr "Blå"
 msgid "Adjust the blue gamma"
 msgstr "Justér gamma for blå"
 
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr "Sort"
+
 #: src/main/print-color.c:315
 msgid "Adjust the black gamma"
 msgstr "Justér sort gamma"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
 msgstr "Cyan balance"
 
@@ -881,7 +729,7 @@ msgstr "Grå balance"
 msgid "Adjust the cyan gray balance"
 msgstr "Justér cyans gråbalance"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 msgid "Magenta Balance"
 msgstr "Magenta balance"
 
@@ -889,7 +737,7 @@ msgstr "Magenta balance"
 msgid "Adjust the magenta gray balance"
 msgstr "Justér magentas gråbalance"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 msgid "Yellow Balance"
 msgstr "Gul balance"
 
@@ -915,9 +763,9 @@ msgstr "Begræns blækmængde"
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 msgid "Advanced Output Control"
 msgstr "Avanceret udskriftskontrol"
 
@@ -949,10 +797,6 @@ msgstr "GCR overgrænse"
 msgid "Upper bound of gray component reduction"
 msgstr "Overgrænse for reduktion af grå bestanddel"
 
-#: src/main/print-color.c:446
-msgid " Curve"
-msgstr "Kurve"
-
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
@@ -1066,81 +910,81 @@ msgstr "Grå bestanddels reduktion"
 msgid "Gray component reduction curve"
 msgstr "Grå bestanddels reduktionskurve"
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
 msgstr "Traditionel Gutenprint farveomsætning"
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr "Værdi skal angives for %s\n"
 
-#: src/main/printers.c:516 src/main/printers.c:521
+#: src/main/printers.c:519 src/main/printers.c:524
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "`%s' er ikke en gyldig %s\n"
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr "%s skal være mellem %f og %f (er %f)\n"
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr "%s skal være mellem %d og %d (er %d)\n"
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr "%s grænser skal være mellem %f og %f\n"
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr "%s nulstilling tilstand skal være %s\n"
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
 msgstr "ingen nulstilling af tæller"
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
 msgstr "nulstil tæller"
 
-#: src/main/printers.c:673
+#: src/main/printers.c:676
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Ukendt parametertype %s (%d)\n"
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s uden for område (værdi %d, min %d, max %d)\n"
 
-#: src/main/printers.c:755
+#: src/main/printers.c:761
 msgid "Page size is not valid\n"
 msgstr "Arkstørrelse er ikke gyldig\n"
 
-#: src/main/printers.c:776
+#: src/main/printers.c:782
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Top margin må ikke være mindre end %d\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:788
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Venstre margin må ikke være mindre end %d\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:794
 msgid "Height must be greater than zero\n"
 msgstr "Højde skal være større end nul\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:800
 msgid "Width must be greater than zero\n"
 msgstr "Bredde skal være større end nul\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -1149,7 +993,7 @@ msgstr ""
 "Billedet er for bredt til siden: venstre margin er %d, bredde %d, højre kant "
 "er %d\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1158,442 +1002,266 @@ msgstr ""
 "Billedet er for langt til siden: top margin er %d, højde %d, bund kant er %"
 "d\n"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-msgid "Roll Feed"
-msgstr "Rulle fødning"
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr "Rulle fødning (skær efter hver side)"
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr "Rulle fødning (ingen afskæring)"
-
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-msgid "Manual Feed"
-msgstr "Manuel fødning"
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-msgid "Print to CD"
-msgstr "Udskriv på Cd"
-
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-msgid "Manual Sheet Guide"
-msgstr "Manuel ark guide"
-
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-msgid "Manual Feed (Front)"
-msgstr "Manuel fødning (front)"
-
-#: src/main/print-escp2-data.c:554
-msgid "Rear Tray"
-msgstr "Bagerste bakke"
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr "Front bakke"
-
-#: src/main/print-escp2-data.c:581
-msgid "Photo Board"
-msgstr "Foto plade"
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr "Tilskårne ark, bakke 1"
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr "Tilskårne ark, bakke 2"
-
-#: src/main/print-escp2-data.c:638
-msgid "Cut Sheet Autoselect"
-msgstr "Automatisk valg af bakke"
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr "Manuel udvælgelse"
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr "Hurtig økonomisk"
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr "Økonomisk"
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr "Kladde"
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-msgid "High"
-msgstr "Høj"
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-msgid "Photo"
-msgstr "Foto"
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-msgid "Super Photo"
-msgstr "Super foto"
-
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-msgid "Ultra Photo"
-msgstr "Ultra foto"
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr "Bedst"
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-msgid "Light Cyan"
-msgstr "Lys cyan"
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-msgid "Light Magenta"
-msgstr "Lys magenta"
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-msgid "Light Black"
-msgstr "Lys sort"
-
-#: src/main/print-escp2-data.c:811
-msgid "Dark Yellow"
-msgstr "Mørk gul"
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-msgid "Matte Black"
-msgstr "Mat sort"
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-msgid "Photo Black"
-msgstr "Foto sort"
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-msgid "Gloss Optimizer"
-msgstr "Glans forbedrer"
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-msgid "Light Light Black"
-msgstr "Lys lys-sort"
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
 msgstr "Automatisk printningstilstand"
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr "Basis udskriftsjustering"
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
 msgstr "Automatisk printningstilstand"
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Udskriftskvalitet"
 
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr "Cd center størrelse"
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr "Print kun udenfor centeret af Cd-en, eller helt ind til hullet"
-
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr "Cd vandret finjustering"
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr "Finjustering i vandret plan til printning på Cd"
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr "Cd lodret finjustering"
-
-#: src/main/print-escp2.c:214
+#: src/main/print-escp2.c:228
 msgid "Resolution of the print"
 msgstr "Udskriftens opløsning"
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
 msgstr "Forbedret glans"
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
 msgstr "Tilføj glansforbedring"
 
-#: src/main/print-escp2.c:236
+#: src/main/print-escp2.c:250
 msgid "Ink Set"
 msgstr "Blæk sæt"
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
 msgstr "Printretning"
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
 msgstr "Avanceret udskriftsjustering"
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr "Printretning (envejs giver højere kvalitet, men er langsommere)"
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
 msgstr "Med/uden margin"
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
 msgstr "Print uden margin"
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
 msgstr "Udjævningsmetode"
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
 msgstr "Udjævningsmønster der skal bruges"
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
 msgstr "Justér punktstørrelse som nødvendigt"
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr "Justér punktstørrelse som nødvendigt, for at opnå ønsket tæthed"
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 msgid "Output Order"
 msgstr "Udskriftsrækkefølge"
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
 msgstr "Retten-ind gennemløb"
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
 msgstr "Retten-ind valg"
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 msgid "Ink change command"
 msgstr "Kommando til udskiftning af blækpatron"
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
 msgstr "Skiftende retten-ind gennemløb"
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 msgid "Alternate Alignment Choices"
 msgstr "Skiftende retten-ind valg"
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
 msgstr "Understøtter netværkstilstand"
 
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 msgid "Channel Names"
 msgstr "Kanalnavne"
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
 msgstr "Ufiltreret kanal tælling"
 
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:346
 msgid "Cyan Map"
 msgstr "Diagram for cyan"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:347
 msgid "Adjust the cyan map"
 msgstr "Justér diagram for cyan"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:352
 msgid "Magenta Map"
 msgstr "Diagram for magenta"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:353
 msgid "Adjust the magenta map"
 msgstr "Justér diagram for magenta"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:358
 msgid "Yellow Map"
 msgstr "Diagram for gul"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:359
 msgid "Adjust the yellow map"
 msgstr "Justér diagram for gul"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:364
 msgid "Blue Map"
 msgstr "Diagram for blå"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:365
 msgid "Adjust the blue map"
 msgstr "Justér diagram for blå"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
 msgstr "Diagram for rød"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:371
 msgid "Adjust the red map"
 msgstr "Justér diagram for rød"
 
-#: src/main/print-escp2.c:447
+#: src/main/print-escp2.c:464
 msgid "Red Density"
 msgstr "Tæthed for rød"
 
-#: src/main/print-escp2.c:448
+#: src/main/print-escp2.c:465
 msgid "Adjust the red density"
 msgstr "Justér tæthed for rød"
 
-#: src/main/print-escp2.c:455
+#: src/main/print-escp2.c:472
 msgid "Blue Density"
 msgstr "Tæthed for blå"
 
-#: src/main/print-escp2.c:456
+#: src/main/print-escp2.c:473
 msgid "Adjust the blue density"
 msgstr "Justér tæthed for blå"
 
-#: src/main/print-escp2.c:463
+#: src/main/print-escp2.c:480
 msgid "Gloss Level"
 msgstr "Glansniveau"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:481
 msgid "Adjust the gloss level"
 msgstr "Justér glansniveau"
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
 msgstr "Mørkgul overgang"
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
 msgstr "Grå overgang"
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 msgid "Light Gray Transition"
 msgstr "Lysgrå overgang"
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 msgid "Dark Gray Transition"
 msgstr "Mørkgrå overgang"
 
-#: src/main/print-escp2.c:527
+#: src/main/print-escp2.c:544
 msgid "Mid Gray Transition"
 msgstr "Mellemgrå overgang"
 
-#: src/main/print-escp2.c:528
+#: src/main/print-escp2.c:545
 msgid "Medium Gray Transition"
 msgstr "Middelgrå overgang"
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 msgid "Full Manual Control"
 msgstr "Fuld manuel kontrol"
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
 msgstr "Automatisk indstillingskontrol"
 
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr "Cd - 12 cm"
-
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr "Cd - 8 cm"
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr "Normal"
-
-#: src/main/print-escp2.c:1564
-msgid "Print To Hub"
-msgstr "Print til center"
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Manuel kontrol"
 
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr "Standard"
+
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/main/print-escp2.c:1701
+#: src/main/print-escp2.c:1829
 msgid "Bidirectional"
 msgstr "Tovejs"
 
-#: src/main/print-escp2.c:1703
+#: src/main/print-escp2.c:1831
 msgid "Unidirectional"
 msgstr "Envejs"
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
 msgstr "Alternativ udfyldning"
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
 msgstr "Stigende udfyldning"
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
 msgstr "Aftagende udfyldning"
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
 msgstr "Stigende dobbelt"
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
 msgstr "Vige udenom nærmeste nabo"
 
-#: src/main/print-escp2.c:2168
+#: src/main/print-escp2.c:2313
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Printeren understøtter ikke en ufiltreret enheds uddata ved dybde %d\n"
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print indstillinger ikke kontrolleret, kan ikke printe.\n"
@@ -1647,247 +1315,300 @@ msgid "test print"
 msgstr "test print"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
 msgstr "Fire farver standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
 msgstr "Tre farver sammensat"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
 msgstr "Seks farver foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
 msgstr "Fem farver foto sammensat"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+msgid "Plain Paper"
+msgstr "Almindeligt papir"
+
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
 msgstr "Blanke film"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+msgid "Transparencies"
+msgstr "Transparenter"
+
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 msgid "Envelopes"
 msgstr "Kuverter"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 msgid "Matte Paper"
 msgstr "Mat papir"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
 msgstr "Inkjetpapir"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotokvalitets inkjetpapir"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 msgid "Photo Paper"
 msgstr "Fotopapir"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
 msgstr "Førsteklasses blankt fotopapir"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
 msgstr "Førsteklasses glittet fotopapir"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
 msgstr "Fotokvalitets blankt papir"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Papir"
 
-#: src/main/print-olympus.c:265
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr "Andet"
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr "Automatisk arkføder"
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr "Manuel fødning med pause"
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr "Manuel fødning uden pause"
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
 msgstr "Coated"
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
 msgstr "Ingen"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 msgid "Glossy"
 msgstr "Blankt"
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
 msgstr "Tekstur"
 
-#: src/main/print-olympus.c:861
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 msgid "Matte"
 msgstr "Mat"
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
 msgstr "Lamineret mønster"
 
-#: src/main/print-olympus.c:1331
+#: src/main/print-olympus.c:1627
 msgid "Adjust the cyan balance"
 msgstr "Justér cyanbalance"
 
-#: src/main/print-olympus.c:1339
+#: src/main/print-olympus.c:1635
 msgid "Adjust the magenta balance"
 msgstr "Justér magentabalance"
 
-#: src/main/print-olympus.c:1347
+#: src/main/print-olympus.c:1643
 msgid "Adjust the yellow balance"
 msgstr "Justér gulbalance"
 
-#: src/main/print-olympus.c:1354
+#: src/main/print-olympus.c:1650
 msgid "Black Balance"
 msgstr "Sort balance"
 
-#: src/main/print-olympus.c:1355
+#: src/main/print-olympus.c:1651
 msgid "Adjust the black balance"
 msgstr "Justér sortbalance"
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 msgid "Plain"
 msgstr "Alm"
 
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 msgid "Bond"
 msgstr "Printer papir"
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 msgid "Premium"
 msgstr "Førsteklasses"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
 msgstr "Blankt foto"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 msgid "Transparency"
 msgstr "Gennemsigtighed"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
 msgstr "Hurtigttørrende foto"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 msgid "Quick-dry Transparency"
 msgstr "Hurtigttørrende klar film"
 
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
 msgstr "Manuelt"
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 msgid "Tray 1"
 msgstr "Bakke 1"
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 msgid "Tray 2"
 msgstr "Bakke 2"
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 msgid "Tray 3"
 msgstr "Bakke 3"
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 msgid "Tray 4"
 msgstr "Bakke 4"
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
 msgstr "Alternativ arkføder"
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 msgid "Desktop Sheet Feeder"
 msgstr "Intern arkføder"
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 msgid "Tray"
 msgstr "Bakke"
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 msgid "Optional Source"
 msgstr "Valgfri kilde"
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 msgid "Autoselect"
 msgstr "Autoudvælg"
 
 #: src/main/print-pcl.c:256
+msgid "150x150 DPI"
+msgstr "150x150 DPI"
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr "300x300 DPI"
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
+msgstr "600x300 DPI"
+
+#: src/main/print-pcl.c:259
 msgid "600x600 DPI monochrome"
 msgstr "600x600 DPI monokrom"
 
-#: src/main/print-pcl.c:259
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr "600x600 DPI"
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr "1200x600 DPI"
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
 msgstr "Farve + sort patroner"
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
 msgstr "Farve + foto patroner"
 
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr "Lang kant (standard)"
-
 #: src/main/print-ps.c:97
 msgid "PPDFile"
 msgstr "PPDfil"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 msgid "PPD File"
 msgstr "PPD fil"
 
@@ -1895,164 +1616,267 @@ msgstr "PPD fil"
 msgid "Image dimensions must match paper dimensions"
 msgstr "Billedets størrelse skal passe til papirets størrelse"
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 msgid "Two Level Grayscale"
 msgstr "To-niveau gråskala"
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 msgid "Three Level Grayscale"
 msgstr "Tre-niveau gråskala"
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
 msgstr "FireTone grå"
 
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
 msgstr "Seks farver forbedret sammensat"
 
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 msgid "Seven Color Photo"
 msgstr "Syv farver foto"
 
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 msgid "Seven Color Enhanced"
 msgstr "Syv farver forbedret"
 
-#: src/main/escp2-channels.c:1535
+#: src/main/escp2-channels.c:1649
 msgid "Eight Color Photo"
 msgstr "Otte farver foto"
 
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 msgid "One Color Raw"
 msgstr "En farve ufiltreret"
 
-#: src/main/escp2-channels.c:1695
+#: src/main/escp2-channels.c:1809
 msgid "One Color Raw Enhanced Gloss"
 msgstr "En farve ufiltreret forbedret glans"
 
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 msgid "Two Color Raw"
 msgstr "To farver ufiltreret"
 
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 msgid "Three Color Raw"
 msgstr "Tre farver ufiltreret"
 
-#: src/main/escp2-channels.c:1762
+#: src/main/escp2-channels.c:1876
 msgid "Three Color Raw Gloss"
 msgstr "Fire farver ufiltreret, glans "
 
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 msgid "Four Color Raw"
 msgstr "Fire farver ufiltreret"
 
-#: src/main/escp2-channels.c:1884
+#: src/main/escp2-channels.c:2017
 msgid "Four Color Raw Gloss"
 msgstr "Fire farver ufiltreret, glans"
 
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 msgid "Five Color Raw"
 msgstr "Fem farver ufiltreret"
 
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 msgid "Six Color Raw"
 msgstr "Seks farver ufiltreret"
 
-#: src/main/escp2-channels.c:1962
+#: src/main/escp2-channels.c:2109
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seks farver forbedret glans ufiltreret"
 
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 msgid "Seven Color Raw"
 msgstr "Syv farver ufiltreret"
 
-#: src/main/escp2-channels.c:2024
+#: src/main/escp2-channels.c:2187
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Syv farver forbedret glans ufiltreret"
 
-#: src/main/escp2-channels.c:2042
+#: src/main/escp2-channels.c:2205
 msgid "Eight Color Raw"
 msgstr "Otte farver ufiltreret"
 
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
 msgstr "Epson standard blæk"
 
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome foto sort"
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
 msgstr "UltraChrome mat sort"
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+msgid "Photo Black"
+msgstr "Foto sort"
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+msgid "Matte Black"
+msgstr "Mat sort"
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+msgid "Light Cyan"
+msgstr "Lys cyan"
+
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+msgid "Light Magenta"
+msgstr "Lys magenta"
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+msgid "Light Black"
+msgstr "Lys sort"
+
+#: src/main/escp2-channels.c:2981
+msgid "Dark Yellow"
+msgstr "Mørk gul"
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+msgid "Gloss Optimizer"
+msgstr "Glans forbedrer"
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+msgid "Light Light Black"
+msgstr "Lys lys-sort"
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 msgid "Plain Paper Fast Load"
 msgstr "Almindeligt papir hurtigindføring"
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postkort"
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 msgid "Back Light Film"
 msgstr "Baglys film"
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 msgid "Matte Paper Heavyweight"
 msgstr "Heavyweight mat papir"
 
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium silkemat fotopapir"
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 msgid "ColorLife Paper"
 msgstr "ColorLife papir"
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 msgid "Archival Matte Paper"
 msgstr "Arkivfast mat papir"
 
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
 msgstr "Vandfarvepapir - strålende hvidt"
 
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+msgid "Roll Feed"
+msgstr "Rulle fødning"
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr "Rulle fødning (skær efter hver side)"
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr "Rulle fødning (ingen afskæring)"
+
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+msgid "Manual Feed"
+msgstr "Manuel fødning"
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+msgid "Print to CD"
+msgstr "Udskriv på Cd"
+
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+msgid "Manual Sheet Guide"
+msgstr "Manuel ark guide"
+
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+msgid "Manual Feed (Front)"
+msgstr "Manuel fødning (front)"
+
+#: src/main/escp2-papers.c:1859
+msgid "Rear Tray"
+msgstr "Bagerste bakke"
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr "Front bakke"
+
+#: src/main/escp2-papers.c:1886
+msgid "Photo Board"
+msgstr "Foto plade"
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr "Tilskårne ark, bakke 1"
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr "Tilskårne ark, bakke 2"
+
+#: src/main/escp2-papers.c:1943
+msgid "Cut Sheet Autoselect"
+msgstr "Automatisk valg af bakke"
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr "Manuel udvælgelse"
+
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
 msgstr "360 x 90 DPI hurtig økonomisk"
@@ -2086,121 +1910,146 @@ msgstr "360 DPI"
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/main/escp2-resolutions.c:94
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 msgid "720 DPI High Quality"
 msgstr "720 DPI høj kvalitet"
 
-#: src/main/escp2-resolutions.c:97
+#: src/main/escp2-resolutions.c:103
 msgid "720 DPI Highest Quality"
 msgstr "720 DPI højeste kvalitet"
 
-#: src/main/escp2-resolutions.c:100
+#: src/main/escp2-resolutions.c:106
 msgid "720 x 720 DPI"
 msgstr "720 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:116
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 720 DPI højeste kvalitet"
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI vendt om"
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:129
+#: src/main/escp2-resolutions.c:135
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 DPI højeste kvalitet"
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
+#: src/main/escp2-resolutions.c:145
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:142
-msgid "1440 x 1440"
-msgstr "1440 x 1440"
-
-#: src/main/escp2-resolutions.c:145
-msgid "1440 x 1440 DPI High Quality"
-msgstr "1440 x 1440 DPI høj kvalitet"
-
-#: src/main/escp2-resolutions.c:148
-msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1440 x 1440 DPI højeste kvalitet"
-
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:158
+#: src/main/escp2-resolutions.c:155
 msgid "2880 x 1440 DPI Transposed"
 msgstr "2880 x 1440 DPI vendt om"
 
-#: src/main/escp2-resolutions.c:164
-msgid "2880 x 1440 DPI High Quality"
-msgstr "2880 x 1440 DPI høj kvalitet"
-
-#: src/main/escp2-resolutions.c:167
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr "2880 x 1440 DPI højeste kvalitet"
-
-#: src/main/escp2-resolutions.c:171
+#: src/main/escp2-resolutions.c:162
 msgid "5760 x 1440 DPI"
 msgstr "5760 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 msgid "5760 x 2880 DPI"
 msgstr "5760 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
 msgstr "Tændt"
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 msgid "Interleave"
 msgstr "Udjævning"
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
 msgstr "Fuld overlapning"
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
 msgstr "Fire gennemløb"
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
 msgstr "Fuld overlapning 2"
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 msgid "Interleave 2"
 msgstr "Udjævning 2"
 
-#: src/main/escp2-resolutions.c:584
+#: src/main/escp2-resolutions.c:594
 msgid "Eight Pass"
 msgstr "Otte gennemløb"
 
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr "Hurtig økonomisk"
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr "Økonomisk"
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr "Kladde"
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+msgid "High"
+msgstr "Høj"
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+msgid "Photo"
+msgstr "Foto"
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+msgid "Super Photo"
+msgstr "Super foto"
+
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+msgid "Ultra Photo"
+msgstr "Ultra foto"
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr "Bedst"
+
 #: src/main/generic-options.c:46
 msgid "Text"
 msgstr "Tekst"
@@ -2269,3652 +2118,4000 @@ msgstr "Tabloid"
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/main/xmli18n-tmp.h:11
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 fotopapir (riv-af kanter)"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17x22"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/main/xmli18n-tmp.h:26
 msgid "22x30"
 msgstr "22x30"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/main/xmli18n-tmp.h:32
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
 msgstr "A4"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/main/xmli18n-tmp.h:67
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 msgid "ArchA transposed"
 msgstr "ArchA vendt"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 msgid "ArchB transposed"
 msgstr "ArchB vendt"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 msgid "ArchC transposed"
 msgstr "ArchC vendt"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 msgid "ArchD transposed"
 msgstr "ArchD vendt"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 msgid "ArchE transposed"
 msgstr "ArchE vendt"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 msgid "American foolscap"
 msgstr "American foolscap"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 msgid "European foolscap"
 msgstr "European foolscap"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/main/xmli18n-tmp.h:109
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
 msgstr "ISO A5"
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 msgid "Small paperback"
 msgstr "Small paperback"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 msgid "Penguin small paperback"
 msgstr "Penguin small paperback"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 msgid "Penguin large paperback"
 msgstr "Penguin large paperback"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 msgid "Hagaki Card"
 msgstr "Hagaki Card"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
 msgstr "Oufuku Card"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
 msgstr "Japanese lang kuvert #3"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
 msgstr "Japanese lang kuvert #4"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanese Kaku kuvert #4"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/main/xmli18n-tmp.h:125
+#: src/main/xmli18n-tmp.h:126
 msgid "Monarch Envelope"
 msgstr "Monarch kuvert"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/main/xmli18n-tmp.h:128
 msgid "4x7"
 msgstr "4x7"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
 msgstr "Card"
 
-#: src/main/xmli18n-tmp.h:130
+#: src/main/xmli18n-tmp.h:131
 msgid "Wide Postcard"
 msgstr "Wide Postcard"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 msgid "Custom"
 msgstr "Egendefineret"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
 msgstr "89 mm rulle papir"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
 msgstr "4 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
 msgstr "5 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
 msgstr "210mm rulle papir"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
 msgstr "13 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
 msgstr "22 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
 msgstr "24 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
 msgstr "36 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
 msgstr "44 tommer rulle papir"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 1"
 msgstr "Postscript Level 1"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/main/xmli18n-tmp.h:146
 msgid "PostScript Level 2"
 msgstr "Postscript Level 2"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/main/xmli18n-tmp.h:147
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/main/xmli18n-tmp.h:148
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/main/xmli18n-tmp.h:148
+#: src/main/xmli18n-tmp.h:149
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/main/xmli18n-tmp.h:150
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/main/xmli18n-tmp.h:150
+#: src/main/xmli18n-tmp.h:151
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:151
+#: src/main/xmli18n-tmp.h:152
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/main/xmli18n-tmp.h:153
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/main/xmli18n-tmp.h:153
+#: src/main/xmli18n-tmp.h:154
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/main/xmli18n-tmp.h:154
+#: src/main/xmli18n-tmp.h:155
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/main/xmli18n-tmp.h:155
+#: src/main/xmli18n-tmp.h:156
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/main/xmli18n-tmp.h:156
+#: src/main/xmli18n-tmp.h:157
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/main/xmli18n-tmp.h:158
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/main/xmli18n-tmp.h:159
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/main/xmli18n-tmp.h:160
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/main/xmli18n-tmp.h:161
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/main/xmli18n-tmp.h:162
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/main/xmli18n-tmp.h:163
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/main/xmli18n-tmp.h:164
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:173
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:180
-msgid "Canon iP4000"
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:182
+#, fuzzy
+msgid "Canon PIXMA iP3000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:183
+#, fuzzy
+msgid "Canon PIXMA iP3100"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "Canon PIXMA iP4000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:185
+#, fuzzy
+msgid "Canon PIXMA iP4100"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:186
+#, fuzzy
+msgid "Canon PIXMA iP4200"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:187
+#, fuzzy
+msgid "Canon PIXMA iP4300"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:188
+#, fuzzy
+msgid "Canon PIXMA iP5000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "Canon PIXMA iP5200"
+msgstr "Canon CP-200"
+
+#: src/main/xmli18n-tmp.h:190
+#, fuzzy
+msgid "Canon PIXMA iP6700"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA MP150"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:192
+#, fuzzy
+msgid "Canon PIXMA MP500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:193
+#, fuzzy
+msgid "Canon PIXMA MP700"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA MP730"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:195
+#, fuzzy
+msgid "Canon PIXMA MP750"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA MP760"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA MP770"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA MP780"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:199
+#, fuzzy
+msgid "Canon PIXMA MP790"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP830"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXUS iP3100"
+msgstr "Canon S100"
+
+#: src/main/xmli18n-tmp.h:202
+#, fuzzy
+msgid "Canon PIXUS iP4100"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon i560"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:204
+#, fuzzy
+msgid "Canon i850"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon i860"
+msgstr "Canon S600"
+
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon BJC-85"
+
+#: src/main/xmli18n-tmp.h:207
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:208
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:209
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:210
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:211
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:212
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:213
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:214
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:215
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:216
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:217
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:218
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:219
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:220
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:221
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:222
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:223
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:224
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:225
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:226
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:227
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:228
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:229
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:230
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:231
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:232
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:233
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:234
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:235
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:236
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:237
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:238
+#, fuzzy
+msgid "Epson Stylus C79"
+msgstr "Epson Stylus C70"
+
+#: src/main/xmli18n-tmp.h:239
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:240
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:241
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:242
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:243
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:244
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:245
+#, fuzzy
+msgid "Epson Stylus C87"
+msgstr "Epson Stylus C48"
+
+#: src/main/xmli18n-tmp.h:246
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:247
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:248
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:249
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:250
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:251
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:252
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:253
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:254
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:255
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:256
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:257
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:258
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:259
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:260
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:261
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:262
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:263
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:264
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:265
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:266
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:267
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:268
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:269
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:270
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:271
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:272
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:273
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:274
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:275
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:276
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:277
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:278
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:279
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:280
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:281
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:282
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:283
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:284
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:285
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:286
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:287
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:288
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:289
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:290
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:291
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:292
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:293
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:294
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:295
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:296
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:297
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:298
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:299
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:300
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:301
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:302
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:303
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:304
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:305
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "Epson Stylus Photo 1400"
+msgstr "Epson Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "Epson Stylus Photo 1410"
+msgstr "Epson Stylus Photo 810"
+
+#: src/main/xmli18n-tmp.h:308
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:309
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:310
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:311
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:312
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:313
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:314
+#, fuzzy
+msgid "Epson Stylus Photo R230"
+msgstr "Epson Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:315
+#, fuzzy
+msgid "Epson Stylus Photo R240"
+msgstr "Epson Stylus Photo R2400"
+
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "Epson Stylus Photo R245"
+msgstr "Epson Stylus Photo RX425"
+
+#: src/main/xmli18n-tmp.h:317
+#, fuzzy
+msgid "Epson Stylus Photo R260"
+msgstr "Epson Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Epson Stylus Photo R265"
+msgstr "Epson Stylus Photo RX425"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "Epson Stylus Photo R270"
+msgstr "Epson Stylus Photo 1270"
+
+#: src/main/xmli18n-tmp.h:320
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:321
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:322
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:323
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "Epson Stylus Photo R350"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "Epson Stylus Photo R360"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "Epson Stylus Photo R380"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "Epson Stylus Photo R390"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:329
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:330
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:331
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:332
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:333
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Epson Stylus Photo RX560"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:335
+#, fuzzy
+msgid "Epson Stylus Photo RX580"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:336
+#, fuzzy
+msgid "Epson Stylus Photo RX590"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:337
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:338
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:339
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:340
+#, fuzzy
+msgid "Epson Stylus Photo RX640"
+msgstr "Epson Stylus Photo RX400"
+
+#: src/main/xmli18n-tmp.h:341
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:342
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:343
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:344
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:345
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:346
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:347
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:348
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:349
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:350
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:351
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:352
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:353
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:354
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:355
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:356
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:357
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:358
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:359
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:360
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:361
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:362
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:363
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:364
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:365
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:366
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:367
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:368
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:369
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:370
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:371
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:372
+#, fuzzy
+msgid "Epson Stylus CX5000"
+msgstr "Epson Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:373
+#, fuzzy
+msgid "Epson Stylus CX5000F"
+msgstr "Epson Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:374
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:375
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:376
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:377
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:378
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:379
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:380
+#, fuzzy
+msgid "Epson Stylus CX6000"
+msgstr "Epson Stylus CX3600"
+
+#: src/main/xmli18n-tmp.h:381
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:382
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:383
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:384
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX7000F"
+msgstr "Epson Stylus CX3700"
+
+#: src/main/xmli18n-tmp.h:386
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:387
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:388
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:389
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:390
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:391
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:392
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:393
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:394
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:395
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:396
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:397
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:399
+#, fuzzy
+msgid "Epson PictureMate Flash"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:400
+#, fuzzy
+msgid "Epson PictureMate Pal"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:401
+#, fuzzy
+msgid "Epson PictureMate Snap"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:402
+#, fuzzy
+msgid "Epson PictureMate 200"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:403
+#, fuzzy
+msgid "Epson PictureMate 210"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:404
+#, fuzzy
+msgid "Epson PictureMate 240"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:405
+#, fuzzy
+msgid "Epson PictureMate 250"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson PictureMate 280"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:411
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:414
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:417
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:426
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:427
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:428
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:429
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:430
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:448
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:454
+#, fuzzy
+msgid "Epson PM A820"
+msgstr "Epson PM A890"
+
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:462
+#, fuzzy
+msgid "Epson PM D870"
+msgstr "Epson PM 870C"
+
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
+#, fuzzy
+msgid "Epson PM G850"
+msgstr "Epson PM G800"
+
+#: src/main/xmli18n-tmp.h:470
+#, fuzzy
+msgid "Epson PM G4500"
+msgstr "Epson PM G700"
+
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:476
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:549
 msgid "Generic PCL 4 Printer"
 msgstr "Generic PCL 4 Printer"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:550
 msgid "Generic PCL 5 Printer"
 msgstr "Generic PCL 5 Printer"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:551
 msgid "Generic PCL 5c Printer"
 msgstr "Generic PCL 5c Printer"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:552
 msgid "Generic PCL 5e Printer"
 msgstr "Generic PCL 5e Printer"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Generic PCL 6/PCL XL Printer"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:802
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+#, fuzzy
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Optra E"
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
 msgstr "Okidata OL400"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
 msgstr "Okidata OL400e"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
 msgstr "Okidata OL410e"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
 msgstr "Okidata OL600e"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
 msgstr "Okidata OL800"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:913
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:924
+#, fuzzy
+msgid "Xerox WorkCentre M118"
+msgstr "Xerox Document Centre 400"
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:926
+#, fuzzy
+msgid "Lexmark X73"
+msgstr "Lexmark Z43"
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+#, fuzzy
+msgid "Olympus P-S100"
+msgstr "Olympus P-10"
+
+#: src/main/xmli18n-tmp.h:942
+#, fuzzy
+msgid "Canon CP-10"
+msgstr "Canon CP-100"
+
+#: src/main/xmli18n-tmp.h:943
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:953
+#, fuzzy
+msgid "Sony DPP-EX5"
+msgstr "Sony UP-DR150"
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+#, fuzzy
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DR150"
+
+#: src/main/xmli18n-tmp.h:957
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:960
+#, fuzzy
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm Printpix-CX-400"
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Inch"
 msgstr "Tommer"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
 msgstr "Brug tommer som basisenhed ved målangivelse"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Brug centimeter som basisenhed ved målangivelse"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Points"
 msgstr "Punkter"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Brug punkter (1/72\") som basisenhed ved målangivelse"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
 msgstr "mm"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Brug millimeter som basisenhed ved målangivelse"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
 msgstr "Pica"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Brug picas (1/12\") som basisenhed ved målangivelse"
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color output"
 msgstr "Farveudskrift"
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
 msgstr "Print gråtoner med sort blæk"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Standard Command"
 msgstr "Standard kommando"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
 msgstr "Brug standarddefineret printerkommando"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Custom Command"
 msgstr "Bruger kommando"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
 msgstr "Anvend egendefineret printerkommando"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
 msgstr "Fil"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Print to a file"
 msgstr "Udskriv til fil"
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
 msgstr "Ret kurve..."
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 msgid "Set Default"
 msgstr "Sæt som standard"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
 msgstr "Genskab forrige"
 
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
 msgstr "O.k"
 
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
 msgstr "Annullér"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Udskriv v%s"
 
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
 msgstr "Om"
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -5922,7 +6119,7 @@ msgstr ""
 "    Print og\n"
 "gem opsætning"
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 msgid ""
 "Save\n"
 "Settings"
@@ -5930,15 +6127,15 @@ msgstr ""
 "    Gem\n"
 "opsætning"
 
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
 msgstr "Udskriv"
 
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
 msgstr "Smugkig"
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -5962,73 +6159,73 @@ msgstr ""
 "Hvis du trykker på en anden musetaste mens du trækker med musen, vil "
 "billedet returnere til dets oprindelig position."
 
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 msgid "Paper Size"
 msgstr "Papirstørrelse"
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
 msgstr "Vis alle papirstørrelser"
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
 msgstr "Størrelser:"
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
 msgstr "Bredde:"
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 msgid "Width of the paper that you wish to print to"
 msgstr "Bredden af det papir der skal udskrives på"
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
 msgstr "Højde:"
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 msgid "Height of the paper that you wish to print to"
 msgstr "Højden af det papir der skal udskrives på"
 
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 msgid "Automatic Paper Size"
 msgstr "Automatisk papirstørrelse"
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
 msgstr "Antal kopier"
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr "Vælg antal kopier; skal være mellem 1 og 100"
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 msgid "Image Position"
 msgstr "Billedposition"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
 msgstr "Portræt"
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
 msgstr "Tværformat"
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 msgid "Upside down"
 msgstr "Vendt op/ned"
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
 msgstr "Tværformat vendt op/ned"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -6036,119 +6233,120 @@ msgstr ""
 "Vælg papirretning: portræt, tværformat eller portræt og tværformat vendt op/"
 "ned"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 msgid "Orientation:"
 msgstr "Orientering:"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
 msgstr "Venstre:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
 msgstr "Afstand fra venstre side af arket til billedet"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
 msgstr "Højre:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Afstand fra venstre papiretkant til højre side af billedet"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
 msgstr "Afstand fra højre papirkant til billedet"
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
 msgstr "Øverst:"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
 msgstr "Afstand fra toppen af arket til billedet"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
 msgstr "Nederst:"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Afstand fra toppen af arket til bunden af billedet"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Afstand fra den nederste kant af arket til billedet"
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Center:"
 msgstr "Centrér:"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Horizontal"
 msgstr "Vandret"
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
 msgstr "Centrér billedet i vandret på papiret"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
 msgstr "Begge"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image on the paper"
 msgstr "Centrér billedet på papiret"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 msgid "Vertical"
 msgstr "Lodret"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Center the image vertically on the paper"
 msgstr "Centrér billedet i lodret på papiret"
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
 msgstr "Indstil printer"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 msgid "Printer Make:"
 msgstr "Printer mærke:"
 
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 msgid "Select the make of your printer"
 msgstr "Vælg dit printermærke"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 msgid "Printer Model:"
 msgstr "Printermodel:"
 
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 msgid "Select your printer model"
 msgstr "Vælg din printermodel"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 msgid "PPD File:"
 msgstr "PPD-fil:"
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Angiv korrekt PPD filnavn for printeren"
 
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
 msgstr "Bladr igennem"
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Vælg korrekt PPD filnavn for printeren"
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
@@ -6156,96 +6354,52 @@ msgstr ""
 "Vælg navnet på uddatakøen (hverken type eller model af printer) som du "
 "ønsker at printe til"
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 msgid "Printer Queue:"
 msgstr "Printerkø:"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 msgid "Enter the correct command to print to your printer. "
 msgstr "Angiv den korrekte kommando til printning på din printer. "
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
 msgstr "Angiv hvilken fil du vil skrive til. "
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 msgid "File to print to"
 msgstr "Fil der skal skrives til"
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 msgid "Print To File"
 msgstr "Udskriv til fil"
 
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 msgid "Define New Printer"
 msgstr "Definér ny printer"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 msgid "Printer Name:"
 msgstr "Printernavn:"
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Angiv et navn til denne logiske printer"
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 msgid "About Gutenprint "
 msgstr "Om Gutenprint"
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 msgid "Gutenprint Version "
 msgstr "Gutenprint version"
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"og resten af Gutenprint udviklings teamet.\n"
-"\n"
-"Besøg vores web site på: http://gimp-print.sourceforge.net.\n"
-"\n"
-"Dette program er fri software, du må redistribuere det og/eller ændre\n"
-"det, under betingelserne i GNU General Public License som publiceret af\n"
-"the Free Software Foundation; enten version 2 af licensen, eller\n"
-"(efter eget ønske) enhver senere version.\n"
-"\n"
-"Dette program er distribueret i det håb at det kan være nyttigt, men\n"
-"UDEN ENHVER FORM FOR GARANTI, endda uden den underforståede\n"
-"garanti for SALGBARHED, eller EGNETHED FOR ET BESTEMT FORMÃ…L\n"
-"Se GNU General Public License for yderligere detaljer.\n"
-"\n"
-"Du skulle have modtaget en kopi af GNU General Public License sammen\n"
-"med dette program. Hvis ikke, skriv da til Free Software Foundation, Inc .,\n"
-"59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 msgid "Printer Settings"
 msgstr "Printer indstillinger"
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6253,11 +6407,11 @@ msgstr ""
 "Vælg navnet på printeren (hverken type eller model af printer) som du ønsker "
 "at udskrive til"
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 msgid "Setup Printer..."
 msgstr "Opsætning printer..."
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -6265,11 +6419,11 @@ msgstr ""
 "Vælg printermodel, PPD fil og kommando, der skal bruges for at printe til "
 "denne printer"
 
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 msgid "New Printer..."
 msgstr "Ny printer..."
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6277,23 +6431,23 @@ msgstr ""
 "Definer en ny logisk printer. Dette kan bruges til at navngive en samling af "
 "indstillinger, som du ønsker at huske til senere brug."
 
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 msgid "Image Size"
 msgstr "Billedstørrelse"
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 msgid "Scaling:"
 msgstr "Skalering:"
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 msgid "Set the scale (size) of the image"
 msgstr "Angiv skalering (størrelse) af billedet"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
 msgstr "Skalér med:"
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6301,31 +6455,31 @@ msgstr ""
 "Vælg om skalering måles i procent af valgt sidestørrelse, eller antal af "
 "udskriftspunkter pr. tomme"
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
 msgstr "Procent"
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 msgid "Scale the print to the size of the page"
 msgstr "Skalér udskriften til arkstørrelsen"
 
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
 msgstr "Skalér udskriften til antal punkter pr. tomme"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 msgid "Set the width of the print"
 msgstr "Angiv bredden af udskriften"
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 msgid "Set the height of the print"
 msgstr "Angiv højden på udskriften"
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6333,101 +6487,101 @@ msgstr ""
 "Brug original\n"
 "billedstørrelse"
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the print size to the size of the image"
 msgstr "Sætter udskriftsstørrelse til størrelsen på billedet"
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 msgid "Print Color Adjust"
 msgstr "Udskrifts-farvejustering"
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 msgid "Set Defaults"
 msgstr "Sæt til standardværdier"
 
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
 msgstr "Luk"
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 msgid "Image preview"
 msgstr "Smugkig af billede"
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
 msgstr "Vis udskriftskanaler:"
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 msgid "Output"
 msgstr "Udskrift"
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 msgid "Output Type:"
 msgstr "Udskriftstype:"
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 msgid "Select the desired output type"
 msgstr "Vælg den ønskede udskriftstype"
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
 msgstr "Justér udskrift..."
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr "Justér farvebalance, lyshed, kontrast, mætning og ditherings algoritme"
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 msgid "Size Units:"
 msgstr "MÃ¥l-enhed:"
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 msgid " "
 msgstr " "
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 msgid "Units:"
 msgstr "Enheder:"
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 msgid "Select the base unit of measurement for printing"
 msgstr "Vælg basisenhed for målangivelse ved printning"
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
 msgstr "System V lp"
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
 msgstr "CUPS"
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
 msgstr "Berkeley lpd (/etc/lpc)"
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
 msgstr "Berkeley lpd (/usr/bsd/lpc)"
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
 msgstr "Berkeley lpd (/usr/etc/lpc"
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
 msgstr "Berkeley lpd (/usr/libexec/lpc)"
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 msgid "Printer"
 msgstr "Printer"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 msgid "(Default Printer)"
 msgstr "(Standard printer)"
 
@@ -6475,59 +6629,85 @@ msgstr "Størst mulige værdi for Y"
 msgid "_Gamma value"
 msgstr "_Gamma værdi"
 
-#: src/cups/genppd.c:133
+#: src/cups/genppd.c:146
 msgid "Printer Features"
 msgstr "Printer egenskaber"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 msgid "Output Control"
 msgstr "Udskriftskontrol"
 
-#: src/cups/genppd.c:139
+#: src/cups/genppd.c:152
 msgid "Common"
 msgstr "Almindelig"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:153
 msgid "Extra 1"
 msgstr "Ekstra 1"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:154
 msgid "Extra 2"
 msgstr "Ekstra 2"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:155
 msgid "Extra 3"
 msgstr "Ekstra 3"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:156
 msgid "Extra 4"
 msgstr "Ekstra 4"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
 msgstr "Ekstra 5"
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr "Danish"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1465
+#: src/cups/genppd.c:1613
+#, fuzzy
+msgid "2-Sided Printing"
+msgstr "Tosidet printning"
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1717
 msgid "No"
 msgstr "Nej"
 
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1719
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cups/genppd.c:1497
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#, fuzzy
+msgid "Value"
+msgstr "Blå"
+
+#: src/cups/genppd.c:1756
 msgid "Fine Adjustment"
 msgstr "Finjustering"
 
@@ -6535,19 +6715,6 @@ msgstr "Finjustering"
 msgid "Escputil version "
 msgstr "Escputil version "
 
-#: src/escputil/escputil.c:71
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil kommer UDEN NOGEN FORM FOR GARANTI; for detaljer skriv 'escputil -"
-"l'\n"
-"Dette er fri software, og du er velkommen til at redistribuere det\n"
-"under bestemte forudsætninger; skriv 'escputil -l' for detaljer.\n"
-
 #: src/escputil/escputil.c:76
 msgid ""
 "Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
@@ -7570,5 +7737,219 @@ msgstr "ERROR: ijsgutenprint: Forkerte parametre; kan ikke fortsætte!\n"
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "ERROR: ijsgutenprint: Hentning af næste række fejlede ved %.0f\n"
 
+#, fuzzy
+#~ msgid "Model Name"
+#~ msgstr "Kanalnavne"
+
+#, fuzzy
+#~ msgid "Canon MULTIPASS MP500"
+#~ msgstr "Canon S500"
+
+#, fuzzy
+#~ msgid "Canon MULTIPASS MP760"
+#~ msgstr "Canon LBP-1760"
+
+#~ msgid "Cassette"
+#~ msgstr "Kassette"
+
+#~ msgid "CD tray"
+#~ msgstr "CD skuffe"
+
+#~ msgid " Gamma"
+#~ msgstr "Gamma"
+
+#~ msgid " Curve"
+#~ msgstr "Kurve"
+
+#~ msgid "1440 x 1440"
+#~ msgstr "1440 x 1440"
+
+#~ msgid "1440 x 1440 DPI High Quality"
+#~ msgstr "1440 x 1440 DPI høj kvalitet"
+
+#~ msgid "1440 x 1440 DPI Highest Quality"
+#~ msgstr "1440 x 1440 DPI højeste kvalitet"
+
+#~ msgid "2880 x 1440 DPI High Quality"
+#~ msgstr "2880 x 1440 DPI høj kvalitet"
+
+#~ msgid "2880 x 1440 DPI Highest Quality"
+#~ msgstr "2880 x 1440 DPI højeste kvalitet"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "and the rest of the Gutenprint Development Team.\n"
+#~ "\n"
+#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "og resten af Gutenprint udviklings teamet.\n"
+#~ "\n"
+#~ "Besøg vores web site på: http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "Dette program er fri software, du må redistribuere det og/eller ændre\n"
+#~ "det, under betingelserne i GNU General Public License som publiceret af\n"
+#~ "the Free Software Foundation; enten version 2 af licensen, eller\n"
+#~ "(efter eget ønske) enhver senere version.\n"
+#~ "\n"
+#~ "Dette program er distribueret i det håb at det kan være nyttigt, men\n"
+#~ "UDEN ENHVER FORM FOR GARANTI, endda uden den underforståede\n"
+#~ "garanti for SALGBARHED, eller EGNETHED FOR ET BESTEMT FORMÃ…L\n"
+#~ "Se GNU General Public License for yderligere detaljer.\n"
+#~ "\n"
+#~ "Du skulle have modtaget en kopi af GNU General Public License sammen\n"
+#~ "med dette program. Hvis ikke, skriv da til Free Software Foundation, "
+#~ "Inc .,\n"
+#~ "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+
+#~ msgid ""
+#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
+#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
+#~ "l'\n"
+#~ "This is free software, and you are welcome to redistribute it\n"
+#~ "under certain conditions; type 'escputil -l' for details.\n"
+#~ msgstr ""
+#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
+#~ "Escputil kommer UDEN NOGEN FORM FOR GARANTI; for detaljer skriv 'escputil "
+#~ "-l'\n"
+#~ "Dette er fri software, og du er velkommen til at redistribuere det\n"
+#~ "under bestemte forudsætninger; skriv 'escputil -l' for detaljer.\n"
+
+#~ msgid "90x90 DPI"
+#~ msgstr "90x90 DPI"
+
+#~ msgid "90x90 DPI DMT"
+#~ msgstr "90x90 DPI DMT"
+
+#~ msgid "180x180 DPI"
+#~ msgstr "180x180 DPI"
+
+#~ msgid "180x180 DPI DMT"
+#~ msgstr "180x180 DPI DMT"
+
+#~ msgid "360x360 DPI"
+#~ msgstr "360x360 DPI"
+
+#~ msgid "360x360 DPI DMT"
+#~ msgstr "360x360 DPI DMT"
+
+#~ msgid "720x360 DPI"
+#~ msgstr "720x360 DPI"
+
+#~ msgid "720x360 DPI DMT"
+#~ msgstr "720x360 DPI DMT"
+
+#~ msgid "720x720 DPI"
+#~ msgstr "720x720 DPI"
+
+#~ msgid "720x720 DPI DMT"
+#~ msgstr "720x720 DPI DMT"
+
+#~ msgid "1440x720 DPI"
+#~ msgstr "1440x720 DPI"
+
+#~ msgid "1440x720 DPI DMT"
+#~ msgstr "1440x720 DPI DMT"
+
+#~ msgid "1440x1440 DPI"
+#~ msgstr "1440x1440 DPI"
+
+#~ msgid "1440x1440 DPI DMT"
+#~ msgstr "1440x1440 DPI DMT"
+
+#~ msgid "2880x2880 DPI"
+#~ msgstr "2880x2880 DPI"
+
+#~ msgid "2880x2880 DPI DMT"
+#~ msgstr "2880x2880 DPI DMT"
+
+#~ msgid "150x150 DPI DMT"
+#~ msgstr "150x150 DPI DMT"
+
+#~ msgid "300x300 DPI DMT"
+#~ msgstr "300x300 DPI DMT"
+
+#~ msgid "600x300 DPI DMT"
+#~ msgstr "600x300 DPI DMT"
+
+#~ msgid "600x600 DPI DMT"
+#~ msgstr "600x600 DPI DMT"
+
+#~ msgid "1200x600 DPI DMT"
+#~ msgstr "1200x600 DPI DMT"
+
+#~ msgid "1200x1200 DPI"
+#~ msgstr "1200x1200 DPI"
+
+#~ msgid "1200x1200 DPI DMT"
+#~ msgstr "1200x1200 DPI DMT"
+
+#~ msgid "2400x2400 DPI"
+#~ msgstr "2400x2400 DPI"
+
+#~ msgid "2400x2400 DPI DMT"
+#~ msgstr "2400x2400 DPI DMT"
+
+#~ msgid "Plain Paper PIXMA"
+#~ msgstr "Almindeligt papir PIXMA"
+
+#~ msgid "Back Print Film"
+#~ msgstr "Bagside-printfilm"
+
+#~ msgid "Fabric Sheets"
+#~ msgstr "Stofark"
+
+#~ msgid "Envelope"
+#~ msgstr "Kuvert"
+
+#~ msgid "High Resolution Paper"
+#~ msgstr "Højopløsningspapir"
+
+#~ msgid "T-Shirt Transfers"
+#~ msgstr "T-shirt overføring"
+
+#~ msgid "High Gloss Film"
+#~ msgstr "Højglansfilm"
+
+#~ msgid "Glossy Photo Paper"
+#~ msgstr "Blankt fotopapir"
+
+#~ msgid "Glossy Photo Cards"
+#~ msgstr "Blanke fotokort"
+
+#~ msgid "Photo Paper Pro"
+#~ msgstr "Prof. fotopapir"
+
+#~ msgid "Photo CcMmYK Color"
+#~ msgstr "Foto CcMmYK farver"
+
+#~ msgid "Photo CcMmY Color"
+#~ msgstr "Foto CcMmY farver"
+
+#~ msgid "CMYK Color"
+#~ msgstr "CMYK farver"
+
+#~ msgid "CMY Color"
+#~ msgstr "CMY farver"
+
 #~ msgid "Gutenprint"
 #~ msgstr "Gutenprint"
diff --git a/po/de.gmo b/po/de.gmo
index 5f89e8a..b8d52f8 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 48dcc35..9c8734d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimpprint 4.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\n"
 "PO-Revision-Date: 2002-09-05 21:20MET\n"
 "Last-Translator: Olaf Klemke <olke@users.sourceforge.net>\n"
 "Language-Team: deutsch <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 #, fuzzy
 msgid "Default"
-msgstr "Zurücksetzen"
+msgstr "Zurücksetzen"
 
 #: src/main/dither-main.c:47
 msgid "EvenTone"
@@ -83,18 +83,18 @@ msgstr ""
 msgid "Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -105,8 +105,8 @@ msgid ""
 "regions are not solid."
 msgstr ""
 "Stellen sie die Empfindlichkeit (Tintenmenge) des Druckes ein. Eine "
-"Verringerung läßt die Tinte durch das Papierdringen oder verschmieren, eine "
-"Erhöhung kann zu schlecht gedeckten Bereichen führen."
+"Verringerung läßt die Tinte durch das Papierdringen oder verschmieren, eine "
+"Erhöhung kann zu schlecht gedeckten Bereichen führen."
 
 #: src/main/dither-main.c:97
 msgid "Dither Algorithm"
@@ -128,10 +128,10 @@ msgid ""
 "art.\n"
 "Hybrid Floyd-Steinberg generally produces inferior output."
 msgstr ""
-"Wählen sie den Raster-Algorythmus aus\n"
-"Adaptive Hybrid ist gut für alles.\n"
-"Abgestuft ist schnell und für Fotos geeignet.\n"
-"Schnell und Sehr Schnell sind am schnellsten und gut für Zeichnungen und "
+"Wählen sie den Raster-Algorythmus aus\n"
+"Adaptive Hybrid ist gut für alles.\n"
+"Abgestuft ist schnell und für Fotos geeignet.\n"
+"Schnell und Sehr Schnell sind am schnellsten und gut für Zeichnungen und "
 "Texte.\n"
 "Hybrid Floyd-Steinberg bringt im allgemeinen weniger gute Resultate."
 
@@ -152,507 +152,320 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Raster Algorythmus"
 
-#: src/main/print-canon.c:1382
-#, fuzzy
-msgid "90x90 DPI"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1382
-#, fuzzy
-msgid "90x90 DPI DMT"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI"
-msgstr "150×150 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI DMT"
-msgstr "150×150 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI"
-msgstr "300×300 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI DMT"
-msgstr "600×600 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI"
-msgstr "720 x 360 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI DMT"
-msgstr "720 x 360 DPI MW2"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI DMT"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI"
-msgstr "1440 x 720 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI DMT"
-msgstr "1440 x 720 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI DMT"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI DMT"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr "150×150 DPI"
-
-#: src/main/print-canon.c:1390
-#, fuzzy
-msgid "150x150 DPI DMT"
-msgstr "150×150 DPI"
-
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
-msgstr "300×300 DPI"
-
-#: src/main/print-canon.c:1391
-#, fuzzy
-msgid "300x300 DPI DMT"
-msgstr "300×300 DPI"
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr "600×300 DPI"
-
-#: src/main/print-canon.c:1392
-#, fuzzy
-msgid "600x300 DPI DMT"
-msgstr "600×300 DPI"
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr "600×600 DPI"
-
-#: src/main/print-canon.c:1393
-#, fuzzy
-msgid "600x600 DPI DMT"
-msgstr "600×600 DPI"
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr "1200×600 DPI"
-
-#: src/main/print-canon.c:1394
-#, fuzzy
-msgid "1200x600 DPI DMT"
-msgstr "1200×600 DPI"
-
-#: src/main/print-canon.c:1395
-#, fuzzy
-msgid "1200x1200 DPI"
-msgstr "1200×600 DPI"
-
-#: src/main/print-canon.c:1395
-#, fuzzy
-msgid "1200x1200 DPI DMT"
-msgstr "1200×600 DPI"
-
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI"
-msgstr "2400×600 DPI"
-
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI DMT"
-msgstr "2400×600 DPI"
-
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-msgid "Plain Paper"
-msgstr "Normalpapier"
-
-#: src/main/print-canon.c:1448
-#, fuzzy
-msgid "Plain Paper PIXMA"
-msgstr "Normalpapier"
-
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-msgid "Transparencies"
-msgstr "Folie"
-
-#: src/main/print-canon.c:1450
-msgid "Back Print Film"
-msgstr "Transferfolie"
-
-#: src/main/print-canon.c:1451
-msgid "Fabric Sheets"
-msgstr "Schreibmaschinenpapier"
-
-#: src/main/print-canon.c:1452
-msgid "Envelope"
-msgstr "Briefumschlag"
-
-#: src/main/print-canon.c:1453
-msgid "High Resolution Paper"
-msgstr "Spezialpapier"
-
-#: src/main/print-canon.c:1454
-msgid "T-Shirt Transfers"
-msgstr "T-Shirt Transfers"
-
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
-msgstr "High Gloss Film"
-
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
-msgstr "Glossy Foto Papier"
-
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
-msgstr "Glossy Foto Karten"
-
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
-msgstr "Foto Papier Pro"
-
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
-msgstr "Anderes"
-
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
 msgid "Page Size"
-msgstr "Größe"
-
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
+msgstr "Größe"
+
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Drucker Einstellungen"
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 #, fuzzy
 msgid "Size of the paper being printed to"
-msgstr "Größe des Papiers "
+msgstr "Größe des Papiers "
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
 msgid "Media Type"
 msgstr "Medium Type"
 
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
 msgid "Media Source"
 msgstr "Medium Quelle"
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "in welchem Schacht ist das Druckmedium"
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
+msgstr ""
+
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr ""
+
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
+msgstr ""
+
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
+
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+msgid "CD Hub Size (Custom)"
+msgstr ""
+
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#, fuzzy
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "Bildgröße an Seitengröße anpassen"
+
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
+msgstr ""
+
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr ""
+
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
-msgstr "Auflösung"
+msgstr "Auflösung"
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
-msgstr "Auflösung und Druckqualität"
+msgstr "Auflösung und Druckqualität"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tintentype"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr ""
-
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tintenart im Drucker"
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Druckermodel:"
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Normalpapier"
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "helles Magenta"
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
-msgid "Short Edge (Flip)"
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-msgid "Auto Sheet Feeder"
-msgstr "Auto-Einzug"
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+msgid "Short Edge (Flip)"
+msgstr ""
 
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-msgid "Manual with Pause"
-msgstr "Handeinzug mit Pause"
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
+msgstr ""
 
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
-msgstr "Handeinzug ohne Pause"
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
+msgstr ""
 
-#: src/main/print-canon.c:1923
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
 #, fuzzy
-msgid "Cassette"
-msgstr "Mattes Papier"
+msgid "CD - Custom"
+msgstr "Auto"
 
-#: src/main/print-canon.c:1924
-msgid "CD tray"
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:2049
-msgid "Photo CcMmYK Color"
-msgstr "Foto CcMmYK Farbe"
-
-#: src/main/print-canon.c:2052
-msgid "Photo CcMmY Color"
-msgstr "Foto CcMmY Farbe"
-
-#: src/main/print-canon.c:2055
-msgid "CMYK Color"
-msgstr "CMYK Farbe"
-
-#: src/main/print-canon.c:2058
-msgid "CMY Color"
-msgstr "CMY Farbe"
-
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
-msgstr "Schwarz"
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#, fuzzy
+msgid "Print To Hub"
+msgstr "Drucke in Datei?"
 
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
 msgstr "Farbe"
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
-msgstr "Schwarz-Weiß"
+msgstr "Schwarz-Weiß"
 
 #: src/main/print-color.c:50
 msgid "High Accuracy"
@@ -688,9 +501,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Drucken"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
 msgstr "Graustufen"
 
@@ -720,11 +533,6 @@ msgstr ""
 msgid "Channel "
 msgstr "Abbruch"
 
-#: src/main/print-color.c:165
-#, fuzzy
-msgid " Gamma"
-msgstr "Gamma:"
-
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
 #: src/main/print-color.c:266 src/main/print-color.c:274
@@ -782,7 +590,7 @@ msgid "Output image type"
 msgstr "Ausgabeart:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
 msgstr ""
 
@@ -803,7 +611,7 @@ msgstr "Helligkeit:"
 #: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
-msgstr "Einstellen der Höhe des Ausdrucks"
+msgstr "Einstellen der Höhe des Ausdrucks"
 
 #: src/main/print-color.c:232
 #, fuzzy
@@ -837,8 +645,8 @@ msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
 msgstr ""
-"Stellen sie den Gamma-Parameter des Bildes ein. Größere Werte ergeben "
-"hellere Ausdrucke, kleinere dunkelere. Schwarz-Weiß bleibt gleich, nicht wie "
+"Stellen sie den Gamma-Parameter des Bildes ein. Größere Werte ergeben "
+"hellere Ausdrucke, kleinere dunkelere. Schwarz-Weiß bleibt gleich, nicht wie "
 "bei  der Helligkeitseinstellung."
 
 #: src/main/print-color.c:258
@@ -850,13 +658,13 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
@@ -867,13 +675,13 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 msgid "Magenta"
@@ -884,13 +692,13 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
@@ -901,9 +709,9 @@ msgstr "Gelb"
 msgid "Adjust the yellow gamma"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
 msgstr ""
@@ -913,8 +721,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
 msgstr ""
 
@@ -923,9 +731,9 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
 msgstr ""
@@ -935,12 +743,24 @@ msgstr ""
 msgid "Adjust the blue gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr "Schwarz"
+
 #: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
 msgstr ""
 
@@ -955,7 +775,7 @@ msgstr "Graustufen"
 msgid "Adjust the cyan gray balance"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -965,7 +785,7 @@ msgstr "Magenta"
 msgid "Adjust the magenta gray balance"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Stellen sie die Gelb-Balance ein"
@@ -996,9 +816,9 @@ msgstr "Tintentype"
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Ausgabeart:"
@@ -1031,11 +851,6 @@ msgstr ""
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:446
-#, fuzzy
-msgid " Curve"
-msgstr "Schwarz"
-
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
@@ -1166,591 +981,395 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:516 src/main/printers.c:521
+#: src/main/printers.c:519 src/main/printers.c:524
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s ist kein erlaubter Parameter von %s\n"
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:673
+#: src/main/printers.c:676
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Unbekannter Drucker %s\n"
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
-msgstr "%s Bereichsüberschreitung (Wert %d, min %d, max %d)\n"
+msgstr "%s Bereichsüberschreitung (Wert %d, min %d, max %d)\n"
 
-#: src/main/printers.c:755
+#: src/main/printers.c:761
 #, fuzzy
 msgid "Page size is not valid\n"
-msgstr "Die Bildgröße stimmt nicht\n"
+msgstr "Die Bildgröße stimmt nicht\n"
 
-#: src/main/printers.c:776
+#: src/main/printers.c:782
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Der obere Rand darf nicht kleiner Null sein\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:788
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Der linke Rand darf nicht kleiner Null sein\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:794
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Der linke Rand darf nicht kleiner Null sein\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:800
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Der obere Rand darf nicht kleiner Null sein\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-msgid "Roll Feed"
-msgstr "Vorschub"
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-#, fuzzy
-msgid "Manual Feed"
-msgstr "Manuell"
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-#, fuzzy
-msgid "Print to CD"
-msgstr "Drucke in Datei?"
-
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-#, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Manuell"
-
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-#, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Manuell"
-
-#: src/main/print-escp2-data.c:554
-#, fuzzy
-msgid "Rear Tray"
-msgstr "Schacht"
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr ""
-
-#: src/main/print-escp2-data.c:581
-#, fuzzy
-msgid "Photo Board"
-msgstr "Foto Papier"
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr ""
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr ""
-
-#: src/main/print-escp2-data.c:638
-#, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "autom. Auswahl"
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr ""
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr ""
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-#, fuzzy
-msgid "High"
-msgstr "Höhe:"
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-#, fuzzy
-msgid "Photo"
-msgstr "Foto"
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-#, fuzzy
-msgid "Super Photo"
-msgstr "Sieben Farb Foto"
-
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-#, fuzzy
-msgid "Ultra Photo"
-msgstr "Sechs Farben Foto"
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-#, fuzzy
-msgid "Light Cyan"
-msgstr "helles Cyan"
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-#, fuzzy
-msgid "Light Magenta"
-msgstr "helles Magenta"
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-#, fuzzy
-msgid "Light Black"
-msgstr "Schwarz"
-
-#: src/main/print-escp2-data.c:811
-#, fuzzy
-msgid "Dark Yellow"
-msgstr "Gelb"
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-#, fuzzy
-msgid "Matte Black"
-msgstr "Mattes Papier"
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-#, fuzzy
-msgid "Photo Black"
-msgstr "Foto Papier"
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-#, fuzzy
-msgid "Gloss Optimizer"
-msgstr "Glossy Film"
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-#, fuzzy
-msgid "Light Light Black"
-msgstr "Schwarz"
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 #, fuzzy
 msgid "Print Quality"
-msgstr "720 DPI höchste Qualität"
-
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr ""
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr ""
-
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr ""
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr ""
+msgstr "720 DPI höchste Qualität"
 
-#: src/main/print-escp2.c:214
+#: src/main/print-escp2.c:228
 #, fuzzy
 msgid "Resolution of the print"
-msgstr "Auflösung und Druckqualität"
+msgstr "Auflösung und Druckqualität"
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:236
+#: src/main/print-escp2.c:250
 #, fuzzy
 msgid "Ink Set"
 msgstr "Tintentype"
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 #, fuzzy
 msgid "Output Order"
 msgstr "Ausgabeart:"
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 #, fuzzy
 msgid "Ink change command"
 msgstr "Unbekannter Befehl.\n"
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Wiederhole die Kopf-Ausrichtung.\n"
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 #, fuzzy
 msgid "Channel Names"
 msgstr "Abbruch"
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:346
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Cyan"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:347
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:352
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:358
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Gelb"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:364
 #, fuzzy
 msgid "Blue Map"
-msgstr "Schwarz-Weiß"
+msgstr "Schwarz-Weiß"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:447
+#: src/main/print-escp2.c:464
 #, fuzzy
 msgid "Red Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-escp2.c:448
+#: src/main/print-escp2.c:465
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:455
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Blue Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-escp2.c:456
+#: src/main/print-escp2.c:473
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-escp2.c:463
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Glossy Film"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:481
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:527
+#: src/main/print-escp2.c:544
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:528
+#: src/main/print-escp2.c:545
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr ""
-
-#: src/main/print-escp2.c:1564
-#, fuzzy
-msgid "Print To Hub"
-msgstr "Drucke in Datei?"
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr "Standard"
+
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 #, fuzzy
 msgid "Automatic"
-msgstr "Größe"
+msgstr "Größe"
 
-#: src/main/print-escp2.c:1701
+#: src/main/print-escp2.c:1829
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1703
+#: src/main/print-escp2.c:1831
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2168
+#: src/main/print-escp2.c:2313
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
-msgstr "Drucker unterstützt keine Rohdatenausgabe\n"
+msgstr "Drucker unterstützt keine Rohdatenausgabe\n"
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
-msgstr "Ungeprüfte Druckoptionen; drucken nicht möglich.\n"
+msgstr "Ungeprüfte Druckoptionen; drucken nicht möglich.\n"
 
 #: src/main/print-lexmark.c:577 src/main/print-lexmark.c:653
 msgid "300 DPI x 600 DPI"
-msgstr "300 DPI × 600 DPI"
+msgstr "300 DPI × 600 DPI"
 
 #: src/main/print-lexmark.c:578 src/main/print-lexmark.c:654
 msgid "600 DPI"
@@ -1758,7 +1377,7 @@ msgstr "600 DPI"
 
 #: src/main/print-lexmark.c:579 src/main/print-lexmark.c:655
 msgid "600 DPI high quality"
-msgstr "600 DPI hohe Qualität"
+msgstr "600 DPI hohe Qualität"
 
 #: src/main/print-lexmark.c:580 src/main/print-lexmark.c:656
 msgid "600 DPI Unidirectional"
@@ -1770,11 +1389,11 @@ msgstr "1200 DPI"
 
 #: src/main/print-lexmark.c:582 src/main/print-lexmark.c:658
 msgid "1200 DPI high quality"
-msgstr "1200 DPI hohe Qualität"
+msgstr "1200 DPI hohe Qualität"
 
 #: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659
 msgid "1200 DPI highest quality"
-msgstr "1200 DPI höchste Qualität"
+msgstr "1200 DPI höchste Qualität"
 
 #: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660
 msgid "1200 DPI  Unidirectional"
@@ -1782,270 +1401,323 @@ msgstr "1200 DPI  Unidirectional"
 
 #: src/main/print-lexmark.c:585
 msgid "2400 DPI x 1200 DPI"
-msgstr "2400 DPI × 1200 DPI"
+msgstr "2400 DPI × 1200 DPI"
 
 #: src/main/print-lexmark.c:586
 msgid "2400 DPI x 1200 DPI high quality"
-msgstr "2400 DPI × 1200 DPI hohe Qualität"
+msgstr "2400 DPI × 1200 DPI hohe Qualität"
 
 #: src/main/print-lexmark.c:587
 msgid "2400 DPI x 1200 DPI highest quality"
-msgstr "2400 DPI × 1200 DPI höchste Qualität"
+msgstr "2400 DPI × 1200 DPI höchste Qualität"
 
 #: src/main/print-lexmark.c:589
 msgid "test print"
 msgstr "Probeausdruck"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
 msgstr "Vier Farben Standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
 msgstr "Aus drei Farben gemischt"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
 msgstr "Sechs Farben Foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
-msgstr "Foto aus fünf Farben gemischt "
+msgstr "Foto aus fünf Farben gemischt "
+
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+msgid "Plain Paper"
+msgstr "Normalpapier"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
 msgstr "Glossy Film"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+msgid "Transparencies"
+msgstr "Folie"
+
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 msgid "Envelopes"
 msgstr "Umschlag"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 msgid "Matte Paper"
 msgstr "Mattes Papier"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
 msgstr "Inkjet Papier"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
 msgstr "Photo Quality Inkjet Papier"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 msgid "Photo Paper"
 msgstr "Foto Papier"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium Glossy Foto Papier"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Glanz Foto Papier"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
 msgstr "Photo Quality Glossy Papier"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
 msgstr "Ilford schweres Papier"
 
-#: src/main/print-olympus.c:265
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr "Anderes"
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr "Auto-Einzug"
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr "Handeinzug mit Pause"
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr "Handeinzug ohne Pause"
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 #, fuzzy
 msgid "Glossy"
 msgstr "Glossy Film"
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:861
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 #, fuzzy
 msgid "Matte"
 msgstr "Mattes Papier"
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1331
+#: src/main/print-olympus.c:1627
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-olympus.c:1339
+#: src/main/print-olympus.c:1635
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-olympus.c:1347
+#: src/main/print-olympus.c:1643
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-olympus.c:1354
+#: src/main/print-olympus.c:1650
 #, fuzzy
 msgid "Black Balance"
-msgstr "Schwarz-Weiß"
+msgstr "Schwarz-Weiß"
 
-#: src/main/print-olympus.c:1355
+#: src/main/print-olympus.c:1651
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 msgid "Plain"
 msgstr "Einfach"
 
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 msgid "Bond"
 msgstr "Fett"
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 msgid "Premium"
 msgstr "Premium"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
 msgstr "Hochglanz"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 msgid "Transparency"
 msgstr "Folie"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
 msgstr "Schnelltrocknendes Glossy"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 msgid "Quick-dry Transparency"
 msgstr "Schnelltrocknende Folie"
 
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
 msgstr "Manuell"
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 msgid "Tray 1"
 msgstr "Schacht 1"
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 msgid "Tray 2"
 msgstr "Schacht 2"
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 msgid "Tray 3"
 msgstr "Schacht 3"
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 msgid "Tray 4"
 msgstr "Schacht 4"
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
-msgstr "optionale Papierzuführung"
+msgstr "optionale Papierzuführung"
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 msgid "Desktop Sheet Feeder"
-msgstr "eingebaute Papierzuführung"
+msgstr "eingebaute Papierzuführung"
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 msgid "Tray"
 msgstr "Schacht"
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 msgid "Optional Source"
-msgstr "sonstige Zuführung"
+msgstr "sonstige Zuführung"
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 msgid "Autoselect"
 msgstr "autom. Auswahl"
 
 #: src/main/print-pcl.c:256
-msgid "600x600 DPI monochrome"
-msgstr "600×600 DPI monochrome"
+msgid "150x150 DPI"
+msgstr "150×150 DPI"
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr "300×300 DPI"
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
+msgstr "600×300 DPI"
 
 #: src/main/print-pcl.c:259
+msgid "600x600 DPI monochrome"
+msgstr "600×600 DPI monochrome"
+
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr "600×600 DPI"
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr "1200×600 DPI"
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
-msgstr "2400×600 DPI"
+msgstr "2400×600 DPI"
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
 msgstr "Farbe+Schwarz Patrone"
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
 msgstr "Farb + Foto Patronen"
 
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr ""
-
 #: src/main/print-ps.c:97
 #, fuzzy
 msgid "PPDFile"
 msgstr "PPD Datei:"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD Datei?"
@@ -2054,180 +1726,298 @@ msgstr "PPD Datei?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 msgid "Two Level Grayscale"
 msgstr "zweistufig Grau"
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 #, fuzzy
 msgid "Three Level Grayscale"
 msgstr "zweistufig Grau"
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
 msgstr "Aus sechs Farben gemischt "
 
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 msgid "Seven Color Enhanced"
 msgstr "Aus sieben Farben gemischt"
 
-#: src/main/escp2-channels.c:1535
+#: src/main/escp2-channels.c:1649
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 msgid "One Color Raw"
 msgstr "einfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1695
+#: src/main/escp2-channels.c:1809
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Aus sieben Farben gemischt"
 
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 msgid "Two Color Raw"
 msgstr "zweifarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1762
+#: src/main/escp2-channels.c:1876
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 msgid "Four Color Raw"
 msgstr "vierfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1884
+#: src/main/escp2-channels.c:2017
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "vierfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 msgid "Six Color Raw"
 msgstr "Sechsfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1962
+#: src/main/escp2-channels.c:2109
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Aus sechs Farben gemischt "
 
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 msgid "Seven Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:2024
+#: src/main/escp2-channels.c:2187
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Aus sieben Farben gemischt"
 
-#: src/main/escp2-channels.c:2042
+#: src/main/escp2-channels.c:2205
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Sechsfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Sechs Farben Foto"
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#, fuzzy
+msgid "Photo Black"
+msgstr "Foto Papier"
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+#, fuzzy
+msgid "Matte Black"
+msgstr "Mattes Papier"
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+#, fuzzy
+msgid "Light Cyan"
+msgstr "helles Cyan"
+
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+#, fuzzy
+msgid "Light Magenta"
+msgstr "helles Magenta"
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+#, fuzzy
+msgid "Light Black"
+msgstr "Schwarz"
+
+#: src/main/escp2-channels.c:2981
+#, fuzzy
+msgid "Dark Yellow"
+msgstr "Gelb"
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#, fuzzy
+msgid "Gloss Optimizer"
+msgstr "Glossy Film"
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Schwarz"
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 msgid "Plain Paper Fast Load"
 msgstr "Normalpapier Schnelleinzug"
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postkarte"
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 msgid "Back Light Film"
 msgstr "Durchlichtfolie"
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Mattes Papier"
 
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium Glossy Foto Papier"
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Normalpapier"
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Mattes Papier"
 
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+msgid "Roll Feed"
+msgstr "Vorschub"
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#, fuzzy
+msgid "Manual Feed"
+msgstr "Manuell"
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+#, fuzzy
+msgid "Print to CD"
+msgstr "Drucke in Datei?"
+
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Manuell"
+
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Manuell"
+
+#: src/main/escp2-papers.c:1859
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Schacht"
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/escp2-papers.c:1886
+#, fuzzy
+msgid "Photo Board"
+msgstr "Foto Papier"
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr ""
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr ""
+
+#: src/main/escp2-papers.c:1943
+#, fuzzy
+msgid "Cut Sheet Autoselect"
+msgstr "autom. Auswahl"
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr ""
+
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
@@ -2235,7 +2025,7 @@ msgstr ""
 #: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
 #, fuzzy
 msgid "360 x 120 DPI Economy"
-msgstr "600×600 DPI monochrome"
+msgstr "600×600 DPI monochrome"
 
 #: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
 msgid "180 DPI Economy"
@@ -2244,17 +2034,17 @@ msgstr ""
 #: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
 #, fuzzy
 msgid "360 x 180 DPI Draft"
-msgstr "150×150 DPI"
+msgstr "150×150 DPI"
 
 #: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
 #, fuzzy
 msgid "360 x 240 DPI Draft"
-msgstr "600×600 DPI"
+msgstr "600×600 DPI"
 
 #: src/main/escp2-resolutions.c:68
 #, fuzzy
 msgid "360 DPI High Quality"
-msgstr "600 DPI hohe Qualität"
+msgstr "600 DPI hohe Qualität"
 
 #: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
 #: src/main/escp2-resolutions.c:77
@@ -2267,144 +2057,168 @@ msgstr "600 DPI"
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:94
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 #, fuzzy
 msgid "720 DPI High Quality"
-msgstr "1200 DPI hohe Qualität"
+msgstr "1200 DPI hohe Qualität"
 
-#: src/main/escp2-resolutions.c:97
+#: src/main/escp2-resolutions.c:103
 #, fuzzy
 msgid "720 DPI Highest Quality"
-msgstr "1200 DPI höchste Qualität"
+msgstr "1200 DPI höchste Qualität"
 
-#: src/main/escp2-resolutions.c:100
+#: src/main/escp2-resolutions.c:106
 #, fuzzy
 msgid "720 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
-msgstr "1200 DPI höchste Qualität"
+msgstr "1200 DPI höchste Qualität"
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:129
+#: src/main/escp2-resolutions.c:135
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
-msgstr "1200 DPI höchste Qualität"
+msgstr "1200 DPI höchste Qualität"
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
+#: src/main/escp2-resolutions.c:145
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:142
-#, fuzzy
-msgid "1440 x 1440"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/escp2-resolutions.c:145
-#, fuzzy
-msgid "1440 x 1440 DPI High Quality"
-msgstr "1200 DPI höchste Qualität"
-
-#: src/main/escp2-resolutions.c:148
-#, fuzzy
-msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1200 DPI höchste Qualität"
-
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:158
+#: src/main/escp2-resolutions.c:155
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:164
-#, fuzzy
-msgid "2880 x 1440 DPI High Quality"
-msgstr "1200 DPI höchste Qualität"
-
-#: src/main/escp2-resolutions.c:167
-#, fuzzy
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr "1200 DPI höchste Qualität"
-
-#: src/main/escp2-resolutions.c:171
+#: src/main/escp2-resolutions.c:162
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 #, fuzzy
 msgid "Interleave"
 msgstr "Drucker Name:"
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Drucker Name:"
 
-#: src/main/escp2-resolutions.c:584
+#: src/main/escp2-resolutions.c:594
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Helligkeit:"
 
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+#, fuzzy
+msgid "High"
+msgstr "Höhe:"
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+#, fuzzy
+msgid "Photo"
+msgstr "Foto"
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+#, fuzzy
+msgid "Super Photo"
+msgstr "Sieben Farb Foto"
+
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+#, fuzzy
+msgid "Ultra Photo"
+msgstr "Sechs Farben Foto"
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr ""
+
 #: src/main/generic-options.c:46
 msgid "Text"
 msgstr ""
@@ -2429,7 +2243,7 @@ msgstr "Strichzeichnung"
 #: src/main/generic-options.c:55
 #, fuzzy
 msgid "Page"
-msgstr "Größe"
+msgstr "Größe"
 
 #: src/main/generic-options.c:56
 msgid "Job"
@@ -2456,12 +2270,12 @@ msgstr ""
 #: src/main/generic-options.c:80
 #, fuzzy
 msgid "Page Number"
-msgstr "Größe"
+msgstr "Größe"
 
 #: src/main/generic-options.c:81
 #, fuzzy
 msgid "Page number"
-msgstr "Größe"
+msgstr "Größe"
 
 #: src/main/xmli18n-tmp.h:1
 msgid "Letter"
@@ -2479,3699 +2293,4004 @@ msgstr "Tabloid"
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
-msgstr "3×5"
+msgstr "3×5"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
-msgstr "4×6"
+msgstr "4×6"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/main/xmli18n-tmp.h:11
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
-msgstr "5×7"
+msgstr "5×7"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
-msgstr "5×8"
+msgstr "5×8"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
-msgstr "6×8"
+msgstr "6×8"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
-msgstr "8×10"
+msgstr "8×10"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
-msgstr "12×18"
+msgstr "12×18"
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
-msgstr "Super B 13×19"
+msgstr "Super B 13×19"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
-msgstr "8×12"
+msgstr "8×12"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
-msgstr "11×14"
+msgstr "11×14"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
-msgstr "16×20"
+msgstr "16×20"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
-msgstr "16×24"
+msgstr "16×24"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
-msgstr "20×24"
+msgstr "20×24"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
-msgstr "20×30"
+msgstr "20×30"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/main/xmli18n-tmp.h:26
 #, fuzzy
 msgid "22x30"
-msgstr "20×30"
+msgstr "20×30"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
-msgstr "24×30"
+msgstr "24×30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
-msgstr "30×40"
+msgstr "30×40"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/main/xmli18n-tmp.h:32
 #, fuzzy
 msgid "Super A0"
 msgstr "Sieben Farb Foto"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
 msgstr "A4"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/main/xmli18n-tmp.h:67
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 msgid "American foolscap"
-msgstr "Amerikan. Narrenmütze"
+msgstr "Amerikan. Narrenmütze"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 msgid "European foolscap"
-msgstr "Europäische Narrenmütze"
+msgstr "Europäische Narrenmütze"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:108
+#: src/main/xmli18n-tmp.h:109
 #, fuzzy
 msgid "ISO A4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 msgid "Small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 msgid "Hagaki Card"
 msgstr "Hagaki Card"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
 msgstr "Oufuku Card"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
 msgstr "Japanese langer Umschlag #3"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
 msgstr "Japanese langer Umschlag #4"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 #, fuzzy
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanese langer Umschlag #4"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/main/xmli18n-tmp.h:125
+#: src/main/xmli18n-tmp.h:126
 msgid "Monarch Envelope"
 msgstr "Briefumschlag (Monarch)"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:127
+#: src/main/xmli18n-tmp.h:128
 #, fuzzy
 msgid "4x7"
-msgstr "5×7"
+msgstr "5×7"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:130
+#: src/main/xmli18n-tmp.h:131
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Postkarte"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 #, fuzzy
 msgid "Custom"
 msgstr "Auto"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
 msgstr "89 mm Endlospapier"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
 msgstr "4 Inch Endlospapier"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
 msgstr "5 Inch Endlospapier"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
 msgstr "210 mm Endlospapier"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
 msgstr "13 Zoll Endlospapier"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
 msgstr "22 Zoll Endlospapier"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
 msgstr "24 Zoll Endlospapier"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
 msgstr "36 Zoll Endlospapier"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
 msgstr "44 Zoll Endlospapier"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:145
+#: src/main/xmli18n-tmp.h:146
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:146
+#: src/main/xmli18n-tmp.h:147
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:147
+#: src/main/xmli18n-tmp.h:148
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/main/xmli18n-tmp.h:149
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:149
+#: src/main/xmli18n-tmp.h:150
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/main/xmli18n-tmp.h:151
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/main/xmli18n-tmp.h:152
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:152
+#: src/main/xmli18n-tmp.h:153
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/main/xmli18n-tmp.h:154
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/main/xmli18n-tmp.h:155
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
+#: src/main/xmli18n-tmp.h:156
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:156
+#: src/main/xmli18n-tmp.h:157
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:157
+#: src/main/xmli18n-tmp.h:158
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:158
+#: src/main/xmli18n-tmp.h:159
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:159
+#: src/main/xmli18n-tmp.h:160
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:160
+#: src/main/xmli18n-tmp.h:161
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:161
+#: src/main/xmli18n-tmp.h:162
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:162
+#: src/main/xmli18n-tmp.h:163
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:163
+#: src/main/xmli18n-tmp.h:164
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:164
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:173
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
-msgid "Canon iP4000"
+#: src/main/xmli18n-tmp.h:181
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:182
+msgid "Canon PIXMA iP3000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:183
+msgid "Canon PIXMA iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:184
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:185
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:186
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:187
+msgid "Canon PIXMA iP4300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:188
+msgid "Canon PIXMA iP5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
+msgid "Canon PIXMA iP6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:191
+msgid "Canon PIXMA MP150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:192
+msgid "Canon PIXMA MP500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:193
+msgid "Canon PIXMA MP700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:194
+msgid "Canon PIXMA MP730"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:195
+msgid "Canon PIXMA MP750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:196
+msgid "Canon PIXMA MP760"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:197
+msgid "Canon PIXMA MP770"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:198
+msgid "Canon PIXMA MP780"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:199
+msgid "Canon PIXMA MP790"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:200
+msgid "Canon PIXMA MP830"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:201
+msgid "Canon PIXUS iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:202
+msgid "Canon PIXUS iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:203
+msgid "Canon i560"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:204
+msgid "Canon i850"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:205
+msgid "Canon i860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:206
+msgid "Canon i865"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:207
 msgid "Epson Stylus C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:208
 msgid "Epson Stylus C20SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:209
 msgid "Epson Stylus C20UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:210
 msgid "Epson Stylus C40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:211
 msgid "Epson Stylus C40SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:212
 msgid "Epson Stylus C40UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:213
 msgid "Epson Stylus C41"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:214
 msgid "Epson Stylus C41SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:215
 msgid "Epson Stylus C41UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:216
 msgid "Epson Stylus C42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:217
 msgid "Epson Stylus C42SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:218
 msgid "Epson Stylus C42UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:219
 msgid "Epson Stylus C43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:220
 msgid "Epson Stylus C43SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:221
 msgid "Epson Stylus C43UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:222
 msgid "Epson Stylus C44"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:223
 msgid "Epson Stylus C44SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:224
 msgid "Epson Stylus C44UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:225
 msgid "Epson Stylus C45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:226
 msgid "Epson Stylus C46"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:227
 msgid "Epson Stylus C48"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:228
 msgid "Epson Stylus C50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:229
 msgid "Epson Stylus C60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:230
 msgid "Epson Stylus C61"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:231
 msgid "Epson Stylus C62"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:232
 msgid "Epson Stylus C63"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:233
 msgid "Epson Stylus C64"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:234
 msgid "Epson Stylus C65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:235
 msgid "Epson Stylus C66"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:236
 msgid "Epson Stylus C68"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:237
 msgid "Epson Stylus C70"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:238
+#, fuzzy
+msgid "Epson Stylus C79"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:239
 msgid "Epson Stylus C80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:240
 msgid "Epson Stylus C82"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:241
 msgid "Epson Stylus C83"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:242
 msgid "Epson Stylus C84"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:243
 msgid "Epson Stylus C85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:244
 msgid "Epson Stylus C86"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:245
+#, fuzzy
+msgid "Epson Stylus C87"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:246
 msgid "Epson Stylus C88"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:247
 msgid "Epson Stylus Color"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:248
 msgid "Epson Stylus Color I"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:249
 msgid "Epson Stylus Color II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:250
 msgid "Epson Stylus Color IIs"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:251
 msgid "Epson Stylus Color PRO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:252
 msgid "Epson Stylus Pro XL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:253
 msgid "Epson Stylus Color 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:254
 msgid "Epson Stylus Color 440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:255
 msgid "Epson Stylus Color 460"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:256
 msgid "Epson Stylus Color 480"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:257
 msgid "Epson Stylus Color 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:258
 msgid "Epson Stylus Color 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:259
 msgid "Epson Stylus Color 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:260
 msgid "Epson Stylus Color 640"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:261
 msgid "Epson Stylus Color 660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:262
 msgid "Epson Stylus Color 670"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:263
 msgid "Epson Stylus Color 680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:264
 msgid "Epson Stylus Color 740"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:265
 msgid "Epson Stylus Color 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:266
 msgid "Epson Stylus Color 777"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:267
 msgid "Epson Stylus Color 800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:268
 msgid "Epson Stylus Color 850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:269
 msgid "Epson Stylus Color 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:270
 msgid "Epson Stylus Color 880"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:271
 msgid "Epson Stylus Color 8 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:272
 msgid "Epson Stylus Color 900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:273
 msgid "Epson Stylus Color 980"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:274
 msgid "Epson Stylus Color 1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:275
 msgid "Epson Stylus Color 1500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:276
 msgid "Epson Stylus Color 1520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:277
 msgid "Epson Stylus Color 3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Photo"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Photo 700"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Photo EX"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Photo 720"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Photo 750"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Photo 780"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Photo 785"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Photo 790"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Photo 810"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Photo 820"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Photo 825"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Photo 830"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:291
 msgid "Epson Stylus Photo 830U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Photo 870"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Photo 875"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo 890"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 895"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo 900"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo 915"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 925"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 935"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 950"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 960"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:302
 msgid "Epson Stylus Photo 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:303
 msgid "Epson Stylus Photo 1270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:304
 msgid "Epson Stylus Photo 1280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:305
 msgid "Epson Stylus Photo 1290"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "Epson Stylus Photo 1400"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "Epson Stylus Photo 1410"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
-msgstr "Epson 4×6 Photo Paper"
+msgstr "Epson 4×6 Photo Paper"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:309
 msgid "Epson Stylus Photo 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:310
 msgid "Epson Stylus Photo 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:311
 msgid "Epson Stylus Photo R200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:312
 msgid "Epson Stylus Photo R210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:313
 msgid "Epson Stylus Photo R220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:314
+#, fuzzy
+msgid "Epson Stylus Photo R230"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:315
+#, fuzzy
+msgid "Epson Stylus Photo R240"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "Epson Stylus Photo R245"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:317
+#, fuzzy
+msgid "Epson Stylus Photo R260"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Epson Stylus Photo R265"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "Epson Stylus Photo R270"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:320
 msgid "Epson Stylus Photo R300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:321
 msgid "Epson Stylus Photo R310"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:322
 msgid "Epson Stylus Photo R320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:323
 msgid "Epson Stylus Photo R340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "Epson Stylus Photo R350"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "Epson Stylus Photo R360"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "Epson Stylus Photo R380"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "Epson Stylus Photo R390"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "Epson Stylus Photo RX400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:329
 msgid "Epson Stylus Photo RX420"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:330
 msgid "Epson Stylus Photo RX425"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:331
 msgid "Epson Stylus Photo RX430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:332
 msgid "Epson Stylus Photo RX500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:333
 msgid "Epson Stylus Photo RX510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Epson Stylus Photo RX560"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:335
+#, fuzzy
+msgid "Epson Stylus Photo RX580"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:336
+#, fuzzy
+msgid "Epson Stylus Photo RX590"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:337
 msgid "Epson Stylus Photo RX600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:338
 msgid "Epson Stylus Photo RX620"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:339
 msgid "Epson Stylus Photo RX630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:340
+#, fuzzy
+msgid "Epson Stylus Photo RX640"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:341
 msgid "Epson Stylus Photo RX700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:342
 msgid "Epson Stylus Photo R800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:343
 msgid "Epson Stylus Photo R1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:344
 msgid "Epson Stylus Photo R2400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:345
 msgid "Epson Stylus Pro 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:346
 msgid "Epson Stylus Pro 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:347
 msgid "Epson Stylus Pro 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:348
 msgid "Epson Stylus Pro 7500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:349
 msgid "Epson Stylus Pro 7600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:350
 msgid "Epson Stylus Pro 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:351
 msgid "Epson Stylus Pro 9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:352
 msgid "Epson Stylus Pro 9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:353
 msgid "Epson Stylus Pro 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:354
 msgid "Epson Stylus Scan 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:355
 msgid "Epson Stylus Scan 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:356
 msgid "Epson Stylus CX1500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:357
 msgid "Epson Stylus CX3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:358
 msgid "Epson Stylus CX3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:359
 msgid "Epson Stylus CX3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:360
 msgid "Epson Stylus CX3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:361
 msgid "Epson Stylus CX3650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:362
 msgid "Epson Stylus CX3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:363
 msgid "Epson Stylus CX3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:364
 msgid "Epson Stylus CX3805"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:365
 msgid "Epson Stylus CX3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:366
 msgid "Epson Stylus CX4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:367
 msgid "Epson Stylus CX4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:368
 msgid "Epson Stylus CX4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:369
 msgid "Epson Stylus CX4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:370
 msgid "Epson Stylus CX4700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:371
 msgid "Epson Stylus CX4800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:372
+#, fuzzy
+msgid "Epson Stylus CX5000"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:373
+#, fuzzy
+msgid "Epson Stylus CX5000F"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:374
 msgid "Epson Stylus CX5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:375
 msgid "Epson Stylus CX5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:376
 msgid "Epson Stylus CX5300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:377
 msgid "Epson Stylus CX5400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:378
 msgid "Epson Stylus CX5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:379
 msgid "Epson Stylus CX5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:380
+#, fuzzy
+msgid "Epson Stylus CX6000"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:381
 msgid "Epson Stylus CX6300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:382
 msgid "Epson Stylus CX6400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:383
 msgid "Epson Stylus CX6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:384
 msgid "Epson Stylus CX6600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX7000F"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:386
 msgid "Epson Stylus CX7700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:387
 msgid "Epson Stylus CX7800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:388
 msgid "Epson Stylus CX8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:389
 msgid "Epson Stylus CX8400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:390
 msgid "Epson Stylus D68"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:391
 msgid "Epson Stylus D88"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:392
 msgid "Epson Stylus DX3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:393
 msgid "Epson Stylus DX3850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:394
 msgid "Epson Stylus DX4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:395
 msgid "Epson Stylus DX4250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:396
 msgid "Epson Stylus DX4800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:397
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:399
+msgid "Epson PictureMate Flash"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:400
+msgid "Epson PictureMate Pal"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:401
+msgid "Epson PictureMate Snap"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:402
+msgid "Epson PictureMate 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:403
+msgid "Epson PictureMate 210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:404
+msgid "Epson PictureMate 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:405
+msgid "Epson PictureMate 250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:406
+msgid "Epson PictureMate 280"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:411
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:414
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:417
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:426
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:427
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:428
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:429
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:430
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:448
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:454
+#, fuzzy
+msgid "Epson PM A820"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM D750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM D770"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:462
+#, fuzzy
+msgid "Epson PM D870"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM D1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM G700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM G720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM G800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM G820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson PM G850"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+#, fuzzy
+msgid "Epson PM G4500"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PX G900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PX G920"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PX G5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PX V500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:476
 msgid "Epson PX V600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:549
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:550
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:551
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:552
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:802
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Drucker Name:"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+msgid "Lexmark Optra E220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:913
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Drucker einrichten"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:924
+msgid "Xerox WorkCentre M118"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:926
+msgid "Lexmark X73"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+msgid "Olympus P-S100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:942
+msgid "Canon CP-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:943
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:953
+msgid "Sony DPP-EX5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:957
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:960
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Inch"
 msgstr "Zoll"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
-msgstr "Stelle die Basismaßeinheit auf Zoll"
+msgstr "Stelle die Basismaßeinheit auf Zoll"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Die Basiseinheit auf Zentimeter einstellen"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Points"
 msgstr "Drucken"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Stelle die Basismaßeinheit auf Zoll"
+msgstr "Stelle die Basismaßeinheit auf Zoll"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Die Basiseinheit auf Zentimeter einstellen"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Stelle die Basismaßeinheit auf Zoll"
+msgstr "Stelle die Basismaßeinheit auf Zoll"
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color output"
 msgstr "Farbausgabe"
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
 msgstr "Drucke Graustufen nur mit schwarzer Tinte"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 #, fuzzy
 msgid "Standard Command"
 msgstr "Standard"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Custom Command"
 msgstr "Befehl:"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
 msgstr "Datei"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Print to a file"
 msgstr "Drucke in Datei?"
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 #, fuzzy
 msgid "Set Default"
-msgstr "Zurücksetzen"
+msgstr "Zurücksetzen"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Drucke v%s"
 
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
-msgstr "Über"
+msgstr "Ãœber"
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6179,7 +6298,7 @@ msgstr ""
 "Drucke und\n"
 "Sichere die Einstellungen"
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 msgid ""
 "Save\n"
 "Settings"
@@ -6187,15 +6306,15 @@ msgstr ""
 "Sichere\n"
 "die Einstellungen"
 
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
 msgstr "Drucken"
 
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
 msgstr "Vorschau"
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6212,207 +6331,208 @@ msgstr ""
 "Mit der linken Maustaste verschieben sie das Bild.\n"
 "Mit der rechten geht es feiner; jede Bewegung verschiebt das Bild um einen "
 "Punkt (1/72\")\n"
-"Die mittlere verschiebt das Bild in Relation zur seiner Größe\n"
-"Wenn sie dabei die Umschalttaste (Shift) gedrückt halten, verschieben sie "
+"Die mittlere verschiebt das Bild in Relation zur seiner Größe\n"
+"Wenn sie dabei die Umschalttaste (Shift) gedrückt halten, verschieben sie "
 "entweder nur waagerecht oder nur senkrecht\n"
-"Das Drücken einer anderen Taste, während des Verschiebens, bringt das Bild "
-"in seine Ausgangsposition zurück."
+"Das Drücken einer anderen Taste, während des Verschiebens, bringt das Bild "
+"in seine Ausgangsposition zurück."
 
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 #, fuzzy
 msgid "Paper Size"
-msgstr "Größe"
+msgstr "Größe"
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
-msgstr "Maße:"
+msgstr "Maße:"
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
 msgstr "Breite:"
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 msgid "Width of the paper that you wish to print to"
 msgstr "Breite des Papiers"
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
-msgstr "Höhe:"
+msgstr "Höhe:"
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 msgid "Height of the paper that you wish to print to"
-msgstr "Höhe des Papiers"
+msgstr "Höhe des Papiers"
 
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 #, fuzzy
 msgid "Automatic Paper Size"
-msgstr "Größe"
+msgstr "Größe"
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 #, fuzzy
 msgid "Image Position"
 msgstr "Position"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
 msgstr "Aufrecht"
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
 msgstr "Querformat"
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 msgid "Upside down"
 msgstr "umgekehrt Aufrecht"
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
 msgstr "umgekehrt Querformat"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
-"wählen sie die Ausrichtung: Aufrecht, Querformat, umgekehrt Aufrecht, "
+"wählen sie die Ausrichtung: Aufrecht, Querformat, umgekehrt Aufrecht, "
 "umgekehrt Querformat"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 msgid "Orientation:"
 msgstr "Ausrichtung:"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
 msgstr "links:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
 msgstr "Entfernung vom linken Blattrand Bildrand"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
 msgstr "rechts:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Entfernung vom linken Blattrand zum rechten Bildrand"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
 msgstr "Entfernung vom rechten Blattrand zum Bildrand"
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
 msgstr "Oben:"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
 msgstr "Entfernung vom oberen Blattrand zum Bildrand"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
 msgstr "unten:"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Entfernung vom oberen Blattrand zum unteren Bildrand"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Entfernung vom unteren Blattrand zum Bild"
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Center:"
 msgstr "Zentrieren:"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 #, fuzzy
 msgid "Horizontal"
 msgstr "Waagerecht"
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
 msgstr "Bild waagerecht auf dem Blatt zentrieren"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
 msgstr "Beides"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image on the paper"
 msgstr "Bild auf dem Blatt zentrieren"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 #, fuzzy
 msgid "Vertical"
 msgstr "senkrecht"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Center the image vertically on the paper"
 msgstr "Bild senkrecht auf dem Blatt zentrieren"
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
 msgstr "Drucker einrichten"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Drucker Name:"
 
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 #, fuzzy
 msgid "Select the make of your printer"
-msgstr "Wählen sie ihr Druckermodel"
+msgstr "Wählen sie ihr Druckermodel"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 msgid "Printer Model:"
 msgstr "Druckermodel:"
 
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 msgid "Select your printer model"
-msgstr "Wählen sie ihr Druckermodel"
+msgstr "Wählen sie ihr Druckermodel"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 msgid "PPD File:"
 msgstr "PPD Datei:"
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
-msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
+msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
 
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
 msgstr "Suchen"
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
-msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
+msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -6421,106 +6541,58 @@ msgstr ""
 "Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, "
 "Modell...)"
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Drucker Name:"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
-msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
+msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 #, fuzzy
 msgid "File to print to"
 msgstr "Probeausdruck"
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 #, fuzzy
 msgid "Print To File"
 msgstr "Drucke in Datei?"
 
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 msgid "Define New Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 msgid "Printer Name:"
 msgstr "Drucker Name:"
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 msgid "Enter the name you wish to give this logical printer"
-msgstr "Bitte geben sie einen Pseudonym für diesen Drucker an."
+msgstr "Bitte geben sie einen Pseudonym für diesen Drucker an."
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 #, fuzzy
 msgid "About Gutenprint "
-msgstr "Über Gimp-Print "
+msgstr "Ãœber Gimp-Print "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Gimp-Print Version "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
-"\n"
-"\n"
-"Copyright © 1997-2001 Michael Sweet, Robert Krawitz,\n"
-"und dem Rest der Gimp-Print Entwicklergruppe.\n"
-"\n"
-"Bitte besuchen sie unsere Internetseite: http://gimp-print.sourceforge.net.\n"
-"\n"
-"Dieses Programm ist freie Software. Sie können es unter\n"
-"den Bedingungen der GNU General Public License, wie von der\n"
-"Free Software Foundation herausgegeben, weitergeben und/oder\n"
-"modifizieren, entweder unter Version 2 der Lizenz oder (wenn\n"
-"Sie es wünschen) jeder späteren Version.\n"
-"\n"
-"Die Veröffentlichung dieses Programms erfolgt in der\n"
-"Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE JEDE\n"
-"GEWÄHRLEISTUNG - sogar ohne die implizite Gewährleistung\n"
-"der MARKTREIFE oder der EIGNUNG FÜR EINEN BESTIMMTEN ZWECK.\n"
-"Details finden Sie in der GNU General Public License.\n"
-"\n"
-"Sie sollten eine Kopie der GNU General Public License zusammen\n"
-"mit diesem Programm erhalten haben. Falls nicht, schreiben Sie\n"
-"an die Free Software Foundation, Inc., 675 Mass Ave, Cambridge,\n"
-"MA 02139, USA.\n"
-
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 msgid "Printer Settings"
 msgstr "Drucker Einstellungen"
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6528,187 +6600,187 @@ msgstr ""
 "Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, "
 "Modell...)"
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 msgid "Setup Printer..."
 msgstr "Drucker einrichten..."
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
-"Wählen sie ein Druckermodel, eine PPD-Datei und einen Befehl zum Drucken auf "
+"Wählen sie ein Druckermodel, eine PPD-Datei und einen Befehl zum Drucken auf "
 "diesem Drucker"
 
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 msgid "New Printer..."
 msgstr "neuer Drucker..."
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr ""
-"neuer logischer Drucker. Hier können sie einer besonderen Druckereinstellung "
-"einen Namen geben und später unter diesem einfach aufrufen."
+"neuer logischer Drucker. Hier können sie einer besonderen Druckereinstellung "
+"einen Namen geben und später unter diesem einfach aufrufen."
 
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 #, fuzzy
 msgid "Image Size"
-msgstr "Größe"
+msgstr "Größe"
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 msgid "Scaling:"
 msgstr "Zoom:"
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 msgid "Set the scale (size) of the image"
-msgstr "Einstellung der Bildgröße"
+msgstr "Einstellung der Bildgröße"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
-"Wählen sie ob die Einstellungen in Prozent oder in Punkte per Zoll erfolgen "
+"Wählen sie ob die Einstellungen in Prozent oder in Punkte per Zoll erfolgen "
 "sollen"
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
 msgstr "Prozent"
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 msgid "Scale the print to the size of the page"
-msgstr "Bildgröße an Seitengröße anpassen"
+msgstr "Bildgröße an Seitengröße anpassen"
 
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
-msgstr "Wählen sie die Druckauflösung (Punkte per Zoll)"
+msgstr "Wählen sie die Druckauflösung (Punkte per Zoll)"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 msgid "Set the width of the print"
 msgstr "Einstellen der Breite des Ausdrucks"
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 msgid "Set the height of the print"
-msgstr "Einstellen der Höhe des Ausdrucks"
+msgstr "Einstellen der Höhe des Ausdrucks"
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
 "Benutze originale\n"
-"Bildgröße"
+"Bildgröße"
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the print size to the size of the image"
-msgstr "Ausdruckgröße gleich Bildgröße"
+msgstr "Ausdruckgröße gleich Bildgröße"
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 msgid "Print Color Adjust"
 msgstr "Farbabstimmung"
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 msgid "Set Defaults"
-msgstr "Zurücksetzen"
+msgstr "Zurücksetzen"
 
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
-msgstr "Schließen"
+msgstr "Schließen"
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 msgid "Image preview"
 msgstr "Vorschau"
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 #, fuzzy
 msgid "Output"
 msgstr "Ausgabeart:"
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 msgid "Output Type:"
 msgstr "Ausgabeart:"
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 msgid "Select the desired output type"
-msgstr "Wählen sie die gewüschte Ausgabeart:"
+msgstr "Wählen sie die gewüschte Ausgabeart:"
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
 msgstr "Ausgabeeinstellungen.."
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
-"Einstellungen für Farbalance, Helligkeit, Kontrast, Sättigung und Rasterung"
+"Einstellungen für Farbalance, Helligkeit, Kontrast, Sättigung und Rasterung"
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 #, fuzzy
 msgid "Size Units:"
 msgstr "Einheiten:"
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 msgid "Units:"
 msgstr "Einheiten:"
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 msgid "Select the base unit of measurement for printing"
-msgstr "Wählen sie die Basismaßeinheit für das Drucken"
+msgstr "Wählen sie die Basismaßeinheit für das Drucken"
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
 msgstr ""
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
 msgstr ""
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
 msgstr ""
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 #, fuzzy
 msgid "Printer"
 msgstr "Drucken"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Drucker einrichten"
@@ -6758,66 +6830,90 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:133
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Printer Features"
 msgstr "Drucker Einstellungen"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 #, fuzzy
 msgid "Output Control"
 msgstr "Ausgabeart:"
 
-#: src/cups/genppd.c:139
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Common"
 msgstr "Befehl:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:153
 #, fuzzy
 msgid "Extra 1"
 msgstr "Schacht 1"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Extra 2"
 msgstr "Schacht 2"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Extra 3"
 msgstr "Schacht 3"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:156
 #, fuzzy
 msgid "Extra 4"
 msgstr "Schacht 4"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr "German"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1465
+#: src/cups/genppd.c:1613
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1717
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1719
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1497
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1756
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -6825,21 +6921,6 @@ msgstr ""
 msgid "Escputil version "
 msgstr "Escputil Version "
 
-#: src/escputil/escputil.c:71
-#, fuzzy
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-", Copyright © 2000-2001 Robert Krawitz\n"
-"Escputil erhalten sie OHNE JEGLICHE GARANTIE; für Einzelheiten geben sie "
-"'escputil -l' ein\n"
-"Dies ist freie Software und sie dürfen sie gern, unter den genannten "
-"Bedingungen, \n"
-"weitergeben; für Einzelheiten geben sie 'escputil -l' ein.\n"
-
 #: src/escputil/escputil.c:76
 #, fuzzy
 msgid ""
@@ -6861,15 +6942,15 @@ msgid ""
 msgstr ""
 "Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
-"Dieses Programm ist freie Software. Sie können es unter\n"
+"Dieses Programm ist freie Software. Sie können es unter\n"
 "    den Bedingungen der GNU General Public License, wie von der\n"
 "    Free Software Foundation herausgegeben, weitergeben und/oder\n"
 "    modifizieren, entweder unter Version 2 der Lizenz oder (wenn\n"
-"    Sie es wünschen) jeder späteren Version.\n"
-"    Die Veröffentlichung dieses Programms erfolgt in der\n"
-"    Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE JEDE\n"
-"    GEWÄHRLEISTUNG - sogar ohne die implizite Gewährleistung\n"
-"    der MARKTREIFE oder der EIGNUNG FÜR EINEN BESTIMMTEN ZWECK\n"
+"    Sie es wünschen) jeder späteren Version.\n"
+"    Die Veröffentlichung dieses Programms erfolgt in der\n"
+"    Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE JEDE\n"
+"    GEWÄHRLEISTUNG - sogar ohne die implizite Gewährleistung\n"
+"    der MARKTREIFE oder der EIGNUNG FÃœR EINEN BESTIMMTEN ZWECK\n"
 ".    Details finden Sie in der GNU General Public License.\n"
 "    Sie sollten eine Kopie der GNU General Public License zusammen\n"
 "    mit diesem Programm erhalten haben. Falls nicht, schreiben Sie\n"
@@ -6924,44 +7005,44 @@ msgid ""
 msgstr ""
 "Benutzung: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
 "                [-P Drucker| -r device] [-u] [-q] [-m model]\n"
-"Perform maintenance on EPSON Stylus ® printers \n"
+"Perform maintenance on EPSON Stylus ® printers \n"
 " Beispiel: escputil --clean-head --printer stpex-on-third-floor\n"
 "          escputil --ink-level --new --raw-device /dev/lp0\n"
 "\n"
 "   Kommandos:\n"
-"    -c|--clean-head    Druckköpfe reinigen.\n"
+"    -c|--clean-head    Druckköpfe reinigen.\n"
 "    -n|--nozzle-check  Testausdruck.\n"
-"                       Schmutzige oder verklebte Düsen sind\n"
+"                       Schmutzige oder verklebte Düsen sind\n"
 "                         als Aussetzer erkennbar. Wenn diese auftreten, \n"
-"                        sollten sie die Köpfe reinigen\n"
-"    -a|--align-head    Richtet die Köpfe aus. VORSICHT: Die unnötige\n"
+"                        sollten sie die Köpfe reinigen\n"
+"    -a|--align-head    Richtet die Köpfe aus. VORSICHT: Die unnötige\n"
 "                       Benutzung dieser Option kann eine schlechte "
-"Druckqualität\n"
-"                       oder Druckerschäden verursachen.\n"
+"Druckqualität\n"
+"                       oder Druckerschäden verursachen.\n"
 "    -o|--align-color    Richtet den Farb-Kopf aus.(nur Stylus Color 480 \n"
-"                       580 ).  VORSICHT: Die unnötige Benutzung dieser \n"
-"                       Option kann eine schlechte Druckqualität oder\n"
-"                       Druckerschäden verursachen.\n"
+"                       580 ).  VORSICHT: Die unnötige Benutzung dieser \n"
+"                       Option kann eine schlechte Druckqualität oder\n"
+"                       Druckerschäden verursachen.\n"
 "    -s|--status        Zeigt den Drucker Status.\n"
-"    -i|--ink-level     Fragt den Tintenstand ab. Benötigt Schreib- und\n"
+"    -i|--ink-level     Fragt den Tintenstand ab. Benötigt Schreib- und\n"
 "                         Leserechte auf die Drucker-Schnittstelle. \n"
 "    -d|--identify      Fragt die Modelinformationen ab.\n"
-"                       Benötigt Schreib- und Leserechte auf die Drucker-"
+"                       Benötigt Schreib- und Leserechte auf die Drucker-"
 "Schnittstelle \n"
 "                       Drucker-Schnittstelle.\n"
 "    -l|--license       Zeigt die Lizenz- und Garantiebedingungen dieses "
 "Programmes\n"
-"    -M|--list-models   Zeigt die unterstützen Drucker an..\n"
+"    -M|--list-models   Zeigt die unterstützen Drucker an..\n"
 "    -h|--help          Zeigt diese Informationen an.\n"
 "  Optionen:\n"
-"    -P|--printer-name  Gibt die ausgewählte Drucker-Schleife an.\n"
+"    -P|--printer-name  Gibt die ausgewählte Drucker-Schleife an.\n"
 "                       ohne Angabe = Systemdrucker lp\n"
 "    -r|--raw-device    Gibt die Druckerschnittstelle an.\n"
 "                       Vorsicht-geht nicht durch die Schleife\n"
 "    -u|--new           Der Drucker ist neu (Stylus Colour 740 or\n"
 "                       neuer).\n"
-"    -q|--quiet         Unterdrücke die Programmausgaben.\n"
-"    -m|--model         Gibt den präzisen Druckertyp zur Kopfausrichtung an.\n"
+"    -q|--quiet         Unterdrücke die Programmausgaben.\n"
+"    -m|--model         Gibt den präzisen Druckertyp zur Kopfausrichtung an.\n"
 
 #: src/escputil/escputil.c:161
 #, fuzzy
@@ -7009,44 +7090,44 @@ msgid ""
 msgstr ""
 "Benutzung: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
 "                [-P Drucker| -r device] [-u] [-q] [-m model]\n"
-"Perform maintenance on EPSON Stylus ® printers \n"
+"Perform maintenance on EPSON Stylus ® printers \n"
 " Beispiel: escputil --clean-head --printer stpex-on-third-floor\n"
 "          escputil --ink-level --new --raw-device /dev/lp0\n"
 "\n"
 "   Kommandos:\n"
-"    -c|--clean-head    Druckköpfe reinigen.\n"
+"    -c|--clean-head    Druckköpfe reinigen.\n"
 "    -n|--nozzle-check  Testausdruck.\n"
-"                       Schmutzige oder verklebte Düsen sind\n"
+"                       Schmutzige oder verklebte Düsen sind\n"
 "                         als Aussetzer erkennbar. Wenn diese auftreten, \n"
-"                        sollten sie die Köpfe reinigen\n"
-"    -a|--align-head    Richtet die Köpfe aus. VORSICHT: Die unnötige\n"
+"                        sollten sie die Köpfe reinigen\n"
+"    -a|--align-head    Richtet die Köpfe aus. VORSICHT: Die unnötige\n"
 "                       Benutzung dieser Option kann eine schlechte "
-"Druckqualität\n"
-"                       oder Druckerschäden verursachen.\n"
+"Druckqualität\n"
+"                       oder Druckerschäden verursachen.\n"
 "    -o|--align-color    Richtet den Farb-Kopf aus.(nur Stylus Color 480 \n"
-"                       580 ).  VORSICHT: Die unnötige Benutzung dieser \n"
-"                       Option kann eine schlechte Druckqualität oder\n"
-"                       Druckerschäden verursachen.\n"
+"                       580 ).  VORSICHT: Die unnötige Benutzung dieser \n"
+"                       Option kann eine schlechte Druckqualität oder\n"
+"                       Druckerschäden verursachen.\n"
 "    -s|--status        Zeigt den Drucker Status.\n"
-"    -i|--ink-level     Fragt den Tintenstand ab. Benötigt Schreib- und\n"
+"    -i|--ink-level     Fragt den Tintenstand ab. Benötigt Schreib- und\n"
 "                         Leserechte auf die Drucker-Schnittstelle. \n"
 "    -d|--identify      Fragt die Modelinformationen ab.\n"
-"                       Benötigt Schreib- und Leserechte auf die Drucker-"
+"                       Benötigt Schreib- und Leserechte auf die Drucker-"
 "Schnittstelle \n"
 "                       Drucker-Schnittstelle.\n"
 "    -l|--license       Zeigt die Lizenz- und Garantiebedingungen dieses "
 "Programmes\n"
-"    -M|--list-models   Zeigt die unterstützen Drucker an..\n"
+"    -M|--list-models   Zeigt die unterstützen Drucker an..\n"
 "    -h|--help          Zeigt diese Informationen an.\n"
 "  Optionen:\n"
-"    -P|--printer-name  Gibt die ausgewählte Drucker-Schleife an.\n"
+"    -P|--printer-name  Gibt die ausgewählte Drucker-Schleife an.\n"
 "                       ohne Angabe = Systemdrucker lp\n"
 "    -r|--raw-device    Gibt die Druckerschnittstelle an.\n"
 "                       Vorsicht-geht nicht durch die Schleife\n"
 "    -u|--new           Der Drucker ist neu (Stylus Colour 740 or\n"
 "                       neuer).\n"
-"    -q|--quiet         Unterdrücke die Programmausgaben.\n"
-"    -m|--model         Gibt den präzisen Druckertyp zur Kopfausrichtung an.\n"
+"    -q|--quiet         Unterdrücke die Programmausgaben.\n"
+"    -m|--model         Gibt den präzisen Druckertyp zur Kopfausrichtung an.\n"
 
 #: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
@@ -7091,7 +7172,7 @@ msgstr ""
 #: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
-msgstr "Kann die Schnittstelle nicht öffnen %s: %s\n"
+msgstr "Kann die Schnittstelle nicht öffnen %s: %s\n"
 
 #: src/escputil/escputil.c:482
 #, c-format
@@ -7361,12 +7442,12 @@ msgstr "Sie sollten nur ein Druckermodell angeben."
 #: src/escputil/escputil.c:1713
 #, c-format
 msgid "Cleaning heads...\n"
-msgstr "Reinige die Köpfe...\n"
+msgstr "Reinige die Köpfe...\n"
 
 #: src/escputil/escputil.c:1728
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
-msgstr "Teste die Köpfe. Ist Papier im Drucker?\n"
+msgstr "Teste die Köpfe. Ist Papier im Drucker?\n"
 
 #: src/escputil/escputil.c:1732
 #, c-format
@@ -7406,42 +7487,42 @@ msgid ""
 "It is essential that you not turn your printer off during this procedure.\n"
 "\n"
 msgstr ""
-"Bitte lesen sie diese Anweisungen sorgfältig bevor sie fortfahren.\n"
+"Bitte lesen sie diese Anweisungen sorgfältig bevor sie fortfahren.\n"
 "\n"
-"Mit diesem Programm können sie die Druckköpfe ihres Epson-Stylus\n"
+"Mit diesem Programm können sie die Druckköpfe ihres Epson-Stylus\n"
 "Druckers ausrichten. Der falsche Gebrauch dieses Programmes kann \n"
-"die Druckqualtät beeinträchtigen und möglicherweise den Drucker \n"
-"beschädigen. Dieses Programm wurde von Seiko Epson nicht getestet\n"
+"die Druckqualtät beeinträchtigen und möglicherweise den Drucker \n"
+"beschädigen. Dieses Programm wurde von Seiko Epson nicht getestet\n"
 "oder zugelassen, es besteht keine Garantie, das es funktioniert. Das volle\n"
 "Risiko seines Einsatzes liegt bei Ihnen.\n"
 " \n"
-"Es werden %d Testmuster gedruckt. Alle Muster ähneln sich.\n"
-"Sie bestehen aus Paaren von senkrechten Linien, welche sich überlappen.\n"
+"Es werden %d Testmuster gedruckt. Alle Muster ähneln sich.\n"
+"Sie bestehen aus Paaren von senkrechten Linien, welche sich überlappen.\n"
 "Zwischen jedem Linienpaar steht eine Zahl von %d bis %d.\n"
 "\n"
 "Wenn sie die Linienpaare untersuchen, sollten sie eines finden, welches am\n"
-"beßsten zusammen paßt, optimal ist eine durchgehende Linie. Benutzen sie \n"
+"beßsten zusammen paßt, optimal ist eine durchgehende Linie. Benutzen sie \n"
 "ruhig hochwertiges Papier und eine Lupe um ganz sicher zu gehen, das "
-"pefekteste Paar zu erkennen. Nachdem sie nun das schönste Paar ausgewählt \n"
+"pefekteste Paar zu erkennen. Nachdem sie nun das schönste Paar ausgewählt \n"
 "und sich die Zahl gemerkt haben; legen sie das Blatt wieder in den Drucker "
 "ein\n"
 "bevor sie die Zahl eingeben.\n"
 "\n"
-"Jedes Muster ist gleich, aber die späteren werden feiner gedruckt um die "
+"Jedes Muster ist gleich, aber die späteren werden feiner gedruckt um die "
 "Unterschiede\n"
-"noch mehr hervorzuheben. Sie müssen zur richtigen Ausrichtung der Druckköpfe "
+"noch mehr hervorzuheben. Sie müssen zur richtigen Ausrichtung der Druckköpfe "
 "alle\n"
-"Durchgänge ausführen. Nach erfolgreicher Ausrichtung wird noch ein "
+"Durchgänge ausführen. Nach erfolgreicher Ausrichtung wird noch ein "
 "Musterausdruck\n"
-"erzeugt. Sie werden erkennen, daß das beßste Paar (#%d von %d) ist.\n"
+"erzeugt. Sie werden erkennen, daß das beßste Paar (#%d von %d) ist.\n"
 "\n"
 "Nach der letzten Ausgabe werden sie gefragt ob sie die Ausrichtung im "
 "Drucker sichern (s),\n"
-"den Vorgang wiederholen(r) oder ohne Sicherung abbrechen möchten. Beim "
+"den Vorgang wiederholen(r) oder ohne Sicherung abbrechen möchten. Beim "
 "Abbruch  \n"
 "bleiben die Einstellungen bis zum Ausschalten des Druckers erhalten, aber "
-"nicht länger.\n"
-"Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n"
+"nicht länger.\n"
+"Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n"
 "\n"
 
 #: src/escputil/escputil.c:1767
@@ -7479,42 +7560,42 @@ msgid ""
 "this procedure.\n"
 "\n"
 msgstr ""
-"Bitte lesen sie diese Anweisungen sorgfältig bevor sie fortfahren.\n"
+"Bitte lesen sie diese Anweisungen sorgfältig bevor sie fortfahren.\n"
 "\n"
-"Mit diesem Programm können sie die Druckköpfe ihres Epson-Stylus\n"
+"Mit diesem Programm können sie die Druckköpfe ihres Epson-Stylus\n"
 "Druckers ausrichten. Der falsche Gebrauch dieses Programmes kann \n"
-"die Druckqualtät beeinträchtigen und möglicherweise den Drucker \n"
-"beschädigen. Dieses Programm wurde von Seiko Epson nicht getestet\n"
+"die Druckqualtät beeinträchtigen und möglicherweise den Drucker \n"
+"beschädigen. Dieses Programm wurde von Seiko Epson nicht getestet\n"
 "oder zugelassen, es besteht keine Garantie, das es funktioniert. Das volle\n"
 "Risiko seines Einsatzes liegt bei Ihnen.\n"
 " \n"
 "Dieses Programm druckt Testmuster.\n"
-"Sie bestehen aus Paaren von senkrechten Linien, welche sich überlappen.\n"
+"Sie bestehen aus Paaren von senkrechten Linien, welche sich überlappen.\n"
 "Zwischen jedem Linienpaar steht eine Zahl von %d bis %d.\n"
 "\n"
 "Wenn sie die Linienpaare untersuchen, sollten sie eines finden, welches am\n"
-"beßsten zusammen paßt, optimal ist eine durchgehende Linie. Benutzen sie \n"
+"beßsten zusammen paßt, optimal ist eine durchgehende Linie. Benutzen sie \n"
 "ruhig hochwertiges Papier und eine Lupe um ganz sicher zu gehen, das "
-"pefekteste Paar zu erkennen. Nachdem sie nun das schönste Paar ausgewählt \n"
+"pefekteste Paar zu erkennen. Nachdem sie nun das schönste Paar ausgewählt \n"
 "und sich die Zahl gemerkt haben; legen sie das Blatt wieder in den Drucker "
 "ein\n"
 "bevor sie die Zahl eingeben.\n"
 "\n"
-"Jedes Muster ist gleich, aber die späteren werden feiner gedruckt um die "
+"Jedes Muster ist gleich, aber die späteren werden feiner gedruckt um die "
 "Unterschiede\n"
-"noch mehr hervorzuheben. Sie müssen zur richtigen Ausrichtung der Druckköpfe "
+"noch mehr hervorzuheben. Sie müssen zur richtigen Ausrichtung der Druckköpfe "
 "alle\n"
-"Durchgänge ausführen. Nach erfolgreicher Ausrichtung wird noch ein "
+"Durchgänge ausführen. Nach erfolgreicher Ausrichtung wird noch ein "
 "Musterausdruck\n"
-"erzeugt. Sie werden erkennen, daß das beßste Paar (#%d von %d) ist.\n"
+"erzeugt. Sie werden erkennen, daß das beßste Paar (#%d von %d) ist.\n"
 "\n"
 "Nach der letzten Ausgabe werden sie gefragt ob sie die Ausrichtung im "
 "Drucker sichern (s),\n"
-"den Vorgang wiederholen(r) oder ohne Sicherung abbrechen möchten. Beim "
+"den Vorgang wiederholen(r) oder ohne Sicherung abbrechen möchten. Beim "
 "Abbruch  \n"
 "bleiben die Einstellungen bis zum Ausschalten des Druckers erhalten, aber "
-"nicht länger.\n"
-"Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n"
+"nicht länger.\n"
+"Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n"
 "\n"
 
 #: src/escputil/escputil.c:1811
@@ -7539,12 +7620,12 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 "Bitte kontrollieren sie den letzten Ausdruck sehr genau, ob ihr\n"
-"Drucker pefekt ausgerichtet ist. Sie können nun:\n"
+"Drucker pefekt ausgerichtet ist. Sie können nun:\n"
 "  (s) die Einstellungen im Drucker sichern ,\n"
 "  (q) das Programm ohne Sicherung verlassen, oder\n"
 "  (r) Den Vorgang von Anfang an wiederholen.\n"
-"Sie werden um eine Bestätigung gebeten.\n"
-"Was möchten sie tun  (s, q, r)?\n"
+"Sie werden um eine Bestätigung gebeten.\n"
+"Was möchten sie tun  (s, q, r)?\n"
 
 #: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
 #: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
@@ -7557,8 +7638,8 @@ msgstr "> "
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
-"Bitte bestätigen sie mit der Taste 'q' das sie die Einstellungen nicht "
-"sichern möchten\n"
+"Bitte bestätigen sie mit der Taste 'q' das sie die Einstellungen nicht "
+"sichern möchten\n"
 
 #: src/escputil/escputil.c:1850
 #, c-format
@@ -7566,8 +7647,8 @@ msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
-"Gut, Die Köpfe sind ausgerichtet aber die Einstellung noch nicht gesichert.\n"
-"Wenn sie die Sicherung wünschen, müssen sie den Prozeß wiederholen.\n"
+"Gut, Die Köpfe sind ausgerichtet aber die Einstellung noch nicht gesichert.\n"
+"Wenn sie die Sicherung wünschen, müssen sie den Prozeß wiederholen.\n"
 
 #: src/escputil/escputil.c:1857
 #, c-format
@@ -7575,8 +7656,8 @@ msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
-"Bitte bestätigen sie mit der Taste 'r', daß sie die Kopf-Ausrichtung\n"
-"wiederholen möchten:\n"
+"Bitte bestätigen sie mit der Taste 'r', daß sie die Kopf-Ausrichtung\n"
+"wiederholen möchten:\n"
 
 #: src/escputil/escputil.c:1865
 #, c-format
@@ -7592,11 +7673,11 @@ msgid ""
 "Please confirm by typing 's' again that you wish to save the settings\n"
 "to your printer:\n"
 msgstr ""
-"Dies wird die Einstellungen ihres Druckers dauerhaft verändern.\n"
-"WARNUNG:diser Vorgang wurde von Seiko Epson nicht geprüft\n"
-"und könnte den Drucker beschädigen. Weiter?\n"
-"Bitte bestätigen sie mit der Taste 's' , wenn sie die Einstellungen im\n"
-"Drucker sichern möchten.\n"
+"Dies wird die Einstellungen ihres Druckers dauerhaft verändern.\n"
+"WARNUNG:diser Vorgang wurde von Seiko Epson nicht geprüft\n"
+"und könnte den Drucker beschädigen. Weiter?\n"
+"Bitte bestätigen sie mit der Taste 's' , wenn sie die Einstellungen im\n"
+"Drucker sichern möchten.\n"
 
 #: src/escputil/escputil.c:1883
 #, c-format
@@ -7635,7 +7716,7 @@ msgstr "Unbekannter Befehl.\n"
 #: src/escputil/escputil.c:1903
 #, c-format
 msgid "Final command was not confirmed.\n"
-msgstr "Der letzte Befehl wurde nicht bestätigt.\n"
+msgstr "Der letzte Befehl wurde nicht bestätigt.\n"
 
 #: src/escputil/escputil.c:1908
 #, c-format
@@ -7647,16 +7728,16 @@ msgid ""
 "Please place a sheet of paper in your printer to begin the head\n"
 "alignment procedure.\n"
 msgstr ""
-"Diese Routine geht davon aus, daß ihr Drucker ein Epson %s ist.\n"
-"Wenn nicht drücken sie bitte jetzt control-C und \n"
-"wählen ihr Modell.\n"
+"Diese Routine geht davon aus, daß ihr Drucker ein Epson %s ist.\n"
+"Wenn nicht drücken sie bitte jetzt control-C und \n"
+"wählen ihr Modell.\n"
 "\n"
 "Bitte legen sie ein Blatt Papier ein, um die Kopf-Ausrichtung zu beginnen.\n"
 
 #: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
 #: src/escputil/escputil.c:2047
 msgid "Press enter to continue > "
-msgstr "Drücken sie Eingabe um fortzufahren > "
+msgstr "Drücken sie Eingabe um fortzufahren > "
 
 #: src/escputil/escputil.c:1980
 #, c-format
@@ -7665,9 +7746,9 @@ msgid ""
 "pattern.\n"
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
-"Bitte betrachten sie den Ausdruck und entscheiden sie sich für \n"
-"die beßsten Übereinstimmungen der Muster-Paare .\n"
-"Geben sie die Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu "
+"Bitte betrachten sie den Ausdruck und entscheiden sie sich für \n"
+"die beßsten Übereinstimmungen der Muster-Paare .\n"
+"Geben sie die Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu "
 "wiederholen\n"
 
 #: src/escputil/escputil.c:1993
@@ -7683,7 +7764,7 @@ msgstr "Bitte legen sie ein neues Blatt ein.\n"
 #: src/escputil/escputil.c:2020
 #, c-format
 msgid "Number out of range!\n"
-msgstr "Die Zahl ist ungültig!\n"
+msgstr "Die Zahl ist ungültig!\n"
 
 #: src/escputil/escputil.c:2025
 #, c-format
@@ -7693,12 +7774,12 @@ msgstr "Wie bitte ?????\n"
 #: src/escputil/escputil.c:2031
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "Die Nummer des beßten Paares sollte zwischen 1 und %d liegen.\n"
+msgstr "Die Nummer des beßten Paares sollte zwischen 1 und %d liegen.\n"
 
 #: src/escputil/escputil.c:2038
 #, c-format
 msgid "Attempting to set alignment..."
-msgstr "Beginne die Köpfe einzurichten..."
+msgstr "Beginne die Köpfe einzurichten..."
 
 #: src/escputil/escputil.c:2041
 #, c-format
@@ -7714,7 +7795,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 "Bitte kontrollieren sie die Ausrichtung. Nachdem die Ausrichtungs-\n"
-"muster nochmal gedruckt wurden, sollten die beßsten Übereinstim-\n"
+"muster nochmal gedruckt wurden, sollten die beßsten Übereinstim-\n"
 "mungen jeder Zeile im Muster %d sein. Wenn nicht, sollten sie diesen\n"
 "Vorgang wiederholen.\n"
 
@@ -7746,7 +7827,7 @@ msgstr ""
 #: src/ghost/ijsgutenprint.c:191
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
-msgstr "schlechter Farbraum:  bps %d Kanäle %d Abstand %s\n"
+msgstr "schlechter Farbraum:  bps %d Kanäle %d Abstand %s\n"
 
 #: src/ghost/ijsgutenprint.c:199
 #, fuzzy, c-format
@@ -7762,7 +7843,7 @@ msgstr "Kann den Parameter %s=%s nicht auswerten (erwarte eine Zahl)\n"
 #: src/ghost/ijsgutenprint.c:498
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
-msgstr "Der Drucker muß mit -sMODEL angegeben werden\n"
+msgstr "Der Drucker muß mit -sMODEL angegeben werden\n"
 
 #: src/ghost/ijsgutenprint.c:500
 #, fuzzy, c-format
@@ -7827,12 +7908,12 @@ msgstr "image_init gescheitert %d\n"
 #: src/ghost/ijsgutenprint.c:1319
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-msgstr "Kann file descriptor : %s nicht öffnen\n"
+msgstr "Kann file descriptor : %s nicht öffnen\n"
 
 #: src/ghost/ijsgutenprint.c:1331
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-msgstr "Kann %s: %s nicht öffnen\n"
+msgstr "Kann %s: %s nicht öffnen\n"
 
 #: src/ghost/ijsgutenprint.c:1344
 #, fuzzy, c-format
@@ -7842,7 +7923,7 @@ msgstr "Unbekannter Drucker %s\n"
 #: src/ghost/ijsgutenprint.c:1516
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-msgstr "Unzulässige Parameter, breche ab!\n"
+msgstr "Unzulässige Parameter, breche ab!\n"
 
 #: src/ghost/ijsgutenprint.c:1534
 #, fuzzy, c-format
@@ -7850,6 +7931,249 @@ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Zeilensprung gescheitert bei % 0f \n"
 
 #, fuzzy
+#~ msgid "Model Name"
+#~ msgstr "Abbruch"
+
+#, fuzzy
+#~ msgid "Cassette"
+#~ msgstr "Mattes Papier"
+
+#, fuzzy
+#~ msgid " Gamma"
+#~ msgstr "Gamma:"
+
+#, fuzzy
+#~ msgid " Curve"
+#~ msgstr "Schwarz"
+
+#, fuzzy
+#~ msgid "1440 x 1440"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI High Quality"
+#~ msgstr "1200 DPI höchste Qualität"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI Highest Quality"
+#~ msgstr "1200 DPI höchste Qualität"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI High Quality"
+#~ msgstr "1200 DPI höchste Qualität"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI Highest Quality"
+#~ msgstr "1200 DPI höchste Qualität"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "and the rest of the Gutenprint Development Team.\n"
+#~ "\n"
+#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright © 1997-2001 Michael Sweet, Robert Krawitz,\n"
+#~ "und dem Rest der Gimp-Print Entwicklergruppe.\n"
+#~ "\n"
+#~ "Bitte besuchen sie unsere Internetseite: http://gimp-print.sourceforge."
+#~ "net.\n"
+#~ "\n"
+#~ "Dieses Programm ist freie Software. Sie können es unter\n"
+#~ "den Bedingungen der GNU General Public License, wie von der\n"
+#~ "Free Software Foundation herausgegeben, weitergeben und/oder\n"
+#~ "modifizieren, entweder unter Version 2 der Lizenz oder (wenn\n"
+#~ "Sie es wünschen) jeder späteren Version.\n"
+#~ "\n"
+#~ "Die Veröffentlichung dieses Programms erfolgt in der\n"
+#~ "Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE JEDE\n"
+#~ "GEWÄHRLEISTUNG - sogar ohne die implizite Gewährleistung\n"
+#~ "der MARKTREIFE oder der EIGNUNG FÃœR EINEN BESTIMMTEN ZWECK.\n"
+#~ "Details finden Sie in der GNU General Public License.\n"
+#~ "\n"
+#~ "Sie sollten eine Kopie der GNU General Public License zusammen\n"
+#~ "mit diesem Programm erhalten haben. Falls nicht, schreiben Sie\n"
+#~ "an die Free Software Foundation, Inc., 675 Mass Ave, Cambridge,\n"
+#~ "MA 02139, USA.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
+#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
+#~ "l'\n"
+#~ "This is free software, and you are welcome to redistribute it\n"
+#~ "under certain conditions; type 'escputil -l' for details.\n"
+#~ msgstr ""
+#~ ", Copyright © 2000-2001 Robert Krawitz\n"
+#~ "Escputil erhalten sie OHNE JEGLICHE GARANTIE; für Einzelheiten geben sie "
+#~ "'escputil -l' ein\n"
+#~ "Dies ist freie Software und sie dürfen sie gern, unter den genannten "
+#~ "Bedingungen, \n"
+#~ "weitergeben; für Einzelheiten geben sie 'escputil -l' ein.\n"
+
+#, fuzzy
+#~ msgid "90x90 DPI"
+#~ msgstr "600 DPI"
+
+#, fuzzy
+#~ msgid "90x90 DPI DMT"
+#~ msgstr "600 DPI"
+
+#, fuzzy
+#~ msgid "180x180 DPI"
+#~ msgstr "150×150 DPI"
+
+#, fuzzy
+#~ msgid "180x180 DPI DMT"
+#~ msgstr "150×150 DPI"
+
+#, fuzzy
+#~ msgid "360x360 DPI"
+#~ msgstr "300×300 DPI"
+
+#, fuzzy
+#~ msgid "360x360 DPI DMT"
+#~ msgstr "600×600 DPI"
+
+#, fuzzy
+#~ msgid "720x360 DPI"
+#~ msgstr "720 x 360 DPI"
+
+#, fuzzy
+#~ msgid "720x360 DPI DMT"
+#~ msgstr "720 x 360 DPI MW2"
+
+#, fuzzy
+#~ msgid "720x720 DPI"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "720x720 DPI DMT"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x720 DPI"
+#~ msgstr "1440 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x720 DPI DMT"
+#~ msgstr "1440 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI DMT"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI DMT"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "150x150 DPI DMT"
+#~ msgstr "150×150 DPI"
+
+#, fuzzy
+#~ msgid "300x300 DPI DMT"
+#~ msgstr "300×300 DPI"
+
+#, fuzzy
+#~ msgid "600x300 DPI DMT"
+#~ msgstr "600×300 DPI"
+
+#, fuzzy
+#~ msgid "600x600 DPI DMT"
+#~ msgstr "600×600 DPI"
+
+#, fuzzy
+#~ msgid "1200x600 DPI DMT"
+#~ msgstr "1200×600 DPI"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI"
+#~ msgstr "1200×600 DPI"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI DMT"
+#~ msgstr "1200×600 DPI"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI"
+#~ msgstr "2400×600 DPI"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI DMT"
+#~ msgstr "2400×600 DPI"
+
+#, fuzzy
+#~ msgid "Plain Paper PIXMA"
+#~ msgstr "Normalpapier"
+
+#~ msgid "Back Print Film"
+#~ msgstr "Transferfolie"
+
+#~ msgid "Fabric Sheets"
+#~ msgstr "Schreibmaschinenpapier"
+
+#~ msgid "Envelope"
+#~ msgstr "Briefumschlag"
+
+#~ msgid "High Resolution Paper"
+#~ msgstr "Spezialpapier"
+
+#~ msgid "T-Shirt Transfers"
+#~ msgstr "T-Shirt Transfers"
+
+#~ msgid "High Gloss Film"
+#~ msgstr "High Gloss Film"
+
+#~ msgid "Glossy Photo Paper"
+#~ msgstr "Glossy Foto Papier"
+
+#~ msgid "Glossy Photo Cards"
+#~ msgstr "Glossy Foto Karten"
+
+#~ msgid "Photo Paper Pro"
+#~ msgstr "Foto Papier Pro"
+
+#~ msgid "Photo CcMmYK Color"
+#~ msgstr "Foto CcMmYK Farbe"
+
+#~ msgid "Photo CcMmY Color"
+#~ msgstr "Foto CcMmY Farbe"
+
+#~ msgid "CMYK Color"
+#~ msgstr "CMYK Farbe"
+
+#~ msgid "CMY Color"
+#~ msgstr "CMY Farbe"
+
+#, fuzzy
 #~ msgid "Gutenprint"
 #~ msgstr "Probeausdruck"
 
@@ -7859,7 +8183,7 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
 
 #, fuzzy
 #~ msgid "Printer does not support listing ink types!\n"
-#~ msgstr "Drucker unterstützt keine Farbausgabe\n"
+#~ msgstr "Drucker unterstützt keine Farbausgabe\n"
 
 #, fuzzy
 #~ msgid "Cannot identify printer!\n"
@@ -7877,7 +8201,7 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
 #~ "Printer alignment must be done with a raw device or else\n"
 #~ "the -m option must be used to specify a printer.\n"
 #~ msgstr ""
-#~ "Zur Druckerausrichtung muß die Schnittstelle bzw.\n"
+#~ "Zur Druckerausrichtung muß die Schnittstelle bzw.\n"
 #~ "mit der \"-m\"- Option das Druckermodel angegeben werden.\n"
 
 #~ msgid "Attempting to detect printer model..."
@@ -7895,21 +8219,21 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
 
 #, fuzzy
 #~ msgid "Gimp-Print"
-#~ msgstr "Über Gimp-Print "
+#~ msgstr "Ãœber Gimp-Print "
 
 #, fuzzy
 #~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
 #~ msgstr ""
 #~ "Stellen sie die Helligkeit ein.\n"
-#~ "0 ist völlig Schwarz, 2 ist völlige Weiß"
+#~ "0 ist völlig Schwarz, 2 ist völlige Weiß"
 
 #~ msgid ""
 #~ "Enter the correct command to print to your printer. Note: Please do not "
 #~ "remove the `-l' or `-oraw' from the command string, or printing will "
 #~ "probably fail!"
 #~ msgstr ""
-#~ "Geben sie den richtigen Druckbefehl für ihren Drucker ein. ( Bitte "
-#~ "löschen sie nicht die -l bzw. -oraw Option von der Befehlszeile, sonst "
+#~ "Geben sie den richtigen Druckbefehl für ihren Drucker ein. ( Bitte "
+#~ "löschen sie nicht die -l bzw. -oraw Option von der Befehlszeile, sonst "
 #~ "kann der Duck scheitern!)"
 
 #~ msgid "PPD File?"
@@ -7925,7 +8249,7 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
 #~ msgstr "%s: Option `%c%s'erlaubt keine Argumente\n"
 
 #~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: Option `%s' benötigt ein Argument\n"
+#~ msgstr "%s: Option `%s' benötigt ein Argument\n"
 
 #~ msgid "%s: unrecognized option `--%s'\n"
 #~ msgstr "%s: unbekannte Option `--%s'\n"
@@ -7937,10 +8261,10 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
 #~ msgstr "%s: nicht erlaubte Option -- %c\n"
 
 #~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: unvollständige Option -- %c\n"
+#~ msgstr "%s: unvollständige Option -- %c\n"
 
 #~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: Option benötigt ein Argument -- %c\n"
+#~ msgstr "%s: Option benötigt ein Argument -- %c\n"
 
 #~ msgid "%s: option `-W %s' is ambiguous\n"
 #~ msgstr "%s: Option `-W %s' ist nicht definiert\n"
@@ -7954,7 +8278,7 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
 
 #, fuzzy
 #~ msgid "Image is too wide for the page\n"
-#~ msgstr "Bildgröße an Seitengröße anpassen"
+#~ msgstr "Bildgröße an Seitengröße anpassen"
 
 #, fuzzy
 #~ msgid "Full Bleed"
@@ -7965,7 +8289,7 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
 #~ msgstr "600 DPI Unidirectional"
 
 #~ msgid "24x36"
-#~ msgstr "24×36"
+#~ msgstr "24×36"
 
 #~ msgid "%.0f of %.0f\n"
 #~ msgstr "%.0f von %.0f\n"
@@ -8018,26 +8342,26 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
 #~ "WARNING: THIS FUNCTION IS NOT YET TESTED!  It may not work, and it may\n"
 #~ "damage your printer!\n"
 #~ msgstr ""
-#~ "Bitte lesen sie diese Anweisungen sorgfältig bevor sie fortfahren.\n"
+#~ "Bitte lesen sie diese Anweisungen sorgfältig bevor sie fortfahren.\n"
 #~ "\n"
-#~ "Mit diesem Programm können sie die Druckköpfe ihres Epson-Stylus\n"
+#~ "Mit diesem Programm können sie die Druckköpfe ihres Epson-Stylus\n"
 #~ "Druckers ausrichten. Der falsche Gebrauch dieses Programmes kann \n"
-#~ "die Druckqualtät beeinträchtigen und möglicherweise den Drucker \n"
-#~ "beschädigen. Dieses Programm wurde von Seiko Epson nicht getestet\n"
+#~ "die Druckqualtät beeinträchtigen und möglicherweise den Drucker \n"
+#~ "beschädigen. Dieses Programm wurde von Seiko Epson nicht getestet\n"
 #~ "oder zugelassen, es besteht keine Garantie, das es funktioniert. Das "
 #~ "volle\n"
 #~ "Risiko seines Einsatzes liegt bei Ihnen.\n"
 #~ " \n"
 #~ "Es werden %d Testmuster auf einem Blastt Papier gedruckt.\n"
-#~ "Das Blatt muß vor jedem Durchgang wieder eingelegt werden.\n"
+#~ "Das Blatt muß vor jedem Durchgang wieder eingelegt werden.\n"
 #~ "Bei jedem Muster steht eine Zahl von %d bis %d.\n"
 #~ "\n"
 #~ "Wenn sie die Muster untersuchen, sollten sie eines finden, welches am\n"
-#~ "beßsten zusammen paßt, optimal ist eine durchgehende Linie. Benutzen "
+#~ "beßsten zusammen paßt, optimal ist eine durchgehende Linie. Benutzen "
 #~ "sie \n"
 #~ "ruhig hochwertiges Papier und eine Lupe um ganz sicher zu gehen, das "
-#~ "pefekteste Paar zu erkennen. Nachdem sie nun das schönste Paar "
-#~ "ausgewählt \n"
+#~ "pefekteste Paar zu erkennen. Nachdem sie nun das schönste Paar "
+#~ "ausgewählt \n"
 #~ "und sich die Zahl gemerkt haben; legen sie das Blatt wieder in den "
 #~ "Drucker ein\n"
 #~ "bevor sie die Zahl eingeben.\n"
@@ -8045,31 +8369,31 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
 #~ "\n"
 #~ "Nach der letzten Ausgabe werden sie gefragt ob sie die Ausrichtung im "
 #~ "Drucker sichern (s),\n"
-#~ "den Vorgang wiederholen(r) oder ohne Sicherung abbrechen möchten. Beim "
+#~ "den Vorgang wiederholen(r) oder ohne Sicherung abbrechen möchten. Beim "
 #~ "Abbruch  \n"
 #~ "bleiben die Einstellungen bis zum Ausschalten des Druckers erhalten, aber "
-#~ "nicht länger.\n"
-#~ "Es ist wichtigt, den Drucker während der Ausrichtung nicht "
+#~ "nicht länger.\n"
+#~ "Es ist wichtigt, den Drucker während der Ausrichtung nicht "
 #~ "Auszuschalten.\n"
 #~ "\n"
 #~ "WARNUNG: DIESE FUNKTION WURDE NOCH NICHT GETEST !! \n"
-#~ " es könnte nicht funktioniert oder ihren Drucker schädigen.\n"
+#~ " es könnte nicht funktioniert oder ihren Drucker schädigen.\n"
 
 #~ msgid "Printer %s does not require color head alignment.\n"
-#~ msgstr "Drucker %s benötigt keine Kopfausrichtung.\n"
+#~ msgstr "Drucker %s benötigt keine Kopfausrichtung.\n"
 
 #~ msgid ""
 #~ "Please inspect the print, and choose the pattern in each set.\n"
 #~ "Type a pattern number, '?' for help, or 'r' to repeat the procedure.\n"
 #~ msgstr ""
-#~ "Bitte betrachten sie den Ausdruck und entscheiden sie sich für \n"
-#~ "die beßsten Übereinstimmungen der Muster-Paare .\n"
-#~ "Geben sie die Muster-Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu "
+#~ "Bitte betrachten sie den Ausdruck und entscheiden sie sich für \n"
+#~ "die beßsten Übereinstimmungen der Muster-Paare .\n"
+#~ "Geben sie die Muster-Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu "
 #~ "wiederholen\n"
 
 #, fuzzy
 #~ msgid "Model %d out of range.\n"
-#~ msgstr "Die Zahl ist ungültig!\n"
+#~ msgstr "Die Zahl ist ungültig!\n"
 
 #~ msgid "Right Border:"
 #~ msgstr "rechter Rand:"
@@ -8078,7 +8402,7 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
 #~ msgstr "unterer Rand:"
 
 #~ msgid "Size"
-#~ msgstr "Größe"
+#~ msgstr "Größe"
 
 #~ msgid "Image / Output Settings"
 #~ msgstr "Bild-/ Ausgabeeinstellungen"
@@ -8089,7 +8413,7 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
 
 #, fuzzy
 #~ msgid "Resolutions"
-#~ msgstr "Auflösung"
+#~ msgstr "Auflösung"
 
 #~ msgid "Media Type:"
 #~ msgstr "Druckmedium: "
@@ -8098,10 +8422,10 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
 #~ msgstr "Art des Druckmediums"
 
 #~ msgid "Media Size:"
-#~ msgstr "Papier Größe:"
+#~ msgstr "Papier Größe:"
 
 #~ msgid "Size of paper that you wish to print to"
-#~ msgstr "Größe des Papiers "
+#~ msgstr "Größe des Papiers "
 
 #~ msgid "Media Source:"
 #~ msgstr "Schacht/Quelle:"
@@ -8113,21 +8437,21 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
 #~ msgstr "Tintenart:"
 
 #~ msgid "Resolution:"
-#~ msgstr "Auflösung:"
+#~ msgstr "Auflösung:"
 
 #~ msgid "Print in black and white (no color, and no shades of gray)"
-#~ msgstr "Drucke in Schwarz-Weiß (keine Farbe oder Graustufen)"
+#~ msgstr "Drucke in Schwarz-Weiß (keine Farbe oder Graustufen)"
 
 #~ msgid "Fastest and brightest color for text and line art"
-#~ msgstr "Schnellste und hellste Farbe für Text und Strichzeichnung."
+#~ msgstr "Schnellste und hellste Farbe für Text und Strichzeichnung."
 
 #~ msgid "Best for images dominated by regions of solid color"
-#~ msgstr "Beste Qualität für Bilder mit einfarbigen Flächen."
+#~ msgstr "Beste Qualität für Bilder mit einfarbigen Flächen."
 
 #~ msgid ""
 #~ "Slowest, but most accurate and smoothest color for continuous tone images "
 #~ "and photographs"
-#~ msgstr "Langsamste aber beste Qualität für Farbverläufe und Fotografien."
+#~ msgstr "Langsamste aber beste Qualität für Farbverläufe und Fotografien."
 
 #~ msgid "Dither Algorithm:"
 #~ msgstr "Raster-Algorythmus:"
@@ -8140,7 +8464,7 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
 #~ "Kann von %s: %s nicht lesen.\n"
 
 #~ msgid "%s out of range (value %f, min %f, max %f)\n"
-#~ msgstr "%s Bereichsüberschreitung (Wert %f, min %f, max %f)\n"
+#~ msgstr "%s Bereichsüberschreitung (Wert %f, min %f, max %f)\n"
 
 #~ msgid "%s is not a valid dither algorithm\n"
 #~ msgstr "%s ist kein Rasteralgorythmus\n"
@@ -8161,13 +8485,13 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
 #~ msgstr ""
 #~ "Betrachten sie den Musterausdruck und finden sie herraus, welches "
 #~ "Muster \n"
-#~ "am beßsten zusammen paßt, optimal ist eine durchgehende Linie.\n"
-#~ "Wenn sie keine gute Übereinstimmung finden, wählen sie die annehm-\n"
+#~ "am beßsten zusammen paßt, optimal ist eine durchgehende Linie.\n"
+#~ "Wenn sie keine gute Übereinstimmung finden, wählen sie die annehm-\n"
 #~ "barste und wiederholen den Vorgang.\n"
-#~ "Geben sie die Musternummer ein oder \"?\" für Hilfe.\n"
+#~ "Geben sie die Musternummer ein oder \"?\" für Hilfe.\n"
 
 #~ msgid "The best pattern should be numbered between 1 and %d.\n"
-#~ msgstr "Die Nummer des beßsten Musters sollte zwischen 1 und %d liegen.\n"
+#~ msgstr "Die Nummer des beßsten Musters sollte zwischen 1 und %d liegen.\n"
 
 #~ msgid "Set the contrast of the print"
 #~ msgstr "Stellen sie den Kontrast ein"
@@ -8182,16 +8506,16 @@ msgstr "Zeilensprung gescheitert bei % 0f \n"
 #~ msgstr "Gelb:"
 
 #~ msgid "Parameter %s out of range (value %f, min %f, max %f)\n"
-#~ msgstr "Parameter %s ist nicht zulässig (wert %f, min %f, max %f)\n"
+#~ msgstr "Parameter %s ist nicht zulässig (wert %f, min %f, max %f)\n"
 
 #~ msgid "Parameter %s out of range (value %d, min %d, max %d)\n"
-#~ msgstr "Parameter %s ist nicht zulässig (wert %d, min %d, max %d)\n"
+#~ msgstr "Parameter %s ist nicht zulässig (wert %d, min %d, max %d)\n"
 
 #~ msgid "Unknown option %s\n"
 #~ msgstr "Unbekannte Option %s\n"
 
 #~ msgid "13x19"
-#~ msgstr "13×19"
+#~ msgstr "13×19"
 
 #~ msgid "Monarch"
 #~ msgstr "Monarch"
diff --git a/po/el.gmo b/po/el.gmo
index e4111cf..f5f8a69 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index fbac1c7..e6a684c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,31 +6,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\n"
 "PO-Revision-Date: 2001-12-29 20:10+0000\n"
 "Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-7\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 #, fuzzy
 msgid "Default"
-msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
+msgstr "Ο�ισμός Π�οκαθο�ισμένων Τιμών"
 
 #: src/main/dither-main.c:47
 #, fuzzy
 msgid "EvenTone"
-msgstr "Åêôýðùóç ÖáêÝëïõ"
+msgstr "Εκτ�πωση Φακέλου"
 
 #: src/main/dither-main.c:48
 #, fuzzy
 msgid "Hybrid EvenTone"
-msgstr "Åêôýðùóç ÖáêÝëïõ"
+msgstr "Εκτ�πωση Φακέλου"
 
 #
 #. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
@@ -39,17 +39,17 @@ msgstr "Åêôýðùóç ÖáêÝëïõ"
 #: src/main/dither-main.c:53
 #, fuzzy
 msgid "EvenBetter"
-msgstr "ÄéáóôÜóåéò Letter"
+msgstr "Διαστάσεις Letter"
 
 #: src/main/dither-main.c:54
 #, fuzzy
 msgid "Hybrid EvenBetter"
-msgstr "Åêôýðùóç ÖáêÝëïõ"
+msgstr "Εκτ�πωση Φακέλου"
 
 #: src/main/dither-main.c:60
 #, fuzzy
 msgid "UniTone"
-msgstr "Åêôýðùóç ÖáêÝëïõ"
+msgstr "Εκτ�πωση Φακέλου"
 
 #: src/main/dither-main.c:61
 msgid "Hybrid UniTone"
@@ -62,16 +62,16 @@ msgstr ""
 #: src/main/dither-main.c:64
 #, fuzzy
 msgid "Ordered"
-msgstr "ÄéÜôáîç"
+msgstr "Διάταξη"
 
 #: src/main/dither-main.c:65
 msgid "Fast"
-msgstr "Ôá÷åßá"
+msgstr "Ταχεία"
 
 #: src/main/dither-main.c:66
 #, fuzzy
 msgid "Very Fast"
-msgstr "Ôá÷åßá"
+msgstr "Ταχεία"
 
 #: src/main/dither-main.c:67
 msgid "Hybrid Floyd-Steinberg"
@@ -84,20 +84,20 @@ msgstr ""
 #: src/main/dither-main.c:88 src/main/print-color.c:56
 #, fuzzy
 msgid "Density"
-msgstr "Ðõêíüôçôá"
-
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+msgstr "Πυκνότητα"
+
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -144,527 +144,326 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr ""
 
-#: src/main/print-canon.c:1382
-#, fuzzy
-msgid "90x90 DPI"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1382
-#, fuzzy
-msgid "90x90 DPI DMT"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI DMT"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI DMT"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI"
-msgstr "720 x 360 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI DMT"
-msgstr "720 x 360 DPI"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI DMT"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI"
-msgstr "1440 x 720 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI DMT"
-msgstr "1440 x 720 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/print-canon.c:1388
+#
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
-msgid "1440x1440 DPI DMT"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/print-canon.c:1389
+msgid "Page Size"
+msgstr "Μέγεθος"
+
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
 #, fuzzy
-msgid "2880x2880 DPI"
-msgstr "2880 x 720 DPI"
+msgid "Basic Printer Setup"
+msgstr "Ρυθμίσεις Επιλογέα"
 
-#: src/main/print-canon.c:1389
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 #, fuzzy
-msgid "2880x2880 DPI DMT"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr "150x150 DPI"
+msgid "Size of the paper being printed to"
+msgstr "Επιλέξτε τον φάκελο που θέλετε να ανοίξετε"
 
-#: src/main/print-canon.c:1390
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
 #, fuzzy
-msgid "150x150 DPI DMT"
-msgstr "150x150 DPI"
+msgid "Media Type"
+msgstr "Είδος MIME"
 
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
+msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1391
-#, fuzzy
-msgid "300x300 DPI DMT"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1392
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
 #, fuzzy
-msgid "600x300 DPI DMT"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1393
-#, fuzzy
-msgid "600x600 DPI DMT"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1394
-#, fuzzy
-msgid "1200x600 DPI DMT"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1395
-#, fuzzy
-msgid "1200x1200 DPI"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1395
-#, fuzzy
-msgid "1200x1200 DPI DMT"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI"
-msgstr "2400x600 DPI"
-
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI DMT"
-msgstr "2400x600 DPI"
-
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-#, fuzzy
-msgid "Plain Paper"
-msgstr "Êýñéá Óåëßäá"
-
-#: src/main/print-canon.c:1448
-#, fuzzy
-msgid "Plain Paper PIXMA"
-msgstr "Êýñéá Óåëßäá"
-
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-#, fuzzy
-msgid "Transparencies"
-msgstr "ÄéáöáíÝò"
-
-#: src/main/print-canon.c:1450
-#, fuzzy
-msgid "Back Print Film"
-msgstr "Åêôýðùóç óå Áñ÷åßï"
-
-#: src/main/print-canon.c:1451
-#, fuzzy
-msgid "Fabric Sheets"
-msgstr "Åêôýðùóç Öýëëùí"
-
-#: src/main/print-canon.c:1452
-#, fuzzy
-msgid "Envelope"
-msgstr "Åêôýðùóç ÖáêÝëïõ"
-
-#
-#: src/main/print-canon.c:1453
-#, fuzzy
-msgid "High Resolution Paper"
-msgstr "AíÜëõóç ×:"
-
-#: src/main/print-canon.c:1454
-#, fuzzy
-msgid "T-Shirt Transfers"
-msgstr "ÌåôáöïñÜ Áñ÷åßùí"
+msgid "Media Source"
+msgstr "Ανοικτό Λογισμικό"
 
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
+msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
 msgstr ""
 
-#
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
-msgstr "¶ëëá"
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
 
-#
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
-#, fuzzy
-msgid "Page Size"
-msgstr "ÌÝãåèïò"
-
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
-#, fuzzy
-msgid "Basic Printer Setup"
-msgstr "Ñõèìßóåéò ÅðéëïãÝá"
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+msgid "CD Hub Size (Custom)"
+msgstr ""
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
 #, fuzzy
-msgid "Size of the paper being printed to"
-msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "Ελάττωση του μεγέθους της εικόνας στο μισό"
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
-#, fuzzy
-msgid "Media Type"
-msgstr "Åßäïò MIME"
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
+msgstr ""
 
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
-msgid "Type of media (plain paper, photo paper, etc.)"
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
-#, fuzzy
-msgid "Media Source"
-msgstr "Áíïéêôü Ëïãéóìéêü"
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr ""
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
-msgid "Source (input slot) of the media"
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
-msgstr "ÁíÜëõóç"
+msgstr "Ανάλυση"
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
 msgstr ""
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 #, fuzzy
 msgid "Ink Type"
-msgstr "Ôýðïò MIME"
-
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr ""
+msgstr "Τ�πος MIME"
 
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 #, fuzzy
 msgid "Type of ink in the printer"
-msgstr "Áñ÷åßï êåéìÝíïõ ðñïò óõìðåñßëçøç óôçí áíáöïñÜ"
+msgstr "Α�χείο κειμένου π�ος συμπε�ίληψη στην αναφο�ά"
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
-msgstr "¼íïìá åêôõðùôÞ:"
+msgstr "Όνομα εκτυπωτή:"
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
-msgstr "Êýñéá Óåëßäá"
+msgstr "Κ��ια Σελίδα"
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
-msgstr "Ðõêíüôçôá"
+msgstr "Πυκνότητα"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 #, fuzzy
 msgid "Adjust the cyan density"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
-msgstr "ìþâ"
+msgstr "μώβ"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 #, fuzzy
 msgid "Adjust the magenta density"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
-msgstr "Ðõêíüôçôá"
+msgstr "Πυκνότητα"
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Adjust the yellow density"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
-msgstr "Ðõêíüôçôá"
+msgstr "Πυκνότητα"
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 #, fuzzy
 msgid "Adjust the black density"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 #, fuzzy
 msgid "Light Cyan Transition"
-msgstr "ØéëÞ Âñï÷Þ"
-
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+msgstr "Ψιλή Β�οχή"
+
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 #, fuzzy
 msgid "Light Magenta Transition"
-msgstr "ØéëÞ Âñï÷Þ"
+msgstr "Ψιλή Β�οχή"
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 #, fuzzy
 msgid "Light Yellow Transition"
-msgstr "ØéëÞ Âñï÷Þ"
+msgstr "Ψιλή Β�οχή"
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
-msgid "Short Edge (Flip)"
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-#, fuzzy
-msgid "Auto Sheet Feeder"
-msgstr "Áõôüìáôç áðüêñõøç"
-
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-#, fuzzy
-msgid "Manual with Pause"
-msgstr "Óåëßäá åã÷åéñéäßïõ"
-
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1923
-#, fuzzy
-msgid "Cassette"
-msgstr "×áñôß Ìáíßëá"
-
-#: src/main/print-canon.c:1924
-msgid "CD tray"
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:2049
-#, fuzzy
-msgid "Photo CcMmYK Color"
-msgstr "ÅðéëïãÞ Åéäéêïý ×ñþìáôïò"
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
+msgstr ""
 
-#: src/main/print-canon.c:2052
+# Translation of "custom" sucks!  ("kata paraggelia"???  nah!)
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
 #, fuzzy
-msgid "Photo CcMmY Color"
-msgstr "ÅðéëïãÞ Åéäéêïý ×ñþìáôïò"
+msgid "CD - Custom"
+msgstr "Ο�ισμένο από το χ�ήστη"
 
-#: src/main/print-canon.c:2055
-#, fuzzy
-msgid "CMYK Color"
-msgstr "+ ×ñþìá"
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
+msgstr ""
 
-#: src/main/print-canon.c:2058
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
 #, fuzzy
-msgid "CMY Color"
-msgstr "+ ×ñþìá"
-
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
-msgstr "Ìáýñï"
+msgid "Print To Hub"
+msgstr "Εκτ�πωση σε Α�χείο"
 
 #
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
-msgstr "×ñþìá"
+msgstr "Χ�ώμα"
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
-msgstr "Ìáõ_ñüáóðñï"
+msgstr "Μαυ_�όασπ�ο"
 
 #: src/main/print-color.c:50
 msgid "High Accuracy"
@@ -673,7 +472,7 @@ msgstr ""
 #: src/main/print-color.c:51
 #, fuzzy
 msgid "Bright Colors"
-msgstr "Ðñùôåýùíôá ×ñþìáôá"
+msgstr "Π�ωτε�ωντα Χ�ώματα"
 
 #: src/main/print-color.c:52
 msgid "Correct Hue Only"
@@ -699,18 +498,18 @@ msgstr ""
 #: src/main/print-color.c:58
 #, fuzzy
 msgid "Pre-Dithered"
-msgstr "Åêôýðùóç"
+msgstr "Εκτ�πωση"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
-msgstr "Êëßìáêá ôïõ ãêñé"
+msgstr "Κλίμακα του γκ�ι"
 
 #: src/main/print-color.c:123
 #, fuzzy
 msgid "Whitescale"
-msgstr "Êßôñéíï"
+msgstr "Κίτ�ινο"
 
 #: src/main/print-color.c:125
 msgid "RGB"
@@ -732,13 +531,7 @@ msgstr ""
 #: src/main/print-color.c:165 src/main/print-color.c:446
 #, fuzzy
 msgid "Channel "
-msgstr "Áêýñùóç"
-
-#
-#: src/main/print-color.c:165
-#, fuzzy
-msgid " Gamma"
-msgstr "ÃÜììá"
+msgstr "Ακ��ωση"
 
 #
 #: src/main/print-color.c:165 src/main/print-color.c:216
@@ -749,7 +542,7 @@ msgstr "ÃÜììá"
 #: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 #, fuzzy
 msgid "Gamma"
-msgstr "ÃÜììá"
+msgstr "Γάμμα"
 
 #: src/main/print-color.c:166
 msgid "Gamma for raw channel "
@@ -780,25 +573,25 @@ msgstr ""
 #: src/main/print-color.c:192
 #, fuzzy
 msgid "Input Image Type"
-msgstr "Åßäïò MIME"
+msgstr "Είδος MIME"
 
 #: src/main/print-color.c:193
 #, fuzzy
 msgid "Input image type"
-msgstr "Åßäïò MIME"
+msgstr "Είδος MIME"
 
 #: src/main/print-color.c:200
 #, fuzzy
 msgid "Output Image Type"
-msgstr "Byte Åîüäïõ"
+msgstr "Byte Εξόδου"
 
 #: src/main/print-color.c:201
 #, fuzzy
 msgid "Output image type"
-msgstr "Byte Åîüäïõ"
+msgstr "Byte Εξόδου"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
 msgstr ""
 
@@ -806,7 +599,7 @@ msgstr ""
 #: src/main/print-color.c:216
 #, fuzzy
 msgid "SimpleGamma"
-msgstr "ÃÜììá"
+msgstr "Γάμμα"
 
 #: src/main/print-color.c:217
 msgid "Do not correct for screen gamma"
@@ -815,17 +608,17 @@ msgstr ""
 #: src/main/print-color.c:224
 #, fuzzy
 msgid "Brightness"
-msgstr "Åñãáóßá"
+msgstr "Ε�γασία"
 
 #: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
-msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò"
+msgstr "Εστίαση για π�οσα�μογή του �ψους της σελίδας"
 
 #: src/main/print-color.c:232
 #, fuzzy
 msgid "Contrast"
-msgstr "Áíôßèåóç"
+msgstr "Αντίθεση"
 
 #: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
@@ -838,7 +631,7 @@ msgstr ""
 #: src/main/print-color.c:240
 #, fuzzy
 msgid "Advanced Image Control"
-msgstr "Byte Åîüäïõ"
+msgstr "Byte Εξόδου"
 
 #: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
@@ -858,67 +651,67 @@ msgstr ""
 #: src/main/print-color.c:258
 #, fuzzy
 msgid "AppGamma"
-msgstr "ÃÜììá"
+msgstr "Γάμμα"
 
 #: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
-msgstr "Êõáíü"
+msgstr "Κυανό"
 
 #: src/main/print-color.c:267
 #, fuzzy
 msgid "Adjust the cyan gamma"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
-
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+msgstr "Στο κέντ�ο της οθόνης"
+
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 #, fuzzy
 msgid "Magenta"
-msgstr "ìþâ"
+msgstr "μώβ"
 
 #: src/main/print-color.c:275
 #, fuzzy
 msgid "Adjust the magenta gamma"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
-
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+msgstr "Στο κέντ�ο της οθόνης"
+
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
-msgstr "Êßôñéíï"
+msgstr "Κίτ�ινο"
 
 #: src/main/print-color.c:283
 #, fuzzy
 msgid "Adjust the yellow gamma"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
 msgstr ""
@@ -926,21 +719,21 @@ msgstr ""
 #: src/main/print-color.c:291
 #, fuzzy
 msgid "Adjust the red gamma"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
 msgstr ""
 
 #: src/main/print-color.c:299
 #, fuzzy
 msgid "Adjust the green gamma"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
 msgstr ""
@@ -948,14 +741,26 @@ msgstr ""
 #: src/main/print-color.c:307
 #, fuzzy
 msgid "Adjust the blue gamma"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
+
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr "Μα��ο"
 
 #: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
 msgstr ""
 
@@ -963,38 +768,38 @@ msgstr ""
 #: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
-msgstr "Êëßìáêá ôïõ ãêñé"
+msgstr "Κλίμακα του γκ�ι"
 
 #: src/main/print-color.c:323
 #, fuzzy
 msgid "Adjust the cyan gray balance"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 #, fuzzy
 msgid "Magenta Balance"
-msgstr "ìþâ"
+msgstr "μώβ"
 
 #: src/main/print-color.c:331
 #, fuzzy
 msgid "Adjust the magenta gray balance"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 #, fuzzy
 msgid "Yellow Balance"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
 #: src/main/print-color.c:339
 #, fuzzy
 msgid "Adjust the yellow gray balance"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
 #
 #: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
-msgstr "Êïñåóìüò:"
+msgstr "Κο�εσμός:"
 
 #: src/main/print-color.c:347
 msgid ""
@@ -1005,16 +810,16 @@ msgstr ""
 #: src/main/print-color.c:357
 #, fuzzy
 msgid "Ink Limit"
-msgstr "Ôýðïò MIME"
+msgstr "Τ�πος MIME"
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 #, fuzzy
 msgid "Advanced Output Control"
-msgstr "Byte Åîüäïõ"
+msgstr "Byte Εξόδου"
 
 #: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
@@ -1044,11 +849,6 @@ msgstr ""
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:446
-#, fuzzy
-msgid " Curve"
-msgstr "Ìáýñï"
-
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
@@ -1056,7 +856,7 @@ msgstr "Ìáýñï"
 #: src/main/print-color.c:513
 #, fuzzy
 msgid "Output Curves"
-msgstr "Byte Åîüäïõ"
+msgstr "Byte Εξόδου"
 
 #: src/main/print-color.c:447
 msgid "Curve for raw channel "
@@ -1070,77 +870,77 @@ msgstr ""
 #: src/main/print-color.c:458
 #, fuzzy
 msgid "Cyan curve"
-msgstr "Áêýñùóç"
+msgstr "Ακ��ωση"
 
 #: src/main/print-color.c:465
 #, fuzzy
 msgid "Magenta Curve"
-msgstr "ìþâ"
+msgstr "μώβ"
 
 #: src/main/print-color.c:466
 #, fuzzy
 msgid "Magenta curve"
-msgstr "ìþâ"
+msgstr "μώβ"
 
 #: src/main/print-color.c:473
 #, fuzzy
 msgid "Yellow Curve"
-msgstr "Êßôñéíï"
+msgstr "Κίτ�ινο"
 
 #: src/main/print-color.c:474
 #, fuzzy
 msgid "Yellow curve"
-msgstr "Êßôñéíï"
+msgstr "Κίτ�ινο"
 
 #: src/main/print-color.c:481
 #, fuzzy
 msgid "Black Curve"
-msgstr "Ìáýñï"
+msgstr "Μα��ο"
 
 #: src/main/print-color.c:482
 #, fuzzy
 msgid "Black curve"
-msgstr "Ìáýñï"
+msgstr "Μα��ο"
 
 #: src/main/print-color.c:489
 #, fuzzy
 msgid "Red Curve"
-msgstr "Êßôñéíï"
+msgstr "Κίτ�ινο"
 
 #: src/main/print-color.c:490
 #, fuzzy
 msgid "Red curve"
-msgstr "Êßôñéíï"
+msgstr "Κίτ�ινο"
 
 #: src/main/print-color.c:497
 #, fuzzy
 msgid "Green Curve"
-msgstr "ìþâ"
+msgstr "μώβ"
 
 #: src/main/print-color.c:498
 #, fuzzy
 msgid "Green curve"
-msgstr "ìþâ"
+msgstr "μώβ"
 
 #: src/main/print-color.c:505
 #, fuzzy
 msgid "Blue Curve"
-msgstr "Ìáýñï"
+msgstr "Μα��ο"
 
 #: src/main/print-color.c:506
 #, fuzzy
 msgid "Blue curve"
-msgstr "Ìáýñï"
+msgstr "Μα��ο"
 
 #: src/main/print-color.c:513
 #, fuzzy
 msgid "White Curve"
-msgstr "Êßôñéíï"
+msgstr "Κίτ�ινο"
 
 #: src/main/print-color.c:514
 #, fuzzy
 msgid "White curve"
-msgstr "Êßôñéíï"
+msgstr "Κίτ�ινο"
 
 #: src/main/print-color.c:521
 msgid "Hue Map"
@@ -1159,7 +959,7 @@ msgstr ""
 #: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
-msgstr "Êïñåóìüò:"
+msgstr "Κο�εσμός:"
 
 #: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
@@ -1181,584 +981,385 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:516 src/main/printers.c:521
+#: src/main/printers.c:519 src/main/printers.c:524
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr ""
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:673
+#: src/main/printers.c:676
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
-msgstr "¶ãíùóôïò êùäéêüò op %u"
+msgstr "Άγνωστος κωδικός op %u"
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr ""
 
-#: src/main/printers.c:755
+#: src/main/printers.c:761
 msgid "Page size is not valid\n"
 msgstr ""
 
-#: src/main/printers.c:776
+#: src/main/printers.c:782
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:782
+#: src/main/printers.c:788
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:788
+#: src/main/printers.c:794
 msgid "Height must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:794
+#: src/main/printers.c:800
 msgid "Width must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr "Êáíïíéêü"
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-#, fuzzy
-msgid "Roll Feed"
-msgstr "Ñüëïò"
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr ""
-
-# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-#, fuzzy
-msgid "Manual Feed"
-msgstr "Åã÷åéñßäéï"
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-#, fuzzy
-msgid "Print to CD"
-msgstr "Åêôýðùóç óå Áñ÷åßï"
-
-# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-#, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Åã÷åéñßäéï"
-
-# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-#, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Åã÷åéñßäéï"
-
-#: src/main/print-escp2-data.c:554
-#, fuzzy
-msgid "Rear Tray"
-msgstr "ÄïêéìÞ"
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr ""
-
-#: src/main/print-escp2-data.c:581
-#, fuzzy
-msgid "Photo Board"
-msgstr "Êåßìåíá"
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr ""
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr ""
-
-#: src/main/print-escp2-data.c:638
-#, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "ÁðåðéëïãÞ"
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr ""
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr ""
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-#, fuzzy
-msgid "High"
-msgstr "¾øïò:"
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-#, fuzzy
-msgid "Photo"
-msgstr "Êñõðôïãñáößá"
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-#, fuzzy
-msgid "Super Photo"
-msgstr "Slashdot"
-
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-#, fuzzy
-msgid "Ultra Photo"
-msgstr "Slashdot"
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-#, fuzzy
-msgid "Light Cyan"
-msgstr "ØéëÞ Âñï÷Þ"
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-#, fuzzy
-msgid "Light Magenta"
-msgstr "ØéëÞ Âñï÷Þ"
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-#, fuzzy
-msgid "Light Black"
-msgstr "Ìáýñï"
-
-#: src/main/print-escp2-data.c:811
-#, fuzzy
-msgid "Dark Yellow"
-msgstr "Êßôñéíï"
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-#, fuzzy
-msgid "Matte Black"
-msgstr "×áñôß Ìáíßëá"
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-#, fuzzy
-msgid "Photo Black"
-msgstr "Êåßìåíá"
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-msgid "Gloss Optimizer"
-msgstr ""
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-#, fuzzy
-msgid "Light Light Black"
-msgstr "Ìáýñï"
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr ""
 
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr ""
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr ""
-
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr ""
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:214
+#: src/main/print-escp2.c:228
 #, fuzzy
 msgid "Resolution of the print"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:236
+#: src/main/print-escp2.c:250
 #, fuzzy
 msgid "Ink Set"
-msgstr "Ôýðïò MIME"
+msgstr "Τ�πος MIME"
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 #, fuzzy
 msgid "Output Order"
-msgstr "Byte Åîüäïõ"
+msgstr "Byte Εξόδου"
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 #, fuzzy
 msgid "Ink change command"
-msgstr "Üãíùóôï ÷ñþìá: %s"
+msgstr "άγνωστο χ�ώμα: %s"
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 #, fuzzy
 msgid "Alternate Alignment Choices"
-msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
+msgstr "Εκκίνηση των Έξυπνων Εισαγωγέων"
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
 msgstr ""
 
 #
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 #, fuzzy
 msgid "Channel Names"
-msgstr "Áêýñùóç"
+msgstr "Ακ��ωση"
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:346
 #, fuzzy
 msgid "Cyan Map"
-msgstr "Êõáíü"
+msgstr "Κυανό"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:347
 #, fuzzy
 msgid "Adjust the cyan map"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:352
 #, fuzzy
 msgid "Magenta Map"
-msgstr "ìþâ"
+msgstr "μώβ"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Adjust the magenta map"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:358
 #, fuzzy
 msgid "Yellow Map"
-msgstr "Êßôñéíï"
+msgstr "Κίτ�ινο"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Adjust the yellow map"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:364
 #, fuzzy
 msgid "Blue Map"
-msgstr "Ìáõ_ñüáóðñï"
+msgstr "Μαυ_�όασπ�ο"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Adjust the blue map"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Adjust the red map"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-escp2.c:447
+#: src/main/print-escp2.c:464
 #, fuzzy
 msgid "Red Density"
-msgstr "Ðõêíüôçôá"
+msgstr "Πυκνότητα"
 
-#: src/main/print-escp2.c:448
+#: src/main/print-escp2.c:465
 #, fuzzy
 msgid "Adjust the red density"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-escp2.c:455
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Blue Density"
-msgstr "Ðõêíüôçôá"
+msgstr "Πυκνότητα"
 
-#: src/main/print-escp2.c:456
+#: src/main/print-escp2.c:473
 #, fuzzy
 msgid "Adjust the blue density"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-escp2.c:463
+#: src/main/print-escp2.c:480
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:481
 #, fuzzy
 msgid "Adjust the gloss level"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 #, fuzzy
 msgid "Light Gray Transition"
-msgstr "ØéëÞ Âñï÷Þ"
+msgstr "Ψιλή Β�οχή"
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 #, fuzzy
 msgid "Dark Gray Transition"
-msgstr "ØéëÞ Âñï÷Þ"
+msgstr "Ψιλή Β�οχή"
 
-#: src/main/print-escp2.c:527
+#: src/main/print-escp2.c:544
 #, fuzzy
 msgid "Mid Gray Transition"
-msgstr "ØéëÞ Âñï÷Þ"
+msgstr "Ψιλή Β�οχή"
 
-#: src/main/print-escp2.c:528
+#: src/main/print-escp2.c:545
 #, fuzzy
 msgid "Medium Gray Transition"
-msgstr "ØéëÞ Âñï÷Þ"
+msgstr "Ψιλή Β�οχή"
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 #, fuzzy
 msgid "Full Manual Control"
-msgstr "Byte Åîüäïõ"
+msgstr "Byte Εξόδου"
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr ""
-
-#: src/main/print-escp2.c:1564
-#, fuzzy
-msgid "Print To Hub"
-msgstr "Åêôýðùóç óå Áñ÷åßï"
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
-msgstr "Byte Åîüäïõ"
+msgstr "Byte Εξόδου"
+
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr "Κανονικό"
 
 #
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 #, fuzzy
 msgid "Automatic"
-msgstr "ÌÝãåèïò"
+msgstr "Μέγεθος"
 
-#: src/main/print-escp2.c:1701
+#: src/main/print-escp2.c:1829
 #, fuzzy
 msgid "Bidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:1703
+#: src/main/print-escp2.c:1831
 #, fuzzy
 msgid "Unidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2168
+#: src/main/print-escp2.c:2313
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1810,464 +1411,643 @@ msgstr ""
 #: src/main/print-lexmark.c:589
 #, fuzzy
 msgid "test print"
-msgstr "Ôßôëïé ðñïò åêôýðùóç"
+msgstr "Τίτλοι π�ος εκτ�πωση"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+#, fuzzy
+msgid "Plain Paper"
+msgstr "Κ��ια Σελίδα"
+
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
 msgstr ""
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+#, fuzzy
+msgid "Transparencies"
+msgstr "Διαφανές"
+
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 #, fuzzy
 msgid "Envelopes"
-msgstr "ÐñïãñáììáôéóôÝò"
+msgstr "Π�ογ�αμματιστές"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 #, fuzzy
 msgid "Matte Paper"
-msgstr "×áñôß Ìáíßëá"
+msgstr "Χα�τί Μανίλα"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 #, fuzzy
 msgid "Photo Paper"
-msgstr "Êåßìåíá"
+msgstr "Κείμενα"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-olympus.c:265
+#
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr "Άλλα"
+
+#: src/main/print-lexmark.c:1113
+#, fuzzy
+msgid "Auto Sheet Feeder"
+msgstr "Αυτόματη απόκ�υψη"
+
+#: src/main/print-lexmark.c:1114
+#, fuzzy
+msgid "Manual with Pause"
+msgstr "Σελίδα εγχει�ιδίου"
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr ""
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:861
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 #, fuzzy
 msgid "Matte"
-msgstr "×áñôß Ìáíßëá"
+msgstr "Χα�τί Μανίλα"
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1331
+#: src/main/print-olympus.c:1627
 #, fuzzy
 msgid "Adjust the cyan balance"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-olympus.c:1339
+#: src/main/print-olympus.c:1635
 #, fuzzy
 msgid "Adjust the magenta balance"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-olympus.c:1347
+#: src/main/print-olympus.c:1643
 #, fuzzy
 msgid "Adjust the yellow balance"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-olympus.c:1354
+#: src/main/print-olympus.c:1650
 #, fuzzy
 msgid "Black Balance"
-msgstr "Ìáõ_ñüáóðñï"
+msgstr "Μαυ_�όασπ�ο"
 
-#: src/main/print-olympus.c:1355
+#: src/main/print-olympus.c:1651
 #, fuzzy
 msgid "Adjust the black balance"
-msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+msgstr "Στο κέντ�ο της οθόνης"
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 #, fuzzy
 msgid "Plain"
-msgstr "Óå áíáðáñáãùãÞ"
+msgstr "Σε αναπα�αγωγή"
 
 #
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 #, fuzzy
 msgid "Bond"
-msgstr "¸íôïíç ÃñáöÞ"
+msgstr "Έντονη Γ�αφή"
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 #, fuzzy
 msgid "Premium"
-msgstr "Ðñùô"
+msgstr "Π�ωτ"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 #, fuzzy
 msgid "Transparency"
-msgstr "ÄéáöáíÝò"
+msgstr "Διαφανές"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 #, fuzzy
 msgid "Quick-dry Transparency"
-msgstr "ÄéáöÜíåéá ×ñïéÜò"
+msgstr "Διαφάνεια Χ�οιάς"
 
 # Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
-msgstr "Åã÷åéñßäéï"
+msgstr "Εγχει�ίδιο"
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 #, fuzzy
 msgid "Tray 1"
-msgstr "ÄïêéìÞ"
+msgstr "Δοκιμή"
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 #, fuzzy
 msgid "Tray 2"
-msgstr "ÄïêéìÞ"
+msgstr "Δοκιμή"
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 #, fuzzy
 msgid "Tray 3"
-msgstr "ÄïêéìÞ"
+msgstr "Δοκιμή"
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 #, fuzzy
 msgid "Tray 4"
-msgstr "ÄïêéìÞ"
+msgstr "Δοκιμή"
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
 msgstr ""
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 #, fuzzy
 msgid "Desktop Sheet Feeder"
-msgstr "Ñõèìßóåéò åðéöÜíåéáò åñãáóßáò"
+msgstr "Ρυθμίσεις επιφάνειας ε�γασίας"
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 #, fuzzy
 msgid "Tray"
-msgstr "ÄïêéìÞ"
+msgstr "Δοκιμή"
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 #, fuzzy
 msgid "Optional Source"
-msgstr "Áíïéêôü Ëïãéóìéêü"
+msgstr "Ανοικτό Λογισμικό"
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 #, fuzzy
 msgid "Autoselect"
-msgstr "ÁðåðéëïãÞ"
+msgstr "Απεπιλογή"
 
 #: src/main/print-pcl.c:256
+msgid "150x150 DPI"
+msgstr "150x150 DPI"
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr ""
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
+msgstr "600x300 DPI"
+
+#: src/main/print-pcl.c:259
 #, fuzzy
 msgid "600x600 DPI monochrome"
-msgstr "ìïíü÷ñùìï"
+msgstr "μονόχ�ωμο"
 
-#: src/main/print-pcl.c:259
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr "600x600 DPI"
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr "1200x600 DPI"
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr ""
-
 #: src/main/print-ps.c:97
 #, fuzzy
 msgid "PPDFile"
-msgstr "Áñ÷åßï Ôáõôüôçôáò Äéåñãáóßáò: "
+msgstr "Α�χείο Ταυτότητας Διε�γασίας: "
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 #, fuzzy
 msgid "PPD File"
-msgstr " Áñ÷åßï "
+msgstr " Α�χείο "
 
 #: src/main/print-raw.c:223
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 #, fuzzy
 msgid "Two Level Grayscale"
-msgstr "Êëßìáêá ôïõ ãêñé"
+msgstr "Κλίμακα του γκ�ι"
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 #, fuzzy
 msgid "Three Level Grayscale"
-msgstr "Êëßìáêá ôïõ ãêñé"
+msgstr "Κλίμακα του γκ�ι"
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 #, fuzzy
 msgid "Seven Color Enhanced"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1535
+#: src/main/escp2-channels.c:1649
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1695
+#: src/main/escp2-channels.c:1809
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1762
+#: src/main/escp2-channels.c:1876
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1884
+#: src/main/escp2-channels.c:2017
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1962
+#: src/main/escp2-channels.c:2109
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:2024
+#: src/main/escp2-channels.c:2187
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:2042
+#: src/main/escp2-channels.c:2205
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Slashdot"
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#, fuzzy
+msgid "Photo Black"
+msgstr "Κείμενα"
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+#, fuzzy
+msgid "Matte Black"
+msgstr "Χα�τί Μανίλα"
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+#, fuzzy
+msgid "Light Cyan"
+msgstr "Ψιλή Β�οχή"
+
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+#, fuzzy
+msgid "Light Magenta"
+msgstr "Ψιλή Β�οχή"
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+#, fuzzy
+msgid "Light Black"
+msgstr "Μα��ο"
+
+#: src/main/escp2-channels.c:2981
+#, fuzzy
+msgid "Dark Yellow"
+msgstr "Κίτ�ινο"
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+msgid "Gloss Optimizer"
+msgstr ""
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Μα��ο"
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 #, fuzzy
 msgid "Plain Paper Fast Load"
-msgstr "Êýñéá Óåëßäá"
+msgstr "Κ��ια Σελίδα"
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 #, fuzzy
 msgid "Postcard"
-msgstr "Ôåëåõôáßá êáñôÝëá"
+msgstr "Τελευταία κα�τέλα"
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 #, fuzzy
 msgid "Back Light Film"
-msgstr "Åëáöñý ÷áëÜæé"
+msgstr "Ελαφ�� χαλάζι"
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 #, fuzzy
 msgid "Matte Paper Heavyweight"
-msgstr "×áñôß Ìáíßëá"
+msgstr "Χα�τί Μανίλα"
 
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 #, fuzzy
 msgid "ColorLife Paper"
-msgstr "Êýñéá Óåëßäá"
+msgstr "Κ��ια Σελίδα"
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 #, fuzzy
 msgid "Archival Matte Paper"
-msgstr "×áñôß Ìáíßëá"
+msgstr "Χα�τί Μανίλα"
 
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+#, fuzzy
+msgid "Roll Feed"
+msgstr "Ρόλος"
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr ""
+
+# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#, fuzzy
+msgid "Manual Feed"
+msgstr "Εγχει�ίδιο"
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+#, fuzzy
+msgid "Print to CD"
+msgstr "Εκτ�πωση σε Α�χείο"
+
+# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Εγχει�ίδιο"
+
+# Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Εγχει�ίδιο"
+
+#: src/main/escp2-papers.c:1859
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Δοκιμή"
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/escp2-papers.c:1886
+#, fuzzy
+msgid "Photo Board"
+msgstr "Κείμενα"
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr ""
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr ""
+
+#: src/main/escp2-papers.c:1943
+#, fuzzy
+msgid "Cut Sheet Autoselect"
+msgstr "Απεπιλογή"
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr ""
+
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
@@ -2275,7 +2055,7 @@ msgstr ""
 #: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
 #, fuzzy
 msgid "360 x 120 DPI Economy"
-msgstr "ìïíü÷ñùìï"
+msgstr "μονόχ�ωμο"
 
 #: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
 msgid "180 DPI Economy"
@@ -2306,139 +2086,163 @@ msgstr "600 DPI"
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:94
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 msgid "720 DPI High Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:97
+#: src/main/escp2-resolutions.c:103
 msgid "720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:100
+#: src/main/escp2-resolutions.c:106
 #, fuzzy
 msgid "720 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:116
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:129
+#: src/main/escp2-resolutions.c:135
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
-#, fuzzy
-msgid "1440 x 1440 DPI"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/escp2-resolutions.c:142
-#, fuzzy
-msgid "1440 x 1440"
-msgstr "1440 x 1440 DPI"
-
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
 #: src/main/escp2-resolutions.c:145
 #, fuzzy
-msgid "1440 x 1440 DPI High Quality"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/escp2-resolutions.c:148
-#, fuzzy
-msgid "1440 x 1440 DPI Highest Quality"
+msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:158
+#: src/main/escp2-resolutions.c:155
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:164
-#, fuzzy
-msgid "2880 x 1440 DPI High Quality"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/escp2-resolutions.c:167
-#, fuzzy
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/escp2-resolutions.c:171
+#: src/main/escp2-resolutions.c:162
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 #, fuzzy
 msgid "Interleave"
-msgstr "¼íïìá åêôõðùôÞ:"
+msgstr "Όνομα εκτυπωτή:"
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 #, fuzzy
 msgid "Interleave 2"
-msgstr "¼íïìá åêôõðùôÞ:"
+msgstr "Όνομα εκτυπωτή:"
 
-#: src/main/escp2-resolutions.c:584
+#: src/main/escp2-resolutions.c:594
 #, fuzzy
 msgid "Eight Pass"
-msgstr "Åñãáóßá"
+msgstr "Ε�γασία"
+
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+#, fuzzy
+msgid "High"
+msgstr "Ύψος:"
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+#, fuzzy
+msgid "Photo"
+msgstr "Κ�υπτογ�αφία"
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+#, fuzzy
+msgid "Super Photo"
+msgstr "Slashdot"
+
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+#, fuzzy
+msgid "Ultra Photo"
+msgstr "Slashdot"
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr ""
 
 #: src/main/generic-options.c:46
 msgid "Text"
@@ -2455,18 +2259,18 @@ msgstr ""
 #: src/main/generic-options.c:49
 #, fuzzy
 msgid "Photograph"
-msgstr "Êñõðôïãñáößá"
+msgstr "Κ�υπτογ�αφία"
 
 #: src/main/generic-options.c:50
 #, fuzzy
 msgid "Line Art"
-msgstr "ÃñáììÞ"
+msgstr "Γ�αμμή"
 
 #
 #: src/main/generic-options.c:55
 #, fuzzy
 msgid "Page"
-msgstr "ÌÝãåèïò"
+msgstr "Μέγεθος"
 
 #: src/main/generic-options.c:56
 msgid "Job"
@@ -2475,12 +2279,12 @@ msgstr ""
 #: src/main/generic-options.c:68
 #, fuzzy
 msgid "Image Type"
-msgstr "Ôýðïò Óôïé÷åßïõ:"
+msgstr "Τ�πος Στοιχείου:"
 
 #: src/main/generic-options.c:69
 #, fuzzy
 msgid "Type of image being printed"
-msgstr "Áñ÷åßï êåéìÝíïõ ðñïò óõìðåñßëçøç óôçí áíáöïñÜ"
+msgstr "Α�χείο κειμένου π�ος συμπε�ίληψη στην αναφο�ά"
 
 #: src/main/generic-options.c:74 src/main/generic-options.c:80
 msgid "Job Mode"
@@ -2494,3953 +2298,4277 @@ msgstr ""
 #: src/main/generic-options.c:80
 #, fuzzy
 msgid "Page Number"
-msgstr "ÌÝãåèïò"
+msgstr "Μέγεθος"
 
 #
 #: src/main/generic-options.c:81
 #, fuzzy
 msgid "Page number"
-msgstr "ÌÝãåèïò"
+msgstr "Μέγεθος"
 
 #
 #: src/main/xmli18n-tmp.h:1
 msgid "Letter"
-msgstr "ÄéáóôÜóåéò Letter"
+msgstr "Διαστάσεις Letter"
 
 #
 #: src/main/xmli18n-tmp.h:2
 msgid "Legal"
-msgstr "ÄéáóôÜóåéò Legal"
+msgstr "Διαστάσεις Legal"
 
 #: src/main/xmli18n-tmp.h:3
 #, fuzzy
 msgid "Tabloid"
-msgstr "Ðßíáêáò"
+msgstr "Πίνακας"
 
 #: src/main/xmli18n-tmp.h:4
 #, fuzzy
 msgid "Executive"
-msgstr "ÅêôÝëåóç"
+msgstr "Εκτέλεση"
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/main/xmli18n-tmp.h:11
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
-msgstr "Êåßìåíá"
+msgstr "Κείμενα"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/main/xmli18n-tmp.h:26
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/main/xmli18n-tmp.h:32
 #, fuzzy
 msgid "Super A0"
 msgstr "Slashdot"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
 msgstr "A3"
 
 #
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
-msgstr "ÄéáóôÜóåéò Á4"
+msgstr "Διαστάσεις Α4"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
 msgstr "A10"
 
 #
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 #, fuzzy
 msgid "RA0"
 msgstr "RAD"
 
 #
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 #, fuzzy
 msgid "RA1"
 msgstr "RAD"
 
 #
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 #, fuzzy
 msgid "RA2"
 msgstr "RAD"
 
 #
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 #, fuzzy
 msgid "RA3"
 msgstr "RAD"
 
 #
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 #, fuzzy
 msgid "RA4"
-msgstr "ÄéáóôÜóåéò Á4"
+msgstr "Διαστάσεις Α4"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr "SRA3"
 
 #
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 #, fuzzy
 msgid "SRA4"
-msgstr "ÄéáóôÜóåéò Á4"
+msgstr "Διαστάσεις Α4"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/main/xmli18n-tmp.h:67
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 #, fuzzy
 msgid "DL"
-msgstr "Ôåêìçñßùóç"
+msgstr "Τεκμη�ίωση"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 #, fuzzy
 msgid "ArchA"
-msgstr "Ôüîï"
+msgstr "Τόξο"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 #, fuzzy
 msgid "ArchB"
-msgstr "Ôüîï"
+msgstr "Τόξο"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 #, fuzzy
 msgid "ArchC"
-msgstr "Ôüîï"
+msgstr "Τόξο"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 #, fuzzy
 msgid "ArchD"
-msgstr "Ôüîï"
+msgstr "Τόξο"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 #, fuzzy
 msgid "ArchE"
-msgstr "Ôüîï"
+msgstr "Τόξο"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 #, fuzzy
 msgid "American foolscap"
-msgstr "ÁìåñéêáíéêÞ Óáìüá"
+msgstr "Αμε�ικανική Σαμόα"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 #, fuzzy
 msgid "European foolscap"
-msgstr "ÁìåñéêáíéêÞ Óáìüá"
+msgstr "Αμε�ικανική Σαμόα"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 #, fuzzy
 msgid "Crown Quarto"
-msgstr "ðñïóïìïßùóç"
+msgstr "π�οσομοίωση"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 #, fuzzy
 msgid "Demy Quarto"
-msgstr "ðñïóïìïßùóç"
+msgstr "π�οσομοίωση"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 #, fuzzy
 msgid "Royal Quarto"
-msgstr "ðñïóïìïßùóç"
+msgstr "π�οσομοίωση"
 
 #
-#: src/main/xmli18n-tmp.h:108
+#: src/main/xmli18n-tmp.h:109
 #, fuzzy
 msgid "ISO A4"
-msgstr "ÄéáóôÜóåéò Á4"
+msgstr "Διαστάσεις Α4"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 #, fuzzy
 msgid "Demy Octavo"
-msgstr "ðñïóïìïßùóç"
+msgstr "π�οσομοίωση"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 #, fuzzy
 msgid "Small paperback"
-msgstr "ÅðÝíäõóç"
+msgstr "Επένδυση"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 #, fuzzy
 msgid "Penguin small paperback"
-msgstr "ÅðÝíäõóç"
+msgstr "Επένδυση"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 #, fuzzy
 msgid "Hagaki Card"
-msgstr "ÁíáæÞôçóç êáñôÝëáò"
+msgstr "Αναζήτηση κα�τέλας"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 #, fuzzy
 msgid "A2 Invitation"
-msgstr "Êéíïýìåíá ó÷Ýäéá"
+msgstr "Κινο�μενα σχέδια"
 
-#: src/main/xmli18n-tmp.h:125
+#: src/main/xmli18n-tmp.h:126
 #, fuzzy
 msgid "Monarch Envelope"
-msgstr "Åêôýðùóç ÖáêÝëïõ"
+msgstr "Εκτ�πωση Φακέλου"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:127
+#: src/main/xmli18n-tmp.h:128
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:130
+#: src/main/xmli18n-tmp.h:131
 #, fuzzy
 msgid "Wide Postcard"
-msgstr "Ôåëåõôáßá êáñôÝëá"
+msgstr "Τελευταία κα�τέλα"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
 msgstr ""
 
 # Translation of "custom" sucks!  ("kata paraggelia"???  nah!)
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 msgid "Custom"
-msgstr "ÏñéóìÝíï áðü ôï ÷ñÞóôç"
+msgstr "Ο�ισμένο από το χ�ήστη"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:144
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:145
+#: src/main/xmli18n-tmp.h:146
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:146
+#: src/main/xmli18n-tmp.h:147
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:147
+#: src/main/xmli18n-tmp.h:148
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/main/xmli18n-tmp.h:149
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:149
+#: src/main/xmli18n-tmp.h:150
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/main/xmli18n-tmp.h:151
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/main/xmli18n-tmp.h:152
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:152
+#: src/main/xmli18n-tmp.h:153
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/main/xmli18n-tmp.h:154
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/main/xmli18n-tmp.h:155
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
+#: src/main/xmli18n-tmp.h:156
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:156
+#: src/main/xmli18n-tmp.h:157
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:157
+#: src/main/xmli18n-tmp.h:158
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:158
+#: src/main/xmli18n-tmp.h:159
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:159
+#: src/main/xmli18n-tmp.h:160
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:160
+#: src/main/xmli18n-tmp.h:161
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:161
+#: src/main/xmli18n-tmp.h:162
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:162
+#: src/main/xmli18n-tmp.h:163
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:163
+#: src/main/xmli18n-tmp.h:164
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:164
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:173
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
-msgid "Canon iP4000"
+#: src/main/xmli18n-tmp.h:181
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:182
+msgid "Canon PIXMA iP3000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:183
+msgid "Canon PIXMA iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:184
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:185
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:186
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:187
+#, fuzzy
+msgid "Canon PIXMA iP4300"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:188
+#, fuzzy
+msgid "Canon PIXMA iP5000"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
+#, fuzzy
+msgid "Canon PIXMA iP6700"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA MP150"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:192
+#, fuzzy
+msgid "Canon PIXMA MP500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:193
+#, fuzzy
+msgid "Canon PIXMA MP700"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA MP730"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:195
+#, fuzzy
+msgid "Canon PIXMA MP750"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA MP760"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA MP770"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA MP780"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
+#, fuzzy
+msgid "Canon PIXMA MP790"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP830"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:201
+msgid "Canon PIXUS iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:202
+msgid "Canon PIXUS iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:203
+msgid "Canon i560"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:204
+msgid "Canon i850"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:205
+msgid "Canon i860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:206
+msgid "Canon i865"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:238
+#, fuzzy
+msgid "Epson Stylus C79"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:245
+#, fuzzy
+msgid "Epson Stylus C87"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Slashdot"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "Epson Stylus Photo 1400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "Epson Stylus Photo 1410"
+msgstr "Stylus Photo 810"
+
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:314
+#, fuzzy
+msgid "Epson Stylus Photo R230"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:315
+#, fuzzy
+msgid "Epson Stylus Photo R240"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "Epson Stylus Photo R245"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:317
+#, fuzzy
+msgid "Epson Stylus Photo R260"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Epson Stylus Photo R265"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "Epson Stylus Photo R270"
+msgstr "Stylus Photo 1270"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "Epson Stylus Photo R350"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "Epson Stylus Photo R360"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "Epson Stylus Photo R380"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "Epson Stylus Photo R390"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Epson Stylus Photo RX560"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:335
+#, fuzzy
+msgid "Epson Stylus Photo RX580"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:336
+#, fuzzy
+msgid "Epson Stylus Photo RX590"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:340
+#, fuzzy
+msgid "Epson Stylus Photo RX640"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:353
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:372
+#, fuzzy
+msgid "Epson Stylus CX5000"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:373
+#, fuzzy
+msgid "Epson Stylus CX5000F"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:380
+#, fuzzy
+msgid "Epson Stylus CX6000"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX7000F"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:397
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:399
+msgid "Epson PictureMate Flash"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:400
+msgid "Epson PictureMate Pal"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:401
+msgid "Epson PictureMate Snap"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:402
+#, fuzzy
+msgid "Epson PictureMate 200"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:403
+#, fuzzy
+msgid "Epson PictureMate 210"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:404
+#, fuzzy
+msgid "Epson PictureMate 240"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:405
+#, fuzzy
+msgid "Epson PictureMate 250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson PictureMate 280"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:411
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:414
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:417
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:426
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:427
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:428
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:429
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:430
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:448
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:451
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:454
+#, fuzzy
+msgid "Epson PM A820"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:456
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:459
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:460
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:462
+#, fuzzy
+msgid "Epson PM D870"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:463
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:464
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:465
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:467
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:468
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
+#, fuzzy
+msgid "Epson PM G850"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:470
+#, fuzzy
+msgid "Epson PM G4500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:471
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:472
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:473
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:474
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:475
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:478
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
 #
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:549
 #, fuzzy
 msgid "Generic PCL 4 Printer"
-msgstr "ÅðéëïãÞ åêôõðùôÞ"
+msgstr "Επιλογή εκτυπωτή"
 
 #
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:550
 #, fuzzy
 msgid "Generic PCL 5 Printer"
-msgstr "ÅðéëïãÞ åêôõðùôÞ"
+msgstr "Επιλογή εκτυπωτή"
 
 #
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:551
 #, fuzzy
 msgid "Generic PCL 5c Printer"
-msgstr "ÅðéëïãÞ åêôõðùôÞ"
+msgstr "Επιλογή εκτυπωτή"
 
 #
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:552
 #, fuzzy
 msgid "Generic PCL 5e Printer"
-msgstr "ÅðéëïãÞ åêôõðùôÞ"
+msgstr "Επιλογή εκτυπωτή"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:802
 #, fuzzy
 msgid "HP e-printer e20"
-msgstr "¼íïìá åêôõðùôÞ:"
+msgstr "Όνομα εκτυπωτή:"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+msgid "Lexmark Optra E220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:913
 #, fuzzy
 msgid "Star LaserPrinter 8"
-msgstr "Ñýèìéóç ÅêôõðùôÞ"
+msgstr "Ρ�θμιση Εκτυπωτή"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:924
+msgid "Xerox WorkCentre M118"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:926
+msgid "Lexmark X73"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+msgid "Olympus P-S100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:942
+msgid "Canon CP-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:943
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:953
+msgid "Sony DPP-EX5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:957
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:960
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 #, fuzzy
 msgid "Inch"
-msgstr "ßíôóá"
+msgstr "ίντσα"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Points"
-msgstr "Åêôýðùóç"
+msgstr "Εκτ�πωση"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
+msgstr "Επιλέγει γ�αμματοσει�ές για επικόλληση"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
-msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
+msgstr "Επιλέγει γ�αμματοσει�ές για επικόλληση"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
+msgstr "Επιλέγει γ�αμματοσει�ές για επικόλληση"
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 #, fuzzy
 msgid "Color output"
-msgstr "Êýëéóç üôáí õðÜñ÷åé íÝá Ýîïäïò"
+msgstr "Κ�λιση όταν υπά�χει νέα έξοδος"
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
 msgstr ""
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 #, fuzzy
 msgid "Standard Command"
-msgstr "Êáíïíéêü"
+msgstr "Κανονικό"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Custom Command"
-msgstr "ÅíôïëÞ:"
+msgstr "Εντολή:"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
-msgstr "Áñ÷åßï"
+msgstr "Α�χείο"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Print to a file"
-msgstr "Åêôýðùóç óå Áñ÷åßï"
+msgstr "Εκτ�πωση σε Α�χείο"
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 #, fuzzy
 msgid "Set Default"
-msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
+msgstr "Ο�ισμός Π�οκαθο�ισμένων Τιμών"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
-msgstr "ÅíôÜîåé"
+msgstr "Εντάξει"
 
 #
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
-msgstr "Áêýñùóç"
+msgstr "Ακ��ωση"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, fuzzy, c-format
 msgid "%s -- Print v%s"
-msgstr "%s Ýêäïóç %s"
+msgstr "%s έκδοση %s"
 
 #
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
-msgstr "Ðåñß"
+msgstr "Πε�ί"
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 #, fuzzy
 msgid ""
 "Print and\n"
 "Save Settings"
-msgstr "ÁðïèÞêåõóç Ñõèìßóåùí"
+msgstr "Αποθήκευση Ρυθμίσεων"
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 #, fuzzy
 msgid ""
 "Save\n"
 "Settings"
-msgstr "ÁðïèÞêåõóç Ñõèìßóåùí"
+msgstr "Αποθήκευση Ρυθμίσεων"
 
 #
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
-msgstr "Åêôýðùóç"
+msgstr "Εκτ�πωση"
 
 #
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
-msgstr "Ðñïåðéóêüðçóç"
+msgstr "Π�οεπισκόπηση"
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6455,511 +6583,488 @@ msgid ""
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 #, fuzzy
 msgid "Paper Size"
-msgstr "ÌÝãåèïò"
+msgstr "Μέγεθος"
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
-msgstr "ÄéáóôÜóåéò:"
+msgstr "Διαστάσεις:"
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
-msgstr "ÐëÜôïò:"
+msgstr "Πλάτος:"
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 #, fuzzy
 msgid "Width of the paper that you wish to print to"
-msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
+msgstr "Επιλέξτε τον φάκελο που θέλετε να ανοίξετε"
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
-msgstr "¾øïò:"
+msgstr "Ύψος:"
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 #, fuzzy
 msgid "Height of the paper that you wish to print to"
-msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
+msgstr "Επιλέξτε τον φάκελο που θέλετε να ανοίξετε"
 
 #
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 #, fuzzy
 msgid "Automatic Paper Size"
-msgstr "ÌÝãåèïò"
+msgstr "Μέγεθος"
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 #, fuzzy
 msgid "Image Position"
-msgstr "ÈÝóç"
+msgstr "Θέση"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
-msgstr "Áõôüìáôï"
+msgstr "Αυτόματο"
 
 # Not sure how the terms "portrait" and "landscape" are usually
 # translated; if anyone knows what the term in the Greek version
 # of MSWindoze is and if it is better (or equally good), maybe we
 # would want to use that for consistency and for the sake of newbies?
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
-msgstr "Ðïñôñáßôï"
+msgstr "Πο�τ�αίτο"
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
-msgstr "Ïñéæüíôéïò"
+msgstr "Ο�ιζόντιος"
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 #, fuzzy
 msgid "Upside down"
-msgstr "ÁíÜðïäá"
+msgstr "Ανάποδα"
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
-msgstr "Tïðßï"
+msgstr "Tοπίο"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 #, fuzzy
 msgid "Orientation:"
-msgstr "Ðñïóáíáôïëéóìüò"
+msgstr "Π�οσανατολισμός"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
-msgstr "ÁñéóôåñÜ:"
+msgstr "Α�ιστε�ά:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
-msgstr "ÄåîéÜ:"
+msgstr "Δεξιά:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 #, fuzzy
 msgid "Distance from the left of the paper to the right of the image"
-msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò"
+msgstr "Εστίαση για π�οσα�μογή του �ψους της σελίδας"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
-msgstr "ÐÜíù:"
+msgstr "Πάνω:"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
-msgstr "ÊÜôù:"
+msgstr "Κάτω:"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
-msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò"
+msgstr "Εστίαση για π�οσα�μογή του �ψους της σελίδας"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 #, fuzzy
 msgid "Center:"
-msgstr "ÊÝíôñï"
+msgstr "Κέντ�ο"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 #, fuzzy
 msgid "Horizontal"
-msgstr "_Ïñéæüíôéá"
+msgstr "_Ο�ιζόντια"
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
-msgstr "Êáé ôá äýï"
+msgstr "Και τα δ�ο"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 #, fuzzy
 msgid "Center the image on the paper"
-msgstr "ÁëëáãÞ ôïõ ìåãÝèïõò óåëßäáò"
+msgstr "Αλλαγή του μεγέθους σελίδας"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 #, fuzzy
 msgid "Vertical"
-msgstr "Êáôáêüñõ_öá"
+msgstr "Κατακό�υ_φα"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 #, fuzzy
 msgid "Center the image vertically on the paper"
-msgstr "ÐåñéóôñïöÞ åéêüíáò ãéá êÜèåôá ôáìðëþ"
+msgstr "Πε�ιστ�οφή εικόνας για κάθετα ταμπλώ"
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
-msgstr "Ñýèìéóç ÅêôõðùôÞ"
+msgstr "Ρ�θμιση Εκτυπωτή"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 #, fuzzy
 msgid "Printer Make:"
-msgstr "¼íïìá åêôõðùôÞ:"
+msgstr "Όνομα εκτυπωτή:"
 
 #
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 #, fuzzy
 msgid "Select the make of your printer"
-msgstr "ÅðéëïãÞ åêôõðùôÞ"
+msgstr "Επιλογή εκτυπωτή"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 #, fuzzy
 msgid "Printer Model:"
-msgstr "¼íïìá åêôõðùôÞ:"
+msgstr "Όνομα εκτυπωτή:"
 
 #
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 #, fuzzy
 msgid "Select your printer model"
-msgstr "ÅðéëïãÞ åêôõðùôÞ"
+msgstr "Επιλογή εκτυπωτή"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 #, fuzzy
 msgid "PPD File:"
-msgstr "Áñ÷åßï Ôáõôüôçôáò Äéåñãáóßáò: "
+msgstr "Α�χείο Ταυτότητας Διε�γασίας: "
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
-msgstr "Åîåñåýíçóç"
+msgstr "Εξε�ε�νηση"
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 #, fuzzy
 msgid "Printer Queue:"
-msgstr "¼íïìá åêôõðùôÞ:"
+msgstr "Όνομα εκτυπωτή:"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 msgid "Enter the correct command to print to your printer. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 #, fuzzy
 msgid "File to print to"
-msgstr "Ôßôëïé ðñïò åêôýðùóç"
+msgstr "Τίτλοι π�ος εκτ�πωση"
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 #, fuzzy
 msgid "Print To File"
-msgstr "Åêôýðùóç óå Áñ÷åßï"
+msgstr "Εκτ�πωση σε Α�χείο"
 
 #
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 #, fuzzy
 msgid "Define New Printer"
-msgstr "ÅðéëïãÞ åêôõðùôÞ"
+msgstr "Επιλογή εκτυπωτή"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 #, fuzzy
 msgid "Printer Name:"
-msgstr "¼íïìá åêôõðùôÞ:"
+msgstr "Όνομα εκτυπωτή:"
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 #, fuzzy
 msgid "Enter the name you wish to give this logical printer"
-msgstr "ÅéóÜãåôå ôïí áñéèìü ãñáììÞò óôïí ïðïßï èÝëåôå íá ðÜôå."
+msgstr "Εισάγετε τον α�ιθμό γ�αμμής στον οποίο θέλετε να πάτε."
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 #, fuzzy
 msgid "About Gutenprint "
-msgstr "Óçìåßï ÐñïóÜñôçóçò: "
+msgstr "Σημείο Π�οσά�τησης: "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 #, fuzzy
 msgid "Gutenprint Version "
-msgstr "Åêôýðùóç óå: "
-
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
+msgstr "Εκτ�πωση σε: "
 
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 #, fuzzy
 msgid "Printer Settings"
-msgstr "Ñõèìßóåéò ÅðéëïãÝá"
+msgstr "Ρυθμίσεις Επιλογέα"
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 #, fuzzy
 msgid "Setup Printer..."
-msgstr "Ñýèìéóç ÅêôõðùôÞ"
+msgstr "Ρ�θμιση Εκτυπωτή"
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 #, fuzzy
 msgid "New Printer..."
-msgstr "Åêôýðùóç..."
+msgstr "Εκτ�πωση..."
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 #, fuzzy
 msgid "Image Size"
-msgstr "ÌÝãåèïò"
+msgstr "Μέγεθος"
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 #, fuzzy
 msgid "Scaling:"
-msgstr "ÁðïèÞêåõóç:"
+msgstr "Αποθήκευση:"
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 #, fuzzy
 msgid "Set the scale (size) of the image"
-msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü"
+msgstr "Ελάττωση του μεγέθους της εικόνας στο μισό"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
-msgstr "Ðïóïóôü"
+msgstr "Ποσοστό"
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 #, fuzzy
 msgid "Scale the print to the size of the page"
-msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü"
+msgstr "Ελάττωση του μεγέθους της εικόνας στο μισό"
 
 #
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 #, fuzzy
 msgid "PPI"
-msgstr "ÁÑÉÈÌ.ÄÉÅÑÃÁÓÉÁÓ"
+msgstr "ΑΡΙΘΜ.ΔΙΕΡΓΑΣΙΑΣ"
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 #, fuzzy
 msgid "Set the width of the print"
-msgstr "Ôï ðëÜôïò ôïõ ìáñáöåôéïý"
+msgstr "Το πλάτος του μα�αφετιο�"
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 #, fuzzy
 msgid "Set the height of the print"
-msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò"
+msgstr "Εστίαση για π�οσα�μογή του �ψους της σελίδας"
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 #, fuzzy
 msgid ""
 "Use Original\n"
 "Image Size"
-msgstr "Áñ÷éêü _ÌÝãåèïò"
+msgstr "Α�χικό _Μέγεθος"
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 #, fuzzy
 msgid "Set the print size to the size of the image"
-msgstr "Ïñéóìüò ðáñáìåôñïðïéçìÝíïõ ìåãÝèïõò ãéá ôçí åéêüíá"
+msgstr "Ο�ισμός πα�αμετ�οποιημένου μεγέθους για την εικόνα"
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 #, fuzzy
 msgid "Print Color Adjust"
-msgstr "Ðñùôåýùíôá ×ñþìáôá"
+msgstr "Π�ωτε�ωντα Χ�ώματα"
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 #, fuzzy
 msgid "Set Defaults"
-msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
+msgstr "Ο�ισμός Π�οκαθο�ισμένων Τιμών"
 
 #
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
-msgstr "Êëåßóéìï"
+msgstr "Κλείσιμο"
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 #, fuzzy
 msgid "Image preview"
-msgstr "ÐáñáôçñçôÞò Åéêüíùí"
+msgstr "Πα�ατη�ητής Εικόνων"
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 #, fuzzy
 msgid "Output"
-msgstr "Byte Åîüäïõ"
+msgstr "Byte Εξόδου"
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 #, fuzzy
 msgid "Output Type:"
-msgstr "Byte Åîüäïõ"
+msgstr "Byte Εξόδου"
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 #, fuzzy
 msgid "Select the desired output type"
-msgstr "ÅðéëïãÞ áñ÷åßïõ ðñïò áðïèÞêåõóç"
+msgstr "Επιλογή α�χείου π�ος αποθήκευση"
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 #, fuzzy
 msgid "Size Units:"
-msgstr "&ÌïíÜäåò:"
+msgstr "&Μονάδες:"
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 #, fuzzy
 msgid "Units:"
-msgstr "&ÌïíÜäåò:"
+msgstr "&Μονάδες:"
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 #, fuzzy
 msgid "Select the base unit of measurement for printing"
-msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
+msgstr "Επιλέγει γ�αμματοσει�ές για επικόλληση"
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
 msgstr ""
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
 msgstr ""
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
 msgstr ""
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
 #
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 #, fuzzy
 msgid "Printer"
-msgstr "Åêôýðùóç"
+msgstr "Εκτ�πωση"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 #, fuzzy
 msgid "(Default Printer)"
-msgstr "Ñýèìéóç ÅêôõðùôÞ"
+msgstr "Ρ�θμιση Εκτυπωτή"
 
 #: src/gutenprintui2/curve.c:130
 #, fuzzy
 msgid "Curve type"
-msgstr "Ìáýñï"
+msgstr "Μα��ο"
 
 #: src/gutenprintui2/curve.c:131
 msgid "Is this curve linear, spline interpolated, or free-form"
@@ -7001,88 +7106,99 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:133
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Printer Features"
-msgstr "Ñõèìßóåéò ÅðéëïãÝá"
+msgstr "Ρυθμίσεις Επιλογέα"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 #, fuzzy
 msgid "Output Control"
-msgstr "Byte Åîüäïõ"
+msgstr "Byte Εξόδου"
 
 #
-#: src/cups/genppd.c:139
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Common"
-msgstr "ÅíôïëÞ:"
+msgstr "Εντολή:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:153
 #, fuzzy
 msgid "Extra 1"
-msgstr "ÄïêéìÞ"
+msgstr "Δοκιμή"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Extra 2"
-msgstr "ÄïêéìÞ"
+msgstr "Δοκιμή"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Extra 3"
-msgstr "ÄïêéìÞ"
+msgstr "Δοκιμή"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:156
 #, fuzzy
 msgid "Extra 4"
-msgstr "ÄïêéìÞ"
+msgstr "Δοκιμή"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr "Greek"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 #, fuzzy
 msgid "ISOLatin1"
-msgstr "ËÜôéí"
+msgstr "Λάτιν"
+
+#: src/cups/genppd.c:1613
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
+msgstr ""
 
-#: src/cups/genppd.c:1465
+#: src/cups/genppd.c:1717
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1719
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1497
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1756
 msgid "Fine Adjustment"
 msgstr ""
 
 #: src/escputil/escputil.c:70
 #, fuzzy
 msgid "Escputil version "
-msgstr "%s Ýêäïóç %s"
-
-#: src/escputil/escputil.c:71
-#, fuzzy
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-"Áõôü ôï ðñüãñáììá åßíáé ìÝñïò ôïõ GNOME.\n"
-"Ôï Gnome-Chess äåí ðáñÝ÷åé ÁÐÏËÕÔÙÓ ÊÁÌÉÁ ÅÃÃÕÇÓÇ.  Ðñüêåéôáé ãéá åëåýèåñï "
-"ëïãéóìéêï, êáé ìðïñåßôå íá ôï áíáäéáíåßìåôå âÜóåé ôùí óõíèçêþí ôçò ÃåíéêÞò "
-"Äçìüóéáò ¶äåéáò GNU (GNU General Public Licence)."
+msgstr "%s έκδοση %s"
 
 #: src/escputil/escputil.c:76
 msgid ""
@@ -7196,12 +7312,12 @@ msgstr ""
 #: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, fuzzy, c-format
 msgid "You may only specify one printer or raw device."
-msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n"
+msgstr "Μπο�είτε να αποθηκε�σετε μια μόνο διε�θυνση τη φο�ά.\n"
 
 #: src/escputil/escputil.c:345
 #, fuzzy, c-format
 msgid "You may only specify one printer model."
-msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n"
+msgstr "Μπο�είτε να αποθηκε�σετε μια μόνο διε�θυνση τη φο�ά.\n"
 
 #: src/escputil/escputil.c:369
 #, c-format
@@ -7216,7 +7332,7 @@ msgstr ""
 #: src/escputil/escputil.c:381
 #, fuzzy, c-format
 msgid "Unknown option %c\n"
-msgstr "¶ãíùóôïò êùäéêüò op %u"
+msgstr "Άγνωστος κωδικός op %u"
 
 #: src/escputil/escputil.c:389
 #, c-format
@@ -7236,17 +7352,17 @@ msgstr ""
 #: src/escputil/escputil.c:459
 #, fuzzy, c-format
 msgid "Cannot open device %s: %s\n"
-msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
+msgstr "Άνοιγμα α�χείου %s αδ�νατον\n"
 
 #: src/escputil/escputil.c:482
 #, fuzzy, c-format
 msgid "Cannot print to printer %s with %s\n"
-msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
+msgstr "Δεν είναι δυνατό να γίνει καταχώ�ηση αποθήκευσης με κέλυφος"
 
 #: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, fuzzy, c-format
 msgid "Unable to send command to printer\n"
-msgstr "Áíåðéôõ÷Þò óýíäåóç óôï ðéëüôï"
+msgstr "Ανεπιτυχής σ�νδεση στο πιλότο"
 
 #: src/escputil/escputil.c:568
 #, c-format
@@ -7256,7 +7372,7 @@ msgstr ""
 #: src/escputil/escputil.c:573
 #, fuzzy, c-format
 msgid "Cannot read from %s: %s\n"
-msgstr "Äåí åßíáé äõíáôü íá åëåã÷èåß ï öÜêåëïò: %s: %s"
+msgstr "Δεν είναι δυνατό να ελεγχθεί ο φάκελος: %s: %s"
 
 #: src/escputil/escputil.c:747
 #, c-format
@@ -7266,12 +7382,12 @@ msgstr ""
 #: src/escputil/escputil.c:754
 #, fuzzy, c-format
 msgid "Cannot open %s read/write: %s\n"
-msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
+msgstr "Άνοιγμα α�χείου %s αδ�νατον\n"
 
 #: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
 #, fuzzy, c-format
 msgid "Cannot write to %s: %s\n"
-msgstr "ÅããñáöÞ áäýíáôç: %s"
+msgstr "Εγγ�αφή αδ�νατη: %s"
 
 #: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
 #: src/escputil/escputil.c:1511
@@ -7279,7 +7395,7 @@ msgstr "ÅããñáöÞ áäýíáôç: %s"
 msgid ""
 "\n"
 "Cannot write to %s: %s\n"
-msgstr "ÅããñáöÞ áäýíáôç: %s"
+msgstr "Εγγ�αφή αδ�νατη: %s"
 
 #: src/escputil/escputil.c:885
 #, c-format
@@ -7318,7 +7434,7 @@ msgstr ""
 #: src/escputil/escputil.c:1036
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
-msgstr "Êïñåóìüò:"
+msgstr "Κο�εσμός:"
 
 #: src/escputil/escputil.c:1039
 #, c-format
@@ -7373,12 +7489,12 @@ msgstr ""
 #: src/escputil/escputil.c:1077
 #, fuzzy, c-format
 msgid "Error: Ink out\n"
-msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
+msgstr "Σφάλμα π�οσθήκης λίστας"
 
 #: src/escputil/escputil.c:1080
 #, fuzzy, c-format
 msgid "Error: Paper out\n"
-msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
+msgstr "Σφάλμα π�οσθήκης λίστας"
 
 #: src/escputil/escputil.c:1083
 #, c-format
@@ -7435,14 +7551,14 @@ msgstr ""
 #: src/escputil/escputil.c:1646
 #, fuzzy
 msgid "Ink color"
-msgstr " ÷ñþìá"
+msgstr " χ�ώμα"
 
 #: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
 #: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
 #: src/escputil/escputil.c:1646
 #, fuzzy
 msgid "Percent remaining"
-msgstr "Åðß ôïéò åêáôü åëåýèåñï"
+msgstr "Επί τοις εκατό ελε�θε�ο"
 
 #: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
 #: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
@@ -7497,12 +7613,12 @@ msgstr ""
 #: src/escputil/escputil.c:1693
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
-msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n"
+msgstr "Μπο�είτε να αποθηκε�σετε μια μόνο διε�θυνση τη φο�ά.\n"
 
 #: src/escputil/escputil.c:1713
 #, fuzzy, c-format
 msgid "Cleaning heads...\n"
-msgstr "ÁíÜãíùóç åðéêåöáëßäùí..."
+msgstr "Ανάγνωση επικεφαλίδων..."
 
 #: src/escputil/escputil.c:1728
 #, c-format
@@ -7635,7 +7751,7 @@ msgstr ""
 #: src/escputil/escputil.c:1865
 #, fuzzy, c-format
 msgid "Repeating the alignment process.\n"
-msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
+msgstr "Εκκίνηση των Έξυπνων Εισαγωγέων"
 
 #: src/escputil/escputil.c:1871
 #, c-format
@@ -7677,7 +7793,7 @@ msgstr ""
 #: src/escputil/escputil.c:1900
 #, fuzzy, c-format
 msgid "Unrecognized command.\n"
-msgstr "Üãíùóôï ÷ñþìá: %s"
+msgstr "άγνωστο χ�ώμα: %s"
 
 #: src/escputil/escputil.c:1903
 #, c-format
@@ -7699,7 +7815,7 @@ msgstr ""
 #: src/escputil/escputil.c:2047
 #, fuzzy
 msgid "Press enter to continue > "
-msgstr "Ðáñáêáëþ åéóáãÜãåôå ìéá ãñáììÞ åíôïëþí ðáñáêÜôù."
+msgstr "Πα�ακαλώ εισαγάγετε μια γ�αμμή εντολών πα�ακάτω."
 
 #: src/escputil/escputil.c:1980
 #, c-format
@@ -7718,17 +7834,17 @@ msgstr ""
 #: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
 #, fuzzy, c-format
 msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Ðáñáêáëþ åéóÜãåôå 200 äñá÷ìÝò ãéá íá óõíå÷ßóåôå."
+msgstr "Πα�ακαλώ εισάγετε 200 δ�αχμές για να συνεχίσετε."
 
 #: src/escputil/escputil.c:2020
 #, fuzzy, c-format
 msgid "Number out of range!\n"
-msgstr "Áñéèìüò Óåëßäùí"
+msgstr "Α�ιθμός Σελίδων"
 
 #: src/escputil/escputil.c:2025
 #, fuzzy, c-format
 msgid "I cannot understand what you typed!\n"
-msgstr "Äåí êáôáëáâáßíù ôçí åíôïëÞ óïõ. "
+msgstr "Δεν καταλαβαίνω την εντολή σου. "
 
 #: src/escputil/escputil.c:2031
 #, c-format
@@ -7738,7 +7854,7 @@ msgstr ""
 #: src/escputil/escputil.c:2038
 #, fuzzy, c-format
 msgid "Attempting to set alignment..."
-msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
+msgstr "Εκκίνηση των Έξυπνων Εισαγωγέων"
 
 #: src/escputil/escputil.c:2041
 #, c-format
@@ -7757,17 +7873,17 @@ msgstr ""
 #: src/escputil/escputil.c:2088
 #, fuzzy, c-format
 msgid "Error in input\n"
-msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
+msgstr "Σφάλμα π�οσθήκης λίστας"
 
 #: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225
 #, fuzzy
 msgid "Printing..."
-msgstr "Åêôõðþíåôáé .."
+msgstr "Εκτυπώνεται .."
 
 #: src/gimp/print.c:133
 #, fuzzy
 msgid "<Image>/File/Print..."
-msgstr "<Image>/Ößëôñá/Êåßìåíï/FreeType..."
+msgstr "<Image>/Φίλτ�α/Κείμενο/FreeType..."
 
 #: src/ghost/ijsgutenprint.c:98
 #, c-format
@@ -7789,13 +7905,13 @@ msgstr ""
 #: src/ghost/ijsgutenprint.c:199
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
-msgstr "¶ãíùóôïò êùäéêüò op %u"
+msgstr "Άγνωστος κωδικός op %u"
 
 #: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
-msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
+msgstr "Άνοιγμα α�χείου %s αδ�νατον\n"
 
 #: src/ghost/ijsgutenprint.c:498
 #, c-format
@@ -7815,47 +7931,47 @@ msgstr ""
 #: src/ghost/ijsgutenprint.c:700
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
-msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
+msgstr "Δεν είναι δυνατό να γίνει καταχώ�ηση αποθήκευσης με κέλυφος"
 
 #: src/ghost/ijsgutenprint.c:723
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
-msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
+msgstr "Δεν είναι δυνατό να γίνει καταχώ�ηση αποθήκευσης με κέλυφος"
 
 #: src/ghost/ijsgutenprint.c:795
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
-msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
+msgstr "Δεν είναι δυνατό να γίνει καταχώ�ηση αποθήκευσης με κέλυφος"
 
 #: src/ghost/ijsgutenprint.c:802
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
-msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
+msgstr "Δεν είναι δυνατό να γίνει καταχώ�ηση αποθήκευσης με κέλυφος"
 
 #: src/ghost/ijsgutenprint.c:809
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
-msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
+msgstr "Δεν είναι δυνατό να γίνει καταχώ�ηση αποθήκευσης με κέλυφος"
 
 #: src/ghost/ijsgutenprint.c:816
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
-msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
+msgstr "Δεν είναι δυνατό να γίνει καταχώ�ηση αποθήκευσης με κέλυφος"
 
 #: src/ghost/ijsgutenprint.c:830
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
-msgstr "Äåí åßíáé äõíáôü íá ãßíåé êáôá÷þñçóç áðïèÞêåõóçò ìå êÝëõöïò"
+msgstr "Δεν είναι δυνατό να γίνει καταχώ�ηση αποθήκευσης με κέλυφος"
 
 #: src/ghost/ijsgutenprint.c:841
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
-msgstr "¶ãíùóôïò êùäéêüò op %u"
+msgstr "Άγνωστος κωδικός op %u"
 
 #: src/ghost/ijsgutenprint.c:867
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
-msgstr "¶ãíùóôïò êùäéêüò op %u"
+msgstr "Άγνωστος κωδικός op %u"
 
 #: src/ghost/ijsgutenprint.c:1308
 #, c-format
@@ -7865,17 +7981,17 @@ msgstr ""
 #: src/ghost/ijsgutenprint.c:1319
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
+msgstr "Άνοιγμα α�χείου %s αδ�νατον\n"
 
 #: src/ghost/ijsgutenprint.c:1331
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
+msgstr "Άνοιγμα α�χείου %s αδ�νατον\n"
 
 #: src/ghost/ijsgutenprint.c:1344
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
-msgstr "¶ãíùóôïò êùäéêüò op %u"
+msgstr "Άγνωστος κωδικός op %u"
 
 #: src/ghost/ijsgutenprint.c:1516
 #, c-format
@@ -7887,9 +8003,201 @@ msgstr ""
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr ""
 
+#
+#, fuzzy
+#~ msgid "Model Name"
+#~ msgstr "Ακ��ωση"
+
+#, fuzzy
+#~ msgid "Cassette"
+#~ msgstr "Χα�τί Μανίλα"
+
+#
+#, fuzzy
+#~ msgid " Gamma"
+#~ msgstr "Γάμμα"
+
+#, fuzzy
+#~ msgid " Curve"
+#~ msgstr "Μα��ο"
+
+#, fuzzy
+#~ msgid "1440 x 1440"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI High Quality"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI Highest Quality"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI High Quality"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI Highest Quality"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid ""
+#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
+#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
+#~ "l'\n"
+#~ "This is free software, and you are welcome to redistribute it\n"
+#~ "under certain conditions; type 'escputil -l' for details.\n"
+#~ msgstr ""
+#~ "Αυτό το π�όγ�αμμα είναι μέ�ος του GNOME.\n"
+#~ "Το Gnome-Chess δεν πα�έχει ΑΠΟΛΥΤΩΣ ΚΑΜΙΑ ΕΓΓΥΗΣΗ.  Π�όκειται για "
+#~ "ελε�θε�ο λογισμικο, και μπο�είτε να το αναδιανείμετε βάσει των συνθηκών "
+#~ "της Γενικής Δημόσιας Άδειας GNU (GNU General Public Licence)."
+
+#, fuzzy
+#~ msgid "90x90 DPI"
+#~ msgstr "600 DPI"
+
+#, fuzzy
+#~ msgid "90x90 DPI DMT"
+#~ msgstr "600 DPI"
+
+#, fuzzy
+#~ msgid "180x180 DPI"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "180x180 DPI DMT"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "360x360 DPI"
+#~ msgstr "600x300 DPI"
+
+#, fuzzy
+#~ msgid "360x360 DPI DMT"
+#~ msgstr "600x600 DPI"
+
+#, fuzzy
+#~ msgid "720x360 DPI"
+#~ msgstr "720 x 360 DPI"
+
+#, fuzzy
+#~ msgid "720x360 DPI DMT"
+#~ msgstr "720 x 360 DPI"
+
+#, fuzzy
+#~ msgid "720x720 DPI"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "720x720 DPI DMT"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x720 DPI"
+#~ msgstr "1440 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x720 DPI DMT"
+#~ msgstr "1440 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI DMT"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI DMT"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "150x150 DPI DMT"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "300x300 DPI DMT"
+#~ msgstr "600x300 DPI"
+
+#, fuzzy
+#~ msgid "600x300 DPI DMT"
+#~ msgstr "600x300 DPI"
+
+#, fuzzy
+#~ msgid "600x600 DPI DMT"
+#~ msgstr "600x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x600 DPI DMT"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI DMT"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI"
+#~ msgstr "2400x600 DPI"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI DMT"
+#~ msgstr "2400x600 DPI"
+
+#, fuzzy
+#~ msgid "Plain Paper PIXMA"
+#~ msgstr "Κ��ια Σελίδα"
+
+#, fuzzy
+#~ msgid "Back Print Film"
+#~ msgstr "Εκτ�πωση σε Α�χείο"
+
+#, fuzzy
+#~ msgid "Fabric Sheets"
+#~ msgstr "Εκτ�πωση Φ�λλων"
+
+#, fuzzy
+#~ msgid "Envelope"
+#~ msgstr "Εκτ�πωση Φακέλου"
+
+#
+#, fuzzy
+#~ msgid "High Resolution Paper"
+#~ msgstr "Aνάλυση Χ:"
+
+#, fuzzy
+#~ msgid "T-Shirt Transfers"
+#~ msgstr "Μεταφο�ά Α�χείων"
+
+#, fuzzy
+#~ msgid "Photo CcMmYK Color"
+#~ msgstr "Επιλογή Ειδικο� Χ�ώματος"
+
+#, fuzzy
+#~ msgid "Photo CcMmY Color"
+#~ msgstr "Επιλογή Ειδικο� Χ�ώματος"
+
+#, fuzzy
+#~ msgid "CMYK Color"
+#~ msgstr "+ Χ�ώμα"
+
+#, fuzzy
+#~ msgid "CMY Color"
+#~ msgstr "+ Χ�ώμα"
+
 #, fuzzy
 #~ msgid "Gutenprint"
-#~ msgstr "Ôßôëïé ðñïò åêôýðùóç"
+#~ msgstr "Τίτλοι π�ος εκτ�πωση"
 
 #, fuzzy
 #~ msgid "EPSON Stylus C50"
@@ -8189,85 +8497,85 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Cannot identify printer!\n"
-#~ msgstr "Áäõíáìßá áíïßãìáôïò áñ÷åßïõ åîüäïõ: %s\n"
+#~ msgstr "Αδυναμία ανοίγματος α�χείου εξόδου: %s\n"
 
 #, fuzzy
 #~ msgid "Red Balance"
-#~ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+#~ msgstr "Στο κέντ�ο της οθόνης"
 
 #, fuzzy
 #~ msgid "Gloss Balance"
-#~ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
+#~ msgstr "Στο κέντ�ο της οθόνης"
 
 #, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "Cannot open %s read/write: %s\n"
-#~ msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
+#~ msgstr "Άνοιγμα α�χείου %s αδ�νατον\n"
 
 #, fuzzy
 #~ msgid "Gimp-Print"
-#~ msgstr "Óçìåßï ÐñïóÜñôçóçò: "
+#~ msgstr "Σημείο Π�οσά�τησης: "
 
 #, fuzzy
 #~ msgid "PPD File?"
-#~ msgstr " Áñ÷åßï "
+#~ msgstr " Α�χείο "
 
 #
 #~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: ç åðéëïãÞ `%s' åßíáé áóáöÞò\n"
+#~ msgstr "%s: η επιλογή `%s' είναι ασαφής\n"
 
 #
 #~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: ç åðéëïãÞ `--%s' äå äÝ÷åôáé üñéóìá\n"
+#~ msgstr "%s: η επιλογή `--%s' δε δέχεται ό�ισμα\n"
 
 #
 #~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: ç åðéëïãÞ `%c%s' äå äÝ÷åôáé üñéóìá\n"
+#~ msgstr "%s: η επιλογή `%c%s' δε δέχεται ό�ισμα\n"
 
 #
 #~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: ç åðéëïãÞ `%s' áðáéôåß üñéóìá\n"
+#~ msgstr "%s: η επιλογή `%s' απαιτεί ό�ισμα\n"
 
 #
 #~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: Üãíùóôç åðéëïãÞ `--%s'\n"
+#~ msgstr "%s: άγνωστη επιλογή `--%s'\n"
 
 #
 #~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: Üãíùóôç åðéëïãÞ `%c%s'\n"
+#~ msgstr "%s: άγνωστη επιλογή `%c%s'\n"
 
 #
 #~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ìç åðéôñåðüìåíç åðéëïãÞ -- %c\n"
+#~ msgstr "%s: μη επιτ�επόμενη επιλογή -- %c\n"
 
 #
 #~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: Üêõñç åðéëïãÞ -- %c'\n"
+#~ msgstr "%s: άκυ�η επιλογή -- %c'\n"
 
 #
 #~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: ç åðéëïãÞ áðáéôåß üñéóìá -- %c\n"
+#~ msgstr "%s: η επιλογή απαιτεί ό�ισμα -- %c\n"
 
 #
 #~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: ç åðéëïãÞ `-W %s' åßíáé áóáöÞò\n"
+#~ msgstr "%s: η επιλογή `-W %s' είναι ασαφής\n"
 
 #
 #~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: ç åðéëïãÞ `-W %s' äåí åðéôñÝðåé üñéóìá\n"
+#~ msgstr "%s: η επιλογή `-W %s' δεν επιτ�έπει ό�ισμα\n"
 
 #, fuzzy
 #~ msgid "Bright"
-#~ msgstr "Åñãáóßá"
+#~ msgstr "Ε�γασία"
 
 #, fuzzy
 #~ msgid "Image is too wide for the page\n"
-#~ msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü"
+#~ msgstr "Ελάττωση του μεγέθους της εικόνας στο μισό"
 
 #, fuzzy
 #~ msgid "Full Bleed"
-#~ msgstr "Ñüëïò"
+#~ msgstr "Ρόλος"
 
 #, fuzzy
 #~ msgid "traditional"
@@ -8278,7 +8586,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "ps2"
-#~ msgstr "óôéã."
+#~ msgstr "στιγ."
 
 #~ msgid "Stylus C20sx"
 #~ msgstr "Stylus C20sx"
@@ -8310,74 +8618,74 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Model %d out of range.\n"
-#~ msgstr "Áñéèìüò Óåëßäùí"
+#~ msgstr "Α�ιθμός Σελίδων"
 
 #, fuzzy
 #~ msgid "Right Border:"
-#~ msgstr "Äåîéü÷åéñáò"
+#~ msgstr "Δεξιόχει�ας"
 
 #, fuzzy
 #~ msgid "Bottom Border:"
-#~ msgstr "Ðëáßóéï Åéêïíéäßïõ:"
+#~ msgstr "Πλαίσιο Εικονιδίου:"
 
 #
 #~ msgid "Size"
-#~ msgstr "ÌÝãåèïò"
+#~ msgstr "Μέγεθος"
 
 #, fuzzy
 #~ msgid "Image / Output Settings"
-#~ msgstr "Ñõèìßóåéò Åéóüäïõ/Åîüäïõ IRC"
+#~ msgstr "Ρυθμίσεις Εισόδου/Εξόδου IRC"
 
 #
 #, fuzzy
 #~ msgid "GIMP-print"
-#~ msgstr "Åêôýðùóç"
+#~ msgstr "Εκτ�πωση"
 
 #, fuzzy
 #~ msgid "Resolutions"
-#~ msgstr "ÁíÜëõóç"
+#~ msgstr "Ανάλυση"
 
 #, fuzzy
 #~ msgid "Media Type:"
-#~ msgstr "Ôýðïò MIME:"
+#~ msgstr "Τ�πος MIME:"
 
 #, fuzzy
 #~ msgid "Media Size:"
-#~ msgstr "ÌÝãåèïò ×:"
+#~ msgstr "Μέγεθος Χ:"
 
 #, fuzzy
 #~ msgid "Media Source:"
-#~ msgstr "Áíïéêôü Ëïãéóìéêü"
+#~ msgstr "Ανοικτό Λογισμικό"
 
 #, fuzzy
 #~ msgid "Ink Type:"
-#~ msgstr "Ôýðïò Óôïé÷åßïõ:"
+#~ msgstr "Τ�πος Στοιχείου:"
 
 #, fuzzy
 #~ msgid "Resolution:"
-#~ msgstr "ÁíÜëõóç"
+#~ msgstr "Ανάλυση"
 
 #, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "Cannot read from %s: %s\n"
-#~ msgstr "Äåí åßíáé äõíáôü íá åëåã÷èåß ï öÜêåëïò: %s: %s"
+#~ msgstr "Δεν είναι δυνατό να ελεγχθεί ο φάκελος: %s: %s"
 
 #, fuzzy
 #~ msgid "Cyan:"
-#~ msgstr "Êõáíü"
+#~ msgstr "Κυανό"
 
 #, fuzzy
 #~ msgid "Magenta:"
-#~ msgstr "ìþâ"
+#~ msgstr "μώβ"
 
 #, fuzzy
 #~ msgid "Yellow:"
-#~ msgstr "Êßôñéíï"
+#~ msgstr "Κίτ�ινο"
 
 #, fuzzy
 #~ msgid "Unknown option %s\n"
-#~ msgstr "¶ãíùóôïò êùäéêüò op %u"
+#~ msgstr "Άγνωστος κωδικός op %u"
 
 #~ msgid "1440 x 360 DPI"
 #~ msgstr "1440 x 360 DPI"
@@ -8387,20 +8695,20 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Monarch"
-#~ msgstr "ÌÜñôéïò"
+#~ msgstr "Μά�τιος"
 
 #, fuzzy
 #~ msgid "Long 3"
-#~ msgstr "ÌåãÜëç"
+#~ msgstr "Μεγάλη"
 
 #, fuzzy
 #~ msgid "Long 4"
-#~ msgstr "ÌåãÜëç"
+#~ msgstr "Μεγάλη"
 
 #, fuzzy
 #~ msgid "Kaku"
-#~ msgstr "Áíôßãñáöï áóöáëåßáò"
+#~ msgstr "Αντίγ�αφο ασφαλείας"
 
 #, fuzzy
 #~ msgid "HP Greeting Card"
-#~ msgstr "×áéñåôéóìüò SMTP"
+#~ msgstr "Χαι�ετισμός SMTP"
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index a391f48..c9d9968 100644
--- a/po/en_GB.gmo
+++ b/po/en_GB.gmo
diff --git a/po/en_GB.po b/po/en_GB.po
index 808e51f..ae37bd9 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\n"
 "PO-Revision-Date: 2006-05-29 12:39+0100\n"
 "Last-Translator: Roger Leigh <rleigh@debian.org>\n"
 "Language-Team: British English\n"
@@ -17,7 +17,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 msgid "Default"
 msgstr "Default"
 
@@ -76,18 +76,18 @@ msgstr "Predithered Input"
 msgid "Density"
 msgstr "Density"
 
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
 msgstr "Output Level Adjustment"
 
@@ -145,459 +145,299 @@ msgstr "Colour conversion module"
 msgid "Dither algorithm"
 msgstr "Dither algorithm"
 
-#: src/main/print-canon.c:1382
-msgid "90x90 DPI"
-msgstr "90×90 DPI"
-
-#: src/main/print-canon.c:1382
-msgid "90x90 DPI DMT"
-msgstr "90×90 DPI DMT"
-
-#: src/main/print-canon.c:1383
-msgid "180x180 DPI"
-msgstr "180×180 DPI"
-
-#: src/main/print-canon.c:1383
-msgid "180x180 DPI DMT"
-msgstr "180×180 DPI DMT"
-
-#: src/main/print-canon.c:1384
-msgid "360x360 DPI"
-msgstr "360×360 DPI"
-
-#: src/main/print-canon.c:1384
-msgid "360x360 DPI DMT"
-msgstr "360×360 DPI DMT"
-
-#: src/main/print-canon.c:1385
-msgid "720x360 DPI"
-msgstr "720×360 DPI"
-
-#: src/main/print-canon.c:1385
-msgid "720x360 DPI DMT"
-msgstr "720×360 DPI DMT"
-
-#: src/main/print-canon.c:1386
-msgid "720x720 DPI"
-msgstr "720×720 DPI"
-
-#: src/main/print-canon.c:1386
-msgid "720x720 DPI DMT"
-msgstr "720×720 DPI DMT"
-
-#: src/main/print-canon.c:1387
-msgid "1440x720 DPI"
-msgstr "1440×720 DPI"
-
-#: src/main/print-canon.c:1387
-msgid "1440x720 DPI DMT"
-msgstr "1440×720 DPI DMT"
-
-#: src/main/print-canon.c:1388
-msgid "1440x1440 DPI"
-msgstr "1440×1440 DPI DMT"
-
-#: src/main/print-canon.c:1388
-msgid "1440x1440 DPI DMT"
-msgstr "1440×1440 DPI DMT"
-
-#: src/main/print-canon.c:1389
-msgid "2880x2880 DPI"
-msgstr "2880×2880 DPI"
-
-#: src/main/print-canon.c:1389
-msgid "2880x2880 DPI DMT"
-msgstr "2880×2880 DPI DMT"
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr "150×150 DPI"
-
-#: src/main/print-canon.c:1390
-msgid "150x150 DPI DMT"
-msgstr "150×150 DPI DMT"
-
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
-msgstr "300×300 DPI"
-
-#: src/main/print-canon.c:1391
-msgid "300x300 DPI DMT"
-msgstr "300×300 DPI DMT"
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr "600×300 DPI"
-
-#: src/main/print-canon.c:1392
-msgid "600x300 DPI DMT"
-msgstr "600×300 DPI DMT"
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr "600×600 DPI"
-
-#: src/main/print-canon.c:1393
-msgid "600x600 DPI DMT"
-msgstr "600×600 DPI DMT"
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr "1200×600 DPI"
-
-#: src/main/print-canon.c:1394
-msgid "1200x600 DPI DMT"
-msgstr "1200×600 DPI DMT"
-
-#: src/main/print-canon.c:1395
-msgid "1200x1200 DPI"
-msgstr "1200×1200 DPI"
-
-#: src/main/print-canon.c:1395
-msgid "1200x1200 DPI DMT"
-msgstr "1200×1200 DPI DMT"
-
-#: src/main/print-canon.c:1396
-msgid "2400x2400 DPI"
-msgstr "2400×2400 DPI"
-
-#: src/main/print-canon.c:1396
-msgid "2400x2400 DPI DMT"
-msgstr "2400×2400 DPI DMT"
-
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-msgid "Plain Paper"
-msgstr "Plain Paper"
-
-#: src/main/print-canon.c:1448
-msgid "Plain Paper PIXMA"
-msgstr "Plain Paper PIXMA"
-
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-msgid "Transparencies"
-msgstr "Transparencies"
-
-#: src/main/print-canon.c:1450
-msgid "Back Print Film"
-msgstr "Back Print Film"
-
-#: src/main/print-canon.c:1451
-msgid "Fabric Sheets"
-msgstr "Fabric Sheets"
-
-#: src/main/print-canon.c:1452
-msgid "Envelope"
-msgstr "Envelope"
-
-#: src/main/print-canon.c:1453
-msgid "High Resolution Paper"
-msgstr "High Resolution Paper"
-
-#: src/main/print-canon.c:1454
-msgid "T-Shirt Transfers"
-msgstr "T-Shirt Transfers"
-
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
-msgstr "High Gloss Film"
-
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
-msgstr "Glossy Photo Paper"
-
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
-msgstr "Glossy Photo Cards"
-
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
-msgstr "Photo Paper Pro"
-
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
-msgstr "Other"
-
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 msgid "Page Size"
 msgstr "Page Size"
 
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
 msgid "Basic Printer Setup"
 msgstr "Basic Printer Setup"
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 msgid "Size of the paper being printed to"
 msgstr "Size of the paper being printed to"
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
 msgid "Media Type"
 msgstr "Media Type"
 
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Type of media (plain paper, photo paper, etc.)"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
 msgid "Media Source"
 msgstr "Media Source"
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
 msgid "Source (input slot) of the media"
 msgstr "Source (input slot) of the media"
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
+msgstr "CD Hub Size"
+
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr "Print only outside of the hub of the CD, or all the way to the hole"
+
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
+msgstr ""
+
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
+
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#, fuzzy
+msgid "CD Hub Size (Custom)"
+msgstr "CD Hub Size"
+
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#, fuzzy
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "Scale the print to the size of the page"
+
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
+msgstr "CD Horizontal Fine Adjustment"
+
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
+msgstr "Advanced Printer Setup"
+
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr "Fine adjustment to horizontal position for CD printing"
+
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
+msgstr "CD Vertical Fine Adjustment"
+
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
 msgstr "Resolution"
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
 msgstr "Resolution and quality of the print"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Ink Type"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr "Advanced Printer Setup"
-
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type of ink in the printer"
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr "Ink Channels"
 
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr "Advanced Printer Functionality"
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Printing Mode"
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Core Parameter"
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Printing Output Mode"
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr "Double-Sided Printing"
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr "Duplex/Tumble Setting"
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 msgid "Cyan Density"
 msgstr "Cyan Density"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 msgid "Adjust the cyan density"
 msgstr "Adjust the cyan density"
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 msgid "Magenta Density"
 msgstr "Magenta Density"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 msgid "Adjust the magenta density"
 msgstr "Adjust the magenta density"
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 msgid "Yellow Density"
 msgstr "Yellow Density"
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 msgid "Adjust the yellow density"
 msgstr "Adjust the yellow density"
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 msgid "Black Density"
 msgstr "Black Density"
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 msgid "Adjust the black density"
 msgstr "Adjust the black density"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 msgid "Light Cyan Transition"
 msgstr "Light Cyan Transition"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr "Advanced Ink Adjustment"
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 msgid "Light Magenta Transition"
 msgstr "Light Magenta Transition"
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 msgid "Light Yellow Transition"
 msgstr "Light Yellow Transition"
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
 msgstr "Off"
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
+msgstr "Long Edge (Standard)"
+
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr "Short Edge (Flip)"
 
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-msgid "Auto Sheet Feeder"
-msgstr "Auto Sheet Feeder"
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
+msgstr "CD - 5 inch"
 
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-msgid "Manual with Pause"
-msgstr "Manual with Pause"
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
+msgstr "CD - 3 inch"
 
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
-msgstr "Manual without Pause"
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
+#, fuzzy
+msgid "CD - Custom"
+msgstr "Custom"
 
-#: src/main/print-canon.c:1923
-msgid "Cassette"
-msgstr "Cassette"
-
-#: src/main/print-canon.c:1924
-msgid "CD tray"
-msgstr "CD tray"
-
-#: src/main/print-canon.c:2049
-msgid "Photo CcMmYK Color"
-msgstr "Photo CcMmYK Colour"
-
-#: src/main/print-canon.c:2052
-msgid "Photo CcMmY Color"
-msgstr "Photo CcMmY Colour"
-
-#: src/main/print-canon.c:2055
-msgid "CMYK Color"
-msgstr "CMYK Colour"
-
-#: src/main/print-canon.c:2058
-msgid "CMY Color"
-msgstr "CMY Colour"
-
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
-msgstr "Black"
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
+msgstr "Normal"
 
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+msgid "Print To Hub"
+msgstr "Print To Hub"
+
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
 msgstr "Colour"
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Black and White"
@@ -634,9 +474,9 @@ msgstr "Raw"
 msgid "Pre-Dithered"
 msgstr "Pre-Dithered"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
 msgstr "Grayscale"
 
@@ -664,10 +504,6 @@ msgstr "KCMY"
 msgid "Channel "
 msgstr "Channel "
 
-#: src/main/print-color.c:165
-msgid " Gamma"
-msgstr " Gamma"
-
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
 #: src/main/print-color.c:266 src/main/print-color.c:274
@@ -720,7 +556,7 @@ msgid "Output image type"
 msgstr "Output image type"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
 msgstr "Raw Channels"
 
@@ -780,13 +616,13 @@ msgstr "AppGamma"
 msgid "Gamma value assumed by application"
 msgstr "Gamma value assumed by application"
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
@@ -796,13 +632,13 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Adjust the cyan gamma"
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 msgid "Magenta"
@@ -812,13 +648,13 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Adjust the magenta gamma"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
@@ -828,9 +664,9 @@ msgstr "Yellow"
 msgid "Adjust the yellow gamma"
 msgstr "Adjust the yellow gamma"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
 msgstr "Red"
@@ -839,8 +675,8 @@ msgstr "Red"
 msgid "Adjust the red gamma"
 msgstr "Adjust the red gamma"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
 msgstr "Green"
 
@@ -848,9 +684,9 @@ msgstr "Green"
 msgid "Adjust the green gamma"
 msgstr "Adjust the green gamma"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
 msgstr "Blue"
@@ -859,11 +695,23 @@ msgstr "Blue"
 msgid "Adjust the blue gamma"
 msgstr "Adjust the blue gamma"
 
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr "Black"
+
 #: src/main/print-color.c:315
 msgid "Adjust the black gamma"
 msgstr "Adjust the black gamma"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
 msgstr "Cyan Balance"
 
@@ -876,7 +724,7 @@ msgstr "GrayBalance"
 msgid "Adjust the cyan gray balance"
 msgstr "Adjust the cyan gray balance"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 msgid "Magenta Balance"
 msgstr "Magenta Balance"
 
@@ -884,7 +732,7 @@ msgstr "Magenta Balance"
 msgid "Adjust the magenta gray balance"
 msgstr "Adjust the magenta gray balance"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 msgid "Yellow Balance"
 msgstr "Yellow Balance"
 
@@ -910,9 +758,9 @@ msgstr "Ink Limit"
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 msgid "Advanced Output Control"
 msgstr "Advanced Output Control"
 
@@ -944,10 +792,6 @@ msgstr "GCR Upper Bound"
 msgid "Upper bound of gray component reduction"
 msgstr "Upper bound of gray component reduction"
 
-#: src/main/print-color.c:446
-msgid " Curve"
-msgstr " Curve"
-
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
@@ -1061,81 +905,81 @@ msgstr "Gray Component Reduction"
 msgid "Gray component reduction curve"
 msgstr "Gray component reduction curve"
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
 msgstr "Traditional Gutenprint colour conversion"
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr "Value must be set for %s\n"
 
-#: src/main/printers.c:516 src/main/printers.c:521
+#: src/main/printers.c:519 src/main/printers.c:524
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "`%s' is not a valid %s\n"
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr "%s must be between %f and %f (is %f)\n"
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr "%s must be between %d and %d (is %d)\n"
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr "%s bounds must be between %f and %f\n"
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr "%s wrap mode must be %s\n"
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
 msgstr "no wrap"
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
 msgstr "wrap around"
 
-#: src/main/printers.c:673
+#: src/main/printers.c:676
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Unknown type parameter %s (%d)\n"
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s out of range (value %d, min %d, max %d)\n"
 
-#: src/main/printers.c:755
+#: src/main/printers.c:761
 msgid "Page size is not valid\n"
 msgstr "Page size is not valid\n"
 
-#: src/main/printers.c:776
+#: src/main/printers.c:782
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Top margin must not be less than %d\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:788
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Left margin must not be less than %d\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:794
 msgid "Height must be greater than zero\n"
 msgstr "Height must be greater than zero\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:800
 msgid "Width must be greater than zero\n"
 msgstr "Width must be greater than zero\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -1144,7 +988,7 @@ msgstr ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1153,442 +997,266 @@ msgstr ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-msgid "Roll Feed"
-msgstr "Roll Feed"
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr "Roll Feed (cut each page)"
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr "Roll Feed (do not cut)"
-
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-msgid "Manual Feed"
-msgstr "Manual Feed"
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-msgid "Print to CD"
-msgstr "Print to CD"
-
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-msgid "Manual Sheet Guide"
-msgstr "Manual Sheet Guide"
-
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-msgid "Manual Feed (Front)"
-msgstr "Manual Feed (Front)"
-
-#: src/main/print-escp2-data.c:554
-msgid "Rear Tray"
-msgstr "Rear Tray"
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr "Front Tray"
-
-#: src/main/print-escp2-data.c:581
-msgid "Photo Board"
-msgstr "Photo Board"
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr "Cut Sheet Bin 1"
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr "Cut Sheet Bin 2"
-
-#: src/main/print-escp2-data.c:638
-msgid "Cut Sheet Autoselect"
-msgstr "Cut Sheet Autoselect"
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr "Manual Selection"
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr "Fast Economy"
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr "Economy"
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr "Draft"
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-msgid "High"
-msgstr "High"
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-msgid "Photo"
-msgstr "Photo"
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-msgid "Super Photo"
-msgstr "Super Photo"
-
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-msgid "Ultra Photo"
-msgstr "Ultra Photo"
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr "Best"
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-msgid "Light Cyan"
-msgstr "Light Cyan"
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-msgid "Light Magenta"
-msgstr "Light Magenta"
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-msgid "Light Black"
-msgstr "Light Black"
-
-#: src/main/print-escp2-data.c:811
-msgid "Dark Yellow"
-msgstr "Dark Yellow"
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-msgid "Matte Black"
-msgstr "Matte Black"
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-msgid "Photo Black"
-msgstr "Photo Black"
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-msgid "Gloss Optimizer"
-msgstr "Gloss Optimiser"
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-msgid "Light Light Black"
-msgstr "Light Light Black"
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
 msgstr "Automatic Printing Mode"
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr "Basic Output Adjustment"
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
 msgstr "Automatic printing mode"
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Print Quality"
 
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr "CD Hub Size"
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr "Print only outside of the hub of the CD, or all the way to the hole"
-
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr "CD Horizontal Fine Adjustment"
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr "Fine adjustment to horizontal position for CD printing"
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr "CD Vertical Fine Adjustment"
-
-#: src/main/print-escp2.c:214
+#: src/main/print-escp2.c:228
 msgid "Resolution of the print"
 msgstr "Resolution of the print"
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
 msgstr "Enhanced Gloss"
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
 msgstr "Add gloss enhancement"
 
-#: src/main/print-escp2.c:236
+#: src/main/print-escp2.c:250
 msgid "Ink Set"
 msgstr "Ink Set"
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
 msgstr "Printing Direction"
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
 msgstr "Advanced Output Adjustment"
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr "Printing direction (unidirectional is higher quality, but slower)"
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
 msgstr "Borderless"
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
 msgstr "Print without borders"
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
 msgstr "Interleave Method"
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
 msgstr "Interleave pattern to use"
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
 msgstr "Adjust dot size as necessary"
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr "Adjust dot size as necessary to achieve desired density"
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 msgid "Output Order"
 msgstr "Output Order"
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
 msgstr "Alignment Passes"
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
 msgstr "Alignment Choices"
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 msgid "Ink change command"
 msgstr "Ink change command"
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
 msgstr "Alternate Alignment Passes"
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 msgid "Alternate Alignment Choices"
 msgstr "Alternate Alignment Choices"
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
 msgstr "Supports Packet Mode"
 
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 msgid "Channel Names"
 msgstr "Channel Names"
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
 msgstr "Raw Channel Count"
 
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:346
 msgid "Cyan Map"
 msgstr "Cyan Map"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:347
 msgid "Adjust the cyan map"
 msgstr "Adjust the cyan map"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:352
 msgid "Magenta Map"
 msgstr "Magenta Map"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:353
 msgid "Adjust the magenta map"
 msgstr "Adjust the magenta map"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:358
 msgid "Yellow Map"
 msgstr "Yellow Map"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:359
 msgid "Adjust the yellow map"
 msgstr "Adjust the yellow map"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:364
 msgid "Blue Map"
 msgstr "Blue Map"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:365
 msgid "Adjust the blue map"
 msgstr "Adjust the blue map"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
 msgstr "Red Map"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:371
 msgid "Adjust the red map"
 msgstr "Adjust the red map"
 
-#: src/main/print-escp2.c:447
+#: src/main/print-escp2.c:464
 msgid "Red Density"
 msgstr "Red Density"
 
-#: src/main/print-escp2.c:448
+#: src/main/print-escp2.c:465
 msgid "Adjust the red density"
 msgstr "Adjust the red density"
 
-#: src/main/print-escp2.c:455
+#: src/main/print-escp2.c:472
 msgid "Blue Density"
 msgstr "Blue Density"
 
-#: src/main/print-escp2.c:456
+#: src/main/print-escp2.c:473
 msgid "Adjust the blue density"
 msgstr "Adjust the blue density"
 
-#: src/main/print-escp2.c:463
+#: src/main/print-escp2.c:480
 msgid "Gloss Level"
 msgstr "Gloss Level"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:481
 msgid "Adjust the gloss level"
 msgstr "Adjust the gloss level"
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
 msgstr "Dark Yellow Transition"
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
 msgstr "Gray Transition"
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 msgid "Light Gray Transition"
 msgstr "Light Gray Transition"
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 msgid "Dark Gray Transition"
 msgstr "Dark Gray Transition"
 
-#: src/main/print-escp2.c:527
+#: src/main/print-escp2.c:544
 msgid "Mid Gray Transition"
 msgstr "Mid Gray Transition"
 
-#: src/main/print-escp2.c:528
+#: src/main/print-escp2.c:545
 msgid "Medium Gray Transition"
 msgstr "Medium Gray Transition"
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 msgid "Full Manual Control"
 msgstr "Full Manual Control"
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
 msgstr "Automatic Setting Control"
 
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr "CD - 5 inch"
-
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr "CD - 3 inch"
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr "Normal"
-
-#: src/main/print-escp2.c:1564
-msgid "Print To Hub"
-msgstr "Print To Hub"
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Manual Control"
 
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr "Standard"
+
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/main/print-escp2.c:1701
+#: src/main/print-escp2.c:1829
 msgid "Bidirectional"
 msgstr "Bidirectional"
 
-#: src/main/print-escp2.c:1703
+#: src/main/print-escp2.c:1831
 msgid "Unidirectional"
 msgstr "Unidirectional"
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
 msgstr "Alternate Fill"
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
 msgstr "Ascending Fill"
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
 msgstr "Descending Fill"
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
 msgstr "Ascending Double"
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
 msgstr "Nearest Neighbour Avoidance"
 
-#: src/main/print-escp2.c:2168
+#: src/main/print-escp2.c:2313
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "This printer does not support raw printer output at depth %d\n"
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print options not verified; cannot print.\n"
@@ -1642,247 +1310,300 @@ msgid "test print"
 msgstr "test print"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
 msgstr "Four Colour Standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
 msgstr "Three Colour Composite"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
 msgstr "Six Colour Photo"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
 msgstr "Five Colour Photo Composite"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+msgid "Plain Paper"
+msgstr "Plain Paper"
+
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
 msgstr "Glossy Film"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+msgid "Transparencies"
+msgstr "Transparencies"
+
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 msgid "Envelopes"
 msgstr "Envelopes"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 msgid "Matte Paper"
 msgstr "Matte Paper"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
 msgstr "Inkjet Paper"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
 msgstr "Photo Quality Inkjet Paper"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 msgid "Photo Paper"
 msgstr "Photo Paper"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium Glossy Photo Paper"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Lustre Photo Paper"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
 msgstr "Photo Quality Glossy Paper"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
-#: src/main/print-olympus.c:265
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr "Other"
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr "Auto Sheet Feeder"
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr "Manual with Pause"
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr "Manual without Pause"
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
 msgstr "Coated"
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
 msgstr "None"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 msgid "Glossy"
 msgstr "Glossy"
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
 msgstr "Texture"
 
-#: src/main/print-olympus.c:861
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 msgid "Matte"
 msgstr "Matte"
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
 msgstr "Laminate Pattern"
 
-#: src/main/print-olympus.c:1331
+#: src/main/print-olympus.c:1627
 msgid "Adjust the cyan balance"
 msgstr "Adjust the cyan balance"
 
-#: src/main/print-olympus.c:1339
+#: src/main/print-olympus.c:1635
 msgid "Adjust the magenta balance"
 msgstr "Adjust the magenta balance"
 
-#: src/main/print-olympus.c:1347
+#: src/main/print-olympus.c:1643
 msgid "Adjust the yellow balance"
 msgstr "Adjust the yellow balance"
 
-#: src/main/print-olympus.c:1354
+#: src/main/print-olympus.c:1650
 msgid "Black Balance"
 msgstr "Black Balance"
 
-#: src/main/print-olympus.c:1355
+#: src/main/print-olympus.c:1651
 msgid "Adjust the black balance"
 msgstr "Adjust the black balance"
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 msgid "Plain"
 msgstr "Plain"
 
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 msgid "Bond"
 msgstr "Bond"
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 msgid "Premium"
 msgstr "Premium"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
 msgstr "Glossy Photo"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 msgid "Transparency"
 msgstr "Transparency"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
 msgstr "Quick-dry Photo"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 msgid "Quick-dry Transparency"
 msgstr "Quick-dry Transparency"
 
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
 msgstr "Manual"
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 msgid "Tray 1"
 msgstr "Tray 1"
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 msgid "Tray 2"
 msgstr "Tray 2"
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 msgid "Tray 3"
 msgstr "Tray 3"
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 msgid "Tray 4"
 msgstr "Tray 4"
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
 msgstr "Portable Sheet Feeder"
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 msgid "Desktop Sheet Feeder"
 msgstr "Desktop Sheet Feeder"
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 msgid "Tray"
 msgstr "Tray"
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 msgid "Optional Source"
 msgstr "Optional Source"
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 msgid "Autoselect"
 msgstr "Autoselect"
 
 #: src/main/print-pcl.c:256
+msgid "150x150 DPI"
+msgstr "150×150 DPI"
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr "300×300 DPI"
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
+msgstr "600×300 DPI"
+
+#: src/main/print-pcl.c:259
 msgid "600x600 DPI monochrome"
 msgstr "600×600 DPI monochrome"
 
-#: src/main/print-pcl.c:259
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr "600×600 DPI"
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr "1200×600 DPI"
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
 msgstr "Colour + Black Cartridges"
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
 msgstr "Colour + Photo Cartridges"
 
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr "Long Edge (Standard)"
-
 #: src/main/print-ps.c:97
 msgid "PPDFile"
 msgstr "PPDFile"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 msgid "PPD File"
 msgstr "PPD File"
 
@@ -1890,164 +1611,267 @@ msgstr "PPD File"
 msgid "Image dimensions must match paper dimensions"
 msgstr "Image dimensions must match paper dimensions"
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 msgid "Two Level Grayscale"
 msgstr "Two Level Grayscale"
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 msgid "Three Level Grayscale"
 msgstr "Three Level Grayscale"
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
 msgstr "Six Colour Enhanced Composite"
 
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 msgid "Seven Color Photo"
 msgstr "Seven Colour Photo"
 
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 msgid "Seven Color Enhanced"
 msgstr "Seven Colour Enhanced"
 
-#: src/main/escp2-channels.c:1535
+#: src/main/escp2-channels.c:1649
 msgid "Eight Color Photo"
 msgstr "Eight Colour Photo"
 
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 msgid "One Color Raw"
 msgstr "One Colour Raw"
 
-#: src/main/escp2-channels.c:1695
+#: src/main/escp2-channels.c:1809
 msgid "One Color Raw Enhanced Gloss"
 msgstr "One Colour Raw Enhanced Gloss"
 
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 msgid "Two Color Raw"
 msgstr "Two Colour Raw"
 
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 msgid "Three Color Raw"
 msgstr "Three Colour Raw"
 
-#: src/main/escp2-channels.c:1762
+#: src/main/escp2-channels.c:1876
 msgid "Three Color Raw Gloss"
 msgstr "Three Colour Raw Gloss"
 
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 msgid "Four Color Raw"
 msgstr "Four Colour Raw"
 
-#: src/main/escp2-channels.c:1884
+#: src/main/escp2-channels.c:2017
 msgid "Four Color Raw Gloss"
 msgstr "Four Colour Raw Gloss"
 
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 msgid "Five Color Raw"
 msgstr "Five Colour Raw"
 
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 msgid "Six Color Raw"
 msgstr "Six Colour Raw"
 
-#: src/main/escp2-channels.c:1962
+#: src/main/escp2-channels.c:2109
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Six Colour Enhanced Gloss Raw"
 
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 msgid "Seven Color Raw"
 msgstr "Seven Colour Raw"
 
-#: src/main/escp2-channels.c:2024
+#: src/main/escp2-channels.c:2187
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Seven Colour Enhanced Gloss Raw"
 
-#: src/main/escp2-channels.c:2042
+#: src/main/escp2-channels.c:2205
 msgid "Eight Color Raw"
 msgstr "Eight Colour Raw"
 
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
 msgstr "EPSON Standard Inks"
 
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome Photo Black"
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
 msgstr "UltraChrome Matte Black"
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+msgid "Photo Black"
+msgstr "Photo Black"
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+msgid "Matte Black"
+msgstr "Matte Black"
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+msgid "Light Cyan"
+msgstr "Light Cyan"
+
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+msgid "Light Magenta"
+msgstr "Light Magenta"
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+msgid "Light Black"
+msgstr "Light Black"
+
+#: src/main/escp2-channels.c:2981
+msgid "Dark Yellow"
+msgstr "Dark Yellow"
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+msgid "Gloss Optimizer"
+msgstr "Gloss Optimiser"
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+msgid "Light Light Black"
+msgstr "Light Light Black"
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 msgid "Plain Paper Fast Load"
 msgstr "Plain Paper Fast Load"
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postcard"
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 msgid "Back Light Film"
 msgstr "Back Light Film"
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 msgid "Matte Paper Heavyweight"
 msgstr "Matte Paper Heavyweight"
 
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium Semigloss Photo Paper"
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 msgid "ColorLife Paper"
 msgstr "ColorLife Paper"
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 msgid "Archival Matte Paper"
 msgstr "Archival Matte Paper"
 
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
 msgstr "Watercolour Paper - Radiant White"
 
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+msgid "Roll Feed"
+msgstr "Roll Feed"
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr "Roll Feed (cut each page)"
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr "Roll Feed (do not cut)"
+
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+msgid "Manual Feed"
+msgstr "Manual Feed"
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+msgid "Print to CD"
+msgstr "Print to CD"
+
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+msgid "Manual Sheet Guide"
+msgstr "Manual Sheet Guide"
+
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+msgid "Manual Feed (Front)"
+msgstr "Manual Feed (Front)"
+
+#: src/main/escp2-papers.c:1859
+msgid "Rear Tray"
+msgstr "Rear Tray"
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr "Front Tray"
+
+#: src/main/escp2-papers.c:1886
+msgid "Photo Board"
+msgstr "Photo Board"
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr "Cut Sheet Bin 1"
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr "Cut Sheet Bin 2"
+
+#: src/main/escp2-papers.c:1943
+msgid "Cut Sheet Autoselect"
+msgstr "Cut Sheet Autoselect"
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr "Manual Selection"
+
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
 msgstr "360 × 90 DPI Fast Economy"
@@ -2081,121 +1905,146 @@ msgstr "360 DPI"
 msgid "720 x 360 DPI"
 msgstr "720 × 360 DPI"
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 × 360 DPI"
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/main/escp2-resolutions.c:94
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 msgid "720 DPI High Quality"
 msgstr "720 DPI High Quality"
 
-#: src/main/escp2-resolutions.c:97
+#: src/main/escp2-resolutions.c:103
 msgid "720 DPI Highest Quality"
 msgstr "720 DPI Highest Quality"
 
-#: src/main/escp2-resolutions.c:100
+#: src/main/escp2-resolutions.c:106
 msgid "720 x 720 DPI"
 msgstr "720 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 msgid "1440 x 720 DPI"
 msgstr "1440 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:116
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 × 720 DPI Highest Quality"
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 × 720 DPI Transposed"
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 msgid "2880 x 720 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:129
+#: src/main/escp2-resolutions.c:135
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 × 720 DPI Highest Quality"
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
+#: src/main/escp2-resolutions.c:145
 msgid "1440 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:142
-msgid "1440 x 1440"
-msgstr "1440 × 1440"
-
-#: src/main/escp2-resolutions.c:145
-msgid "1440 x 1440 DPI High Quality"
-msgstr "1440 × 1440 DPI High Quality"
-
-#: src/main/escp2-resolutions.c:148
-msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1440 × 1440 DPI Highest Quality"
-
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 msgid "2880 x 1440 DPI"
 msgstr "2880 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:158
+#: src/main/escp2-resolutions.c:155
 msgid "2880 x 1440 DPI Transposed"
 msgstr "2880 × 1440 DPI Transposed"
 
-#: src/main/escp2-resolutions.c:164
-msgid "2880 x 1440 DPI High Quality"
-msgstr "2880 × 1440 DPI High Quality"
-
-#: src/main/escp2-resolutions.c:167
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr "2880 × 1440 DPI Highest Quality"
-
-#: src/main/escp2-resolutions.c:171
+#: src/main/escp2-resolutions.c:162
 msgid "5760 x 1440 DPI"
 msgstr "5760 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 msgid "2880 x 2880 DPI"
 msgstr "2880 × 2880 DPI"
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 msgid "5760 x 2880 DPI"
 msgstr "5760 × 2880 DPI"
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
 msgstr "On"
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 msgid "Interleave"
 msgstr "Interleave"
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
 msgstr "Full Overlap"
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
 msgstr "Four Pass"
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
 msgstr "Full Overlap 2"
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 msgid "Interleave 2"
 msgstr "Interleave 2"
 
-#: src/main/escp2-resolutions.c:584
+#: src/main/escp2-resolutions.c:594
 msgid "Eight Pass"
 msgstr "Eight Pass"
 
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr "Fast Economy"
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr "Economy"
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr "Draft"
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+msgid "High"
+msgstr "High"
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+msgid "Photo"
+msgstr "Photo"
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+msgid "Super Photo"
+msgstr "Super Photo"
+
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+msgid "Ultra Photo"
+msgstr "Ultra Photo"
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr "Best"
+
 #: src/main/generic-options.c:46
 msgid "Text"
 msgstr "Text"
@@ -2264,3652 +2113,4000 @@ msgstr "Tabloid"
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
 msgstr "3×5"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
 msgstr "4×6"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/main/xmli18n-tmp.h:11
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 Photo Paper (tear-off borders)"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
 msgstr "5×7"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
 msgstr "5×8"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
 msgstr "6×8"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
 msgstr "8×10"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
 msgstr "12×18"
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
 msgstr "Super B 13×19"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17×22"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
 msgstr "8×12"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
 msgstr "11×14"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
 msgstr "16×20"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
 msgstr "16×24"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
 msgstr "20×24"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
 msgstr "20×30"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/main/xmli18n-tmp.h:26
 msgid "22x30"
 msgstr "22×30"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
 msgstr "24×30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
 msgstr "Super A1 24×36"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
 msgstr "30×40"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/main/xmli18n-tmp.h:32
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
 msgstr "A4"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/main/xmli18n-tmp.h:67
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 msgid "ArchA transposed"
 msgstr "ArchA transposed"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 msgid "ArchB transposed"
 msgstr "ArchB transposed"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 msgid "ArchC transposed"
 msgstr "ArchC transposed"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 msgid "ArchD transposed"
 msgstr "ArchD transposed"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 msgid "ArchE transposed"
 msgstr "ArchE transposed"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 msgid "American foolscap"
 msgstr "American foolscap"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 msgid "European foolscap"
 msgstr "European foolscap"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/main/xmli18n-tmp.h:109
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
 msgstr "ISO A5"
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 msgid "Small paperback"
 msgstr "Small paperback"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 msgid "Penguin small paperback"
 msgstr "Penguin small paperback"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 msgid "Penguin large paperback"
 msgstr "Penguin large paperback"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 msgid "Hagaki Card"
 msgstr "Hagaki Card"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
 msgstr "Oufuku Card"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
 msgstr "Japanese long envelope #3"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
 msgstr "Japanese long envelope #4"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanese Kaku envelope #4"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/main/xmli18n-tmp.h:125
+#: src/main/xmli18n-tmp.h:126
 msgid "Monarch Envelope"
 msgstr "Monarch Envelope"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
 msgstr "4×5 3/8"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/main/xmli18n-tmp.h:128
 msgid "4x7"
 msgstr "4×7"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
 msgstr "Card"
 
-#: src/main/xmli18n-tmp.h:130
+#: src/main/xmli18n-tmp.h:131
 msgid "Wide Postcard"
 msgstr "Wide Postcard"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 msgid "Custom"
 msgstr "Custom"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
 msgstr "89 mm Roll Paper"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
 msgstr "4 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
 msgstr "5 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
 msgstr "210 mm Roll Paper"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
 msgstr "13 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
 msgstr "22 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
 msgstr "24 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
 msgstr "36 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
 msgstr "44 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 1"
 msgstr "PostScript Level 1"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/main/xmli18n-tmp.h:146
 msgid "PostScript Level 2"
 msgstr "PostScript Level 2"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/main/xmli18n-tmp.h:147
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/main/xmli18n-tmp.h:148
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/main/xmli18n-tmp.h:148
+#: src/main/xmli18n-tmp.h:149
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/main/xmli18n-tmp.h:150
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/main/xmli18n-tmp.h:150
+#: src/main/xmli18n-tmp.h:151
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:151
+#: src/main/xmli18n-tmp.h:152
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/main/xmli18n-tmp.h:153
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/main/xmli18n-tmp.h:153
+#: src/main/xmli18n-tmp.h:154
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/main/xmli18n-tmp.h:154
+#: src/main/xmli18n-tmp.h:155
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/main/xmli18n-tmp.h:155
+#: src/main/xmli18n-tmp.h:156
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/main/xmli18n-tmp.h:156
+#: src/main/xmli18n-tmp.h:157
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/main/xmli18n-tmp.h:158
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/main/xmli18n-tmp.h:159
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/main/xmli18n-tmp.h:160
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/main/xmli18n-tmp.h:161
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/main/xmli18n-tmp.h:162
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/main/xmli18n-tmp.h:163
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/main/xmli18n-tmp.h:164
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:173
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:180
-msgid "Canon iP4000"
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:182
+#, fuzzy
+msgid "Canon PIXMA iP3000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:183
+#, fuzzy
+msgid "Canon PIXMA iP3100"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "Canon PIXMA iP4000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:185
+#, fuzzy
+msgid "Canon PIXMA iP4100"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:186
+#, fuzzy
+msgid "Canon PIXMA iP4200"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:187
+#, fuzzy
+msgid "Canon PIXMA iP4300"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:188
+#, fuzzy
+msgid "Canon PIXMA iP5000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "Canon PIXMA iP5200"
+msgstr "Canon CP-200"
+
+#: src/main/xmli18n-tmp.h:190
+#, fuzzy
+msgid "Canon PIXMA iP6700"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA MP150"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:192
+#, fuzzy
+msgid "Canon PIXMA MP500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:193
+#, fuzzy
+msgid "Canon PIXMA MP700"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA MP730"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:195
+#, fuzzy
+msgid "Canon PIXMA MP750"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA MP760"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA MP770"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA MP780"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:199
+#, fuzzy
+msgid "Canon PIXMA MP790"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP830"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXUS iP3100"
+msgstr "Canon S100"
+
+#: src/main/xmli18n-tmp.h:202
+#, fuzzy
+msgid "Canon PIXUS iP4100"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon i560"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:204
+#, fuzzy
+msgid "Canon i850"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon i860"
+msgstr "Canon S600"
+
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon BJC-85"
+
+#: src/main/xmli18n-tmp.h:207
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:208
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:209
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:210
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:211
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:212
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:213
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:214
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:215
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:216
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:217
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:218
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:219
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:220
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:221
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:222
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:223
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:224
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:225
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:226
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:227
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:228
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:229
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:230
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:231
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:232
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:233
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:234
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:235
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:236
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:237
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:238
+#, fuzzy
+msgid "Epson Stylus C79"
+msgstr "Epson Stylus C70"
+
+#: src/main/xmli18n-tmp.h:239
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:240
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:241
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:242
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:243
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:244
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:245
+#, fuzzy
+msgid "Epson Stylus C87"
+msgstr "Epson Stylus C48"
+
+#: src/main/xmli18n-tmp.h:246
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:247
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:248
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:249
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:250
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:251
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:252
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:253
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:254
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:255
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:256
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:257
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:258
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:259
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:260
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:261
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:262
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:263
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:264
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:265
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:266
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:267
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:268
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:269
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:270
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:271
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:272
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:273
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:274
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:275
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:276
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:277
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:278
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:279
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:280
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:281
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:282
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:283
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:284
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:285
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:286
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:287
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:288
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:289
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:290
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:291
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:292
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:293
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:294
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:295
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:296
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:297
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:298
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:299
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:300
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:301
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:302
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:303
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:304
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:305
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "Epson Stylus Photo 1400"
+msgstr "Epson Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "Epson Stylus Photo 1410"
+msgstr "Epson Stylus Photo 810"
+
+#: src/main/xmli18n-tmp.h:308
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:309
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:310
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:311
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:312
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:313
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:314
+#, fuzzy
+msgid "Epson Stylus Photo R230"
+msgstr "Epson Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:315
+#, fuzzy
+msgid "Epson Stylus Photo R240"
+msgstr "Epson Stylus Photo R2400"
+
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "Epson Stylus Photo R245"
+msgstr "Epson Stylus Photo RX425"
+
+#: src/main/xmli18n-tmp.h:317
+#, fuzzy
+msgid "Epson Stylus Photo R260"
+msgstr "Epson Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Epson Stylus Photo R265"
+msgstr "Epson Stylus Photo RX425"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "Epson Stylus Photo R270"
+msgstr "Epson Stylus Photo 1270"
+
+#: src/main/xmli18n-tmp.h:320
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:321
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:322
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:323
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "Epson Stylus Photo R350"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "Epson Stylus Photo R360"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "Epson Stylus Photo R380"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "Epson Stylus Photo R390"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:329
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:330
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:331
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:332
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:333
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Epson Stylus Photo RX560"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:335
+#, fuzzy
+msgid "Epson Stylus Photo RX580"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:336
+#, fuzzy
+msgid "Epson Stylus Photo RX590"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:337
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:338
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:339
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:340
+#, fuzzy
+msgid "Epson Stylus Photo RX640"
+msgstr "Epson Stylus Photo RX400"
+
+#: src/main/xmli18n-tmp.h:341
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:342
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:343
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:344
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:345
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:346
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:347
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:348
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:349
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:350
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:351
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:352
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:353
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:354
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:355
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:356
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:357
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:358
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:359
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:360
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:361
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:362
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:363
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:364
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:365
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:366
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:367
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:368
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:369
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:370
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:371
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:372
+#, fuzzy
+msgid "Epson Stylus CX5000"
+msgstr "Epson Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:373
+#, fuzzy
+msgid "Epson Stylus CX5000F"
+msgstr "Epson Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:374
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:375
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:376
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:377
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:378
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:379
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:380
+#, fuzzy
+msgid "Epson Stylus CX6000"
+msgstr "Epson Stylus CX3600"
+
+#: src/main/xmli18n-tmp.h:381
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:382
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:383
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:384
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX7000F"
+msgstr "Epson Stylus CX3700"
+
+#: src/main/xmli18n-tmp.h:386
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:387
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:388
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:389
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:390
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:391
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:392
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:393
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:394
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:395
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:396
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:397
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:399
+#, fuzzy
+msgid "Epson PictureMate Flash"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:400
+#, fuzzy
+msgid "Epson PictureMate Pal"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:401
+#, fuzzy
+msgid "Epson PictureMate Snap"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:402
+#, fuzzy
+msgid "Epson PictureMate 200"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:403
+#, fuzzy
+msgid "Epson PictureMate 210"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:404
+#, fuzzy
+msgid "Epson PictureMate 240"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:405
+#, fuzzy
+msgid "Epson PictureMate 250"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson PictureMate 280"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:411
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:414
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:417
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:426
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:427
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:428
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:429
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:430
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:448
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:454
+#, fuzzy
+msgid "Epson PM A820"
+msgstr "Epson PM A890"
+
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:462
+#, fuzzy
+msgid "Epson PM D870"
+msgstr "Epson PM 870C"
+
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
+#, fuzzy
+msgid "Epson PM G850"
+msgstr "Epson PM G800"
+
+#: src/main/xmli18n-tmp.h:470
+#, fuzzy
+msgid "Epson PM G4500"
+msgstr "Epson PM G700"
+
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:476
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Colour StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Colour StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Colour StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:549
 msgid "Generic PCL 4 Printer"
 msgstr "Generic PCL 4 Printer"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:550
 msgid "Generic PCL 5 Printer"
 msgstr "Generic PCL 5 Printer"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:551
 msgid "Generic PCL 5c Printer"
 msgstr "Generic PCL 5c Printer"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:552
 msgid "Generic PCL 5e Printer"
 msgstr "Generic PCL 5e Printer"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Generic PCL 6/PCL XL Printer"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:802
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+#, fuzzy
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Optra E"
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
 msgstr "Okidata OL400"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
 msgstr "Okidata OL400e"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
 msgstr "Okidata OL410e"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
 msgstr "Okidata OL600e"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
 msgstr "Okidata OL800"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:913
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:924
+#, fuzzy
+msgid "Xerox WorkCentre M118"
+msgstr "Xerox Document Centre 400"
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:926
+#, fuzzy
+msgid "Lexmark X73"
+msgstr "Lexmark Z43"
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+#, fuzzy
+msgid "Olympus P-S100"
+msgstr "Olympus P-10"
+
+#: src/main/xmli18n-tmp.h:942
+#, fuzzy
+msgid "Canon CP-10"
+msgstr "Canon CP-100"
+
+#: src/main/xmli18n-tmp.h:943
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:953
+#, fuzzy
+msgid "Sony DPP-EX5"
+msgstr "Sony UP-DR150"
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+#, fuzzy
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DR150"
+
+#: src/main/xmli18n-tmp.h:957
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:960
+#, fuzzy
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm Printpix-CX-400"
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Inch"
 msgstr "Inch"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
 msgstr "Set the base unit of measurement to inches"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Set the base unit of measurement to centimetres"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Points"
 msgstr "Points"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Set the base unit of measurement to points (1/72\")"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
 msgstr "mm"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Set the base unit of measurement to millimetres"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
 msgstr "Pica"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Set the base unit of measurement to picas (1/12\")"
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color output"
 msgstr "Colour output"
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
 msgstr "Print in shades of gray using black ink"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Standard Command"
 msgstr "Standard Command"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
 msgstr "Use standard print command"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Custom Command"
 msgstr "Custom Command"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
 msgstr "Use custom print command"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
 msgstr "File"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Print to a file"
 msgstr "Print to a file"
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
 msgstr "Edit Curve..."
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 msgid "Set Default"
 msgstr "Set Default"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
 msgstr "Restore Previous"
 
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Print v%s"
 
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
 msgstr "About"
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -5917,7 +6114,7 @@ msgstr ""
 "Print and\n"
 "Save Settings"
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 msgid ""
 "Save\n"
 "Settings"
@@ -5925,15 +6122,15 @@ msgstr ""
 "Save\n"
 "Settings"
 
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
 msgstr "Print"
 
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
 msgstr "Preview"
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -5957,73 +6154,73 @@ msgstr ""
 "If you click another button while dragging the mouse, the image will return "
 "to its original position."
 
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 msgid "Paper Size"
 msgstr "Paper Size"
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
 msgstr "Show All Paper Sizes"
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
 msgstr "Dimensions:"
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
 msgstr "Width:"
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 msgid "Width of the paper that you wish to print to"
 msgstr "Width of the paper that you wish to print to"
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
 msgstr "Height:"
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 msgid "Height of the paper that you wish to print to"
 msgstr "Height of the paper that you wish to print to"
 
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 msgid "Automatic Paper Size"
 msgstr "Automatic Paper Size"
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
 msgstr "Number of Copies"
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr "Select the number of copies to print; a value between 1 and 100"
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 msgid "Image Position"
 msgstr "Image Position"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
 msgstr "Portrait"
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
 msgstr "Landscape"
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 msgid "Upside down"
 msgstr "Upside down"
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
 msgstr "Seascape"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -6031,119 +6228,120 @@ msgstr ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 msgid "Orientation:"
 msgstr "Orientation:"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
 msgstr "Left:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
 msgstr "Distance from the left of the paper to the image"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
 msgstr "Right:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Distance from the left of the paper to the right of the image"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
 msgstr "Distance from the right of the paper to the image"
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
 msgstr "Top:"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
 msgstr "Distance from the top of the paper to the image"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
 msgstr "Bottom:"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Distance from the top of the paper to bottom of the image"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Distance from the bottom of the paper to the image"
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Center:"
 msgstr "Centre:"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
 msgstr "Centre the image horizontally on the paper"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
 msgstr "Both"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image on the paper"
 msgstr "Centre the image on the paper"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 msgid "Vertical"
 msgstr "Vertical"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Center the image vertically on the paper"
 msgstr "Centre the image vertically on the paper"
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
 msgstr "Setup Printer"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 msgid "Printer Make:"
 msgstr "Printer Make:"
 
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 msgid "Select the make of your printer"
 msgstr "Select the make of your printer"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 msgid "Printer Model:"
 msgstr "Printer Model:"
 
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 msgid "Select your printer model"
 msgstr "Select your printer model"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 msgid "PPD File:"
 msgstr "PPD File:"
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Enter the correct PPD filename for your printer"
 
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
 msgstr "Browse"
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Choose the correct PPD filename for your printer"
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
@@ -6151,96 +6349,52 @@ msgstr ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 msgid "Printer Queue:"
 msgstr "Printer Queue:"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 msgid "Enter the correct command to print to your printer. "
 msgstr "Enter the correct command to print to your printer. "
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
 msgstr "Enter the file to print to. "
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 msgid "File to print to"
 msgstr "File to print to"
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 msgid "Print To File"
 msgstr "Print To File"
 
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 msgid "Define New Printer"
 msgstr "Define New Printer"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 msgid "Printer Name:"
 msgstr "Printer Name:"
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Enter the name you wish to give this logical printer"
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 msgid "About Gutenprint "
 msgstr "About Gutenprint "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 msgid "Gutenprint Version "
 msgstr "Gutenprint Version "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 msgid "Printer Settings"
 msgstr "Printer Settings"
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6248,11 +6402,11 @@ msgstr ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 msgid "Setup Printer..."
 msgstr "Setup Printer..."
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -6260,11 +6414,11 @@ msgstr ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 msgid "New Printer..."
 msgstr "New Printer..."
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6272,23 +6426,23 @@ msgstr ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 msgid "Image Size"
 msgstr "Image Size"
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 msgid "Scaling:"
 msgstr "Scaling:"
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 msgid "Set the scale (size) of the image"
 msgstr "Set the scale (size) of the image"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
 msgstr "Scale by:"
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6296,31 +6450,31 @@ msgstr ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
 msgstr "Percent"
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 msgid "Scale the print to the size of the page"
 msgstr "Scale the print to the size of the page"
 
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
 msgstr "Scale the print to the number of dots per inch"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 msgid "Set the width of the print"
 msgstr "Set the width of the print"
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 msgid "Set the height of the print"
 msgstr "Set the height of the print"
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6328,102 +6482,102 @@ msgstr ""
 "Use Original\n"
 "Image Size"
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the print size to the size of the image"
 msgstr "Set the print size to the size of the image"
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 msgid "Print Color Adjust"
 msgstr "Print Colour Adjust"
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 msgid "Set Defaults"
 msgstr "Set Defaults"
 
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
 msgstr "Close"
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 msgid "Image preview"
 msgstr "Image preview"
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
 msgstr "View Output Channels:"
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 msgid "Output"
 msgstr "Output"
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 msgid "Output Type:"
 msgstr "Output Type:"
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 msgid "Select the desired output type"
 msgstr "Select the desired output type"
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
 msgstr "Adjust Output..."
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Adjust colour balance, brightness, contrast, saturation, and dither algorithm"
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 msgid "Size Units:"
 msgstr "Size Units:"
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 msgid " "
 msgstr " "
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 msgid "Units:"
 msgstr "Units:"
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 msgid "Select the base unit of measurement for printing"
 msgstr "Select the base unit of measurement for printing"
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
 msgstr "System V lp"
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
 msgstr "CUPS"
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
 msgstr "Berkeley lpd (/etc/lpc)"
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
 msgstr "Berkeley lpd (/usr/bsd/lpc)"
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
 msgstr "Berkeley lpd (/usr/etc/lpc"
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
 msgstr "Berkeley lpd (/usr/libexec/lpc)"
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 msgid "Printer"
 msgstr "Printer"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 msgid "(Default Printer)"
 msgstr "(Default Printer)"
 
@@ -6471,59 +6625,85 @@ msgstr "Maximum possible value for Y"
 msgid "_Gamma value"
 msgstr "_Gamma value"
 
-#: src/cups/genppd.c:133
+#: src/cups/genppd.c:146
 msgid "Printer Features"
 msgstr "Printer Features"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 msgid "Output Control"
 msgstr "Output Control"
 
-#: src/cups/genppd.c:139
+#: src/cups/genppd.c:152
 msgid "Common"
 msgstr "Common"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:153
 msgid "Extra 1"
 msgstr "Extra 1"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:154
 msgid "Extra 2"
 msgstr "Extra 2"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:155
 msgid "Extra 3"
 msgstr "Extra 3"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:156
 msgid "Extra 4"
 msgstr "Extra 4"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
 msgstr "Extra 5"
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr "English-GB"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 msgid "ISOLatin1"
 msgstr "UTF-8"
 
-#: src/cups/genppd.c:1465
+#: src/cups/genppd.c:1613
+#, fuzzy
+msgid "2-Sided Printing"
+msgstr "Double-Sided Printing"
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1717
 msgid "No"
 msgstr "No"
 
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1719
 msgid "Yes"
 msgstr "Yes"
 
-#: src/cups/genppd.c:1497
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#, fuzzy
+msgid "Value"
+msgstr "Blue"
+
+#: src/cups/genppd.c:1756
 msgid "Fine Adjustment"
 msgstr "Fine Adjustment"
 
@@ -6531,18 +6711,6 @@ msgstr "Fine Adjustment"
 msgid "Escputil version "
 msgstr "Escputil version "
 
-#: src/escputil/escputil.c:71
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-", Copyright © 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-
 #: src/escputil/escputil.c:76
 msgid ""
 "Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
@@ -7545,3 +7713,217 @@ msgstr "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 #, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
+
+#, fuzzy
+#~ msgid "Model Name"
+#~ msgstr "Channel Names"
+
+#, fuzzy
+#~ msgid "Canon MULTIPASS MP500"
+#~ msgstr "Canon S500"
+
+#, fuzzy
+#~ msgid "Canon MULTIPASS MP760"
+#~ msgstr "Canon LBP-1760"
+
+#~ msgid "Cassette"
+#~ msgstr "Cassette"
+
+#~ msgid "CD tray"
+#~ msgstr "CD tray"
+
+#~ msgid " Gamma"
+#~ msgstr " Gamma"
+
+#~ msgid " Curve"
+#~ msgstr " Curve"
+
+#~ msgid "1440 x 1440"
+#~ msgstr "1440 × 1440"
+
+#~ msgid "1440 x 1440 DPI High Quality"
+#~ msgstr "1440 × 1440 DPI High Quality"
+
+#~ msgid "1440 x 1440 DPI Highest Quality"
+#~ msgstr "1440 × 1440 DPI Highest Quality"
+
+#~ msgid "2880 x 1440 DPI High Quality"
+#~ msgstr "2880 × 1440 DPI High Quality"
+
+#~ msgid "2880 x 1440 DPI Highest Quality"
+#~ msgstr "2880 × 1440 DPI Highest Quality"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "and the rest of the Gutenprint Development Team.\n"
+#~ "\n"
+#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "and the rest of the Gutenprint Development Team.\n"
+#~ "\n"
+#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
+
+#~ msgid ""
+#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
+#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
+#~ "l'\n"
+#~ "This is free software, and you are welcome to redistribute it\n"
+#~ "under certain conditions; type 'escputil -l' for details.\n"
+#~ msgstr ""
+#~ ", Copyright © 2000-2006 Robert Krawitz\n"
+#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
+#~ "l'\n"
+#~ "This is free software, and you are welcome to redistribute it\n"
+#~ "under certain conditions; type 'escputil -l' for details.\n"
+
+#~ msgid "90x90 DPI"
+#~ msgstr "90×90 DPI"
+
+#~ msgid "90x90 DPI DMT"
+#~ msgstr "90×90 DPI DMT"
+
+#~ msgid "180x180 DPI"
+#~ msgstr "180×180 DPI"
+
+#~ msgid "180x180 DPI DMT"
+#~ msgstr "180×180 DPI DMT"
+
+#~ msgid "360x360 DPI"
+#~ msgstr "360×360 DPI"
+
+#~ msgid "360x360 DPI DMT"
+#~ msgstr "360×360 DPI DMT"
+
+#~ msgid "720x360 DPI"
+#~ msgstr "720×360 DPI"
+
+#~ msgid "720x360 DPI DMT"
+#~ msgstr "720×360 DPI DMT"
+
+#~ msgid "720x720 DPI"
+#~ msgstr "720×720 DPI"
+
+#~ msgid "720x720 DPI DMT"
+#~ msgstr "720×720 DPI DMT"
+
+#~ msgid "1440x720 DPI"
+#~ msgstr "1440×720 DPI"
+
+#~ msgid "1440x720 DPI DMT"
+#~ msgstr "1440×720 DPI DMT"
+
+#~ msgid "1440x1440 DPI"
+#~ msgstr "1440×1440 DPI DMT"
+
+#~ msgid "1440x1440 DPI DMT"
+#~ msgstr "1440×1440 DPI DMT"
+
+#~ msgid "2880x2880 DPI"
+#~ msgstr "2880×2880 DPI"
+
+#~ msgid "2880x2880 DPI DMT"
+#~ msgstr "2880×2880 DPI DMT"
+
+#~ msgid "150x150 DPI DMT"
+#~ msgstr "150×150 DPI DMT"
+
+#~ msgid "300x300 DPI DMT"
+#~ msgstr "300×300 DPI DMT"
+
+#~ msgid "600x300 DPI DMT"
+#~ msgstr "600×300 DPI DMT"
+
+#~ msgid "600x600 DPI DMT"
+#~ msgstr "600×600 DPI DMT"
+
+#~ msgid "1200x600 DPI DMT"
+#~ msgstr "1200×600 DPI DMT"
+
+#~ msgid "1200x1200 DPI"
+#~ msgstr "1200×1200 DPI"
+
+#~ msgid "1200x1200 DPI DMT"
+#~ msgstr "1200×1200 DPI DMT"
+
+#~ msgid "2400x2400 DPI"
+#~ msgstr "2400×2400 DPI"
+
+#~ msgid "2400x2400 DPI DMT"
+#~ msgstr "2400×2400 DPI DMT"
+
+#~ msgid "Plain Paper PIXMA"
+#~ msgstr "Plain Paper PIXMA"
+
+#~ msgid "Back Print Film"
+#~ msgstr "Back Print Film"
+
+#~ msgid "Fabric Sheets"
+#~ msgstr "Fabric Sheets"
+
+#~ msgid "Envelope"
+#~ msgstr "Envelope"
+
+#~ msgid "High Resolution Paper"
+#~ msgstr "High Resolution Paper"
+
+#~ msgid "T-Shirt Transfers"
+#~ msgstr "T-Shirt Transfers"
+
+#~ msgid "High Gloss Film"
+#~ msgstr "High Gloss Film"
+
+#~ msgid "Glossy Photo Paper"
+#~ msgstr "Glossy Photo Paper"
+
+#~ msgid "Glossy Photo Cards"
+#~ msgstr "Glossy Photo Cards"
+
+#~ msgid "Photo Paper Pro"
+#~ msgstr "Photo Paper Pro"
+
+#~ msgid "Photo CcMmYK Color"
+#~ msgstr "Photo CcMmYK Colour"
+
+#~ msgid "Photo CcMmY Color"
+#~ msgstr "Photo CcMmY Colour"
+
+#~ msgid "CMYK Color"
+#~ msgstr "CMYK Colour"
+
+#~ msgid "CMY Color"
+#~ msgstr "CMY Colour"
diff --git a/po/es.gmo b/po/es.gmo
index d1ba5de..25525cf 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index fe795a6..0425082 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,22 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\n"
 "PO-Revision-Date: 2002-04-29 00:38GMT\n"
 "Last-Translator: Gustavo D. Vranjes <gvranjes@abaconet.com.ar>\n"
 "Language-Team: Castellano <es@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0beta1\n"
 
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 #, fuzzy
 msgid "Default"
-msgstr "Establecer por Omisión"
+msgstr "Establecer por Omisión"
 
 #: src/main/dither-main.c:47
 #, fuzzy
@@ -57,7 +57,7 @@ msgstr ""
 
 #: src/main/dither-main.c:63
 msgid "Adaptive Hybrid"
-msgstr "Híbrido Adaptativo"
+msgstr "Híbrido Adaptativo"
 
 #: src/main/dither-main.c:64
 msgid "Ordered"
@@ -65,15 +65,15 @@ msgstr "Ordenado"
 
 #: src/main/dither-main.c:65
 msgid "Fast"
-msgstr "Rápido"
+msgstr "Rápido"
 
 #: src/main/dither-main.c:66
 msgid "Very Fast"
-msgstr "Muy Rápido"
+msgstr "Muy Rápido"
 
 #: src/main/dither-main.c:67
 msgid "Hybrid Floyd-Steinberg"
-msgstr "Floyd-Steinberg Híbrido"
+msgstr "Floyd-Steinberg Híbrido"
 
 #: src/main/dither-main.c:68
 msgid "Predithered Input"
@@ -84,18 +84,18 @@ msgstr ""
 msgid "Density"
 msgstr "Densidad:"
 
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -105,9 +105,9 @@ msgid ""
 "ink bleeds through the paper or smears; increase the density if black "
 "regions are not solid."
 msgstr ""
-"Ajusta la densidad (cantidad de tinta de la impresión.Reducir la densidad si "
+"Ajusta la densidad (cantidad de tinta de la impresión.Reducir la densidad si "
 "la tinta se difumina sobre el papel; aumentar la densidad si las regiones "
-"negras no son sólidas."
+"negras no son sólidas."
 
 #: src/main/dither-main.c:97
 msgid "Dither Algorithm"
@@ -130,12 +130,12 @@ msgid ""
 "Hybrid Floyd-Steinberg generally produces inferior output."
 msgstr ""
 "Elija el algoritmo de entramado a usar.\n"
-"El Híbrido Adaptivo normalmente produce la mejor calidad en general.\n"
-"El Ordenado es más rápido y produce una calidad casi tan buena como\n"
-"el anterior para fotografías.\n"
-"El Rápido y Muy Rápido son considerablemente más rápidos, y funcionan\n"
+"El Híbrido Adaptivo normalmente produce la mejor calidad en general.\n"
+"El Ordenado es más rápido y produce una calidad casi tan buena como\n"
+"el anterior para fotografías.\n"
+"El Rápido y Muy Rápido son considerablemente más rápidos, y funcionan\n"
 "bien para texto y arte lineal.\n"
-"El Floyd-Steinberg Híbrido en general produce una salida inferior.\n"
+"El Floyd-Steinberg Híbrido en general produce una salida inferior.\n"
 
 #: src/main/module.c:52
 msgid "Miscellaneous (unclassified)"
@@ -154,503 +154,316 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmo de Entramado"
 
-#: src/main/print-canon.c:1382
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
-msgid "90x90 DPI"
-msgstr "600 PPP"
-
-#: src/main/print-canon.c:1382
-#, fuzzy
-msgid "90x90 DPI DMT"
-msgstr "600 PPP"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI"
-msgstr "150x150 PPP"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI DMT"
-msgstr "150x150 PPP"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI"
-msgstr "300x300 PPP"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI DMT"
-msgstr "600x600 PPP"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI"
-msgstr "720 x 360 PPP"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI DMT"
-msgstr "720 x 360 PPP MW2"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI"
-msgstr "2880 x 720 PPP"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI DMT"
-msgstr "2880 x 720 PPP"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI"
-msgstr "1440 x 720 PPP"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI DMT"
-msgstr "1440 x 720 PPP"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI"
-msgstr "1440 x 1440 PPP"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI DMT"
-msgstr "1440 x 1440 PPP"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI"
-msgstr "2880 x 720 PPP"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI DMT"
-msgstr "2880 x 720 PPP"
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr "150x150 PPP"
-
-#: src/main/print-canon.c:1390
-#, fuzzy
-msgid "150x150 DPI DMT"
-msgstr "150x150 PPP"
-
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
-msgstr "300x300 PPP"
-
-#: src/main/print-canon.c:1391
-#, fuzzy
-msgid "300x300 DPI DMT"
-msgstr "300x300 PPP"
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr "600x300 PPP"
-
-#: src/main/print-canon.c:1392
-#, fuzzy
-msgid "600x300 DPI DMT"
-msgstr "600x300 PPP"
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr "600x600 PPP"
-
-#: src/main/print-canon.c:1393
-#, fuzzy
-msgid "600x600 DPI DMT"
-msgstr "600x600 PPP"
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr "1200x600 PPP"
-
-#: src/main/print-canon.c:1394
-#, fuzzy
-msgid "1200x600 DPI DMT"
-msgstr "1200x600 PPP"
-
-#: src/main/print-canon.c:1395
+msgid "Page Size"
+msgstr "Tamaño"
+
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
 #, fuzzy
-msgid "1200x1200 DPI"
-msgstr "1200x600 PPP"
+msgid "Basic Printer Setup"
+msgstr "Configuración de la Impresora"
 
-#: src/main/print-canon.c:1395
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 #, fuzzy
-msgid "1200x1200 DPI DMT"
-msgstr "1200x600 PPP"
+msgid "Size of the paper being printed to"
+msgstr "Tamaño del papel al que desea imprimir"
 
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI"
-msgstr "2400x600 PPP"
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
+msgid "Media Type"
+msgstr "Tipo de Medio"
 
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI DMT"
-msgstr "2400x600 PPP"
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
+msgid "Type of media (plain paper, photo paper, etc.)"
+msgstr ""
 
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-msgid "Plain Paper"
-msgstr "Papel Común"
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
+msgid "Media Source"
+msgstr "Fuente de Medio"
 
-#: src/main/print-canon.c:1448
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
 #, fuzzy
-msgid "Plain Paper PIXMA"
-msgstr "Papel Común"
-
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-msgid "Transparencies"
-msgstr "Transparencias"
-
-#: src/main/print-canon.c:1450
-msgid "Back Print Film"
-msgstr "Película para Imprimir por Atrás"
-
-#: src/main/print-canon.c:1451
-msgid "Fabric Sheets"
-msgstr "Hojas de Tela"
-
-#: src/main/print-canon.c:1452
-msgid "Envelope"
-msgstr "Sobre"
-
-#: src/main/print-canon.c:1453
-msgid "High Resolution Paper"
-msgstr "Papel de Alta Resolución"
-
-#: src/main/print-canon.c:1454
-msgid "T-Shirt Transfers"
-msgstr "Transferencias a Remeras"
-
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
-msgstr "Película de Alto Brillo"
+msgid "Source (input slot) of the media"
+msgstr "Origen del medio (ranura de entrada) al que está imprimiendo"
 
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
-msgstr "Papel Brillante de Fotografía"
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
+msgstr ""
 
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
-msgstr "Tarjetas Brillantes de Fotografía"
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr ""
 
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
-msgstr "Papel de Fotografía Profesional"
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
+msgstr ""
 
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
-msgstr "Otro"
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
 
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
-#, fuzzy
-msgid "Page Size"
-msgstr "Tamaño"
-
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
-#, fuzzy
-msgid "Basic Printer Setup"
-msgstr "Configuración de la Impresora"
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+msgid "CD Hub Size (Custom)"
+msgstr ""
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
 #, fuzzy
-msgid "Size of the paper being printed to"
-msgstr "Tamaño del papel al que desea imprimir"
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "Redimensionar la impresión al tamaño de la página"
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
-msgid "Media Type"
-msgstr "Tipo de Medio"
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
+msgstr ""
 
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
-msgid "Type of media (plain paper, photo paper, etc.)"
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
-msgid "Media Source"
-msgstr "Fuente de Medio"
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr ""
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
-#, fuzzy
-msgid "Source (input slot) of the media"
-msgstr "Origen del medio (ranura de entrada) al que está imprimiendo"
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
+msgstr ""
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
-msgstr "Resolución"
+msgstr "Resolución"
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
-msgstr "Resolución y calidad de la impresión"
+msgstr "Resolución y calidad de la impresión"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tipo de Tinta"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr ""
-
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tipo de tinta de la impresora"
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Modelo de Impresora:"
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
-msgstr "Papel Común"
+msgstr "Papel Común"
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 #, fuzzy
 msgid "Adjust the cyan density"
-msgstr "Ajustar el balance de cian de la impresión"
+msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 #, fuzzy
 msgid "Adjust the magenta density"
-msgstr "Ajusta el balance magenta de la impresión"
+msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Adjust the yellow density"
-msgstr "Ajusta el balance amarillo de la impresión"
+msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 #, fuzzy
 msgid "Adjust the black density"
-msgstr "Ajustar el balance de cian de la impresión"
+msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Magenta Claro"
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
-msgid "Short Edge (Flip)"
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-msgid "Auto Sheet Feeder"
-msgstr "Autoalimentador de Hojas"
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+msgid "Short Edge (Flip)"
+msgstr ""
 
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-msgid "Manual with Pause"
-msgstr "Manual con Pausa"
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
+msgstr ""
 
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
-msgstr "Manual sin Pausa"
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
+msgstr ""
 
-#: src/main/print-canon.c:1923
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
 #, fuzzy
-msgid "Cassette"
-msgstr "Papel Opaco"
+msgid "CD - Custom"
+msgstr "Personalizado"
 
-#: src/main/print-canon.c:1924
-msgid "CD tray"
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:2049
-msgid "Photo CcMmYK Color"
-msgstr "Color CcMmYK para Fotografía"
-
-#: src/main/print-canon.c:2052
-msgid "Photo CcMmY Color"
-msgstr "Color CcMmY para Fotografía"
-
-#: src/main/print-canon.c:2055
-msgid "CMYK Color"
-msgstr "Color CMYK (Cian/Mag/Amar/Negro)"
-
-#: src/main/print-canon.c:2058
-msgid "CMY Color"
-msgstr "Color CMY (Cian/Mag/Amar)"
-
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
-msgstr "Negro"
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#, fuzzy
+msgid "Print To Hub"
+msgstr "¿Imprimir a un archivo?"
 
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
 msgstr "Color"
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
@@ -663,7 +476,7 @@ msgstr ""
 #: src/main/print-color.c:51
 #, fuzzy
 msgid "Bright Colors"
-msgstr "Ajuste de Impresión en Color"
+msgstr "Ajuste de Impresión en Color"
 
 #: src/main/print-color.c:52
 msgid "Correct Hue Only"
@@ -690,9 +503,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Imprimir"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
 msgstr "Tonos de gris"
 
@@ -722,11 +535,6 @@ msgstr ""
 msgid "Channel "
 msgstr "Cancelar"
 
-#: src/main/print-color.c:165
-#, fuzzy
-msgid " Gamma"
-msgstr "Gamma:"
-
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
 #: src/main/print-color.c:266 src/main/print-color.c:274
@@ -784,7 +592,7 @@ msgid "Output image type"
 msgstr "Tipo de salida:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
 msgstr ""
 
@@ -805,7 +613,7 @@ msgstr "Brillo:"
 #: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
-msgstr "Establecer el alto de la impresión"
+msgstr "Establecer el alto de la impresión"
 
 #: src/main/print-color.c:232
 #, fuzzy
@@ -839,9 +647,9 @@ msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
 msgstr ""
-"Ajusta el gamma de la impresión. Valores más grandes producirán generalmente "
-"una impresión más clara, mientras que valores más pequeñosproducirán "
-"generalmente una impresión más oscura. Negro y blanco permanecerán iguales, "
+"Ajusta el gamma de la impresión. Valores más grandes producirán generalmente "
+"una impresión más clara, mientras que valores más pequeñosproducirán "
+"generalmente una impresión más oscura. Negro y blanco permanecerán iguales, "
 "distinto a lo que sucede con el ajuste de brillo.."
 
 #: src/main/print-color.c:258
@@ -853,13 +661,13 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
@@ -868,15 +676,15 @@ msgstr "Cian"
 #: src/main/print-color.c:267
 #, fuzzy
 msgid "Adjust the cyan gamma"
-msgstr "Ajustar el balance de cian de la impresión"
-
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+msgstr "Ajustar el balance de cian de la impresión"
+
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 msgid "Magenta"
@@ -885,15 +693,15 @@ msgstr "Magenta"
 #: src/main/print-color.c:275
 #, fuzzy
 msgid "Adjust the magenta gamma"
-msgstr "Ajusta el balance magenta de la impresión"
-
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+msgstr "Ajusta el balance magenta de la impresión"
+
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
@@ -902,11 +710,11 @@ msgstr "Amarillo"
 #: src/main/print-color.c:283
 #, fuzzy
 msgid "Adjust the yellow gamma"
-msgstr "Ajusta el balance amarillo de la impresión"
+msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
 msgstr ""
@@ -914,21 +722,21 @@ msgstr ""
 #: src/main/print-color.c:291
 #, fuzzy
 msgid "Adjust the red gamma"
-msgstr "Ajusta el balance amarillo de la impresión"
+msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
 msgstr ""
 
 #: src/main/print-color.c:299
 #, fuzzy
 msgid "Adjust the green gamma"
-msgstr "Ajusta el balance magenta de la impresión"
+msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
 msgstr ""
@@ -936,14 +744,26 @@ msgstr ""
 #: src/main/print-color.c:307
 #, fuzzy
 msgid "Adjust the blue gamma"
-msgstr "Ajustar el balance de cian de la impresión"
+msgstr "Ajustar el balance de cian de la impresión"
+
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr "Negro"
 
 #: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
-msgstr "Ajustar el balance de cian de la impresión"
+msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
 msgstr ""
 
@@ -956,9 +776,9 @@ msgstr "Tonos de gris"
 #: src/main/print-color.c:323
 #, fuzzy
 msgid "Adjust the cyan gray balance"
-msgstr "Ajustar el balance de cian de la impresión"
+msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -966,30 +786,30 @@ msgstr "Magenta"
 #: src/main/print-color.c:331
 #, fuzzy
 msgid "Adjust the magenta gray balance"
-msgstr "Ajusta el balance magenta de la impresión"
+msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 #, fuzzy
 msgid "Yellow Balance"
-msgstr "Ajusta el balance amarillo de la impresión"
+msgstr "Ajusta el balance amarillo de la impresión"
 
 #: src/main/print-color.c:339
 #, fuzzy
 msgid "Adjust the yellow gray balance"
-msgstr "Ajusta el balance amarillo de la impresión"
+msgstr "Ajusta el balance amarillo de la impresión"
 
 #: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
-msgstr "Saturación:"
+msgstr "Saturación:"
 
 #: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
-"Ajusta la saturación (balance de color) de la impresión\n"
-"Usar saturación cero para producir salida de tonos de grises usando tintas "
+"Ajusta la saturación (balance de color) de la impresión\n"
+"Usar saturación cero para producir salida de tonos de grises usando tintas "
 "color y negro."
 
 #: src/main/print-color.c:357
@@ -999,9 +819,9 @@ msgstr "Tipo de Tinta"
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Tipo de salida:"
@@ -1034,11 +854,6 @@ msgstr ""
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:446
-#, fuzzy
-msgid " Curve"
-msgstr "Negro"
-
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
@@ -1147,7 +962,7 @@ msgstr ""
 #: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
-msgstr "Saturación:"
+msgstr "Saturación:"
 
 #: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
@@ -1169,584 +984,388 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:516 src/main/printers.c:521
+#: src/main/printers.c:519 src/main/printers.c:524
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
-msgstr "%s no es un parámetreo válido del tipo %s\n"
+msgstr "%s no es un parámetreo válido del tipo %s\n"
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:673
+#: src/main/printers.c:676
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Impresora desconocida %s\n"
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
-msgstr "%s fuera de rango (valor %d, mín %d, máx %d)\n"
+msgstr "%s fuera de rango (valor %d, mín %d, máx %d)\n"
 
-#: src/main/printers.c:755
+#: src/main/printers.c:761
 #, fuzzy
 msgid "Page size is not valid\n"
-msgstr "La medida de la imagen no es válida\n"
+msgstr "La medida de la imagen no es válida\n"
 
-#: src/main/printers.c:776
+#: src/main/printers.c:782
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "El margen superior no debe ser menos que cero\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:788
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "El margen izquierdo no debe ser menos que cero\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:794
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "El margen izquierdo no debe ser menos que cero\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:800
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "El margen superior no debe ser menos que cero\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr "Estándar"
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-msgid "Roll Feed"
-msgstr "Alimentación por Rollo"
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-#, fuzzy
-msgid "Manual Feed"
-msgstr "Manual"
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-#, fuzzy
-msgid "Print to CD"
-msgstr "¿Imprimir a un archivo?"
-
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-#, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Manual"
-
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-#, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Manual"
-
-#: src/main/print-escp2-data.c:554
-#, fuzzy
-msgid "Rear Tray"
-msgstr "Bandeja"
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr ""
-
-#: src/main/print-escp2-data.c:581
-#, fuzzy
-msgid "Photo Board"
-msgstr "Papel para Fotografía"
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr ""
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr ""
-
-#: src/main/print-escp2-data.c:638
-#, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "Autoseleccionar"
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr ""
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr ""
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-#, fuzzy
-msgid "High"
-msgstr "Altura:"
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-#, fuzzy
-msgid "Photo"
-msgstr "Fotografía"
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-#, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
-
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-#, fuzzy
-msgid "Ultra Photo"
-msgstr "Fotografía de Seis Colores"
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-#, fuzzy
-msgid "Light Cyan"
-msgstr "Cian Claro"
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-#, fuzzy
-msgid "Light Magenta"
-msgstr "Magenta Claro"
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-#, fuzzy
-msgid "Light Black"
-msgstr "Negro"
-
-#: src/main/print-escp2-data.c:811
-#, fuzzy
-msgid "Dark Yellow"
-msgstr "Amarillo"
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-#, fuzzy
-msgid "Matte Black"
-msgstr "Papel Opaco"
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-#, fuzzy
-msgid "Photo Black"
-msgstr "Papel para Fotografía"
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-#, fuzzy
-msgid "Gloss Optimizer"
-msgstr "Película Brillante"
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-#, fuzzy
-msgid "Light Light Black"
-msgstr "Negro"
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 #, fuzzy
 msgid "Print Quality"
-msgstr "720 PPP Altísima Calidad"
-
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr ""
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr ""
+msgstr "720 PPP Altísima Calidad"
 
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr ""
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:214
+#: src/main/print-escp2.c:228
 #, fuzzy
 msgid "Resolution of the print"
-msgstr "Resolución y calidad de la impresión"
+msgstr "Resolución y calidad de la impresión"
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:236
+#: src/main/print-escp2.c:250
 #, fuzzy
 msgid "Ink Set"
 msgstr "Tipo de Tinta"
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 #, fuzzy
 msgid "Output Order"
 msgstr "Tipo de salida:"
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 #, fuzzy
 msgid "Ink change command"
 msgstr "Comando no reconocido.\n"
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 #, fuzzy
 msgid "Alternate Alignment Choices"
-msgstr "Repitiendo el proceso de alineación.\n"
+msgstr "Repitiendo el proceso de alineación.\n"
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 #, fuzzy
 msgid "Channel Names"
 msgstr "Cancelar"
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:346
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Cian"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:347
 #, fuzzy
 msgid "Adjust the cyan map"
-msgstr "Ajustar el balance de cian de la impresión"
+msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:352
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Adjust the magenta map"
-msgstr "Ajusta el balance magenta de la impresión"
+msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:358
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Amarillo"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Adjust the yellow map"
-msgstr "Ajusta el balance amarillo de la impresión"
+msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:364
 #, fuzzy
 msgid "Blue Map"
 msgstr "Blanco y Negro"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Adjust the blue map"
-msgstr "Ajustar el balance de cian de la impresión"
+msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Adjust the red map"
-msgstr "Ajusta el balance amarillo de la impresión"
+msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:447
+#: src/main/print-escp2.c:464
 #, fuzzy
 msgid "Red Density"
 msgstr "Densidad:"
 
-#: src/main/print-escp2.c:448
+#: src/main/print-escp2.c:465
 #, fuzzy
 msgid "Adjust the red density"
-msgstr "Ajusta el balance amarillo de la impresión"
+msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:455
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Blue Density"
 msgstr "Densidad:"
 
-#: src/main/print-escp2.c:456
+#: src/main/print-escp2.c:473
 #, fuzzy
 msgid "Adjust the blue density"
-msgstr "Ajustar el balance de cian de la impresión"
+msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-escp2.c:463
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Gloss Level"
-msgstr "Película Brillante"
+msgstr "Película Brillante"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:481
 #, fuzzy
 msgid "Adjust the gloss level"
-msgstr "Ajusta el balance amarillo de la impresión"
+msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:527
+#: src/main/print-escp2.c:544
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:528
+#: src/main/print-escp2.c:545
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Tipo de salida:"
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr ""
-
-#: src/main/print-escp2.c:1564
-#, fuzzy
-msgid "Print To Hub"
-msgstr "¿Imprimir a un archivo?"
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Tipo de salida:"
 
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr "Estándar"
+
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 #, fuzzy
 msgid "Automatic"
-msgstr "Tamaño"
+msgstr "Tamaño"
 
-#: src/main/print-escp2.c:1701
+#: src/main/print-escp2.c:1829
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:1703
+#: src/main/print-escp2.c:1831
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2168
+#: src/main/print-escp2.c:2313
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "La impresora no soporta salida de color\n"
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1777,7 +1396,7 @@ msgstr "1200 PPP alta calidad"
 
 #: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659
 msgid "1200 DPI highest quality"
-msgstr "1200 PPP altísima calidad"
+msgstr "1200 PPP altísima calidad"
 
 #: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660
 msgid "1200 DPI  Unidirectional"
@@ -1793,452 +1412,623 @@ msgstr "2400 PPP x 1200 PPP alta calidad"
 
 #: src/main/print-lexmark.c:587
 msgid "2400 DPI x 1200 DPI highest quality"
-msgstr "2400 PPP x 1200 PPP altísima calidad"
+msgstr "2400 PPP x 1200 PPP altísima calidad"
 
 #: src/main/print-lexmark.c:589
 msgid "test print"
-msgstr "prueba de impresión"
+msgstr "prueba de impresión"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
-msgstr "Cuatro Colores Estándard"
+msgstr "Cuatro Colores Estándard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
 msgstr "Tres Colores Compuestos"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
-msgstr "Fotografía de Seis Colores"
+msgstr "Fotografía de Seis Colores"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
-msgstr "Fotografía Compuesta de Cinco Colores"
+msgstr "Fotografía Compuesta de Cinco Colores"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+msgid "Plain Paper"
+msgstr "Papel Común"
+
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
-msgstr "Película Brillante"
+msgstr "Película Brillante"
+
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+msgid "Transparencies"
+msgstr "Transparencias"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 msgid "Envelopes"
 msgstr "Sobres"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 msgid "Matte Paper"
 msgstr "Papel Opaco"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
 msgstr "Papel para Chorro de Tinta"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
-msgstr "Papel de Calidad Fotográfica para Chorro de Tinta"
+msgstr "Papel de Calidad Fotográfica para Chorro de Tinta"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 msgid "Photo Paper"
-msgstr "Papel para Fotografía"
+msgstr "Papel para Fotografía"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
-msgstr "Papel Brillante de Altísima Calidad Fotográfica"
+msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
-msgstr "Papel de Fotografía Premium Luster"
+msgstr "Papel de Fotografía Premium Luster"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
-msgstr "Papel Brillante de Calidad Fotográfica"
+msgstr "Papel Brillante de Calidad Fotográfica"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
 msgstr "Papel Pesado Ilford"
 
-#: src/main/print-olympus.c:265
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr "Otro"
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr "Autoalimentador de Hojas"
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr "Manual con Pausa"
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr "Manual sin Pausa"
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 #, fuzzy
 msgid "Glossy"
-msgstr "Película Brillante"
+msgstr "Película Brillante"
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:861
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 #, fuzzy
 msgid "Matte"
 msgstr "Papel Opaco"
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1331
+#: src/main/print-olympus.c:1627
 #, fuzzy
 msgid "Adjust the cyan balance"
-msgstr "Ajustar el balance de cian de la impresión"
+msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-olympus.c:1339
+#: src/main/print-olympus.c:1635
 #, fuzzy
 msgid "Adjust the magenta balance"
-msgstr "Ajusta el balance magenta de la impresión"
+msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-olympus.c:1347
+#: src/main/print-olympus.c:1643
 #, fuzzy
 msgid "Adjust the yellow balance"
-msgstr "Ajusta el balance amarillo de la impresión"
+msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-olympus.c:1354
+#: src/main/print-olympus.c:1650
 #, fuzzy
 msgid "Black Balance"
 msgstr "Blanco y Negro"
 
-#: src/main/print-olympus.c:1355
+#: src/main/print-olympus.c:1651
 #, fuzzy
 msgid "Adjust the black balance"
-msgstr "Ajustar el balance de cian de la impresión"
+msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 msgid "Plain"
-msgstr "Común"
+msgstr "Común"
 
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 msgid "Bond"
 msgstr "Bond"
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 #, fuzzy
 msgid "Premium"
 msgstr "Premium"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
-msgstr "Fotografía Brillante"
+msgstr "Fotografía Brillante"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
-msgstr "Fotografía de Secado Rápido"
+msgstr "Fotografía de Secado Rápido"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 msgid "Quick-dry Transparency"
-msgstr "Transparencia de Secado Rápido"
+msgstr "Transparencia de Secado Rápido"
 
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
 msgstr "Manual"
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 msgid "Tray 1"
 msgstr "Bandeja 1"
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 msgid "Tray 2"
 msgstr "Bandeja 2"
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 msgid "Tray 3"
 msgstr "Bandeja 3"
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 msgid "Tray 4"
 msgstr "Bandeja 4"
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
 msgstr "Alimentador Portable de Hojas"
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 msgid "Desktop Sheet Feeder"
 msgstr "Alimentador de Hojas de Escritorio"
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 msgid "Tray"
 msgstr "Bandeja"
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 msgid "Optional Source"
 msgstr "Fuente Opcional"
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 msgid "Autoselect"
 msgstr "Autoseleccionar"
 
 #: src/main/print-pcl.c:256
+msgid "150x150 DPI"
+msgstr "150x150 PPP"
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr "300x300 PPP"
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
+msgstr "600x300 PPP"
+
+#: src/main/print-pcl.c:259
 msgid "600x600 DPI monochrome"
 msgstr "600x600 PPP monocromo"
 
-#: src/main/print-pcl.c:259
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr "600x600 PPP"
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr "1200x600 PPP"
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
 msgstr "2400x600 PPP"
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
 msgstr "Cartuchos Negro + Color"
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
-msgstr "Cartuchos Color + Fotografía"
-
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr ""
+msgstr "Cartuchos Color + Fotografía"
 
 #: src/main/print-ps.c:97
 #, fuzzy
 msgid "PPDFile"
 msgstr "Archivo PPD:"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 #, fuzzy
 msgid "PPD File"
-msgstr "¿Archivo PPD?"
+msgstr "¿Archivo PPD?"
 
 #: src/main/print-raw.c:223
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Tonos de gris"
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 #, fuzzy
 msgid "Three Level Grayscale"
 msgstr "Tonos de gris"
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
 msgstr "Seis Colores Compuestos Mejorados"
 
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 #, fuzzy
 msgid "Seven Color Photo"
-msgstr "Fotografía de Seis Colores"
+msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 msgid "Seven Color Enhanced"
 msgstr "Siete Colores Mejorados"
 
-#: src/main/escp2-channels.c:1535
+#: src/main/escp2-channels.c:1649
 #, fuzzy
 msgid "Eight Color Photo"
-msgstr "Fotografía de Seis Colores"
+msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 #, fuzzy
 msgid "One Color Raw"
-msgstr "Fotografía de Seis Colores"
+msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1695
+#: src/main/escp2-channels.c:1809
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Siete Colores Mejorados"
 
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 #, fuzzy
 msgid "Two Color Raw"
-msgstr "Cuatro Colores Estándard"
+msgstr "Cuatro Colores Estándard"
 
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Tres Colores Compuestos"
 
-#: src/main/escp2-channels.c:1762
+#: src/main/escp2-channels.c:1876
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Tres Colores Compuestos"
 
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 #, fuzzy
 msgid "Four Color Raw"
-msgstr "Cuatro Colores Estándard"
+msgstr "Cuatro Colores Estándard"
 
-#: src/main/escp2-channels.c:1884
+#: src/main/escp2-channels.c:2017
 #, fuzzy
 msgid "Four Color Raw Gloss"
-msgstr "Cuatro Colores Estándard"
+msgstr "Cuatro Colores Estándard"
 
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 #, fuzzy
 msgid "Five Color Raw"
-msgstr "Fotografía de Seis Colores"
+msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 #, fuzzy
 msgid "Six Color Raw"
-msgstr "Fotografía de Seis Colores"
+msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1962
+#: src/main/escp2-channels.c:2109
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seis Colores Compuestos Mejorados"
 
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 #, fuzzy
 msgid "Seven Color Raw"
-msgstr "Fotografía de Seis Colores"
+msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:2024
+#: src/main/escp2-channels.c:2187
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Siete Colores Mejorados"
 
-#: src/main/escp2-channels.c:2042
+#: src/main/escp2-channels.c:2205
 #, fuzzy
 msgid "Eight Color Raw"
-msgstr "Fotografía de Seis Colores"
-
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+msgstr "Fotografía de Seis Colores"
+
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 #, fuzzy
 msgid "UltraChrome Photo Black"
-msgstr "Fotografía de Seis Colores"
+msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#, fuzzy
+msgid "Photo Black"
+msgstr "Papel para Fotografía"
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+#, fuzzy
+msgid "Matte Black"
+msgstr "Papel Opaco"
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+#, fuzzy
+msgid "Light Cyan"
+msgstr "Cian Claro"
+
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+#, fuzzy
+msgid "Light Magenta"
+msgstr "Magenta Claro"
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+#, fuzzy
+msgid "Light Black"
+msgstr "Negro"
+
+#: src/main/escp2-channels.c:2981
+#, fuzzy
+msgid "Dark Yellow"
+msgstr "Amarillo"
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#, fuzzy
+msgid "Gloss Optimizer"
+msgstr "Película Brillante"
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Negro"
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 msgid "Plain Paper Fast Load"
-msgstr "Papel Común Carga Rápida"
+msgstr "Papel Común Carga Rápida"
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postal"
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 #, fuzzy
 msgid "Back Light Film"
 msgstr "Back Light Film"
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Papel Opaco"
 
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
-msgstr "Papel Brillante de Altísima Calidad Fotográfica"
+msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 #, fuzzy
 msgid "ColorLife Paper"
-msgstr "Papel Común"
+msgstr "Papel Común"
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Papel Opaco"
 
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+msgid "Roll Feed"
+msgstr "Alimentación por Rollo"
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#, fuzzy
+msgid "Manual Feed"
+msgstr "Manual"
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+#, fuzzy
+msgid "Print to CD"
+msgstr "¿Imprimir a un archivo?"
+
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Manual"
+
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Manual"
+
+#: src/main/escp2-papers.c:1859
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Bandeja"
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/escp2-papers.c:1886
+#, fuzzy
+msgid "Photo Board"
+msgstr "Papel para Fotografía"
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr ""
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr ""
+
+#: src/main/escp2-papers.c:1943
+#, fuzzy
+msgid "Cut Sheet Autoselect"
+msgstr "Autoseleccionar"
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr ""
+
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
@@ -2278,144 +2068,168 @@ msgstr "600 PPP"
 msgid "720 x 360 DPI"
 msgstr "720 x 360 PPP"
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 PPP"
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 PPP"
 
-#: src/main/escp2-resolutions.c:94
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 #, fuzzy
 msgid "720 DPI High Quality"
 msgstr "1200 PPP alta calidad"
 
-#: src/main/escp2-resolutions.c:97
+#: src/main/escp2-resolutions.c:103
 #, fuzzy
 msgid "720 DPI Highest Quality"
-msgstr "1200 PPP altísima calidad"
+msgstr "1200 PPP altísima calidad"
 
-#: src/main/escp2-resolutions.c:100
+#: src/main/escp2-resolutions.c:106
 #, fuzzy
 msgid "720 x 720 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
-msgstr "1440 x 360 PPP Altísima Calidad "
+msgstr "1440 x 360 PPP Altísima Calidad "
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:129
+#: src/main/escp2-resolutions.c:135
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
-msgstr "1440 x 360 PPP Altísima Calidad "
+msgstr "1440 x 360 PPP Altísima Calidad "
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
+#: src/main/escp2-resolutions.c:145
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/escp2-resolutions.c:142
-#, fuzzy
-msgid "1440 x 1440"
-msgstr "1440 x 1440 PPP"
-
-#: src/main/escp2-resolutions.c:145
-#, fuzzy
-msgid "1440 x 1440 DPI High Quality"
-msgstr "1440 x 360 PPP Altísima Calidad "
-
-#: src/main/escp2-resolutions.c:148
-#, fuzzy
-msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1440 x 360 PPP Altísima Calidad "
-
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/escp2-resolutions.c:158
+#: src/main/escp2-resolutions.c:155
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/escp2-resolutions.c:164
-#, fuzzy
-msgid "2880 x 1440 DPI High Quality"
-msgstr "1440 x 360 PPP Altísima Calidad "
-
-#: src/main/escp2-resolutions.c:167
-#, fuzzy
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr "1440 x 360 PPP Altísima Calidad "
-
-#: src/main/escp2-resolutions.c:171
+#: src/main/escp2-resolutions.c:162
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 #, fuzzy
 msgid "Interleave"
 msgstr "Nombre de la Impresora:"
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Nombre de la Impresora:"
 
-#: src/main/escp2-resolutions.c:584
+#: src/main/escp2-resolutions.c:594
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Brillo:"
 
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+#, fuzzy
+msgid "High"
+msgstr "Altura:"
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografía"
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+#, fuzzy
+msgid "Super Photo"
+msgstr "Stylus Photo"
+
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+#, fuzzy
+msgid "Ultra Photo"
+msgstr "Fotografía de Seis Colores"
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr ""
+
 #: src/main/generic-options.c:46
 msgid "Text"
 msgstr ""
@@ -2431,7 +2245,7 @@ msgstr ""
 #: src/main/generic-options.c:49
 #, fuzzy
 msgid "Photograph"
-msgstr "Fotografía"
+msgstr "Fotografía"
 
 #: src/main/generic-options.c:50
 msgid "Line Art"
@@ -2440,7 +2254,7 @@ msgstr "Arte lineal"
 #: src/main/generic-options.c:55
 #, fuzzy
 msgid "Page"
-msgstr "Tamaño"
+msgstr "Tamaño"
 
 #: src/main/generic-options.c:56
 msgid "Job"
@@ -2467,12 +2281,12 @@ msgstr ""
 #: src/main/generic-options.c:80
 #, fuzzy
 msgid "Page Number"
-msgstr "Tamaño"
+msgstr "Tamaño"
 
 #: src/main/generic-options.c:81
 #, fuzzy
 msgid "Page number"
-msgstr "Tamaño"
+msgstr "Tamaño"
 
 #: src/main/xmli18n-tmp.h:1
 msgid "Letter"
@@ -2490,3898 +2304,4222 @@ msgstr "Tabloide"
 msgid "Executive"
 msgstr "Ejecutivo"
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/main/xmli18n-tmp.h:11
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
-msgstr "Papel Epson 4x6 de Fotografía"
+msgstr "Papel Epson 4x6 de Fotografía"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/main/xmli18n-tmp.h:26
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/main/xmli18n-tmp.h:32
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
 msgstr "A4"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/main/xmli18n-tmp.h:67
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 #, fuzzy
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 #, fuzzy
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 #, fuzzy
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 #, fuzzy
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 #, fuzzy
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 #, fuzzy
 msgid "American foolscap"
 msgstr "Foolscap Americano"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 #, fuzzy
 msgid "European foolscap"
 msgstr "Foolscap Europeo"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 #, fuzzy
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 #, fuzzy
 msgid "Large Crown Quarto"
 msgstr "Crown Quarto Grande"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 #, fuzzy
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 #, fuzzy
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/main/xmli18n-tmp.h:109
 #, fuzzy
 msgid "ISO A4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 #, fuzzy
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 #, fuzzy
 msgid "Large Crown Octavo"
 msgstr "Crown Octavo Grande"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 #, fuzzy
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 #, fuzzy
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 #, fuzzy
 msgid "Small paperback"
-msgstr "Paperback pequeño"
+msgstr "Paperback pequeño"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 #, fuzzy
 msgid "Penguin small paperback"
-msgstr "Penguin paperback pequeño"
+msgstr "Penguin paperback pequeño"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 #, fuzzy
 msgid "Penguin large paperback"
 msgstr "Penguin paperback grande"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 msgid "Hagaki Card"
 msgstr "Tarjeta Hagaki"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
 msgstr "Tarjeta Oufuku"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
-msgstr "Sobre Japonés grande #3"
+msgstr "Sobre Japonés grande #3"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
-msgstr "Sobre Japonés grande #4"
+msgstr "Sobre Japonés grande #4"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 msgid "Japanese Kaku envelope #4"
-msgstr "Sobre Japonés Kaku #4"
+msgstr "Sobre Japonés Kaku #4"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr "Comercial 10"
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 msgid "A2 Invitation"
-msgstr "A2 Invitación"
+msgstr "A2 Invitación"
 
-#: src/main/xmli18n-tmp.h:125
+#: src/main/xmli18n-tmp.h:126
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Sobre"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:127
+#: src/main/xmli18n-tmp.h:128
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:130
+#: src/main/xmli18n-tmp.h:131
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Postal"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 msgid "Custom"
 msgstr "Personalizado"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
 msgstr "Rollo de Papel de 89 mm"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
 msgstr "Rollo de Papel de 4 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
 msgstr "Rollo de Papel de 5 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
 msgstr "Rollo de Papel de 210 mm"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
 msgstr "Rollo de Papel de 13 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
 msgstr "Rollo de Papel de 22 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
 msgstr "Rollo de Papel de 24 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
 msgstr "Rollo de Papel de 36 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
 msgstr "Rollo de Papel de 44 Pulgadas"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:145
+#: src/main/xmli18n-tmp.h:146
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:146
+#: src/main/xmli18n-tmp.h:147
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:147
+#: src/main/xmli18n-tmp.h:148
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/main/xmli18n-tmp.h:149
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:149
+#: src/main/xmli18n-tmp.h:150
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/main/xmli18n-tmp.h:151
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/main/xmli18n-tmp.h:152
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:152
+#: src/main/xmli18n-tmp.h:153
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/main/xmli18n-tmp.h:154
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/main/xmli18n-tmp.h:155
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
+#: src/main/xmli18n-tmp.h:156
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:156
+#: src/main/xmli18n-tmp.h:157
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:157
+#: src/main/xmli18n-tmp.h:158
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:158
+#: src/main/xmli18n-tmp.h:159
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:159
+#: src/main/xmli18n-tmp.h:160
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:160
+#: src/main/xmli18n-tmp.h:161
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:161
+#: src/main/xmli18n-tmp.h:162
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:162
+#: src/main/xmli18n-tmp.h:163
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:163
+#: src/main/xmli18n-tmp.h:164
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:164
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:173
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
-msgid "Canon iP4000"
+#: src/main/xmli18n-tmp.h:181
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:182
+msgid "Canon PIXMA iP3000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:183
+msgid "Canon PIXMA iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:184
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:185
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:186
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:187
+#, fuzzy
+msgid "Canon PIXMA iP4300"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:188
+#, fuzzy
+msgid "Canon PIXMA iP5000"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
+#, fuzzy
+msgid "Canon PIXMA iP6700"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA MP150"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:192
+#, fuzzy
+msgid "Canon PIXMA MP500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:193
+#, fuzzy
+msgid "Canon PIXMA MP700"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA MP730"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:195
+#, fuzzy
+msgid "Canon PIXMA MP750"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA MP760"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA MP770"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA MP780"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
+#, fuzzy
+msgid "Canon PIXMA MP790"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP830"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:201
+msgid "Canon PIXUS iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:202
+msgid "Canon PIXUS iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:203
+msgid "Canon i560"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:204
+msgid "Canon i850"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:205
+msgid "Canon i860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:206
+msgid "Canon i865"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:238
+#, fuzzy
+msgid "Epson Stylus C79"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:245
+#, fuzzy
+msgid "Epson Stylus C87"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "Epson Stylus Photo 1400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "Epson Stylus Photo 1410"
+msgstr "Stylus Photo 810"
+
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:314
+#, fuzzy
+msgid "Epson Stylus Photo R230"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:315
+#, fuzzy
+msgid "Epson Stylus Photo R240"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "Epson Stylus Photo R245"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:317
+#, fuzzy
+msgid "Epson Stylus Photo R260"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Epson Stylus Photo R265"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "Epson Stylus Photo R270"
+msgstr "Stylus Photo 1270"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "Epson Stylus Photo R350"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "Epson Stylus Photo R360"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "Epson Stylus Photo R380"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "Epson Stylus Photo R390"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Epson Stylus Photo RX560"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:335
+#, fuzzy
+msgid "Epson Stylus Photo RX580"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:336
+#, fuzzy
+msgid "Epson Stylus Photo RX590"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:340
+#, fuzzy
+msgid "Epson Stylus Photo RX640"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:353
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:372
+#, fuzzy
+msgid "Epson Stylus CX5000"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:373
+#, fuzzy
+msgid "Epson Stylus CX5000F"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:380
+#, fuzzy
+msgid "Epson Stylus CX6000"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX7000F"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:397
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:399
+msgid "Epson PictureMate Flash"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:400
+msgid "Epson PictureMate Pal"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:401
+msgid "Epson PictureMate Snap"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:402
+#, fuzzy
+msgid "Epson PictureMate 200"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:403
+#, fuzzy
+msgid "Epson PictureMate 210"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:404
+#, fuzzy
+msgid "Epson PictureMate 240"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:405
+#, fuzzy
+msgid "Epson PictureMate 250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson PictureMate 280"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:411
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:414
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:417
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:426
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:427
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:428
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:429
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:430
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:448
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:451
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:454
+#, fuzzy
+msgid "Epson PM A820"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:456
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:459
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:460
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:462
+#, fuzzy
+msgid "Epson PM D870"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:463
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:464
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:465
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:467
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:468
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
+#, fuzzy
+msgid "Epson PM G850"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:470
+#, fuzzy
+msgid "Epson PM G4500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:471
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:472
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:473
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:474
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:475
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:478
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:549
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:550
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:551
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:552
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:802
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Nombre de la Impresora:"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+msgid "Lexmark Optra E220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:913
 #, fuzzy
 msgid "Star LaserPrinter 8"
-msgstr "Configuración de la Impresora"
+msgstr "Configuración de la Impresora"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:924
+msgid "Xerox WorkCentre M118"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:926
+msgid "Lexmark X73"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+msgid "Olympus P-S100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:942
+msgid "Canon CP-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:943
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:953
+msgid "Sony DPP-EX5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:957
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:960
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Inch"
 msgstr "Pulgada"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
 msgstr "Seleccionar la unidad base de medida a pulgadas"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
-msgstr "Seleccionar la unidad base de medida a pulgadas a centímetros"
+msgstr "Seleccionar la unidad base de medida a pulgadas a centímetros"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Points"
 msgstr "Imprimir"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Seleccionar la unidad base de medida a pulgadas"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
-msgstr "Seleccionar la unidad base de medida a pulgadas a centímetros"
+msgstr "Seleccionar la unidad base de medida a pulgadas a centímetros"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Seleccionar la unidad base de medida a pulgadas"
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color output"
 msgstr "Salida de color"
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
 msgstr "Imprimir en sombras de gris usando tinta negra"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 #, fuzzy
 msgid "Standard Command"
-msgstr "Estándar"
+msgstr "Estándar"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Custom Command"
 msgstr "Comando:"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
 msgstr "Archivo"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Print to a file"
-msgstr "¿Imprimir a un archivo?"
+msgstr "¿Imprimir a un archivo?"
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 #, fuzzy
 msgid "Set Default"
-msgstr "Establecer por Omisión"
+msgstr "Establecer por Omisión"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
 msgstr "Aceptar"
 
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Imprimir v%s"
 
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
 msgstr "Acerca de"
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 #, fuzzy
 msgid ""
 "Print and\n"
 "Save Settings"
-msgstr "Configuración de la Impresora"
+msgstr "Configuración de la Impresora"
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 #, fuzzy
 msgid ""
 "Save\n"
 "Settings"
 msgstr "Guardar Conf."
 
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 #, fuzzy
 msgid ""
 "Position the image on the page.\n"
@@ -6396,214 +6534,215 @@ msgid ""
 "to its original position."
 msgstr ""
 "Posicione la imagen en la hoja.\n"
-"Seleccione y arrastre con el primer botón para posicionar la imagen.\n"
-"Seleccione y arrastre con el segundo botón para mover la imagen con\n"
-"mayor precisión; cada unidad de movimiento mueve la imagen un punto\n"
+"Seleccione y arrastre con el primer botón para posicionar la imagen.\n"
+"Seleccione y arrastre con el segundo botón para mover la imagen con\n"
+"mayor precisión; cada unidad de movimiento mueve la imagen un punto\n"
 "(1/72\")\n"
-"Seleccione y arrastre con el tercer botón (el medio) para mover la\n"
-"imagen en unidades del tamaño de la imagen.\n"
+"Seleccione y arrastre con el tercer botón (el medio) para mover la\n"
+"imagen en unidades del tamaño de la imagen.\n"
 "Sosteniendo la tecla 'shift' mientras se hace click y arrastra restringe\n"
 "el movimiento de la imagen a los ejes vertical y horizontal solamente.\n"
-"Si presiona otro botón mientras arrastra el ratón, la imagen volverá a\n"
-"posición original\n"
+"Si presiona otro botón mientras arrastra el ratón, la imagen volverá a\n"
+"posición original\n"
 
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 #, fuzzy
 msgid "Paper Size"
-msgstr "Tamaño"
+msgstr "Tamaño"
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
 msgstr "Dimensiones:"
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
 msgstr "Ancho:"
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 msgid "Width of the paper that you wish to print to"
 msgstr "Ancho del papel al que desea imprimir"
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
 msgstr "Altura:"
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 msgid "Height of the paper that you wish to print to"
 msgstr "Altura del papel al que desea imprimir"
 
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 #, fuzzy
 msgid "Automatic Paper Size"
-msgstr "Tamaño"
+msgstr "Tamaño"
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 #, fuzzy
 msgid "Image Position"
-msgstr "Posición"
+msgstr "Posición"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
-msgstr "Automático"
+msgstr "Automático"
 
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
 msgstr "Vertical"
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
 msgstr "Apaisado"
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 msgid "Upside down"
 msgstr "Invertido"
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
 msgstr "Horizontal invertido"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
-"Seleccionar la orientación: vertical, horizontal, invertido,  ú horizontal "
+"Seleccionar la orientación: vertical, horizontal, invertido,  ú horizontal "
 "invertido "
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 msgid "Orientation:"
-msgstr "Orientación:"
+msgstr "Orientación:"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
 msgstr "Izquierda:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
 msgstr "Distancia desde el borde izquierdo del papel al borde de la imagen"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
 msgstr "Derecha:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 msgid "Distance from the left of the paper to the right of the image"
 msgstr ""
 "Distancia desde el borde izquierdo del papel al borde derecho de la imagen"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
 msgstr "Distancia desde el borde derecho del papel al borde de la imagen"
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
 msgstr "Arriba:"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
 msgstr "Distancia desde el borde superior del papel al borde de la imagen"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
 msgstr "Abajo:"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr ""
 "Distancia desde el borde superior del papel al borde inferior de la imagen"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Distancia desde el borde inferior del papel al borde de la imagen"
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Center:"
 msgstr "Centrado: "
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
 msgstr "Centrar la imagen horizontalmente en el papel"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
 msgstr "Ambos"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image on the paper"
 msgstr "Centrar la imagen en el papel"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 #, fuzzy
 msgid "Vertical"
 msgstr "Vertical"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Center the image vertically on the paper"
 msgstr "Centrar la imagen verticalmente en el papel"
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
-msgstr "Configuración de la Impresora"
+msgstr "Configuración de la Impresora"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Nombre de la Impresora:"
 
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Seleccionar su madelo de impresora"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 msgid "Printer Model:"
 msgstr "Modelo de Impresora:"
 
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 msgid "Select your printer model"
 msgstr "Seleccionar su madelo de impresora"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 msgid "PPD File:"
 msgstr "Archivo PPD:"
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Ingrese el nombre de archivo PPD correcto para su impresora"
 
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
 msgstr "Explorar"
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Elija el nombre de archivo PPD correcto para su impresora"
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -6612,103 +6751,58 @@ msgstr ""
 "Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al "
 "que desea imprimir"
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Nombre de la Impresora:"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Ingrese el nombre de archivo PPD correcto para su impresora"
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 #, fuzzy
 msgid "File to print to"
-msgstr "prueba de impresión"
+msgstr "prueba de impresión"
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 #, fuzzy
 msgid "Print To File"
-msgstr "¿Imprimir a un archivo?"
+msgstr "¿Imprimir a un archivo?"
 
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 msgid "Define New Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 msgid "Printer Name:"
 msgstr "Nombre de la Impresora:"
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 msgid "Enter the name you wish to give this logical printer"
-msgstr "Ingrese el nombre que desea dar a ésta impresora lógica"
+msgstr "Ingrese el nombre que desea dar a ésta impresora lógica"
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Acerca de Gimp-Print..."
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 #, fuzzy
 msgid "Gutenprint Version "
-msgstr "Versión de Gimp-Print "
+msgstr "Versión de Gimp-Print "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
-"\n"
-"\n"
-"Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n"
-"y el resto del Equipo de Desarrollo del Gimp-Print.\n"
-"\n"
-"Favor de visitar nuetro web site en http://gimp-print.sourceforge.net.\n"
-"\n"
-"Éste programa es software libre, usted puede redistribuirlo y/o modificarlo\n"
-"bajo los términos de la Licencia General Pública GNU tal como se la publica\n"
-"por la Fundación de Software Libre; o la versión 2 de la Licencia, o (a su\n"
-"opción) cualquier versión posterior.\n"
-"\n"
-"Éste programa se distribuye con el deseo de que sea útil, pero SIN NINGUNA\n"
-"GARANTÍA; aún sin la garantía implícita de MERCANTIBILIDAD o AJUSTE PARA UN\n"
-"PROPÓSITO PARTICULAR. Vea la Licencia General Pública GNU para más "
-"detalles.\n"
-"\n"
-"Usted debe haber recibido una copia de la Licencia General Pública GNU\n"
-"junto con éste programa; si no, escriba a la Fundación de Software\n"
-"Libre, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 USA\n"
-
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 msgid "Printer Settings"
-msgstr "Configuración de la Impresora"
+msgstr "Configuración de la Impresora"
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6716,80 +6810,80 @@ msgstr ""
 "Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al "
 "que desea imprimir"
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 msgid "Setup Printer..."
 msgstr "Conf. Impresora..."
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 "Elegir el modelo de impresora, archivo PPD, y comando que se usa para "
-"imprimir a ésta impresora"
+"imprimir a ésta impresora"
 
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 msgid "New Printer..."
 msgstr "Impresora Nueva..."
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr ""
-"Definir una nueva impresora lógica. Ésta puede ser usada para nombrar una "
-"colección de configuraciones que usted desea recordar para uso futuro."
+"Definir una nueva impresora lógica. Ésta puede ser usada para nombrar una "
+"colección de configuraciones que usted desea recordar para uso futuro."
 
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 #, fuzzy
 msgid "Image Size"
-msgstr "Tamaño"
+msgstr "Tamaño"
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 msgid "Scaling:"
 msgstr "Escala:"
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 msgid "Set the scale (size) of the image"
-msgstr "Establecer la escala (el tamaño) de la imagen"
+msgstr "Establecer la escala (el tamaño) de la imagen"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
 msgstr "Escalar por:"
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 "Seleccionar si la escala se mide como porcentaje de la medida del papel "
-"disponible o número de puntos por pulgada en la salida."
+"disponible o número de puntos por pulgada en la salida."
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
 msgstr "Porcentaje"
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 msgid "Scale the print to the size of the page"
-msgstr "Redimensionar la impresión al tamaño de la página"
+msgstr "Redimensionar la impresión al tamaño de la página"
 
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid "PPI"
 msgstr "PPP"
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
-msgstr "Redimensionar la impresión al tamaño de los puntos por pulgada"
+msgstr "Redimensionar la impresión al tamaño de los puntos por pulgada"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 msgid "Set the width of the print"
-msgstr "Establecer el ancho de la impresión"
+msgstr "Establecer el ancho de la impresión"
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 msgid "Set the height of the print"
-msgstr "Establecer el alto de la impresión"
+msgstr "Establecer el alto de la impresión"
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6797,110 +6891,110 @@ msgstr ""
 "Usar Medida Orig.\n"
 "de la Imagen"
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the print size to the size of the image"
-msgstr "Establecer la medida de impresión a la medida de la imagen"
+msgstr "Establecer la medida de impresión a la medida de la imagen"
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 msgid "Print Color Adjust"
-msgstr "Ajuste de Impresión en Color"
+msgstr "Ajuste de Impresión en Color"
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 msgid "Set Defaults"
-msgstr "Establecer por Omisión"
+msgstr "Establecer por Omisión"
 
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 msgid "Image preview"
 msgstr "Vista previa de imagen"
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 #, fuzzy
 msgid "Output"
 msgstr "Tipo de salida:"
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 msgid "Output Type:"
 msgstr "Tipo de salida:"
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 msgid "Select the desired output type"
 msgstr "Seleccionar el tipo de salida deseado"
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
 msgstr "Ajustar Salida..."
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Ajustar balance de color, brillo, contraste, saturacion, y algoritmo de "
 "entramado"
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 #, fuzzy
 msgid "Size Units:"
 msgstr "Unidades:"
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 msgid "Units:"
 msgstr "Unidades:"
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 msgid "Select the base unit of measurement for printing"
 msgstr "Seleccionar la unidad base de medida para imprimir"
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
 msgstr ""
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
 msgstr ""
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
 msgstr ""
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 #, fuzzy
 msgid "Printer"
 msgstr "Imprimir"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 #, fuzzy
 msgid "(Default Printer)"
-msgstr "Configuración de la Impresora"
+msgstr "Configuración de la Impresora"
 
 #: src/gutenprintui2/curve.c:130
 #, fuzzy
@@ -6947,66 +7041,90 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:133
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Printer Features"
-msgstr "Configuración de la Impresora"
+msgstr "Configuración de la Impresora"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 #, fuzzy
 msgid "Output Control"
 msgstr "Tipo de salida:"
 
-#: src/cups/genppd.c:139
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Common"
 msgstr "Comando:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:153
 #, fuzzy
 msgid "Extra 1"
 msgstr "Bandeja 1"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Extra 2"
 msgstr "Bandeja 2"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Extra 3"
 msgstr "Bandeja 3"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:156
 #, fuzzy
 msgid "Extra 4"
 msgstr "Bandeja 4"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr "Spanish"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1465
+#: src/cups/genppd.c:1613
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1717
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1719
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1497
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1756
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -7014,18 +7132,6 @@ msgstr ""
 msgid "Escputil version "
 msgstr ""
 
-#: src/escputil/escputil.c:71
-#, fuzzy
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-"Escputil se entrega sin NINGUNA GARANTÍA; para detalles tipee 'escputil -l'\n"
-"Éste es software libre, y usted es bienvenido a redistribuirlo bajo\n"
-"ciertas condiciones; tipee 'escputil -l' para más detalles.\n"
-
 #: src/escputil/escputil.c:76
 #, fuzzy
 msgid ""
@@ -7046,18 +7152,18 @@ msgid ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 msgstr ""
 "Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
-"Éste programa es software libre, usted puede redistribuirlo y/o modificarlo\n"
-"bajo los términos de la Licencia General Pública GNU tal como se la publica\n"
-"por la Fundación de Software Libre; o la versión 2 de la Licencia, o (a su\n"
-"opción) cualquier versión posterior.\n"
+"Éste programa es software libre, usted puede redistribuirlo y/o modificarlo\n"
+"bajo los términos de la Licencia General Pública GNU tal como se la publica\n"
+"por la Fundación de Software Libre; o la versión 2 de la Licencia, o (a su\n"
+"opción) cualquier versión posterior.\n"
 "\n"
-"Éste programa se distribuye con el deseo de que sea útil, pero SIN NINGUNA\n"
-"GARANTÍA; aún sin la garantía implícita de MERCANTIBILIDAD o AJUSTE PARA UN\n"
-"PROPÓSITO PARTICULAR. Vea la Licencia General Pública GNU para más "
+"Éste programa se distribuye con el deseo de que sea útil, pero SIN NINGUNA\n"
+"GARANT�A; aún sin la garantía implícita de MERCANTIBILIDAD o AJUSTE PARA UN\n"
+"PROPÓSITO PARTICULAR. Vea la Licencia General Pública GNU para más "
 "detalles.\n"
 "\n"
-"Usted debe haber recibido una copia de la Licencia General Pública GNU\n"
-"junto con éste programa; si no, escriba a la Fundación de Software\n"
+"Usted debe haber recibido una copia de la Licencia General Pública GNU\n"
+"junto con éste programa; si no, escriba a la Fundación de Software\n"
 "Libre, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307\n"
 
 #: src/escputil/escputil.c:119
@@ -7113,44 +7219,44 @@ msgstr ""
 "          escputil --ink-level --new --raw-device /dev/lp0\n"
 "\n"
 "  Comandos:\n"
-"    -c|--clean-head    Limpia el cabezal de impresión\n"
-"    -n|--nozzle-check  Imprime un patrón de prueba de toberas.\n"
-"                        Toberas sucias o tapadas se mostrarán como vacíos "
+"    -c|--clean-head    Limpia el cabezal de impresión\n"
+"    -n|--nozzle-check  Imprime un patrón de prueba de toberas.\n"
+"                        Toberas sucias o tapadas se mostrarán como vacíos "
 "en\n"
-"                        el patrón. Si usted ve algún vacío, deberá limpiar\n"
-"                        el cabezal de impresión.\n"
-"    -a|--align-head    Alinear el cabezal de impresión. CUIDADO: El mal uso\n"
-"                        de ésta utilidad puede resultar en una calidad "
+"                        el patrón. Si usted ve algún vacío, deberá limpiar\n"
+"                        el cabezal de impresión.\n"
+"    -a|--align-head    Alinear el cabezal de impresión. CUIDADO: El mal uso\n"
+"                        de ésta utilidad puede resultar en una calidad "
 "pobre\n"
-"                        de impresión y/o daño a la impresora.\n"
-"    -o|--align-color   Alinear el cabezal de impresión color (Stylus Color\n"
-"                        480 y 580 solamente). CUIDADO:El mal uso de ésta\n"
+"                        de impresión y/o daño a la impresora.\n"
+"    -o|--align-color   Alinear el cabezal de impresión color (Stylus Color\n"
+"                        480 y 580 solamente). CUIDADO:El mal uso de ésta\n"
 "         \t\tutilidad puede resultar en una calidad pobre de\n"
-"\t        \timpresión y/o daño a la impresora.\n"
+"\t        \timpresión y/o daño a la impresora.\n"
 "    -s|--status        Recoger el status de la impresora.\n"
-"    -i|--ink-level     Obtener el nivel de tinta de la impresora. Ésto\n"
+"    -i|--ink-level     Obtener el nivel de tinta de la impresora. Ésto\n"
 "                        requiere acceso de lectura/escritura al dispositivo\n"
-"\t\t        crudo de impresión.\n"
-"    -d|--identify      Consultar la impresora por información de marca y\n"
-"                        modelo. Ésto requiere acceso de lectura/escritura "
+"\t\t        crudo de impresión.\n"
+"    -d|--identify      Consultar la impresora por información de marca y\n"
+"                        modelo. Ésto requiere acceso de lectura/escritura "
 "al\n"
-"\t\t\tdispositivo crudo de impresión.\n"
-"    -l|--license       Mostrar los términos de la licencia/garantía de éste\n"
+"\t\t\tdispositivo crudo de impresión.\n"
+"    -l|--license       Mostrar los términos de la licencia/garantía de éste\n"
 "         \t\tprograma\n"
 "    -M|--list-models   Listar los modelos de impresora disponibles.\n"
-"    -h|--help          Imprimir éste mensaje de ayuda.\n"
+"    -h|--help          Imprimir éste mensaje de ayuda.\n"
 "  Opciones:\n"
-"    -P|--printer-name  Especifica el nombre de la cola de impresión en la\n"
+"    -P|--printer-name  Especifica el nombre de la cola de impresión en la\n"
 "\t\t\tque se opera. Por defecto es la impresora del\n"
 "\t\t\tsistema.\n"
 "    -r|--raw-device    Especifica el nombre del dispositivo a escribir\n"
-"\t\t\tdirectamente en vez de mandarlo a través de la cola\n"
-"                        de impresión.\n"
+"\t\t\tdirectamente en vez de mandarlo a través de la cola\n"
+"                        de impresión.\n"
 "    -u|--new           La impresora es de nuevo modelo (Stylus Color 740 o\n"
-"                        más nueva).\n"
+"                        más nueva).\n"
 "    -q|--quiet         Suprimir carteles.\n"
 "    -m|--model         Especificar el modelo preciso de impresora para\n"
-"\t\t\talineación de cabezal.\n"
+"\t\t\talineación de cabezal.\n"
 
 #: src/escputil/escputil.c:161
 #, fuzzy
@@ -7204,51 +7310,51 @@ msgstr ""
 "          escputil -i -u -r /dev/lp0\n"
 "\n"
 "  Comandos:\n"
-"    -c Limpia el cabezal de impresión.\n"
-"    -n Imprime un patrón de prueba de toberas.\n"
-"        Toberas sucias o tapadas se mostrarán como vacíos en\n"
-"        el patrón. Si usted ve algún vacío, deberá limpiar\n"
-"        el cabezal de impresión.\n"
-"    -a Alinear el cabezal de impresión. CUIDADO: El mal uso\n"
-"        de ésta utilidad puede resultar en una calidad pobre\n"
-"        de impresión y/o daño a la impresora.\n"
-"    -o Alinear el cabezal de impresión color (Stylus Color\n"
-"        480 y 580 solamente). CUIDADO:El mal uso de ésta\n"
+"    -c Limpia el cabezal de impresión.\n"
+"    -n Imprime un patrón de prueba de toberas.\n"
+"        Toberas sucias o tapadas se mostrarán como vacíos en\n"
+"        el patrón. Si usted ve algún vacío, deberá limpiar\n"
+"        el cabezal de impresión.\n"
+"    -a Alinear el cabezal de impresión. CUIDADO: El mal uso\n"
+"        de ésta utilidad puede resultar en una calidad pobre\n"
+"        de impresión y/o daño a la impresora.\n"
+"    -o Alinear el cabezal de impresión color (Stylus Color\n"
+"        480 y 580 solamente). CUIDADO:El mal uso de ésta\n"
 "        utilidad puede resultar en una calidad pobre de\n"
-"\t impresión y/o daño a la impresora.\n"
+"\t impresión y/o daño a la impresora.\n"
 "    -s Recoger el status de la impresora.\n"
-"    -i Obtener el nivel de tinta de la impresora. Ésto\n"
+"    -i Obtener el nivel de tinta de la impresora. Ésto\n"
 "        requiere acceso de lectura/escritura al dispositivo\n"
-"\t crudo de impresión.\n"
-"    -d Consultar la impresora por información de marca y\n"
-"        modelo. Ésto requiere acceso de lectura/escritura al\n"
-"\t dispositivo crudo de impresión.\n"
-"    -l Mostrar los términos de la licencia/garantía de éste\n"
+"\t crudo de impresión.\n"
+"    -d Consultar la impresora por información de marca y\n"
+"        modelo. Ésto requiere acceso de lectura/escritura al\n"
+"\t dispositivo crudo de impresión.\n"
+"    -l Mostrar los términos de la licencia/garantía de éste\n"
 "        programa\n"
 "    -M Listar los modelos de impresora disponibles.\n"
-"    -h Imprimir éste mensaje de ayuda.\n"
+"    -h Imprimir éste mensaje de ayuda.\n"
 "  Opciones:\n"
-"    -P Especifica el nombre de la cola de impresión en la\n"
+"    -P Especifica el nombre de la cola de impresión en la\n"
 "\t que se opera. Por defecto es la impresora del\n"
 "\t sistema.\n"
 "    -r Especifica el nombre del dispositivo a escribir\n"
-"\t directamente en vez de mandarlo a través de la cola\n"
-"        de impresión.\n"
+"\t directamente en vez de mandarlo a través de la cola\n"
+"        de impresión.\n"
 "    -u La impresora es de nuevo modelo (Stylus Color 740 o\n"
-"        más nueva).\n"
+"        más nueva).\n"
 "    -q Suprimir carteles.\n"
 "    -m Especificar el modelo preciso de impresora para\n"
-"\t alineación de cabezal.\n"
+"\t alineación de cabezal.\n"
 
 #: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
-msgstr "Usted sólo puede especificar una impresora ó dispositivo crudo."
+msgstr "Usted sólo puede especificar una impresora ó dispositivo crudo."
 
 #: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
-msgstr "Usted sólo puede especificar un modelo de impresora"
+msgstr "Usted sólo puede especificar un modelo de impresora"
 
 #: src/escputil/escputil.c:369
 #, c-format
@@ -7263,7 +7369,7 @@ msgstr ""
 #: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
-msgstr "Opción desconocida %c\n"
+msgstr "Opción desconocida %c\n"
 
 #: src/escputil/escputil.c:389
 #, c-format
@@ -7369,7 +7475,7 @@ msgstr ""
 #: src/escputil/escputil.c:1036
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
-msgstr "Saturación:"
+msgstr "Saturación:"
 
 #: src/escputil/escputil.c:1039
 #, c-format
@@ -7522,13 +7628,13 @@ msgstr ""
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
-"La obtención de los niveles de tinta requiere usar un dispositivo crudo.\n"
+"La obtención de los niveles de tinta requiere usar un dispositivo crudo.\n"
 
 #: src/escputil/escputil.c:1461
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
-"La obtención de los niveles de tinta requiere usar un dispositivo crudo.\n"
+"La obtención de los niveles de tinta requiere usar un dispositivo crudo.\n"
 
 #: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
 #: src/escputil/escputil.c:1646
@@ -7544,12 +7650,12 @@ msgstr ""
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
-"La identificación de la impresora requiere el uso de un dispositivo crudo.\n"
+"La identificación de la impresora requiere el uso de un dispositivo crudo.\n"
 
 #: src/escputil/escputil.c:1693
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
-msgstr "Usted sólo puede especificar un modelo de impresora"
+msgstr "Usted sólo puede especificar un modelo de impresora"
 
 #: src/escputil/escputil.c:1713
 #, c-format
@@ -7601,45 +7707,45 @@ msgid ""
 "It is essential that you not turn your printer off during this procedure.\n"
 "\n"
 msgstr ""
-"Favor de leer éstas instrucciones muy cuidadosamente antes de proceder.\n"
+"Favor de leer éstas instrucciones muy cuidadosamente antes de proceder.\n"
 "\n"
-"Ésta utilidad le permite alinear el cabezal de impresión de su impresora\n"
-"de chorro de tinta Epson Stylus. El mal uso de ésta utilidad puede causar\n"
-"una degradación de la calidad de impresión y posiblemente daño a su "
+"Ésta utilidad le permite alinear el cabezal de impresión de su impresora\n"
+"de chorro de tinta Epson Stylus. El mal uso de ésta utilidad puede causar\n"
+"una degradación de la calidad de impresión y posiblemente daño a su "
 "impresora.\n"
-"Ésta utilidad no fue probada por Seiko Epson en cuanto a correcto\n"
-"funcionamiento y se ofrece sin ninguna garantía. El riesgo del uso de ésta\n"
+"Ésta utilidad no fue probada por Seiko Epson en cuanto a correcto\n"
+"funcionamiento y se ofrece sin ninguna garantía. El riesgo del uso de ésta\n"
 "utilidad corre por la exclusiva cuenta del usuario.\n"
 "\n"
-"Ésta utilidad imprime %d patrones de prueba. Cada patrón tiene aspecto muy\n"
-"similar. Los patrones consisten en una serie de pares de líneas verticales\n"
-"que se solapan. Debajo de cada par de líneas hay un número entre %d y %d.\n"
+"Ésta utilidad imprime %d patrones de prueba. Cada patrón tiene aspecto muy\n"
+"similar. Los patrones consisten en una serie de pares de líneas verticales\n"
+"que se solapan. Debajo de cada par de líneas hay un número entre %d y %d.\n"
 "\n"
-"Cuando inspeccione los pares de líneas, deberá encontrar el par de líneas\n"
-"que este mejor alineado, es decir, que forma mejor una sola línea vertical.\n"
+"Cuando inspeccione los pares de líneas, deberá encontrar el par de líneas\n"
+"que este mejor alineado, es decir, que forma mejor una sola línea vertical.\n"
 "Inspeccione los pares muy cuidadosamente para encontrar el mejor ajuste.\n"
-"Se recomienda el uso de una lupa o cristal de aumento para una inspección\n"
-"más crítica.\n"
-"También se sugiere que use un papel de buena calidad para las pruebas,\n"
-"como para que las líneas queden bien formadas y no se dispersen sobre el\n"
+"Se recomienda el uso de una lupa o cristal de aumento para una inspección\n"
+"más crítica.\n"
+"También se sugiere que use un papel de buena calidad para las pruebas,\n"
+"como para que las líneas queden bien formadas y no se dispersen sobre el\n"
 "papel.\n"
-"Después de anotar el número correspondiente al par de mejor ajuste, ponga\n"
+"Después de anotar el número correspondiente al par de mejor ajuste, ponga\n"
 "de nuevo el papel en la impresora antes de volver a usarla.\n"
 "\n"
-"Cada patrón es similar, pero los últimos patrones usan puntos más finos\n"
-"para una alineación más crítica. Usted debe hacer todas las pasadas para\n"
-"alinear correctamente su impresora. Después de ejecutar todas las pasadas\n"
-"de alineación, los patrones de alineación se imprimirán una vez más. Debe\n"
+"Cada patrón es similar, pero los últimos patrones usan puntos más finos\n"
+"para una alineación más crítica. Usted debe hacer todas las pasadas para\n"
+"alinear correctamente su impresora. Después de ejecutar todas las pasadas\n"
+"de alineación, los patrones de alineación se imprimirán una vez más. Debe\n"
 "observarse que el par medio entre todos (#%d de %d) es el mejor de todos\n"
 "los patrones.\n"
 "\n"
-"Después que los patrones sean impresos una vez más, le será ofrecida la\n"
-"elección de guardar (s) el resultado en la impresora, repetir el proceso\n"
-"(r), o salir sin guardar (q). Salir sin guardar no restaurará la\n"
-"configuración previa, pero apagar y volver a encender la impresora lo hará.\n"
-"Si sale sin guardar, deberá repetir el proceso por completo si quiere\n"
-"guardar más tarde los resultados. Es esencial que no apague la impresora\n"
-"durante éste proceso.\n"
+"Después que los patrones sean impresos una vez más, le será ofrecida la\n"
+"elección de guardar (s) el resultado en la impresora, repetir el proceso\n"
+"(r), o salir sin guardar (q). Salir sin guardar no restaurará la\n"
+"configuración previa, pero apagar y volver a encender la impresora lo hará.\n"
+"Si sale sin guardar, deberá repetir el proceso por completo si quiere\n"
+"guardar más tarde los resultados. Es esencial que no apague la impresora\n"
+"durante éste proceso.\n"
 "\n"
 
 #: src/escputil/escputil.c:1767
@@ -7677,41 +7783,41 @@ msgid ""
 "this procedure.\n"
 "\n"
 msgstr ""
-"Favor de leer éstas instrucciones muy cuidadosamente antes de proceder.\n"
+"Favor de leer éstas instrucciones muy cuidadosamente antes de proceder.\n"
 "\n"
-"Ésta utilidad le permite alinear el cabezal de impresión de su impresora\n"
-"de chorro de tinta Epson Stylus. El mal uso de ésta utilidad puede causar\n"
-"una degradación de la calidad de impresión y posiblemente daño a su "
+"Ésta utilidad le permite alinear el cabezal de impresión de su impresora\n"
+"de chorro de tinta Epson Stylus. El mal uso de ésta utilidad puede causar\n"
+"una degradación de la calidad de impresión y posiblemente daño a su "
 "impresora.\n"
-"Ésta utilidad no fue probada por Seiko Epson en cuanto a correcto\n"
-"funcionamiento y se ofrece sin ninguna garantía. El riesgo del uso de ésta\n"
+"Ésta utilidad no fue probada por Seiko Epson en cuanto a correcto\n"
+"funcionamiento y se ofrece sin ninguna garantía. El riesgo del uso de ésta\n"
 "utilidad corre por la exclusiva cuenta del usuario.\n"
 "\n"
-"Ésta utilidad imprime un patrón de prueba que consiste en una serie de "
+"Ésta utilidad imprime un patrón de prueba que consiste en una serie de "
 "pares\n"
-"de líneas verticales que se solapan. Debajo de cada par de líneas hay un\n"
-"número entre %d y %d.\n"
+"de líneas verticales que se solapan. Debajo de cada par de líneas hay un\n"
+"número entre %d y %d.\n"
 "\n"
-"Cuando inspeccione los pares de líneas, deberá encontrar el par de líneas\n"
-"que este mejor alineado, es decir, que forma mejor una sola línea vertical.\n"
+"Cuando inspeccione los pares de líneas, deberá encontrar el par de líneas\n"
+"que este mejor alineado, es decir, que forma mejor una sola línea vertical.\n"
 "Inspeccione los pares muy cuidadosamente para encontrar el mejor ajuste.\n"
-"Se recomienda el uso de una lupa o cristal de aumento para una inspección\n"
-"más crítica.\n"
-"También se sugiere que use un papel de buena calidad para la prueba,\n"
-"como para que las líneas queden bien formadas y no se dispersen sobre el\n"
+"Se recomienda el uso de una lupa o cristal de aumento para una inspección\n"
+"más crítica.\n"
+"También se sugiere que use un papel de buena calidad para la prueba,\n"
+"como para que las líneas queden bien formadas y no se dispersen sobre el\n"
 "papel.\n"
-"Después de anotar el número correspondiente al par de mejor ajuste, ponga\n"
+"Después de anotar el número correspondiente al par de mejor ajuste, ponga\n"
 "de nuevo el papel en la impresora antes de volver a usarla.\n"
 "\n"
-"Después de ejecutar el patrón de alineación, éste se imprimirá una vez más.\n"
+"Después de ejecutar el patrón de alineación, éste se imprimirá una vez más.\n"
 "Debe observarse que el par medio entre todos (#%d de %d) es el mejor.\n"
-"Entonces le será ofrecida la elección de guardar (s) el resultado en la\n"
+"Entonces le será ofrecida la elección de guardar (s) el resultado en la\n"
 "impresora, repetir el proceso (r), o salir sin guardar (q). Salir sin\n"
-"guardar no restaurará la configuración previa, pero apagar y volver a\n"
-"encender la impresora lo hará.\n"
-"Si sale sin guardar, deberá repetir el proceso por completo si quiere\n"
-"guardar más tarde los resultados. Es esencial que no apague la impresora\n"
-"durante éste proceso.\n"
+"guardar no restaurará la configuración previa, pero apagar y volver a\n"
+"encender la impresora lo hará.\n"
+"Si sale sin guardar, deberá repetir el proceso por completo si quiere\n"
+"guardar más tarde los resultados. Es esencial que no apague la impresora\n"
+"durante éste proceso.\n"
 "\n"
 
 #: src/escputil/escputil.c:1811
@@ -7740,8 +7846,8 @@ msgstr ""
 "  (s) Guardar los resultados en la impresora,\n"
 "  (q) Salir sin guardar los resultados, o\n"
 "  (r) Repetir el proceso completamente desde el principio.\n"
-"Luego le será requerido confirmar su elección.\n"
-"¿Qué opción elige? (s), (q), (r).\n"
+"Luego le será requerido confirmar su elección.\n"
+"¿Qué opción elige? (s), (q), (r).\n"
 
 #: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
 #: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
@@ -7763,8 +7869,8 @@ msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
-"Bien, su impresora está alineada, pero la alineación no fue guardada.\n"
-"Si quiere guardar la alineación, deberá repetir éste proceso.\n"
+"Bien, su impresora está alineada, pero la alineación no fue guardada.\n"
+"Si quiere guardar la alineación, deberá repetir éste proceso.\n"
 
 #: src/escputil/escputil.c:1857
 #, c-format
@@ -7778,7 +7884,7 @@ msgstr ""
 #: src/escputil/escputil.c:1865
 #, c-format
 msgid "Repeating the alignment process.\n"
-msgstr "Repitiendo el proceso de alineación.\n"
+msgstr "Repitiendo el proceso de alineación.\n"
 
 #: src/escputil/escputil.c:1871
 #, c-format
@@ -7789,21 +7895,21 @@ msgid ""
 "Please confirm by typing 's' again that you wish to save the settings\n"
 "to your printer:\n"
 msgstr ""
-"Ésto alterará permanentemente la configuración de su impresora.\n"
-"ADVERTENCIA: éste procedimiento no está aprobado por Seiko Epson, y\n"
-"puede dañar su impresora. ¿Proceder?\n"
-"Favor de confirmar que desea guardar la configuración de su impresora\n"
+"Ésto alterará permanentemente la configuración de su impresora.\n"
+"ADVERTENCIA: éste procedimiento no está aprobado por Seiko Epson, y\n"
+"puede dañar su impresora. ¿Proceder?\n"
+"Favor de confirmar que desea guardar la configuración de su impresora\n"
 "tipeando 's' de nuevo.\n"
 
 #: src/escputil/escputil.c:1883
 #, c-format
 msgid "About to save settings..."
-msgstr "Acerca de guardar configuración..."
+msgstr "Acerca de guardar configuración..."
 
 #: src/escputil/escputil.c:1889
 #, c-format
 msgid "failed!\n"
-msgstr "¡falló!\n"
+msgstr "¡falló!\n"
 
 #: src/escputil/escputil.c:1890
 #, c-format
@@ -7811,18 +7917,18 @@ msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
-"Su configuración no fue guardada exitosamente. Debe repetir el\n"
-"proceso de alineación.\n"
+"Su configuración no fue guardada exitosamente. Debe repetir el\n"
+"proceso de alineación.\n"
 
 #: src/escputil/escputil.c:1894
 #, c-format
 msgid "succeeded!\n"
-msgstr "¡éxito!\n"
+msgstr "¡éxito!\n"
 
 #: src/escputil/escputil.c:1895
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
-msgstr "Su configuración de alineación fue guardada a la impresora.\n"
+msgstr "Su configuración de alineación fue guardada a la impresora.\n"
 
 #: src/escputil/escputil.c:1900
 #, c-format
@@ -7844,12 +7950,12 @@ msgid ""
 "Please place a sheet of paper in your printer to begin the head\n"
 "alignment procedure.\n"
 msgstr ""
-"Éste procedimiento asume que su impresora is una Epson %s.\n"
-"Si éste no es el modelo de su impresora, favor de tipear ctrl-c ahora y\n"
+"Éste procedimiento asume que su impresora is una Epson %s.\n"
+"Si éste no es el modelo de su impresora, favor de tipear ctrl-c ahora y\n"
 "elijir el correcto modelo de impresora.\n"
 "\n"
 "Favor de poner una hoja de papel en la impresora para comenzar el\n"
-"procedimiento de alineación del cabezal.\n"
+"procedimiento de alineación del cabezal.\n"
 
 #: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
 #: src/escputil/escputil.c:2047
@@ -7863,9 +7969,9 @@ msgid ""
 "pattern.\n"
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
-"Favor de inspeccionar la impresión y elegir el mejor par de líneas en cada "
-"patrón.\n"
-"Tipee un número par, '?' para ayuda, ó 'r' para repetir el procedimiento.\n"
+"Favor de inspeccionar la impresión y elegir el mejor par de líneas en cada "
+"patrón.\n"
+"Tipee un número par, '?' para ayuda, ó 'r' para repetir el procedimiento.\n"
 
 #: src/escputil/escputil.c:1993
 #, c-format
@@ -7880,27 +7986,27 @@ msgstr "Favor de insertar una hoja de papel sin imprimir.\n"
 #: src/escputil/escputil.c:2020
 #, c-format
 msgid "Number out of range!\n"
-msgstr "¡Número fuera de rango!\n"
+msgstr "¡Número fuera de rango!\n"
 
 #: src/escputil/escputil.c:2025
 #, c-format
 msgid "I cannot understand what you typed!\n"
-msgstr "¡No puedo entender lo que usted ha tipeado!\n"
+msgstr "¡No puedo entender lo que usted ha tipeado!\n"
 
 #: src/escputil/escputil.c:2031
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "El mejor par de líneas  debe ser numerado entre 1 y %d.\n"
+msgstr "El mejor par de líneas  debe ser numerado entre 1 y %d.\n"
 
 #: src/escputil/escputil.c:2038
 #, c-format
 msgid "Attempting to set alignment..."
-msgstr "Intentando definir alineación..."
+msgstr "Intentando definir alineación..."
 
 #: src/escputil/escputil.c:2041
 #, c-format
 msgid "succeeded.\n"
-msgstr "éxito.\n"
+msgstr "éxito.\n"
 
 #: src/escputil/escputil.c:2042
 #, c-format
@@ -7910,10 +8016,10 @@ msgid ""
 "pattern %d.  If it is not, you should repeat the process to get the best\n"
 "quality printing.\n"
 msgstr ""
-"Favor de verificar que la alineación es correcta. Después que el patrón de\n"
-"alineación sea impreso nuevamente, favor de asegurarse que el mejor patrón\n"
-"para cada línea es patrón %d. Si no lo es, debe repetir el proceso para\n"
-"obtener la mejor calidad de impresión.\n"
+"Favor de verificar que la alineación es correcta. Después que el patrón de\n"
+"alineación sea impreso nuevamente, favor de asegurarse que el mejor patrón\n"
+"para cada línea es patrón %d. Si no lo es, debe repetir el proceso para\n"
+"obtener la mejor calidad de impresión.\n"
 
 #: src/escputil/escputil.c:2088
 #, c-format
@@ -7954,7 +8060,7 @@ msgstr "Sin buffer de filas\n"
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
-msgstr "No puedo analizar el parámetro %s=%s (se espera un número)\n"
+msgstr "No puedo analizar el parámetro %s=%s (se espera un número)\n"
 
 #: src/ghost/ijsgutenprint.c:498
 #, fuzzy, c-format
@@ -8014,12 +8120,12 @@ msgstr "Impresora desconocida %s\n"
 #: src/ghost/ijsgutenprint.c:867
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
-msgstr "Traer próxima fila falló en %d\n"
+msgstr "Traer próxima fila falló en %d\n"
 
 #: src/ghost/ijsgutenprint.c:1308
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
-msgstr "falló image_init %d\n"
+msgstr "falló image_init %d\n"
 
 #: src/ghost/ijsgutenprint.c:1319
 #, fuzzy, c-format
@@ -8039,20 +8145,262 @@ msgstr "Impresora desconocida %s\n"
 #: src/ghost/ijsgutenprint.c:1516
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-msgstr "¡Parámetros malos, no puedo continuar!\n"
+msgstr "¡Parámetros malos, no puedo continuar!\n"
 
 #: src/ghost/ijsgutenprint.c:1534
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
-msgstr "Traer próxima fila falló en %d\n"
+msgstr "Traer próxima fila falló en %d\n"
+
+#, fuzzy
+#~ msgid "Model Name"
+#~ msgstr "Cancelar"
+
+#, fuzzy
+#~ msgid "Cassette"
+#~ msgstr "Papel Opaco"
+
+#, fuzzy
+#~ msgid " Gamma"
+#~ msgstr "Gamma:"
+
+#, fuzzy
+#~ msgid " Curve"
+#~ msgstr "Negro"
+
+#, fuzzy
+#~ msgid "1440 x 1440"
+#~ msgstr "1440 x 1440 PPP"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI High Quality"
+#~ msgstr "1440 x 360 PPP Altísima Calidad "
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI Highest Quality"
+#~ msgstr "1440 x 360 PPP Altísima Calidad "
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI High Quality"
+#~ msgstr "1440 x 360 PPP Altísima Calidad "
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI Highest Quality"
+#~ msgstr "1440 x 360 PPP Altísima Calidad "
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "and the rest of the Gutenprint Development Team.\n"
+#~ "\n"
+#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n"
+#~ "y el resto del Equipo de Desarrollo del Gimp-Print.\n"
+#~ "\n"
+#~ "Favor de visitar nuetro web site en http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "Éste programa es software libre, usted puede redistribuirlo y/o "
+#~ "modificarlo\n"
+#~ "bajo los términos de la Licencia General Pública GNU tal como se la "
+#~ "publica\n"
+#~ "por la Fundación de Software Libre; o la versión 2 de la Licencia, o (a "
+#~ "su\n"
+#~ "opción) cualquier versión posterior.\n"
+#~ "\n"
+#~ "Éste programa se distribuye con el deseo de que sea útil, pero SIN "
+#~ "NINGUNA\n"
+#~ "GARANT�A; aún sin la garantía implícita de MERCANTIBILIDAD o AJUSTE PARA "
+#~ "UN\n"
+#~ "PROPÓSITO PARTICULAR. Vea la Licencia General Pública GNU para más "
+#~ "detalles.\n"
+#~ "\n"
+#~ "Usted debe haber recibido una copia de la Licencia General Pública GNU\n"
+#~ "junto con éste programa; si no, escriba a la Fundación de Software\n"
+#~ "Libre, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 USA\n"
+
+#, fuzzy
+#~ msgid ""
+#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
+#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
+#~ "l'\n"
+#~ "This is free software, and you are welcome to redistribute it\n"
+#~ "under certain conditions; type 'escputil -l' for details.\n"
+#~ msgstr ""
+#~ "Escputil se entrega sin NINGUNA GARANT�A; para detalles tipee 'escputil -"
+#~ "l'\n"
+#~ "Éste es software libre, y usted es bienvenido a redistribuirlo bajo\n"
+#~ "ciertas condiciones; tipee 'escputil -l' para más detalles.\n"
+
+#, fuzzy
+#~ msgid "90x90 DPI"
+#~ msgstr "600 PPP"
+
+#, fuzzy
+#~ msgid "90x90 DPI DMT"
+#~ msgstr "600 PPP"
+
+#, fuzzy
+#~ msgid "180x180 DPI"
+#~ msgstr "150x150 PPP"
+
+#, fuzzy
+#~ msgid "180x180 DPI DMT"
+#~ msgstr "150x150 PPP"
+
+#, fuzzy
+#~ msgid "360x360 DPI"
+#~ msgstr "300x300 PPP"
+
+#, fuzzy
+#~ msgid "360x360 DPI DMT"
+#~ msgstr "600x600 PPP"
+
+#, fuzzy
+#~ msgid "720x360 DPI"
+#~ msgstr "720 x 360 PPP"
+
+#, fuzzy
+#~ msgid "720x360 DPI DMT"
+#~ msgstr "720 x 360 PPP MW2"
+
+#, fuzzy
+#~ msgid "720x720 DPI"
+#~ msgstr "2880 x 720 PPP"
+
+#, fuzzy
+#~ msgid "720x720 DPI DMT"
+#~ msgstr "2880 x 720 PPP"
+
+#, fuzzy
+#~ msgid "1440x720 DPI"
+#~ msgstr "1440 x 720 PPP"
+
+#, fuzzy
+#~ msgid "1440x720 DPI DMT"
+#~ msgstr "1440 x 720 PPP"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI"
+#~ msgstr "1440 x 1440 PPP"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI DMT"
+#~ msgstr "1440 x 1440 PPP"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI"
+#~ msgstr "2880 x 720 PPP"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI DMT"
+#~ msgstr "2880 x 720 PPP"
+
+#, fuzzy
+#~ msgid "150x150 DPI DMT"
+#~ msgstr "150x150 PPP"
+
+#, fuzzy
+#~ msgid "300x300 DPI DMT"
+#~ msgstr "300x300 PPP"
+
+#, fuzzy
+#~ msgid "600x300 DPI DMT"
+#~ msgstr "600x300 PPP"
+
+#, fuzzy
+#~ msgid "600x600 DPI DMT"
+#~ msgstr "600x600 PPP"
+
+#, fuzzy
+#~ msgid "1200x600 DPI DMT"
+#~ msgstr "1200x600 PPP"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI"
+#~ msgstr "1200x600 PPP"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI DMT"
+#~ msgstr "1200x600 PPP"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI"
+#~ msgstr "2400x600 PPP"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI DMT"
+#~ msgstr "2400x600 PPP"
+
+#, fuzzy
+#~ msgid "Plain Paper PIXMA"
+#~ msgstr "Papel Común"
+
+#~ msgid "Back Print Film"
+#~ msgstr "Película para Imprimir por Atrás"
+
+#~ msgid "Fabric Sheets"
+#~ msgstr "Hojas de Tela"
+
+#~ msgid "Envelope"
+#~ msgstr "Sobre"
+
+#~ msgid "High Resolution Paper"
+#~ msgstr "Papel de Alta Resolución"
+
+#~ msgid "T-Shirt Transfers"
+#~ msgstr "Transferencias a Remeras"
+
+#~ msgid "High Gloss Film"
+#~ msgstr "Película de Alto Brillo"
+
+#~ msgid "Glossy Photo Paper"
+#~ msgstr "Papel Brillante de Fotografía"
+
+#~ msgid "Glossy Photo Cards"
+#~ msgstr "Tarjetas Brillantes de Fotografía"
+
+#~ msgid "Photo Paper Pro"
+#~ msgstr "Papel de Fotografía Profesional"
+
+#~ msgid "Photo CcMmYK Color"
+#~ msgstr "Color CcMmYK para Fotografía"
+
+#~ msgid "Photo CcMmY Color"
+#~ msgstr "Color CcMmY para Fotografía"
+
+#~ msgid "CMYK Color"
+#~ msgstr "Color CMYK (Cian/Mag/Amar/Negro)"
+
+#~ msgid "CMY Color"
+#~ msgstr "Color CMY (Cian/Mag/Amar)"
 
 #, fuzzy
 #~ msgid "Gutenprint"
-#~ msgstr "prueba de impresión"
+#~ msgstr "prueba de impresión"
 
 #, fuzzy
 #~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-#~ msgstr "Traer próxima fila falló en %d\n"
+#~ msgstr "Traer próxima fila falló en %d\n"
 
 #, fuzzy
 #~ msgid "EPSON Stylus C50"
@@ -8360,19 +8708,19 @@ msgstr "Traer próxima fila falló en %d\n"
 
 #, fuzzy
 #~ msgid "Red Balance"
-#~ msgstr "Ajusta el balance amarillo de la impresión"
+#~ msgstr "Ajusta el balance amarillo de la impresión"
 
 #, fuzzy
 #~ msgid "Gloss Balance"
-#~ msgstr "Ajusta el balance amarillo de la impresión"
+#~ msgstr "Ajusta el balance amarillo de la impresión"
 
 #~ msgid ""
 #~ "Printer alignment must be done with a raw device or else\n"
 #~ "the -m option must be used to specify a printer.\n"
 #~ msgstr ""
-#~ "La alineación de la impresora debe ser hecha con un dispositivo crudo ó "
+#~ "La alineación de la impresora debe ser hecha con un dispositivo crudo ó "
 #~ "sino\n"
-#~ "la opción -m debe ser usada para especificar una impresora.\n"
+#~ "la opción -m debe ser usada para especificar una impresora.\n"
 
 #~ msgid "Attempting to detect printer model..."
 #~ msgstr "Intentando detectar el modelo de impresora..."
@@ -8394,53 +8742,53 @@ msgstr "Traer próxima fila falló en %d\n"
 #, fuzzy
 #~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
 #~ msgstr ""
-#~ "Establecer el brillo de la impresión.\n"
-#~ "0 es negro sólido, 2 es blanco sólido"
+#~ "Establecer el brillo de la impresión.\n"
+#~ "0 es negro sólido, 2 es blanco sólido"
 
 #~ msgid ""
 #~ "Enter the correct command to print to your printer. Note: Please do not "
 #~ "remove the `-l' or `-oraw' from the command string, or printing will "
 #~ "probably fail!"
 #~ msgstr ""
-#~ "Ingrese el comando correcto para imprimir en su impresora. Nota: ¡Favor "
-#~ "de no remover el '-l' ú '-oraw' de la línea de comando o la impresión "
+#~ "Ingrese el comando correcto para imprimir en su impresora. Nota: ¡Favor "
+#~ "de no remover el '-l' ú '-oraw' de la línea de comando o la impresión "
 #~ "puede fallar!"
 
 #~ msgid "PPD File?"
-#~ msgstr "¿Archivo PPD?"
+#~ msgstr "¿Archivo PPD?"
 
 #~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: la opción `%s' es ambigua\n"
+#~ msgstr "%s: la opción `%s' es ambigua\n"
 
 #~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: la opción `--%s' no permite un argumento\n"
+#~ msgstr "%s: la opción `--%s' no permite un argumento\n"
 
 #~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: la opción `%c%s' no permite un argumento\n"
+#~ msgstr "%s: la opción `%c%s' no permite un argumento\n"
 
 #~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: la opción `%s' requiere un argumento\n"
+#~ msgstr "%s: la opción `%s' requiere un argumento\n"
 
 #~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: opción `--%s' desconocida\n"
+#~ msgstr "%s: opción `--%s' desconocida\n"
 
 #~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: opción `%c%s' desconocida\n"
+#~ msgstr "%s: opción `%c%s' desconocida\n"
 
 #~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opción no permitida -- %c\n"
+#~ msgstr "%s: opción no permitida -- %c\n"
 
 #~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: opción no válida -- %c\n"
+#~ msgstr "%s: opción no válida -- %c\n"
 
 #~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: la opción requiere un argumento -- %c\n"
+#~ msgstr "%s: la opción requiere un argumento -- %c\n"
 
 #~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: la opción `-W %s' es ambigua\n"
+#~ msgstr "%s: la opción `-W %s' es ambigua\n"
 
 #~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: la opción `-W %s' no permite un argumento\n"
+#~ msgstr "%s: la opción `-W %s' no permite un argumento\n"
 
 #, fuzzy
 #~ msgid "Bright"
@@ -8448,11 +8796,11 @@ msgstr "Traer próxima fila falló en %d\n"
 
 #, fuzzy
 #~ msgid "Image is too wide for the page\n"
-#~ msgstr "Redimensionar la impresión al tamaño de la página"
+#~ msgstr "Redimensionar la impresión al tamaño de la página"
 
 #, fuzzy
 #~ msgid "Full Bleed"
-#~ msgstr "Alimentación por Rollo"
+#~ msgstr "Alimentación por Rollo"
 
 #, fuzzy
 #~ msgid "traditional"
@@ -8472,7 +8820,7 @@ msgstr "Traer próxima fila falló en %d\n"
 #~ msgstr "Optimizar la salida para el tipo de imagen a imprimir"
 
 #~ msgid "Solid Colors"
-#~ msgstr "Colores sólidos"
+#~ msgstr "Colores sólidos"
 
 #~ msgid "Stylus C20sx"
 #~ msgstr "Stylus C20sx"
@@ -8540,66 +8888,66 @@ msgstr "Traer próxima fila falló en %d\n"
 #~ "WARNING: THIS FUNCTION IS NOT YET TESTED!  It may not work, and it may\n"
 #~ "damage your printer!\n"
 #~ msgstr ""
-#~ "Favor de leer éstas instrucciones muy cuidadosamente antes de proceder.\n"
+#~ "Favor de leer éstas instrucciones muy cuidadosamente antes de proceder.\n"
 #~ "\n"
-#~ "Ésta utilidad le permite alinear el cabezal de impresión de su impresora\n"
-#~ "de chorro de tinta Epson Stylus. El mal uso de ésta utilidad puede "
+#~ "Ésta utilidad le permite alinear el cabezal de impresión de su impresora\n"
+#~ "de chorro de tinta Epson Stylus. El mal uso de ésta utilidad puede "
 #~ "causar\n"
-#~ "una degradación de la calidad de impresión y posiblemente daño a su "
+#~ "una degradación de la calidad de impresión y posiblemente daño a su "
 #~ "impresora.\n"
-#~ "Ésta utilidad no fue probada por Seiko Epson en cuanto a correcto\n"
-#~ "funcionamiento y se ofrece sin ninguna garantía. El riesgo del uso de "
-#~ "ésta\n"
+#~ "Ésta utilidad no fue probada por Seiko Epson en cuanto a correcto\n"
+#~ "funcionamiento y se ofrece sin ninguna garantía. El riesgo del uso de "
+#~ "ésta\n"
 #~ "utilidad corre por la exclusiva cuenta del usuario.\n"
-#~ "Ésta utilidad imprime %d patrones de prueba sobreimpresos sobre una hoja "
+#~ "Ésta utilidad imprime %d patrones de prueba sobreimpresos sobre una hoja "
 #~ "de\n"
 #~ "papel.\n"
-#~ "Ésto es, imprime un patrón y expulsa la página. Luego debe reinsertarse "
+#~ "Ésto es, imprime un patrón y expulsa la página. Luego debe reinsertarse "
 #~ "la\n"
-#~ "misma página, e imprime otro patrón. Cada patrón consiste en una serie "
+#~ "misma página, e imprime otro patrón. Cada patrón consiste en una serie "
 #~ "de\n"
 #~ "elecciones numeradas entre %d y %d.\n"
 #~ "\n"
-#~ "Cuando inspeccione los patrones, deberá encontrar una impresión con la\n"
-#~ "textura más suave (menor ``grano''). Deberá inspeccionar las impresiones\n"
+#~ "Cuando inspeccione los patrones, deberá encontrar una impresión con la\n"
+#~ "textura más suave (menor ``grano''). Deberá inspeccionar las impresiones\n"
 #~ "muy cuidadosamente para elegir la mejor. Sugerimos que use Papel de "
 #~ "Chorro\n"
-#~ "de Tinta de Calidad Fotográfica o similar de alta calidad para ésta "
+#~ "de Tinta de Calidad Fotográfica o similar de alta calidad para ésta "
 #~ "prueba\n"
-#~ "Si no encuentra un patrón suave, deberá repetir la prueba.\n"
+#~ "Si no encuentra un patrón suave, deberá repetir la prueba.\n"
 #~ "\n"
-#~ "Después de inspeccionar y elegir una impresión, le será ofrecido guardar "
+#~ "Después de inspeccionar y elegir una impresión, le será ofrecido guardar "
 #~ "(s)\n"
 #~ "el resultado en la impresora, repetir el proceso (r), o salir sin "
 #~ "guardar\n"
-#~ "(q). Salir sin guardar no restaurará la configuración previa, pero apagar "
+#~ "(q). Salir sin guardar no restaurará la configuración previa, pero apagar "
 #~ "y\n"
-#~ "volver encender la impresora lo hará.\n"
-#~ "Si sale sin guardar, deberá repetir el proceso por completo si quiere\n"
-#~ "guardar más tarde los resultados. Es esencial que no apague la impresora\n"
-#~ "durante éste proceso.\n"
+#~ "volver encender la impresora lo hará.\n"
+#~ "Si sale sin guardar, deberá repetir el proceso por completo si quiere\n"
+#~ "guardar más tarde los resultados. Es esencial que no apague la impresora\n"
+#~ "durante éste proceso.\n"
 #~ "\n"
-#~ "ADVERTENCIA: ÉSTA FUNCIÓN AÚN NO HA SIDO PROBADA! Puede no funcionar, y "
-#~ "aún\n"
-#~ "dañar su impresora!\n"
+#~ "ADVERTENCIA: ÉSTA FUNCIÓN AÚN NO HA SIDO PROBADA! Puede no funcionar, y "
+#~ "aún\n"
+#~ "dañar su impresora!\n"
 
 #~ msgid "Printer %s does not require color head alignment.\n"
 #~ msgstr ""
-#~ "La impresora %s no requiere alineación de los inyectores de color.\n"
+#~ "La impresora %s no requiere alineación de los inyectores de color.\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "Please inspect the print, and choose the pattern in each set.\n"
 #~ "Type a pattern number, '?' for help, or 'r' to repeat the procedure.\n"
 #~ msgstr ""
-#~ "Favor de inspeccionar la impresión y elegir el mejor par de líneas en "
-#~ "cada patrón.\n"
-#~ "Tipee un número par, '?' para ayuda, ó 'r' para repetir el "
+#~ "Favor de inspeccionar la impresión y elegir el mejor par de líneas en "
+#~ "cada patrón.\n"
+#~ "Tipee un número par, '?' para ayuda, ó 'r' para repetir el "
 #~ "procedimiento.\n"
 
 #, fuzzy
 #~ msgid "Model %d out of range.\n"
-#~ msgstr "¡Número fuera de rango!\n"
+#~ msgstr "¡Número fuera de rango!\n"
 
 #~ msgid "Right Border:"
 #~ msgstr "Borde derecho:"
@@ -8608,10 +8956,10 @@ msgstr "Traer próxima fila falló en %d\n"
 #~ msgstr "Borde inferior:"
 
 #~ msgid "Size"
-#~ msgstr "Tamaño"
+#~ msgstr "Tamaño"
 
 #~ msgid "Image / Output Settings"
-#~ msgstr "Imagen / Configuración de Salida"
+#~ msgstr "Imagen / Configuración de Salida"
 
 #, fuzzy
 #~ msgid "GIMP-print"
@@ -8619,47 +8967,47 @@ msgstr "Traer próxima fila falló en %d\n"
 
 #, fuzzy
 #~ msgid "Resolutions"
-#~ msgstr "Resolución"
+#~ msgstr "Resolución"
 
 #~ msgid "Media Type:"
 #~ msgstr "Tipo de medio:"
 
 #~ msgid "Type of media you're printing to"
-#~ msgstr "Tipo de medio al que usted está imprimiendo"
+#~ msgstr "Tipo de medio al que usted está imprimiendo"
 
 #~ msgid "Media Size:"
-#~ msgstr "Tamaño del medio:"
+#~ msgstr "Tamaño del medio:"
 
 #~ msgid "Size of paper that you wish to print to"
-#~ msgstr "Tamaño del papel al que desea imprimir"
+#~ msgstr "Tamaño del papel al que desea imprimir"
 
 #~ msgid "Media Source:"
 #~ msgstr "Fuente del medio:"
 
 #~ msgid "Source (input slot) of media you're printing to"
-#~ msgstr "Origen del medio (ranura de entrada) al que está imprimiendo"
+#~ msgstr "Origen del medio (ranura de entrada) al que está imprimiendo"
 
 #~ msgid "Ink Type:"
 #~ msgstr "Tipo de Tinta:"
 
 #~ msgid "Resolution:"
-#~ msgstr "Resolución:"
+#~ msgstr "Resolución:"
 
 #~ msgid "Print in black and white (no color, and no shades of gray)"
 #~ msgstr "Imprimir en blanco y negro (no color y no sombras de gris)"
 
 #~ msgid "Fastest and brightest color for text and line art"
-#~ msgstr "Color más rápido y brillante para texto y arte lineal"
+#~ msgstr "Color más rápido y brillante para texto y arte lineal"
 
 #~ msgid "Best for images dominated by regions of solid color"
-#~ msgstr "Mejor para imágenes dominadas por regiones de colores sólidos"
+#~ msgstr "Mejor para imágenes dominadas por regiones de colores sólidos"
 
 #~ msgid ""
 #~ "Slowest, but most accurate and smoothest color for continuous tone images "
 #~ "and photographs"
 #~ msgstr ""
-#~ "Más lento, pero con el color más preciso y suave para imágenes de tono "
-#~ "continuo y fotografías"
+#~ "Más lento, pero con el color más preciso y suave para imágenes de tono "
+#~ "continuo y fotografías"
 
 #~ msgid "Dither Algorithm:"
 #~ msgstr "Algoritmo de entramado:"
@@ -8672,16 +9020,16 @@ msgstr "Traer próxima fila falló en %d\n"
 #~ "No puedo leer desde %s: %s\n"
 
 #~ msgid "%s out of range (value %f, min %f, max %f)\n"
-#~ msgstr "%s fuera de rango (valor %f, mín %f, máx %f)\n"
+#~ msgstr "%s fuera de rango (valor %f, mín %f, máx %f)\n"
 
 #~ msgid "%s is not a valid dither algorithm\n"
-#~ msgstr "%s no es un algoritmo de entramado válido\n"
+#~ msgstr "%s no es un algoritmo de entramado válido\n"
 
 #~ msgid ""
 #~ "Please re-insert the same alignment sheet in the printer when it is\n"
 #~ "finished printing.\n"
 #~ msgstr ""
-#~ "Favor de re-insertar la misma hoja de alineación en la impresora cuando\n"
+#~ "Favor de re-insertar la misma hoja de alineación en la impresora cuando\n"
 #~ "termine de imprimirse.\n"
 
 #~ msgid ""
@@ -8692,19 +9040,19 @@ msgstr "Traer próxima fila falló en %d\n"
 #~ "best pattern, and repeat the procedure.\n"
 #~ "Type a pattern number, or '?' for help.\n"
 #~ msgstr ""
-#~ "Inspeccione la hoja de alineación, y determine cuál de los patrones es "
+#~ "Inspeccione la hoja de alineación, y determine cuál de los patrones es "
 #~ "el\n"
-#~ "más suave. Éste patrón debe verse como el de menor ``grano''.\n"
-#~ "Si no puede encontrar un patrón suave, favor de seleccionar el número "
+#~ "más suave. Éste patrón debe verse como el de menor ``grano''.\n"
+#~ "Si no puede encontrar un patrón suave, favor de seleccionar el número "
 #~ "del\n"
-#~ "mejor patrón, y repita el procedimiento.\n"
-#~ "Tipee un número de patrón, o '?' para ayuda.\n"
+#~ "mejor patrón, y repita el procedimiento.\n"
+#~ "Tipee un número de patrón, o '?' para ayuda.\n"
 
 #~ msgid "The best pattern should be numbered between 1 and %d.\n"
-#~ msgstr "El mejor patrón debe ser numerado entre 1 y %d.\n"
+#~ msgstr "El mejor patrón debe ser numerado entre 1 y %d.\n"
 
 #~ msgid "Set the contrast of the print"
-#~ msgstr "Establecer el contraste de la impresión"
+#~ msgstr "Establecer el contraste de la impresión"
 
 #~ msgid "Cyan:"
 #~ msgstr "Cian:"
@@ -8716,13 +9064,13 @@ msgstr "Traer próxima fila falló en %d\n"
 #~ msgstr "Amarillo:"
 
 #~ msgid "Parameter %s out of range (value %f, min %f, max %f)\n"
-#~ msgstr "Parámetro %s fuera de rango (valor %f, mín %f, máx %f)\n"
+#~ msgstr "Parámetro %s fuera de rango (valor %f, mín %f, máx %f)\n"
 
 #~ msgid "Parameter %s out of range (value %d, min %d, max %d)\n"
-#~ msgstr "Parámetro %s fuera de rango (valor %d, mín %d, máx %d)\n"
+#~ msgstr "Parámetro %s fuera de rango (valor %d, mín %d, máx %d)\n"
 
 #~ msgid "Unknown option %s\n"
-#~ msgstr "Opción desconocida %s\n"
+#~ msgstr "Opción desconocida %s\n"
 
 #~ msgid "1440 x 360 DPI"
 #~ msgstr "1440 x 360 PPP"
@@ -8749,10 +9097,10 @@ msgstr "Traer próxima fila falló en %d\n"
 #~ msgstr "Kaku"
 
 #~ msgid "HP Greeting Card"
-#~ msgstr "Tarjeta HP de Salutación"
+#~ msgstr "Tarjeta HP de Salutación"
 
 #~ msgid "Escputil version 4.2.1, Copyright (C) 2000-2001 Robert Krawitz.\n"
-#~ msgstr "Escputil versión 4.2.1, Copyright (C) 2000-2001 Robert Krawitz.\n"
+#~ msgstr "Escputil versión 4.2.1, Copyright (C) 2000-2001 Robert Krawitz.\n"
 
 #~ msgid "Print/Save Setts."
 #~ msgstr "Imp./Guard. Conf."
diff --git a/po/fr.gmo b/po/fr.gmo
index e92db66..73a40dd 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index b1708f7..e4ad98b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 5.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\n"
 "PO-Revision-Date: 2006-05-28 10:05-0400\n"
 "Last-Translator: regis rampnoux <regisr@pobox.com>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
@@ -22,9 +22,9 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 msgid "Default"
-msgstr "Défaut"
+msgstr "Défaut"
 
 #: src/main/dither-main.c:47
 msgid "EvenTone"
@@ -59,7 +59,7 @@ msgstr "Adaptatif hybride"
 
 #: src/main/dither-main.c:64
 msgid "Ordered"
-msgstr "Ordonné"
+msgstr "Ordonné"
 
 #: src/main/dither-main.c:65
 msgid "Fast"
@@ -67,7 +67,7 @@ msgstr "Rapide"
 
 #: src/main/dither-main.c:66
 msgid "Very Fast"
-msgstr "Très rapide"
+msgstr "Très rapide"
 
 #: src/main/dither-main.c:67
 msgid "Hybrid Floyd-Steinberg"
@@ -75,26 +75,26 @@ msgstr "Floyd-Steinberg hybride"
 
 #: src/main/dither-main.c:68
 msgid "Predithered Input"
-msgstr "Pré tramé"
+msgstr "Pré tramé"
 
 #: src/main/dither-main.c:88 src/main/print-color.c:56
 msgid "Density"
-msgstr "Densité"
-
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+msgstr "Densité"
+
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
-msgstr "Réglage du niveau de sortie"
+msgstr "Réglage du niveau de sortie"
 
 #: src/main/dither-main.c:89
 msgid ""
@@ -102,9 +102,9 @@ msgid ""
 "ink bleeds through the paper or smears; increase the density if black "
 "regions are not solid."
 msgstr ""
-"Ajustement de la densité (quantité d'encre) de l'impression. Réduisez la "
-"densité si l'encre bave sur le papier ou fait des taches; augmentez la "
-"densité si les régions noires ne sont pas pleines."
+"Ajustement de la densité (quantité d'encre) de l'impression. Réduisez la "
+"densité si l'encre bave sur le papier ou fait des taches; augmentez la "
+"densité si les régions noires ne sont pas pleines."
 
 #: src/main/dither-main.c:97
 msgid "Dither Algorithm"
@@ -125,17 +125,17 @@ msgid ""
 "art.\n"
 "Hybrid Floyd-Steinberg generally produces inferior output."
 msgstr ""
-"Choisissez l'algorithme de tramage à utiliser.\n"
-"Adaptative Hybride produit habituellement la meilleure qualité de tous.\n"
-"Ordonné est plus rapide et produit une qualité presque aussi bonne que les "
+"Choisissez l'algorithme de tramage à utiliser.\n"
+"Adaptative Hybride produit habituellement la meilleure qualité de tous.\n"
+"Ordonné est plus rapide et produit une qualité presque aussi bonne que les "
 "photographes.\n"
-"Rapide et Très Rapide sont considérablement rapudes et fonctionne bien pour "
-"du text ou des tracés.\n"
-"Floyd-Steinberg Hybride produit généralement des sorties inférieures."
+"Rapide et Très Rapide sont considérablement rapudes et fonctionne bien pour "
+"du text ou des tracés.\n"
+"Floyd-Steinberg Hybride produit généralement des sorties inférieures."
 
 #: src/main/module.c:52
 msgid "Miscellaneous (unclassified)"
-msgstr "Divers (sans catégorie)"
+msgstr "Divers (sans catégorie)"
 
 #: src/main/module.c:53
 msgid "Family driver"
@@ -149,466 +149,308 @@ msgstr "Module de conversion de couleur"
 msgid "Dither algorithm"
 msgstr "Algorithme de tramage"
 
-#: src/main/print-canon.c:1382
-msgid "90x90 DPI"
-msgstr "90x90 PPP"
-
-#: src/main/print-canon.c:1382
-msgid "90x90 DPI DMT"
-msgstr "90x90 PPP DMT"
-
-#: src/main/print-canon.c:1383
-msgid "180x180 DPI"
-msgstr "180x180 PPP"
-
-#: src/main/print-canon.c:1383
-msgid "180x180 DPI DMT"
-msgstr "180x180 PPP DMT"
-
-#: src/main/print-canon.c:1384
-msgid "360x360 DPI"
-msgstr "360x360 PPP"
-
-#: src/main/print-canon.c:1384
-msgid "360x360 DPI DMT"
-msgstr "360x360 PPP DMT"
-
-#: src/main/print-canon.c:1385
-msgid "720x360 DPI"
-msgstr "720x360 PPP"
-
-#: src/main/print-canon.c:1385
-msgid "720x360 DPI DMT"
-msgstr "720x360 PPP DMT"
-
-#: src/main/print-canon.c:1386
-msgid "720x720 DPI"
-msgstr "720x720 PPP"
-
-#: src/main/print-canon.c:1386
-msgid "720x720 DPI DMT"
-msgstr "720x720 PPP DMT"
-
-#: src/main/print-canon.c:1387
-msgid "1440x720 DPI"
-msgstr "1440x720 PPP"
-
-#: src/main/print-canon.c:1387
-msgid "1440x720 DPI DMT"
-msgstr "1440x720 PPP DMT"
-
-#: src/main/print-canon.c:1388
-msgid "1440x1440 DPI"
-msgstr "1440x1440 PPP"
-
-#: src/main/print-canon.c:1388
-msgid "1440x1440 DPI DMT"
-msgstr "1440x1440 PPP DMT"
-
-#: src/main/print-canon.c:1389
-msgid "2880x2880 DPI"
-msgstr "2880x2880 PPP"
-
-#: src/main/print-canon.c:1389
-msgid "2880x2880 DPI DMT"
-msgstr "2880x2880 PPP DMT"
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr "150x150 PPP"
-
-#: src/main/print-canon.c:1390
-msgid "150x150 DPI DMT"
-msgstr "150x150 PPP DMT"
-
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
-msgstr "300x300 PPP"
-
-#: src/main/print-canon.c:1391
-msgid "300x300 DPI DMT"
-msgstr "300x300 PPP DMT"
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr "600x300 PPP"
-
-#: src/main/print-canon.c:1392
-msgid "600x300 DPI DMT"
-msgstr "600x300 PPP DMT"
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr "600x600 PPP"
-
-#: src/main/print-canon.c:1393
-msgid "600x600 DPI DMT"
-msgstr "600x600 PPP DMT"
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr "1200x600 PPP"
-
-#: src/main/print-canon.c:1394
-msgid "1200x600 DPI DMT"
-msgstr "1200x600 PPP DMT"
-
-#: src/main/print-canon.c:1395
-msgid "1200x1200 DPI"
-msgstr "1200x1200 PPP"
-
-#: src/main/print-canon.c:1395
-msgid "1200x1200 DPI DMT"
-msgstr "1200x1200 PPP DMT"
-
-#: src/main/print-canon.c:1396
-msgid "2400x2400 DPI"
-msgstr "2400x2400 PPP"
-
-#: src/main/print-canon.c:1396
-msgid "2400x2400 DPI DMT"
-msgstr "2400x2400 PPP DMT"
-
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-msgid "Plain Paper"
-msgstr "Papier ordinaire"
-
-#: src/main/print-canon.c:1448
-msgid "Plain Paper PIXMA"
-msgstr "Papier PIXMA"
-
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-msgid "Transparencies"
-msgstr "Transparents"
-
-#: src/main/print-canon.c:1450
-msgid "Back Print Film"
-msgstr "Film back print"
-
-#: src/main/print-canon.c:1451
-msgid "Fabric Sheets"
-msgstr "Support tissu"
-
-#: src/main/print-canon.c:1452
-msgid "Envelope"
-msgstr "Enveloppe"
-
-#: src/main/print-canon.c:1453
-msgid "High Resolution Paper"
-msgstr "Papier haute résolution"
-
-#: src/main/print-canon.c:1454
-msgid "T-Shirt Transfers"
-msgstr "Transferts T-Shirt"
-
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
-msgstr "Film très brillant"
-
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
-msgstr "Papier brillant qualité photo"
-
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
-msgstr "Cartes brillantes qualité photo"
-
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
-msgstr "Papier Photo Pro"
-
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
-msgstr "Autre"
-
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 msgid "Page Size"
 msgstr "Format papier "
 
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
 msgid "Basic Printer Setup"
 msgstr "Configuration de base de l'imprimante"
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 msgid "Size of the paper being printed to"
 msgstr "Taille du papier sur lequel vous imprimez"
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
 msgid "Media Type"
 msgstr "Type de support"
 
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Type de support (papier ordinaire, papier photo etc.)"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
 msgid "Media Source"
 msgstr "Source du support"
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
 msgid "Source (input slot) of the media"
 msgstr "Source (bac) du support vers lequel vous imprimez"
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
+msgstr "Taille du moyeu du CD"
+
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr ""
+"Imprime seulement sur le CD en dehors du moyeu ou y compris le moyeu "
+"jusqu'au trou"
+
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
+msgstr ""
+
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
+
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#, fuzzy
+msgid "CD Hub Size (Custom)"
+msgstr "Taille du moyeu du CD"
+
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#, fuzzy
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "Dimensionne l'impression par rapport à la taille de la page"
+
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
+msgstr "Réglage horizontal précis du CD"
+
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
+msgstr "Réglages imprimante avancés"
+
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr "Réglage précis de la position horizontale pour l'impression sur CD"
+
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
+msgstr "Réglage vertical précis du CD"
+
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
-msgstr "Résolution"
+msgstr "Résolution"
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
-msgstr "Résolution et qualité de l'impression"
+msgstr "Résolution et qualité de l'impression"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Type d'encre"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr "Réglages imprimante avancés"
-
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
-msgstr "Encres installées"
+msgstr "Encres installées"
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr "Encres (canaux)"
 
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
-msgstr "Fonctionalités avancées"
+msgstr "Fonctionalités avancées"
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Mode d'impression"
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Core Parameter"
-msgstr "Paramètres principaux"
+msgstr "Paramètres principaux"
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Mode de sortie"
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr "Impression double face"
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
-msgstr "Paramètres Duplex"
+msgstr "Paramètres Duplex"
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 msgid "Cyan Density"
-msgstr "Densité cyan"
+msgstr "Densité cyan"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 msgid "Adjust the cyan density"
-msgstr "Ajustement de la densité de cyan"
+msgstr "Ajustement de la densité de cyan"
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 msgid "Magenta Density"
-msgstr "Densité magenta"
+msgstr "Densité magenta"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 msgid "Adjust the magenta density"
-msgstr "Ajustement de la densité de magenta"
+msgstr "Ajustement de la densité de magenta"
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 msgid "Yellow Density"
-msgstr "Densité jaune"
+msgstr "Densité jaune"
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 msgid "Adjust the yellow density"
-msgstr "Ajustement de la densité de jaune"
+msgstr "Ajustement de la densité de jaune"
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 msgid "Black Density"
-msgstr "Densité du noir"
+msgstr "Densité du noir"
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 msgid "Adjust the black density"
-msgstr "Ajustement du niveau de densité"
+msgstr "Ajustement du niveau de densité"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 msgid "Light Cyan Transition"
 msgstr "Passage cyan clair"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
-msgstr "Réglage avancé des encres"
+msgstr "Réglage avancé des encres"
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 msgid "Light Magenta Transition"
 msgstr "Transition magenta clair"
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 msgid "Light Yellow Transition"
 msgstr "Transition jaune clair"
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
-msgstr "Désactivé"
+msgstr "Désactivé"
+
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
+msgstr "Côté long (standard)"
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
-msgstr "Côté court (retourné)"
+msgstr "Côté court (retourné)"
 
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-msgid "Auto Sheet Feeder"
-msgstr "Bac automatique"
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
+msgstr "CD - 5 pouces"
 
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-msgid "Manual with Pause"
-msgstr "Manuel avec pause"
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
+msgstr "CD - 3 pouces"
 
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
-msgstr "Manuel sans pause"
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
+#, fuzzy
+msgid "CD - Custom"
+msgstr "Personnalisé"
 
-#: src/main/print-canon.c:1923
-msgid "Cassette"
-msgstr "Cassette"
-
-#: src/main/print-canon.c:1924
-msgid "CD tray"
-msgstr "support CD"
-
-#: src/main/print-canon.c:2049
-msgid "Photo CcMmYK Color"
-msgstr "Photo couleur CcMmJN"
-
-#: src/main/print-canon.c:2052
-msgid "Photo CcMmY Color"
-msgstr "Photo couleur CcMmJ"
-
-#: src/main/print-canon.c:2055
-msgid "CMYK Color"
-msgstr "Couleur CMJN"
-
-#: src/main/print-canon.c:2058
-msgid "CMY Color"
-msgstr "Couleur CMJ"
-
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
-msgstr "Noir"
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
+msgstr "Normal"
 
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+msgid "Print To Hub"
+msgstr "Imprimer sue le moyeu"
+
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
 msgstr "Couleur"
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Noir et blanc"
 
 #: src/main/print-color.c:50
 msgid "High Accuracy"
-msgstr "Haute précision"
+msgstr "Haute précision"
 
 #: src/main/print-color.c:51
 msgid "Bright Colors"
@@ -624,7 +466,7 @@ msgstr "Sans correction"
 
 #: src/main/print-color.c:54
 msgid "Desaturated"
-msgstr "Désaturé"
+msgstr "Désaturé"
 
 #: src/main/print-color.c:55
 msgid "Threshold"
@@ -636,11 +478,11 @@ msgstr "Raw"
 
 #: src/main/print-color.c:58
 msgid "Pre-Dithered"
-msgstr "Pré-tramé"
+msgstr "Pré-tramé"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
 msgstr "Niveaux de gris"
 
@@ -668,10 +510,6 @@ msgstr "NCMJ"
 msgid "Channel "
 msgstr "Canal"
 
-#: src/main/print-color.c:165
-msgid " Gamma"
-msgstr "Gamma"
-
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
 #: src/main/print-color.c:266 src/main/print-color.c:274
@@ -693,11 +531,11 @@ msgstr "Correction des couleurs"
 #: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
-msgstr "Réglage fin de base de l'image"
+msgstr "Réglage fin de base de l'image"
 
 #: src/main/print-color.c:177
 msgid "Color correction to be applied"
-msgstr "Correction de couleur à utiliser"
+msgstr "Correction de couleur à utiliser"
 
 #: src/main/print-color.c:184
 msgid "Channel Bit Depth"
@@ -717,14 +555,14 @@ msgstr "Type d'image"
 
 #: src/main/print-color.c:200
 msgid "Output Image Type"
-msgstr "Type de sortie :"
+msgstr "Type de sortie :"
 
 #: src/main/print-color.c:201
 msgid "Output image type"
-msgstr "Type de sortie :"
+msgstr "Type de sortie :"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
 msgstr "Canaux raw"
 
@@ -738,11 +576,11 @@ msgstr "Pas de correction en fonction du gamma du moniteur"
 
 #: src/main/print-color.c:224
 msgid "Brightness"
-msgstr "Luminosité"
+msgstr "Luminosité"
 
 #: src/main/print-color.c:225
 msgid "Brightness of the print"
-msgstr "Luminosité de l'impression"
+msgstr "Luminosité de l'impression"
 
 #: src/main/print-color.c:232
 msgid "Contrast"
@@ -754,29 +592,29 @@ msgstr "Contraste de l'impression (0 = gris uniforme)"
 
 #: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
-msgstr "Réglage fin Contraste linéaire"
+msgstr "Réglage fin Contraste linéaire"
 
 #: src/main/print-color.c:240
 msgid "Advanced Image Control"
-msgstr "Contrôle avancé de l'image"
+msgstr "Contrôle avancé de l'image"
 
 #: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr ""
-"Utilise un réglage de contraste de type linéaire plutot qu'à point fixe"
+"Utilise un réglage de contraste de type linéaire plutot qu'à point fixe"
 
 #: src/main/print-color.c:248
 msgid "Composite Gamma"
-msgstr "Gamma général"
+msgstr "Gamma général"
 
 #: src/main/print-color.c:249
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
 msgstr ""
-"Ajustement de la Gamma de l'impression. De grandes valeurs vont généralement "
+"Ajustement de la Gamma de l'impression. De grandes valeurs vont généralement "
 "produire une impression plus brillante,tandis que des petites valeurs vont "
-"généralement produire une impression plus sombre. Noir et Blanc vont rester "
+"généralement produire une impression plus sombre. Noir et Blanc vont rester "
 "identiques en fonction de l'ajustement du brillant."
 
 #: src/main/print-color.c:258
@@ -785,15 +623,15 @@ msgstr ""
 
 #: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
-msgstr "Valeur gamma prévue par l'application"
-
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+msgstr "Valeur gamma prévue par l'application"
+
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
@@ -801,15 +639,15 @@ msgstr "Cyan"
 
 #: src/main/print-color.c:267
 msgid "Adjust the cyan gamma"
-msgstr "Réglage du gamma pour le cyan"
-
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+msgstr "Réglage du gamma pour le cyan"
+
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 msgid "Magenta"
@@ -817,15 +655,15 @@ msgstr "Magenta"
 
 #: src/main/print-color.c:275
 msgid "Adjust the magenta gamma"
-msgstr "Réglage du gamma pour le magenta"
-
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+msgstr "Réglage du gamma pour le magenta"
+
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
@@ -833,44 +671,56 @@ msgstr "Jaune"
 
 #: src/main/print-color.c:283
 msgid "Adjust the yellow gamma"
-msgstr "Réglage du gamma pour le jaune"
+msgstr "Réglage du gamma pour le jaune"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
 msgstr "Rouge"
 
 #: src/main/print-color.c:291
 msgid "Adjust the red gamma"
-msgstr "Réglage du gamma pour le rouge"
+msgstr "Réglage du gamma pour le rouge"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
 msgstr "Vert"
 
 #: src/main/print-color.c:299
 msgid "Adjust the green gamma"
-msgstr "Réglage du gamma pour le vert"
+msgstr "Réglage du gamma pour le vert"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
 msgstr "Bleu"
 
 #: src/main/print-color.c:307
 msgid "Adjust the blue gamma"
-msgstr "Réglage du gamma pour le bleu"
+msgstr "Réglage du gamma pour le bleu"
+
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr "Noir"
 
 #: src/main/print-color.c:315
 msgid "Adjust the black gamma"
-msgstr "Réglage du gamma pour le noir"
+msgstr "Réglage du gamma pour le noir"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
 msgstr "Niveau de cyan"
 
@@ -881,23 +731,23 @@ msgstr "Balance des gris"
 
 #: src/main/print-color.c:323
 msgid "Adjust the cyan gray balance"
-msgstr "Réglage du cyan pour la balance des gris"
+msgstr "Réglage du cyan pour la balance des gris"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 msgid "Magenta Balance"
 msgstr "Niveau de magenta"
 
 #: src/main/print-color.c:331
 msgid "Adjust the magenta gray balance"
-msgstr "Réglage du magenta pour la balance des gris"
+msgstr "Réglage du magenta pour la balance des gris"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 msgid "Yellow Balance"
 msgstr "Niveau de jaune"
 
 #: src/main/print-color.c:339
 msgid "Adjust the yellow gray balance"
-msgstr "Réglage du jaune pour la balance des gris"
+msgstr "Réglage du jaune pour la balance des gris"
 
 #: src/main/print-color.c:346
 msgid "Saturation"
@@ -909,7 +759,7 @@ msgid ""
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
 "Ajustement de la saturation (balance des couleurs) de l'impression\n"
-"Utilisez la saturation zéro pour produire une sortie en tons de gris avec "
+"Utilisez la saturation zéro pour produire une sortie en tons de gris avec "
 "les encres noir et couleurs."
 
 #: src/main/print-color.c:357
@@ -918,17 +768,17 @@ msgstr "Limite d'encrage"
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 msgid "Advanced Output Control"
-msgstr "Controle avancé de la sortie"
+msgstr "Controle avancé de la sortie"
 
 #: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr ""
-"Limite l'encre utilisée au total\n"
-"(peut être laissé au nombre d'encres)"
+"Limite l'encre utilisée au total\n"
+"(peut être laissé au nombre d'encres)"
 
 #: src/main/print-color.c:365
 msgid "GCR Transition"
@@ -936,7 +786,7 @@ msgstr "Transition GCR"
 
 #: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
-msgstr "Régle le taux de transition de la composante gris"
+msgstr "Régle le taux de transition de la composante gris"
 
 #: src/main/print-color.c:373
 msgid "GCR Lower Bound"
@@ -954,10 +804,6 @@ msgstr "Limite haute GCR"
 msgid "Upper bound of gray component reduction"
 msgstr "Limite haute de la composante gris"
 
-#: src/main/print-color.c:446
-msgid " Curve"
-msgstr "Courbe"
-
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
@@ -968,7 +814,7 @@ msgstr "Courbes de sortie"
 
 #: src/main/print-color.c:447
 msgid "Curve for raw channel "
-msgstr "Courbe pour données brutes (raw)"
+msgstr "Courbe pour données brutes (raw)"
 
 #: src/main/print-color.c:457
 msgid "Cyan Curve"
@@ -1041,11 +887,11 @@ msgstr "Carte Hue"
 #: src/main/print-color.c:521 src/main/print-color.c:529
 #: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
-msgstr "Courbes HSL avancées"
+msgstr "Courbes HSL avancées"
 
 #: src/main/print-color.c:522
 msgid "Hue adjustment curve"
-msgstr "Courbe de réglage fin HUE"
+msgstr "Courbe de réglage fin HUE"
 
 #: src/main/print-color.c:529
 msgid "Saturation Map"
@@ -1053,15 +899,15 @@ msgstr "Carte de saturation"
 
 #: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
-msgstr "Courbe de réglage de la saturation"
+msgstr "Courbe de réglage de la saturation"
 
 #: src/main/print-color.c:537
 msgid "Luminosity Map"
-msgstr "Carte de luminosité"
+msgstr "Carte de luminosité"
 
 #: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
-msgstr "Courbe de réglage de la luminosité"
+msgstr "Courbe de réglage de la luminosité"
 
 #: src/main/print-color.c:545
 msgid "Gray Component Reduction"
@@ -1071,81 +917,81 @@ msgstr "Composante gris"
 msgid "Gray component reduction curve"
 msgstr "Courbe de la composante gris"
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
 msgstr "Conversion de couleur traditionelle Gutenprint"
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
-msgstr "Valeur à définir pour: %s\n"
+msgstr "Valeur à définir pour: %s\n"
 
-#: src/main/printers.c:516 src/main/printers.c:521
+#: src/main/printers.c:519 src/main/printers.c:524
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s n'est pas une valeur valide pour %s\n"
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
-msgstr "%s doit être entre %f et %f (actuellement %f)\n"
+msgstr "%s doit être entre %f et %f (actuellement %f)\n"
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
-msgstr "%s doit être entre %d et %d (actuellement %d)\n"
+msgstr "%s doit être entre %d et %d (actuellement %d)\n"
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
-msgstr "%s limites doivent être entre %f et %f\n"
+msgstr "%s limites doivent être entre %f et %f\n"
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
-msgstr "%s wrap mode doit être %s\n"
+msgstr "%s wrap mode doit être %s\n"
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:673
+#: src/main/printers.c:676
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
-msgstr "paramètre de type inconnu %s (%d)\n"
+msgstr "paramètre de type inconnu %s (%d)\n"
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s hors-intervalle (valeur %d, mini %d, maxi %d)\n"
 
-#: src/main/printers.c:755
+#: src/main/printers.c:761
 msgid "Page size is not valid\n"
 msgstr "La taille de la page n'est pas valide\n"
 
-#: src/main/printers.c:776
+#: src/main/printers.c:782
 #, c-format
 msgid "Top margin must not be less than %d\n"
-msgstr "La marge supérieure ne doit pas être plus petite que %d\n"
+msgstr "La marge supérieure ne doit pas être plus petite que %d\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:788
 #, c-format
 msgid "Left margin must not be less than %d\n"
-msgstr "La marge gauche ne doit pas être plus petite que %d\n"
+msgstr "La marge gauche ne doit pas être plus petite que %d\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:794
 msgid "Height must be greater than zero\n"
-msgstr "La hauteur doit être supérieure à zéro\n"
+msgstr "La hauteur doit être supérieure à zéro\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:800
 msgid "Width must be greater than zero\n"
-msgstr "La largeur doit être plus grande que zéro\n"
+msgstr "La largeur doit être plus grande que zéro\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -1154,7 +1000,7 @@ msgstr ""
 "L'image est trop large pour la page: marge gauche %d, largeur %d, bord droit "
 "%d\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1163,449 +1009,271 @@ msgstr ""
 "L'image est trop haute pour la page: marge en haut %d, hauteur %d, bord du "
 "bas %d\n"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-msgid "Roll Feed"
-msgstr "Alimentation rouleau"
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr "Alimentation rouleau (couper chaque page)"
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr "Alimentation rouleau (sans découpe des pages)"
-
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-msgid "Manual Feed"
-msgstr "Alimentation manuelle"
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-msgid "Print to CD"
-msgstr "Imprimer un CD"
-
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-msgid "Manual Sheet Guide"
-msgstr "Alimentation guide par feuille (arrière)"
-
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-msgid "Manual Feed (Front)"
-msgstr "Alimentation manuelle (avant)"
-
-#: src/main/print-escp2-data.c:554
-msgid "Rear Tray"
-msgstr "Bac arrière"
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr "Bac avant"
-
-#: src/main/print-escp2-data.c:581
-msgid "Photo Board"
-msgstr "Carte photo"
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr "Coupe papier Bin 1"
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr "Coupe papier Bin 2"
-
-#: src/main/print-escp2-data.c:638
-msgid "Cut Sheet Autoselect"
-msgstr "Sélection de coupe automatique"
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr "Sélection manuelle"
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr "Rapide (économique)"
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr "Economique"
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr "Brouillon"
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-msgid "High"
-msgstr "Hauteur"
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-msgid "Photo"
-msgstr "Photo"
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-msgid "Super Photo"
-msgstr "Super Photo"
-
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-msgid "Ultra Photo"
-msgstr "Ultra photo"
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr "Meilleur"
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-msgid "Light Cyan"
-msgstr "Cyan clair"
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-msgid "Light Magenta"
-msgstr "Magenta clair"
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-msgid "Light Black"
-msgstr "Noir clair"
-
-#: src/main/print-escp2-data.c:811
-msgid "Dark Yellow"
-msgstr "Jaune foncé"
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-msgid "Matte Black"
-msgstr "Noir Mat"
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-msgid "Photo Black"
-msgstr "Noir photo"
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-msgid "Gloss Optimizer"
-msgstr "Optimiseur de brillance"
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-msgid "Light Light Black"
-msgstr "Noir très clair"
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
 msgstr "Mode d'impression automatique"
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
-msgstr "Réglage de base"
+msgstr "Réglage de base"
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
 msgstr "Mode d'impression automatique"
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
-msgstr "Qualité d'impression"
-
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr "Taille du moyeu du CD"
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr ""
-"Imprime seulement sur le CD en dehors du moyeu ou y compris le moyeu "
-"jusqu'au trou"
+msgstr "Qualité d'impression"
 
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr "Réglage horizontal précis du CD"
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr "Réglage précis de la position horizontale pour l'impression sur CD"
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr "Réglage vertical précis du CD"
-
-#: src/main/print-escp2.c:214
+#: src/main/print-escp2.c:228
 msgid "Resolution of the print"
-msgstr "Résolution de l'impression"
+msgstr "Résolution de l'impression"
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
-msgstr "Amélioration de la brillance"
+msgstr "Amélioration de la brillance"
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
-msgstr "Ajouter l'amélioration de brillance"
+msgstr "Ajouter l'amélioration de brillance"
 
-#: src/main/print-escp2.c:236
+#: src/main/print-escp2.c:250
 msgid "Ink Set"
 msgstr "Jeu d'encres"
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
 msgstr "Sens d'impression"
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
-msgstr "Réglage avancé de sorties"
+msgstr "Réglage avancé de sorties"
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
-"Sens d'impression (unidirectionnel est de meilleure qualité mais plus lent)"
+"Sens d'impression (unidirectionnel est de meilleure qualité mais plus lent)"
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
 msgstr "sans marges"
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
 msgstr "Impression sans marges"
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
-msgstr "Méthode d'entrelacement"
+msgstr "Méthode d'entrelacement"
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
 msgstr "Motif d'entrelacement"
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
-msgstr "Ajuster la taille des gouttes si nécessaire"
+msgstr "Ajuster la taille des gouttes si nécessaire"
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
-"Ajuster la taille des gouttes si nécessaire pour obtenir la densité souhaitée"
+"Ajuster la taille des gouttes si nécessaire pour obtenir la densité souhaitée"
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 msgid "Output Order"
 msgstr "Ordre de sortie"
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 msgid "Ink change command"
 msgstr "Commande de changement d'encre"
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 msgid "Alternate Alignment Choices"
 msgstr "Choix d'alignement alternatif"
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
 msgstr "Supporte le mode paquet"
 
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 msgid "Channel Names"
 msgstr "Nom des canaux"
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:346
 msgid "Cyan Map"
 msgstr "Carte du cyan"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:347
 msgid "Adjust the cyan map"
 msgstr "Modification de la carte du cyan"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:352
 msgid "Magenta Map"
 msgstr "Carte du magenta"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:353
 msgid "Adjust the magenta map"
 msgstr "Modification de la carte du majenta"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:358
 msgid "Yellow Map"
 msgstr "Carte du jaune"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:359
 msgid "Adjust the yellow map"
 msgstr "Modification de la carte du jaune"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:364
 msgid "Blue Map"
 msgstr "Carte du bleu"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:365
 msgid "Adjust the blue map"
 msgstr "Modification de la carte du bleu"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
 msgstr "Carte du rouge"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:371
 msgid "Adjust the red map"
 msgstr "Modification de la carte du rouge"
 
-#: src/main/print-escp2.c:447
+#: src/main/print-escp2.c:464
 msgid "Red Density"
-msgstr "Densité du rouge"
+msgstr "Densité du rouge"
 
-#: src/main/print-escp2.c:448
+#: src/main/print-escp2.c:465
 msgid "Adjust the red density"
-msgstr "Ajuste la densité du rouge"
+msgstr "Ajuste la densité du rouge"
 
-#: src/main/print-escp2.c:455
+#: src/main/print-escp2.c:472
 msgid "Blue Density"
-msgstr "Densité du bleu"
+msgstr "Densité du bleu"
 
-#: src/main/print-escp2.c:456
+#: src/main/print-escp2.c:473
 msgid "Adjust the blue density"
-msgstr "Ajuste la densité du bleu"
+msgstr "Ajuste la densité du bleu"
 
-#: src/main/print-escp2.c:463
+#: src/main/print-escp2.c:480
 msgid "Gloss Level"
 msgstr "Niveau de brillance"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:481
 msgid "Adjust the gloss level"
 msgstr "Ajuste le niveau de brillance"
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
-msgstr "transition jaune foncé"
+msgstr "transition jaune foncé"
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
 msgstr "Transition gris"
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 msgid "Light Gray Transition"
 msgstr "Transition cyan clair"
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 msgid "Dark Gray Transition"
-msgstr "Transition gris foncé"
+msgstr "Transition gris foncé"
 
-#: src/main/print-escp2.c:527
+#: src/main/print-escp2.c:544
 msgid "Mid Gray Transition"
-msgstr "Transition gris médian"
+msgstr "Transition gris médian"
 
-#: src/main/print-escp2.c:528
+#: src/main/print-escp2.c:545
 msgid "Medium Gray Transition"
 msgstr "Transition gris moyen"
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 msgid "Full Manual Control"
-msgstr "Contrôle manuel complet"
+msgstr "Contrôle manuel complet"
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
-msgstr "Controle réglage automatique"
-
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr "CD - 5 pouces"
+msgstr "Controle réglage automatique"
 
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr "CD - 3 pouces"
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr "Normal"
-
-#: src/main/print-escp2.c:1564
-msgid "Print To Hub"
-msgstr "Imprimer sue le moyeu"
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Controle manuel"
 
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr "Standard"
+
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/main/print-escp2.c:1701
+#: src/main/print-escp2.c:1829
 msgid "Bidirectional"
 msgstr "Bidirectionnel"
 
-#: src/main/print-escp2.c:1703
+#: src/main/print-escp2.c:1831
 msgid "Unidirectional"
 msgstr "Unirectionnel"
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
 msgstr "en alternance"
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
 msgstr "en montant"
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
 msgstr "en descendant"
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
 msgstr "en montant - double"
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
-msgstr "en évitant les voisins"
+msgstr "en évitant les voisins"
 
-#: src/main/print-escp2.c:2168
+#: src/main/print-escp2.c:2313
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "L'imprimante ne supporte pas les sorties directes en %d bits\n"
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
-msgstr "Options d'impression non vérifiées: ne peut pas imprimer.\n"
+msgstr "Options d'impression non vérifiées: ne peut pas imprimer.\n"
 
 #: src/main/print-lexmark.c:577 src/main/print-lexmark.c:653
 msgid "300 DPI x 600 DPI"
@@ -1617,7 +1285,7 @@ msgstr "600 PPP"
 
 #: src/main/print-lexmark.c:579 src/main/print-lexmark.c:655
 msgid "600 DPI high quality"
-msgstr "600 PPP Haute qualité"
+msgstr "600 PPP Haute qualité"
 
 #: src/main/print-lexmark.c:580 src/main/print-lexmark.c:656
 msgid "600 DPI Unidirectional"
@@ -1629,11 +1297,11 @@ msgstr "1200 PPP"
 
 #: src/main/print-lexmark.c:582 src/main/print-lexmark.c:658
 msgid "1200 DPI high quality"
-msgstr "1200 PPP Haute qualité"
+msgstr "1200 PPP Haute qualité"
 
 #: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659
 msgid "1200 DPI highest quality"
-msgstr "1200 PPP Très haute qualité"
+msgstr "1200 PPP Très haute qualité"
 
 #: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660
 msgid "1200 DPI  Unidirectional"
@@ -1645,426 +1313,582 @@ msgstr "2400 x 1200 PPP"
 
 #: src/main/print-lexmark.c:586
 msgid "2400 DPI x 1200 DPI high quality"
-msgstr "2400 x 1200 PPP Haute qualité"
+msgstr "2400 x 1200 PPP Haute qualité"
 
 #: src/main/print-lexmark.c:587
 msgid "2400 DPI x 1200 DPI highest quality"
-msgstr "2400 x 1200 PPP Très haute qualité"
+msgstr "2400 x 1200 PPP Très haute qualité"
 
 #: src/main/print-lexmark.c:589
 msgid "test print"
 msgstr "test d'impression"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
 msgstr "Quatre couleurs standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
 msgstr "Trois couleurs composite"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
 msgstr "Six couleurs photo"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
 msgstr "Cinq couleurs photo composite"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+msgid "Plain Paper"
+msgstr "Papier ordinaire"
+
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
 msgstr "Film brillant"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+msgid "Transparencies"
+msgstr "Transparents"
+
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 msgid "Envelopes"
 msgstr "Enveloppes"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 msgid "Matte Paper"
 msgstr "Papier Mat"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
 msgstr "Papier jet d'encre"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
-msgstr "Papier jet d'encre qualité photo"
+msgstr "Papier jet d'encre qualité photo"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 msgid "Photo Paper"
 msgstr "Papier photo"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
-msgstr "Papier glacé photo Premium"
+msgstr "Papier glacé photo Premium"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
 msgstr "Papier photo Premium Luster"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
-msgstr "Papier glacé qualité photo"
+msgstr "Papier glacé qualité photo"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
-msgstr "Papier épais Ilford"
+msgstr "Papier épais Ilford"
+
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr "Autre"
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr "Bac automatique"
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr "Manuel avec pause"
 
-#: src/main/print-olympus.c:265
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr "Manuel sans pause"
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
-msgstr "Couché"
+msgstr "Couché"
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
 msgstr "Aucun"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 msgid "Glossy"
 msgstr "Brillant"
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
 msgstr "Texture"
 
-#: src/main/print-olympus.c:861
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 msgid "Matte"
 msgstr "Mat"
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
 msgstr "Motif du vernis protecteur"
 
-#: src/main/print-olympus.c:1331
+#: src/main/print-olympus.c:1627
 msgid "Adjust the cyan balance"
-msgstr "Réglage balance cyan"
+msgstr "Réglage balance cyan"
 
-#: src/main/print-olympus.c:1339
+#: src/main/print-olympus.c:1635
 msgid "Adjust the magenta balance"
-msgstr "Réglage balance magenta"
+msgstr "Réglage balance magenta"
 
-#: src/main/print-olympus.c:1347
+#: src/main/print-olympus.c:1643
 msgid "Adjust the yellow balance"
-msgstr "Réglage balance jaune"
+msgstr "Réglage balance jaune"
 
-#: src/main/print-olympus.c:1354
+#: src/main/print-olympus.c:1650
 msgid "Black Balance"
 msgstr "Balance du noir"
 
-#: src/main/print-olympus.c:1355
+#: src/main/print-olympus.c:1651
 msgid "Adjust the black balance"
-msgstr "Réglage de la balance du noir"
+msgstr "Réglage de la balance du noir"
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 msgid "Plain"
 msgstr "Normal"
 
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 msgid "Bond"
 msgstr "Bond"
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 msgid "Premium"
 msgstr "Premium"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
 msgstr "Photo brillant"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 msgid "Transparency"
 msgstr "Transparent"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
-msgstr "Photo séchage rapide"
+msgstr "Photo séchage rapide"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 msgid "Quick-dry Transparency"
-msgstr "Transparent séchage rapide"
+msgstr "Transparent séchage rapide"
 
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
 msgstr "Manuel"
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 msgid "Tray 1"
 msgstr "Bac 1"
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 msgid "Tray 2"
 msgstr "Bac 2"
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 msgid "Tray 3"
 msgstr "Bac 3"
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 msgid "Tray 4"
 msgstr "Bac 4"
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
 msgstr "Chargeur de feuille portable"
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 msgid "Desktop Sheet Feeder"
 msgstr "Chargeur de feuille de bureau"
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 msgid "Tray"
 msgstr "Bac"
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 msgid "Optional Source"
 msgstr "Source optionnelle"
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 msgid "Autoselect"
-msgstr "Sélection auto"
+msgstr "Sélection auto"
 
 #: src/main/print-pcl.c:256
+msgid "150x150 DPI"
+msgstr "150x150 PPP"
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr "300x300 PPP"
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
+msgstr "600x300 PPP"
+
+#: src/main/print-pcl.c:259
 msgid "600x600 DPI monochrome"
 msgstr "600 x 600 ppp Monochrome"
 
-#: src/main/print-pcl.c:259
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr "600x600 PPP"
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr "1200x600 PPP"
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
 msgstr "2400 x 600 ppp"
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
 msgstr "Cartouches couleur et noir"
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
 msgstr "Cartouches couleur et photo"
 
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr "Côté long (standard)"
-
 #: src/main/print-ps.c:97
 msgid "PPDFile"
 msgstr "Fichier PPD"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 msgid "PPD File"
 msgstr "Fichier PPD"
 
 #: src/main/print-raw.c:223
 msgid "Image dimensions must match paper dimensions"
-msgstr "Les dimensions de l'image doivent correspondre à celles du papier"
+msgstr "Les dimensions de l'image doivent correspondre à celles du papier"
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 msgid "Two Level Grayscale"
-msgstr "EChelle de gris à deux niveaux"
+msgstr "EChelle de gris à deux niveaux"
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 msgid "Three Level Grayscale"
 msgstr "Trois niveaux de gris"
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
-msgstr "Six couleurs amélioré composite"
+msgstr "Six couleurs amélioré composite"
 
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 msgid "Seven Color Photo"
 msgstr "Photo sept couleurs"
 
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 msgid "Seven Color Enhanced"
-msgstr "Sept couleurs amélioré"
+msgstr "Sept couleurs amélioré"
 
-#: src/main/escp2-channels.c:1535
+#: src/main/escp2-channels.c:1649
 msgid "Eight Color Photo"
 msgstr "Huit couleurs photo"
 
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 msgid "One Color Raw"
 msgstr "Une couleur de base"
 
-#: src/main/escp2-channels.c:1695
+#: src/main/escp2-channels.c:1809
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Une couleur de base optimiseur de brillance"
 
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 msgid "Two Color Raw"
 msgstr "Deux couleurs de base"
 
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 msgid "Three Color Raw"
 msgstr "Trois couleurs de base"
 
-#: src/main/escp2-channels.c:1762
+#: src/main/escp2-channels.c:1876
 msgid "Three Color Raw Gloss"
 msgstr "Trois couleurs de base brillant"
 
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 msgid "Four Color Raw"
 msgstr "Quatre couleurs de base"
 
-#: src/main/escp2-channels.c:1884
+#: src/main/escp2-channels.c:2017
 msgid "Four Color Raw Gloss"
 msgstr "Quatre couleurs de base brillant"
 
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 msgid "Five Color Raw"
 msgstr "Cinq couleurs de base"
 
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 msgid "Six Color Raw"
 msgstr "Six couleurs de base"
 
-#: src/main/escp2-channels.c:1962
+#: src/main/escp2-channels.c:2109
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Six couleurs de base Optimiseur de brillance"
 
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 msgid "Seven Color Raw"
 msgstr "Sept couleurs de base"
 
-#: src/main/escp2-channels.c:2024
+#: src/main/escp2-channels.c:2187
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sept couleurs de base Optimiseur de brillance"
 
-#: src/main/escp2-channels.c:2042
+#: src/main/escp2-channels.c:2205
 msgid "Eight Color Raw"
 msgstr "Huit couleurs de base"
 
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
 msgstr "Encres standard EPSON"
 
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 msgid "UltraChrome Photo Black"
 msgstr "Ultrachrome noir photo"
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
 msgstr "Ultrachrome noir mat"
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+msgid "Photo Black"
+msgstr "Noir photo"
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+msgid "Matte Black"
+msgstr "Noir Mat"
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+msgid "Light Cyan"
+msgstr "Cyan clair"
+
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+msgid "Light Magenta"
+msgstr "Magenta clair"
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+msgid "Light Black"
+msgstr "Noir clair"
+
+#: src/main/escp2-channels.c:2981
+msgid "Dark Yellow"
+msgstr "Jaune foncé"
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+msgid "Gloss Optimizer"
+msgstr "Optimiseur de brillance"
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+msgid "Light Light Black"
+msgstr "Noir très clair"
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 msgid "Plain Paper Fast Load"
 msgstr "Papier normal chargement rapide"
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Carte postale"
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 msgid "Back Light Film"
 msgstr "Film back light"
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 msgid "Matte Paper Heavyweight"
 msgstr "Papier Mat Heavyweight"
 
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 msgid "Premium Semigloss Photo Paper"
 msgstr "Papier semi-brillant photo Premium"
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 msgid "ColorLife Paper"
 msgstr "Papier Colorlife"
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 msgid "Archival Matte Paper"
 msgstr "Papier Mat Archival"
 
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
 msgstr "Papier aquarelle - radiant white"
 
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+msgid "Roll Feed"
+msgstr "Alimentation rouleau"
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr "Alimentation rouleau (couper chaque page)"
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr "Alimentation rouleau (sans découpe des pages)"
+
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+msgid "Manual Feed"
+msgstr "Alimentation manuelle"
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+msgid "Print to CD"
+msgstr "Imprimer un CD"
+
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+msgid "Manual Sheet Guide"
+msgstr "Alimentation guide par feuille (arrière)"
+
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+msgid "Manual Feed (Front)"
+msgstr "Alimentation manuelle (avant)"
+
+#: src/main/escp2-papers.c:1859
+msgid "Rear Tray"
+msgstr "Bac arrière"
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr "Bac avant"
+
+#: src/main/escp2-papers.c:1886
+msgid "Photo Board"
+msgstr "Carte photo"
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr "Coupe papier Bin 1"
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr "Coupe papier Bin 2"
+
+#: src/main/escp2-papers.c:1943
+msgid "Cut Sheet Autoselect"
+msgstr "Sélection de coupe automatique"
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr "Sélection manuelle"
+
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
-msgstr "360x90 ppp rapide économique"
+msgstr "360x90 ppp rapide économique"
 
 #: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
 msgid "360 x 120 DPI Economy"
@@ -2084,7 +1908,7 @@ msgstr "360 x 240 ppp brouillon"
 
 #: src/main/escp2-resolutions.c:68
 msgid "360 DPI High Quality"
-msgstr "360 ppp Haute qualité"
+msgstr "360 ppp Haute qualité"
 
 #: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
 #: src/main/escp2-resolutions.c:77
@@ -2095,121 +1919,146 @@ msgstr "360 ppp"
 msgid "720 x 360 DPI"
 msgstr "720 x 360 ppp"
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 ppp"
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 msgid "720 DPI"
 msgstr "720 ppp"
 
-#: src/main/escp2-resolutions.c:94
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 msgid "720 DPI High Quality"
-msgstr "720 ppp Haute qualité"
+msgstr "720 ppp Haute qualité"
 
-#: src/main/escp2-resolutions.c:97
+#: src/main/escp2-resolutions.c:103
 msgid "720 DPI Highest Quality"
-msgstr "720 ppp Qualité maximale"
+msgstr "720 ppp Qualité maximale"
 
-#: src/main/escp2-resolutions.c:100
+#: src/main/escp2-resolutions.c:106
 msgid "720 x 720 DPI"
 msgstr "720 x 720 ppp"
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 ppp"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:116
 msgid "1440 x 720 DPI Highest Quality"
-msgstr "1440 x 720 ppp Trés haute qualité"
+msgstr "1440 x 720 ppp Trés haute qualité"
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 ppp Transposé"
+msgstr "1440 x 720 ppp Transposé"
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 ppp"
 
-#: src/main/escp2-resolutions.c:129
+#: src/main/escp2-resolutions.c:135
 msgid "2880 x 720 DPI Highest Quality"
-msgstr "2880 x 720 ppp Trés haute qualité"
+msgstr "2880 x 720 ppp Trés haute qualité"
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
+#: src/main/escp2-resolutions.c:145
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 ppp"
 
-#: src/main/escp2-resolutions.c:142
-msgid "1440 x 1440"
-msgstr "1440 x 1440"
-
-#: src/main/escp2-resolutions.c:145
-msgid "1440 x 1440 DPI High Quality"
-msgstr "1440 x 1440 ppp Haute qualité"
-
-#: src/main/escp2-resolutions.c:148
-msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1440 x 1440 ppp Qualité maximale"
-
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 ppp"
 
-#: src/main/escp2-resolutions.c:158
+#: src/main/escp2-resolutions.c:155
 msgid "2880 x 1440 DPI Transposed"
-msgstr "2880 x 1440 ppp transposé"
-
-#: src/main/escp2-resolutions.c:164
-msgid "2880 x 1440 DPI High Quality"
-msgstr "2880 x 720 ppp Haute qualité"
+msgstr "2880 x 1440 ppp transposé"
 
-#: src/main/escp2-resolutions.c:167
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr "2880 x 1440 ppp Qualité maximale"
-
-#: src/main/escp2-resolutions.c:171
+#: src/main/escp2-resolutions.c:162
 msgid "5760 x 1440 DPI"
 msgstr "5760 x 1440 ppp"
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 ppp"
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 msgid "5760 x 2880 DPI"
 msgstr "5760 x 2880 ppp"
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
 msgstr "Actif"
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 msgid "Interleave"
 msgstr "Entrelacement"
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
 msgstr "quatre passes"
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 msgid "Interleave 2"
 msgstr "Entrelancement 2"
 
-#: src/main/escp2-resolutions.c:584
+#: src/main/escp2-resolutions.c:594
 msgid "Eight Pass"
 msgstr "huit passes"
 
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr "Rapide (économique)"
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr "Economique"
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr "Brouillon"
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+msgid "High"
+msgstr "Hauteur"
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+msgid "Photo"
+msgstr "Photo"
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+msgid "Super Photo"
+msgstr "Super Photo"
+
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+msgid "Ultra Photo"
+msgstr "Ultra photo"
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr "Meilleur"
+
 #: src/main/generic-options.c:46
 msgid "Text"
 msgstr "Texte"
@@ -2244,7 +2093,7 @@ msgstr "Type d'image"
 
 #: src/main/generic-options.c:69
 msgid "Type of image being printed"
-msgstr "Type d'image à imprimer"
+msgstr "Type d'image à imprimer"
 
 #: src/main/generic-options.c:74 src/main/generic-options.c:80
 msgid "Job Mode"
@@ -2256,11 +2105,11 @@ msgstr "Mode Travail/Page"
 
 #: src/main/generic-options.c:80
 msgid "Page Number"
-msgstr "Page numéro"
+msgstr "Page numéro"
 
 #: src/main/generic-options.c:81
 msgid "Page number"
-msgstr "Page numéro"
+msgstr "Page numéro"
 
 #: src/main/xmli18n-tmp.h:1
 msgid "Letter"
@@ -2278,3676 +2127,4024 @@ msgstr "Tabloid"
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/main/xmli18n-tmp.h:11
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
-msgstr "Papier photo Epson 4x6 (bordures pré-découpées)"
+msgstr "Papier photo Epson 4x6 (bordures pré-découpées)"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17x22"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/main/xmli18n-tmp.h:26
 msgid "22x30"
 msgstr "22x30"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/main/xmli18n-tmp.h:32
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
 msgstr "A4"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/main/xmli18n-tmp.h:67
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 msgid "ArchA transposed"
 msgstr "ArchA sens paysage"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 msgid "ArchB transposed"
 msgstr "ArchB sens paysage"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 msgid "ArchC transposed"
 msgstr "ArcgC sens paysage"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 msgid "ArchD transposed"
 msgstr "ArchD sens paysage"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 msgid "ArchE transposed"
 msgstr "ArchE sens paysage"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 msgid "American foolscap"
-msgstr "Foolscap américain"
+msgstr "Foolscap américain"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 msgid "European foolscap"
-msgstr "Foolscap européen"
+msgstr "Foolscap européen"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 msgid "Large Crown Quarto"
 msgstr "Quatro couronne large"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 msgid "Demy Quarto"
 msgstr "Demi-quatro"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 msgid "Royal Quarto"
 msgstr "Quatro royal"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/main/xmli18n-tmp.h:109
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 msgid "Crown Octavo"
 msgstr "Octave couronne"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 msgid "Large Crown Octavo"
 msgstr "Octave couronne large"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 msgid "Demy Octavo"
 msgstr "Demi-octave"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 msgid "Royal Octavo"
 msgstr "Octave royale"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
 msgstr "ISO A5"
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 msgid "Small paperback"
 msgstr "Petite reliure"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 msgid "Penguin small paperback"
 msgstr "Petite reliure Penguin"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 msgid "Penguin large paperback"
 msgstr "Grande reliure Penguin"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 msgid "Hagaki Card"
 msgstr "Carte Hagaki"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
 msgstr "Carte Oufuku"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
-msgstr "Enveloppe longue japonaise n°3"
+msgstr "Enveloppe longue japonaise n°3"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
-msgstr "Enveloppe longue japonaise n°4"
+msgstr "Enveloppe longue japonaise n°4"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 msgid "Japanese Kaku envelope #4"
-msgstr "Enveloppe Kaku japonaise n°4"
+msgstr "Enveloppe Kaku japonaise n°4"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/main/xmli18n-tmp.h:125
+#: src/main/xmli18n-tmp.h:126
 msgid "Monarch Envelope"
 msgstr "Enveloppe Monarch"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/main/xmli18n-tmp.h:128
 msgid "4x7"
 msgstr "4x7"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
 msgstr "Carte"
 
-#: src/main/xmli18n-tmp.h:130
+#: src/main/xmli18n-tmp.h:131
 msgid "Wide Postcard"
 msgstr "Carte postale large"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 msgid "Custom"
-msgstr "Personnalisé"
+msgstr "Personnalisé"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
 msgstr "Rouleau 89mm"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
 msgstr "Rouleau 4 pouces"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
 msgstr "Rouleau 5 pouces"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
 msgstr "Rouleau 210mm"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
 msgstr "Rouleau 13 pouces"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
 msgstr "Rouleau 22 pouces"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
 msgstr "Rouleau 24 pouces"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
 msgstr "Rouleau 36 pouces"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
 msgstr "Rouleau 44 pouces"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 1"
 msgstr "Postscript level 1"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/main/xmli18n-tmp.h:146
 msgid "PostScript Level 2"
 msgstr "Postscript level 2"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/main/xmli18n-tmp.h:147
 msgid "Canon BJ-30"
 msgstr "Canon BJC-30"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/main/xmli18n-tmp.h:148
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/main/xmli18n-tmp.h:148
+#: src/main/xmli18n-tmp.h:149
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/main/xmli18n-tmp.h:150
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/main/xmli18n-tmp.h:150
+#: src/main/xmli18n-tmp.h:151
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:151
+#: src/main/xmli18n-tmp.h:152
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/main/xmli18n-tmp.h:153
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/main/xmli18n-tmp.h:153
+#: src/main/xmli18n-tmp.h:154
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/main/xmli18n-tmp.h:154
+#: src/main/xmli18n-tmp.h:155
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/main/xmli18n-tmp.h:155
+#: src/main/xmli18n-tmp.h:156
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/main/xmli18n-tmp.h:156
+#: src/main/xmli18n-tmp.h:157
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/main/xmli18n-tmp.h:158
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/main/xmli18n-tmp.h:159
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/main/xmli18n-tmp.h:160
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/main/xmli18n-tmp.h:161
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/main/xmli18n-tmp.h:162
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/main/xmli18n-tmp.h:163
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/main/xmli18n-tmp.h:164
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:173
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:180
-msgid "Canon iP4000"
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:182
+#, fuzzy
+msgid "Canon PIXMA iP3000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:183
+#, fuzzy
+msgid "Canon PIXMA iP3100"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "Canon PIXMA iP4000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:185
+#, fuzzy
+msgid "Canon PIXMA iP4100"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:186
+#, fuzzy
+msgid "Canon PIXMA iP4200"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:187
+#, fuzzy
+msgid "Canon PIXMA iP4300"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:188
+#, fuzzy
+msgid "Canon PIXMA iP5000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "Canon PIXMA iP5200"
+msgstr "Canon CP-200"
+
+#: src/main/xmli18n-tmp.h:190
+#, fuzzy
+msgid "Canon PIXMA iP6700"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA MP150"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:192
+#, fuzzy
+msgid "Canon PIXMA MP500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:193
+#, fuzzy
+msgid "Canon PIXMA MP700"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA MP730"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:195
+#, fuzzy
+msgid "Canon PIXMA MP750"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA MP760"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA MP770"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA MP780"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:199
+#, fuzzy
+msgid "Canon PIXMA MP790"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP830"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXUS iP3100"
+msgstr "Canon S100"
+
+#: src/main/xmli18n-tmp.h:202
+#, fuzzy
+msgid "Canon PIXUS iP4100"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon i560"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:204
+#, fuzzy
+msgid "Canon i850"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon i860"
+msgstr "Canon S600"
+
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon BJC-85"
+
+#: src/main/xmli18n-tmp.h:207
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:208
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:209
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:210
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:211
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:212
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:213
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:214
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:215
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:216
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:217
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:218
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:219
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:220
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:221
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:222
 msgid "Epson Stylus C44"
 msgstr "EPSON Stylus C44"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:223
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:224
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:225
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:226
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:227
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:228
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:229
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:230
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:231
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:232
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:233
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:234
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:235
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:236
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:237
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:238
+#, fuzzy
+msgid "Epson Stylus C79"
+msgstr "Epson Stylus C70"
+
+#: src/main/xmli18n-tmp.h:239
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:240
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:241
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:242
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:243
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:244
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:245
+#, fuzzy
+msgid "Epson Stylus C87"
+msgstr "Epson Stylus C48"
+
+#: src/main/xmli18n-tmp.h:246
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:247
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:248
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:249
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:250
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:251
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:252
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:253
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:254
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:255
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:256
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:257
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:258
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:259
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:260
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:261
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:262
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:263
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:264
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:265
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:266
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:267
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:268
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:269
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:270
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:271
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:272
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:273
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:274
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:275
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:276
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:277
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:278
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:279
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:280
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:281
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:282
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:283
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:284
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:285
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:286
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:287
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:288
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:289
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:290
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:291
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:292
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:293
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:294
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:295
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:296
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:297
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:298
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:299
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:300
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:301
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:302
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:303
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:304
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:305
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "Epson Stylus Photo 1400"
+msgstr "Epson Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "Epson Stylus Photo 1410"
+msgstr "Epson Stylus Photo 810"
+
+#: src/main/xmli18n-tmp.h:308
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:309
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:310
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:311
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:312
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:313
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:314
+#, fuzzy
+msgid "Epson Stylus Photo R230"
+msgstr "Epson Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:315
+#, fuzzy
+msgid "Epson Stylus Photo R240"
+msgstr "Epson Stylus Photo R2400"
+
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "Epson Stylus Photo R245"
+msgstr "Epson Stylus Photo RX425"
+
+#: src/main/xmli18n-tmp.h:317
+#, fuzzy
+msgid "Epson Stylus Photo R260"
+msgstr "Epson Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Epson Stylus Photo R265"
+msgstr "Epson Stylus Photo RX425"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "Epson Stylus Photo R270"
+msgstr "Epson Stylus Photo 1270"
+
+#: src/main/xmli18n-tmp.h:320
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:321
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:322
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:323
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "Epson Stylus Photo R350"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "Epson Stylus Photo R360"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "Epson Stylus Photo R380"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "Epson Stylus Photo R390"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:329
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:330
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:331
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:332
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:333
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Epson Stylus Photo RX560"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:335
+#, fuzzy
+msgid "Epson Stylus Photo RX580"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:336
+#, fuzzy
+msgid "Epson Stylus Photo RX590"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:337
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:338
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:339
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:340
+#, fuzzy
+msgid "Epson Stylus Photo RX640"
+msgstr "Epson Stylus Photo RX400"
+
+#: src/main/xmli18n-tmp.h:341
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:342
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:343
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:344
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:345
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:346
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:347
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:348
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:349
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:350
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:351
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:352
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:353
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:354
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:355
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:356
 msgid "Epson Stylus CX1500"
 msgstr "Epson  Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:357
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:358
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:359
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:360
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:361
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:362
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:363
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:364
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:365
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:366
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:367
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:368
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:369
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:370
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:371
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:372
+#, fuzzy
+msgid "Epson Stylus CX5000"
+msgstr "Epson  Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:373
+#, fuzzy
+msgid "Epson Stylus CX5000F"
+msgstr "Epson  Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:374
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:375
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:376
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:377
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:378
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:379
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:380
+#, fuzzy
+msgid "Epson Stylus CX6000"
+msgstr "Epson Stylus CX3600"
+
+#: src/main/xmli18n-tmp.h:381
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:382
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:383
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:384
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX7000F"
+msgstr "Epson Stylus CX3100"
+
+#: src/main/xmli18n-tmp.h:386
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:387
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:388
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:389
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:390
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:391
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:392
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3600"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:393
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:394
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:395
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:396
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:397
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:399
+#, fuzzy
+msgid "Epson PictureMate Flash"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:400
+#, fuzzy
+msgid "Epson PictureMate Pal"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:401
+#, fuzzy
+msgid "Epson PictureMate Snap"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:402
+#, fuzzy
+msgid "Epson PictureMate 200"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:403
+#, fuzzy
+msgid "Epson PictureMate 210"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:404
+#, fuzzy
+msgid "Epson PictureMate 240"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:405
+#, fuzzy
+msgid "Epson PictureMate 250"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson PictureMate 280"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson CL 700"
 msgstr "Canon CL 700"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:411
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:414
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:417
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:426
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:427
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:428
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:429
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:430
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:448
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:454
+#, fuzzy
+msgid "Epson PM A820"
+msgstr "Epson PM A890"
+
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:462
+#, fuzzy
+msgid "Epson PM D870"
+msgstr "Epson PM 870C"
+
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
+#, fuzzy
+msgid "Epson PM G850"
+msgstr "Epson PM G800"
+
+#: src/main/xmli18n-tmp.h:470
+#, fuzzy
+msgid "Epson PM G4500"
+msgstr "Epson PM G700"
+
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:476
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:549
 msgid "Generic PCL 4 Printer"
-msgstr "Imprimante générique PCL 4"
+msgstr "Imprimante générique PCL 4"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:550
 msgid "Generic PCL 5 Printer"
-msgstr "Imprimante générique PCL 5"
+msgstr "Imprimante générique PCL 5"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:551
 msgid "Generic PCL 5c Printer"
-msgstr "Imprimante générique PCL5 c"
+msgstr "Imprimante générique PCL5 c"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:552
 msgid "Generic PCL 5e Printer"
-msgstr "Imprimante générique PCL 5e"
+msgstr "Imprimante générique PCL 5e"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
-msgstr "Imprimante générique PCL 6/PCL XL"
+msgstr "Imprimante générique PCL 6/PCL XL"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5500"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4O"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1120"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:802
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+#, fuzzy
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Optra E"
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
 msgstr "Okidata OL400"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
 msgstr "Okidata OL400e"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
 msgstr "Okidata OL410e"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
 msgstr "Okidata OL600e"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
 msgstr "Okidata OL800"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
 msgstr "\"Samsung ML-6000"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:913
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:924
+#, fuzzy
+msgid "Xerox WorkCentre M118"
+msgstr "Xerox Document Centre 400"
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:926
+#, fuzzy
+msgid "Lexmark X73"
+msgstr "Lexmark Z43"
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 msgid "Olympus P-300U"
 msgstr "Olympus P-3000"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+#, fuzzy
+msgid "Olympus P-S100"
+msgstr "Olympus P-10"
+
+#: src/main/xmli18n-tmp.h:942
+#, fuzzy
+msgid "Canon CP-10"
+msgstr "Canon CP-100"
+
+#: src/main/xmli18n-tmp.h:943
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:953
+#, fuzzy
+msgid "Sony DPP-EX5"
+msgstr "Sony UP-DR150"
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+#, fuzzy
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DR150"
+
+#: src/main/xmli18n-tmp.h:957
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:960
+#, fuzzy
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm Printpix-CX-400"
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
-msgstr "Données brutes (raw) 16 bits"
+msgstr "Données brutes (raw) 16 bits"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
-msgstr "Données brutes (raw) 8 bits"
+msgstr "Données brutes (raw) 8 bits"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Inch"
 msgstr "Pouce"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
-msgstr "Défini l'unité de base de mesure en pouce"
+msgstr "Défini l'unité de base de mesure en pouce"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
-msgstr "Défini l'unité de base de mesure en centimètres"
+msgstr "Défini l'unité de base de mesure en centimètres"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Points"
 msgstr "Points"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Défini l'unité de base de mesure en points (1/72\")"
+msgstr "Défini l'unité de base de mesure en points (1/72\")"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
 msgstr "mm"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "Set the base unit of measurement to millimetres"
-msgstr "Défini l'unité de base de mesure en millimètres"
+msgstr "Défini l'unité de base de mesure en millimètres"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
 msgstr "Pica"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Défini l'unité de base de mesure en pica (1/72\")"
+msgstr "Défini l'unité de base de mesure en pica (1/72\")"
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color output"
 msgstr "Sortie couleur"
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
 msgstr "Imprimer en niveaux de gris en utilisant l'encre noire"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Standard Command"
 msgstr "Commande standard"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
 msgstr "Utiliser la commande d'impression standard"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Custom Command"
-msgstr "Commande personnalisée"
+msgstr "Commande personnalisée"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
-msgstr "Utiliser une commande personnalisée"
+msgstr "Utiliser une commande personnalisée"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
 msgstr "Fichier"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Print to a file"
 msgstr "Imprimer dans un fichier"
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
 msgstr "Editer la courbe..."
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 msgid "Set Default"
-msgstr "Valeurs par défaut"
+msgstr "Valeurs par défaut"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
-msgstr "Valeurs précédentes"
+msgstr "Valeurs précédentes"
 
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
 msgstr "Valider"
 
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Print v%s"
 
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
-msgstr "À propos"
+msgstr "À propos"
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 msgid ""
 "Print and\n"
 "Save Settings"
 msgstr ""
 "Imprimer et enregistrer\n"
-"les réglages"
+"les réglages"
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 msgid ""
 "Save\n"
 "Settings"
 msgstr ""
 "Enregistrer\n"
-"les réglages"
+"les réglages"
 
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
 msgstr "Imprimer"
 
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
-msgstr "Aperçu"
+msgstr "Aperçu"
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -5963,384 +6160,337 @@ msgstr ""
 "Positionnement de l'image sur la page.\n"
 "Cliquez et Glissez avec le premier bouton pour positionner l'image sur la "
 "page.\n"
-"Cliquez et Glissez avec le second bouton pour déplacer l'image avec "
-"précision, chaque unité de mouvement déplace l'image d'un point (1/72\")\n"
-"Cliquez et Glissez avec le troisième (milieu) bouton pour déplacer l'image "
-"en unités de taille d'image.\n"
-"Maintenir la touche Maj enfoncée en Cliquant et Glissant contraint l'image à "
-"se déplacer horizontalement ou verticalement.\n"
+"Cliquez et Glissez avec le second bouton pour déplacer l'image avec "
+"précision, chaque unité de mouvement déplace l'image d'un point (1/72\")\n"
+"Cliquez et Glissez avec le troisième (milieu) bouton pour déplacer l'image "
+"en unités de taille d'image.\n"
+"Maintenir la touche Maj enfoncée en Cliquant et Glissant contraint l'image à "
+"se déplacer horizontalement ou verticalement.\n"
 "Si vous cliquez un autre bouton tandis que vous bougez la souris, l'image "
-"retournera à sa position de départ."
+"retournera à sa position de départ."
 
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 msgid "Paper Size"
 msgstr "Taille du papier"
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
 msgstr "Afficher tout les formats"
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
-msgstr "Dimensions :"
+msgstr "Dimensions :"
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
-msgstr "Largeur :"
+msgstr "Largeur :"
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 msgid "Width of the paper that you wish to print to"
 msgstr "Largeur du papier sur lequel vous souhaitez imprimer"
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
-msgstr "Hauteur :"
+msgstr "Hauteur :"
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 msgid "Height of the paper that you wish to print to"
 msgstr "Hauteur du papier sur lequel vous souhaitez imprimer"
 
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 msgid "Automatic Paper Size"
 msgstr "Taille papier automatique"
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
 msgstr "Nombre d'exemplaires"
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
-msgstr "Choisir le nombre d'exemplaires à imprimer, entre 1 et 100"
+msgstr "Choisir le nombre d'exemplaires à imprimer, entre 1 et 100"
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 msgid "Image Position"
 msgstr "Position de l'image"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
 msgstr "Portrait"
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
 msgstr "Paysage"
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 msgid "Upside down"
-msgstr "Retourné (haut/bas)"
+msgstr "Retourné (haut/bas)"
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
-msgstr "Paysage retourné (haut/bas)"
+msgstr "Paysage retourné (haut/bas)"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
-"Sélectionnez l'orientation : portrait, paysage, retourné ou paysage retourné "
-"(retourné haut/bas)"
+"Sélectionnez l'orientation : portrait, paysage, retourné ou paysage retourné "
+"(retourné haut/bas)"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 msgid "Orientation:"
-msgstr "Orientation :"
+msgstr "Orientation :"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
 msgstr "Gauche:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
 msgstr "Distance entre le bord gauche du papier et l'image"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
 msgstr "Droite:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Distance entre le bord gauche du papier et le bord droit de l'image"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
 msgstr "Distance entre le bord droit du papier et l'image"
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
 msgstr "Haut:"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
-msgstr "Distance entre le bord supérieur du papier et l'image"
+msgstr "Distance entre le bord supérieur du papier et l'image"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
-msgstr "Bas :"
+msgstr "Bas :"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr ""
-"Distance entre le bord supérieur du papier et le bord inférieur de l'image"
+"Distance entre le bord supérieur du papier et le bord inférieur de l'image"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
-msgstr "Distance entre le bord inférieur du papier et l'image"
+msgstr "Distance entre le bord inférieur du papier et l'image"
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Center:"
 msgstr "Centrer:"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Horizontal"
 msgstr "Horizontalement"
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
 msgstr "Centrer l'image horizontalement sur le papier"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
 msgstr "Les deux"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image on the paper"
 msgstr "Centrer l'image sur le papier"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 msgid "Vertical"
 msgstr "Verticalement"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Center the image vertically on the paper"
 msgstr "Centrer l'image verticalement sur le papier"
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
 msgstr "Configuration de l'imprimante"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 msgid "Printer Make:"
-msgstr "Marque de l'imprimante :"
+msgstr "Marque de l'imprimante :"
 
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 msgid "Select the make of your printer"
-msgstr "Sélectionnez la marque de votre imprimante"
+msgstr "Sélectionnez la marque de votre imprimante"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 msgid "Printer Model:"
-msgstr "Modèle d'imprimante :"
+msgstr "Modèle d'imprimante :"
 
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 msgid "Select your printer model"
-msgstr "Sélectionnez le modèle de votre imprimante"
+msgstr "Sélectionnez le modèle de votre imprimante"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 msgid "PPD File:"
 msgstr "Fichier PPD:"
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Entrez le nom de fichier PPD pour votre imprimante"
 
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
 msgstr "Parcourir"
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Choisissez le fichier PPD correct pour votre imprimante"
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr ""
-"Sélectionnez le nom de la file d'attente (pas le type ni le modèle "
+"Sélectionnez le nom de la file d'attente (pas le type ni le modèle "
 "d'imprimante) que vous voulez utiliser pour l'impression"
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 msgid "Printer Queue:"
 msgstr "File d'attente:"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 msgid "Enter the correct command to print to your printer. "
 msgstr "Entrez la commande pour imprimer sur votre imprimante"
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
 msgstr "Entrez le nom du fichier."
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 msgid "File to print to"
 msgstr "fichier d'impression"
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 msgid "Print To File"
-msgstr "Imprimer dans un fichier ?"
+msgstr "Imprimer dans un fichier ?"
 
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 msgid "Define New Printer"
-msgstr "Définir une nouvelle imprimante"
+msgstr "Définir une nouvelle imprimante"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 msgid "Printer Name:"
-msgstr "Nom de l'imprimante :"
+msgstr "Nom de l'imprimante :"
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 msgid "Enter the name you wish to give this logical printer"
-msgstr "Saisissez le nom que vous voulez donner à cette imprimante logique"
+msgstr "Saisissez le nom que vous voulez donner à cette imprimante logique"
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 msgid "About Gutenprint "
-msgstr "À propos de Gutenprint"
+msgstr "À propos de Gutenprint"
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 msgid "Gutenprint Version "
 msgstr "Version de Gutenprint"
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"et le reste de l'équipe de développement de Gimp-Print.\n"
-"\n"
-"Vistitez notre site web à http://gimp-print.sourceforge.net.\n"
-"\n"
-"Ce programme est un logiciel libre, vous pouvez le redistribuer et/ou le "
-"modifier\n"
-"sous les termes de la licence GNU GPL General Public License telle que "
-"publiée\n"
-"par la Free Software Foundation, soit la version 2 de la licence, ou (à "
-"votre choix)\n"
-"toute version ultérieure.\n"
-"\n"
-"Ce programme est distribuée dans l'espoir qu'il sera utile, mais SANS\n"
-"GARANTIE; sans même la garantie impliquée par la COMMERCIALISATION \n"
-"ou l'ACCORD POUR UN USAGE PARTICULIER. Voyez la licence GNU General Public "
-"License\n"
-"pour plus de détails.\n"
-"\n"
-"Vous devriez avoir reçu une copie de la GNU General Public License fournie\n"
-"avec le programme; si ce n'est pas le cas, écrivez à la Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 msgid "Printer Settings"
-msgstr "Paramètres de l'imprimante"
+msgstr "Paramètres de l'imprimante"
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 msgstr ""
-"Sélectionnez le nom de l'imprimante (pas le type ni le modèle) que vous "
+"Sélectionnez le nom de l'imprimante (pas le type ni le modèle) que vous "
 "voulez utiliser pour l'impression"
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 msgid "Setup Printer..."
 msgstr "Configurer l'imprimante..."
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
-"Indiquez le modèle d'imprimante, le fichier PPD et la commande nécessaire "
+"Indiquez le modèle d'imprimante, le fichier PPD et la commande nécessaire "
 "pour l'impression sur cette imprimante"
 
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 msgid "New Printer..."
 msgstr "Nouvelle imprimante..."
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr ""
-"Crée une nouvelle imprimante logique. Cela peut être utilisé pour nommer un "
-"ensemble de réglage que vous souhaitez réutiliser plus tard."
+"Crée une nouvelle imprimante logique. Cela peut être utilisé pour nommer un "
+"ensemble de réglage que vous souhaitez réutiliser plus tard."
 
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 msgid "Image Size"
 msgstr "Taille de l'image"
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 msgid "Scaling:"
-msgstr "Échelle:"
+msgstr "Échelle:"
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 msgid "Set the scale (size) of the image"
-msgstr "Régler l'échelle (taille) de l'image"
+msgstr "Régler l'échelle (taille) de l'image"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
-msgstr "Mise à l'échelle en "
+msgstr "Mise à l'échelle en "
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
-"Sélectionnez si l'échelle est mesurée en pourcentage de la taille de la page "
+"Sélectionnez si l'échelle est mesurée en pourcentage de la taille de la page "
 "ou en nombre de points par pouces"
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
 msgstr "Pourcentage"
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 msgid "Scale the print to the size of the page"
-msgstr "Dimensionne l'impression par rapport à la taille de la page"
+msgstr "Dimensionne l'impression par rapport à la taille de la page"
 
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid "PPI"
 msgstr "points par pouce"
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
 msgstr "Dimensionne l'impression en nombre de points par pouce"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 msgid "Set the width of the print"
-msgstr "Défini la largeur de l'impression"
+msgstr "Défini la largeur de l'impression"
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 msgid "Set the height of the print"
-msgstr "Défini la hauteur de l'impression"
+msgstr "Défini la hauteur de l'impression"
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6348,105 +6498,105 @@ msgstr ""
 "Utiliser la taille \n"
 "de l'image originale"
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the print size to the size of the image"
 msgstr "Utiliser la taille de l'image comme taille d'impression"
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 msgid "Print Color Adjust"
 msgstr "Ajustement des couleurs d'impression"
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 msgid "Set Defaults"
-msgstr "Valeurs par défaut"
+msgstr "Valeurs par défaut"
 
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
 msgstr "Fermer"
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 msgid "Image preview"
-msgstr "Aperçu de l'image"
+msgstr "Aperçu de l'image"
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
 msgstr "Visualisation canaux de sortie"
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 msgid "Output"
 msgstr "Sortie"
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 msgid "Output Type:"
 msgstr "Type de sortie:"
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 msgid "Select the desired output type"
-msgstr "Sélectionnez le type de sortie désiré"
+msgstr "Sélectionnez le type de sortie désiré"
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
-msgstr "Réglages fins..."
+msgstr "Réglages fins..."
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
-"Ajustement de la balance des couleurs, luminosité, contraste, saturation et "
+"Ajustement de la balance des couleurs, luminosité, contraste, saturation et "
 "algorithme de tramage"
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 msgid "Size Units:"
-msgstr "Unités de taille:"
+msgstr "Unités de taille:"
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 msgid " "
 msgstr " "
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 msgid "Units:"
-msgstr "Unités:"
+msgstr "Unités:"
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 msgid "Select the base unit of measurement for printing"
-msgstr "Sélectionne l'unité de base de mesure pour l'impression"
+msgstr "Sélectionne l'unité de base de mesure pour l'impression"
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
 msgstr "System V lp"
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
 msgstr "CUPS"
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
 msgstr "Berkeley lpd (/etc/lpc)"
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
 msgstr "Berkeley lpd (/usr/bsd/lpc)"
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
 msgstr "Berkeley lpd (/usr/etc/lpc"
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
 msgstr "Berkeley lpd (/usr/libexec/lpc)"
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 msgid "Printer"
 msgstr "Imprimante"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 msgid "(Default Printer)"
-msgstr "(imprimante par défaut)"
+msgstr "(imprimante par défaut)"
 
 #: src/gutenprintui2/curve.c:130
 msgid "Curve type"
@@ -6454,7 +6604,7 @@ msgstr "Type de courbe"
 
 #: src/gutenprintui2/curve.c:131
 msgid "Is this curve linear, spline interpolated, or free-form"
-msgstr "Courbe linéaire, interpolée ou libre"
+msgstr "Courbe linéaire, interpolée ou libre"
 
 #: src/gutenprintui2/curve.c:139
 msgid "Minimum X"
@@ -6492,78 +6642,92 @@ msgstr "Valeur maximum possible pour Y"
 msgid "_Gamma value"
 msgstr "Valeur gamma"
 
-#: src/cups/genppd.c:133
+#: src/cups/genppd.c:146
 msgid "Printer Features"
-msgstr "Caractéristiques de l'imprimante"
+msgstr "Caractéristiques de l'imprimante"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 msgid "Output Control"
-msgstr "contrôle de sortie"
+msgstr "contrôle de sortie"
 
-#: src/cups/genppd.c:139
+#: src/cups/genppd.c:152
 msgid "Common"
 msgstr "Commun"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:153
 msgid "Extra 1"
 msgstr "Extra 1"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:154
 msgid "Extra 2"
 msgstr "Extra 2"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:155
 msgid "Extra 3"
 msgstr "Extra 3"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:156
 msgid "Extra 4"
 msgstr "Extra 4"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
 msgstr "Extra 5"
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr "French"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1465
+#: src/cups/genppd.c:1613
+#, fuzzy
+msgid "2-Sided Printing"
+msgstr "Impression double face"
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1717
 msgid "No"
 msgstr "Non"
 
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1719
 msgid "Yes"
 msgstr "Oui"
 
-#: src/cups/genppd.c:1497
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#, fuzzy
+msgid "Value"
+msgstr "Bleu"
+
+#: src/cups/genppd.c:1756
 msgid "Fine Adjustment"
-msgstr "Réglage fin"
+msgstr "Réglage fin"
 
 #: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr "Version d'escputil"
 
-#: src/escputil/escputil.c:71
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-", Copyright © 2000-2006 Robert Krawitz\n"
-"Escputil ; pour plus de détails, tapez « escputil -l »\n"
-"Ce logiciel est un logiciel libre, vous pouvez le redistribuer\n"
-"sous certaines conditions; tapez « escputil -l » pour plus de détails.\n"
-
 #: src/escputil/escputil.c:76
 msgid ""
 "Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
@@ -6587,19 +6751,19 @@ msgstr ""
 "Ce programme est un logiciel libre, vous pouvez le redistribuer et/ou le "
 "modifier\n"
 "sous les termes de la licence GNU GPL General Public License telle que "
-"publiée\n"
-"par la Free Software Foundation, soit la version 2 de la licence, ou (à "
+"publiée\n"
+"par la Free Software Foundation, soit la version 2 de la licence, ou (à "
 "votre choix)\n"
-"toute version ultérieure.\n"
+"toute version ultérieure.\n"
 "\n"
-"Ce programme est distribuée dans l'espoir qu'il sera utile, mais SANS\n"
-"GARANTIE; sans même la garantie impliquée par la COMMERCIALISATION \n"
+"Ce programme est distribuée dans l'espoir qu'il sera utile, mais SANS\n"
+"GARANTIE; sans même la garantie impliquée par la COMMERCIALISATION \n"
 "ou l'ACCORD POUR UN USAGE PARTICULIER. Voyez la licence GNU General Public "
 "License\n"
-"pour plus de détails.\n"
+"pour plus de détails.\n"
 "\n"
-"Vous devriez avoir reçu une copie de la GNU General Public License fournie\n"
-"avec le programme; si ce n'est pas le cas, écrivez à la Free Software\n"
+"Vous devriez avoir reçu une copie de la GNU General Public License fournie\n"
+"avec le programme; si ce n'est pas le cas, écrivez à la Free Software\n"
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
 #: src/escputil/escputil.c:119
@@ -6647,59 +6811,59 @@ msgid ""
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
-"Utilisation : escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                       [-P imprimante | -r périphérique] [-u] [-q] [-m "
-"modèle] [ -S ]\n"
-"Effectue des opérations de maintenance sur les imprimantes EPSON Stylus "
+"Utilisation : escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                       [-P imprimante | -r périphérique] [-u] [-q] [-m "
+"modèle] [ -S ]\n"
+"Effectue des opérations de maintenance sur les imprimantes EPSON Stylus "
 "(R).\n"
-"Exemples : escputil --ink-level --raw-device /dev/usb/lp0\n"
+"Exemples : escputil --ink-level --raw-device /dev/usb/lp0\n"
 "          escputil --clean-head --new --printer-name MyQueue\n"
 "\n"
-"Commandes :\n"
-"   -c|--clean-head    Nettoie la tête d'impression\n"
+"Commandes :\n"
+"   -c|--clean-head    Nettoie la tête d'impression\n"
 "   -n|--nozzle-check  Imprime un motif de test des buses.\n"
-"                      Les buses sales ou bouchées apparaîtront comme des\n"
+"                      Les buses sales ou bouchées apparaîtront comme des\n"
 "                      trous dans le motif. Si vous en voyez vous devrier "
 "nettoyer \n"
-"                      tête d'impression.\n"
-"   -a|--align-head    Aligne la tête d'impression. ATTENTION : une mauvaise\n"
+"                      tête d'impression.\n"
+"   -a|--align-head    Aligne la tête d'impression. ATTENTION : une mauvaise\n"
 "                      utilisation de cette fonction peut provoquer une "
 "mauvaise\n"
-"                      qualité d'impression et/ou endommager l'imprimante.\n"
+"                      qualité d'impression et/ou endommager l'imprimante.\n"
 "   -s|--status        Indique le statut de l'imprimante.\n"
-"   -i|--ink-level     Récupère le niveau d'encre de l'imprimante. Cela "
-"nécessite\n"
-"                      un accés en lecture/écriture sur le périphérique \n"
-"                      en mode caractère (raw).\n"
-"  -e|--extended-ink-info    Récupère les informations complémentaires \n"
-"                      sur les encres. Cette commande nécessite\n"
-"                      un accés en lecture/écriture sur le périphérique \n"
-"                      en mode caractère (raw).\n"
-"   -d|--identify      Demande à l'imprimante des renseignements sur la "
+"   -i|--ink-level     Récupère le niveau d'encre de l'imprimante. Cela "
+"nécessite\n"
+"                      un accés en lecture/écriture sur le périphérique \n"
+"                      en mode caractère (raw).\n"
+"  -e|--extended-ink-info    Récupère les informations complémentaires \n"
+"                      sur les encres. Cette commande nécessite\n"
+"                      un accés en lecture/écriture sur le périphérique \n"
+"                      en mode caractère (raw).\n"
+"   -d|--identify      Demande à l'imprimante des renseignements sur la "
 "marque\n"
-"                      et le modèle. Cela nécessite un accés en lecture/"
-"écriture\n"
-"                      sur le périphérique en mode caractère (raw) .\n"
+"                      et le modèle. Cela nécessite un accés en lecture/"
+"écriture\n"
+"                      sur le périphérique en mode caractère (raw) .\n"
 "   -l|--license       Affiche la licence de ce programme.\n"
-"   -M|--list-models   Affiche les modèles d'imprimante supportés.\n"
+"   -M|--list-models   Affiche les modèles d'imprimante supportés.\n"
 "   -h|--help          Affiche ce message d'aide.\n"
 " \n"
-"Options :\n"
-"   -P|--printer-name  Indique le nom de la file d'attente d'impression à \n"
-"                      utiliser. Par défaut, utilisation de l'imprimante du \n"
-"                      par défaut du système.\n"
-"   -r|--raw-device    Indique le nom d'un périphérique sur lequel écrire \n"
+"Options :\n"
+"   -P|--printer-name  Indique le nom de la file d'attente d'impression à \n"
+"                      utiliser. Par défaut, utilisation de l'imprimante du \n"
+"                      par défaut du système.\n"
+"   -r|--raw-device    Indique le nom d'un périphérique sur lequel écrire \n"
 "                      directement au lieu d'utiliser une file d'attente \n"
 "                      pour l'impression.\n"
-"   -u|--new           L'imprimante est une imprimante récente (Stylus Color "
+"   -u|--new           L'imprimante est une imprimante récente (Stylus Color "
 "740\n"
-"                      ou plus récent). Utile uniquement si le périphérique \n"
-"                      n'est pas en mode caractère (raw).   -q|--"
-"quiet         N'affiche pas la bannière.\n"
+"                      ou plus récent). Utile uniquement si le périphérique \n"
+"                      n'est pas en mode caractère (raw).   -q|--"
+"quiet         N'affiche pas la bannière.\n"
 "   -S|--short-name    Affiche le nom court de l'imprimante avec --identify.\n"
-"   -m|--model         Indique le modèle précis pour l'alignement des têtes.\n"
+"   -m|--model         Indique le modèle précis pour l'alignement des têtes.\n"
 "   -C|--choices       Nombre de choix de motifs pour l'alignement\n"
-"   -p|--patterns      Numéro des jeux de motifs pour l'alignment\n"
+"   -p|--patterns      Numéro des jeux de motifs pour l'alignment\n"
 
 #: src/escputil/escputil.c:161
 msgid ""
@@ -6752,58 +6916,58 @@ msgstr ""
 "          escputil -i -u -r /dev/lp0\n"
 "\n"
 "  Commandes:\n"
-"    -c Nettoie la tête d'impression.\n"
+"    -c Nettoie la tête d'impression.\n"
 "    -n Imprime une trame de test des buses.\n"
-"          Des buses sales ou bouchées se verront comme des espaces dans la\n"
+"          Des buses sales ou bouchées se verront comme des espaces dans la\n"
 "          trame. Si vous voyez un quelconque espace, vous devriez nettoyer\n"
-"          la tête d'impression.\n"
-"    -a Alignement de la tête d'impression.  ATTENTION: une mauvaise "
+"          la tête d'impression.\n"
+"    -a Alignement de la tête d'impression.  ATTENTION: une mauvaise "
 "utilisation de cet\n"
-"          utilitaire peut conduire à une piètre qualité d'impression et/ou\n"
+"          utilitaire peut conduire à une piètre qualité d'impression et/ou\n"
 "          endommager l'imprimante.\n"
-"    -o Alignement des têtes d'impression couleur (Stylus Color 480 and 580\n"
+"    -o Alignement des têtes d'impression couleur (Stylus Color 480 and 580\n"
 "          seulement).  ATTENTION: une mauvaise utilisation de cet utilitaire "
 "peut\n"
-"          conduire à une piètre qualité d'impression et/ou endommager "
+"          conduire à une piètre qualité d'impression et/ou endommager "
 "l'imprimante.\n"
 "    -s Retrouver le status de l'imprimante.\n"
-"    -i Obtenir le niveau d'encre de l'imprimante.  Ceci nécessite\n"
-"          un accès en lecture/écriture au périphérique d'entrée.\n"
-"    -d Interroge l'imprimante sur la marque et le modèle de l'imprimante."
-"Ceci nécessite\n"
-"          un accès en lecture/écriture au périphérique d'entrée.  \n"
+"    -i Obtenir le niveau d'encre de l'imprimante.  Ceci nécessite\n"
+"          un accès en lecture/écriture au périphérique d'entrée.\n"
+"    -d Interroge l'imprimante sur la marque et le modèle de l'imprimante."
+"Ceci nécessite\n"
+"          un accès en lecture/écriture au périphérique d'entrée.  \n"
 "    -l Affiche les termes de licence/garantie de ce programme.\n"
-"    -M Liste les modèles d'imprimantes disponibles.\n"
+"    -M Liste les modèles d'imprimantes disponibles.\n"
 "    -h Imprime ce message d'aide.\n"
 "  Options:\n"
-"    -P Spécifie le nom de la queue d'imprimante sur laquelle opérer.\n"
-"          Par déaut l'imprimante système.\n"
-"    -r Spécifie le nom du périphérique sur lequel écrire directement\n"
-"          plutôt que de passer via une queue d'impression.\n"
+"    -P Spécifie le nom de la queue d'imprimante sur laquelle opérer.\n"
+"          Par déaut l'imprimante système.\n"
+"    -r Spécifie le nom du périphérique sur lequel écrire directement\n"
+"          plutôt que de passer via une queue d'impression.\n"
 "    -u L'imprimante est une nouvelle imprimante (Stylus Color 740 ou plus "
-"récente).\n"
-"    -q Supprime la bannière.\n"
-"    -m Spécifie le modèle précis pour l'alignement des têtes.\n"
+"récente).\n"
+"    -q Supprime la bannière.\n"
+"    -m Spécifie le modèle précis pour l'alignement des têtes.\n"
 
 #: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
-msgstr "Vous ne pouvez spécifier qu'une imprimante ou périphérique"
+msgstr "Vous ne pouvez spécifier qu'une imprimante ou périphérique"
 
 #: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
-msgstr "Vous ne pouvez spécifier qu'un modèle d'imprimante"
+msgstr "Vous ne pouvez spécifier qu'un modèle d'imprimante"
 
 #: src/escputil/escputil.c:369
 #, c-format
 msgid "Alignment choices must be at least 1."
-msgstr "Le choix de l'alignement doit être au moins 1."
+msgstr "Le choix de l'alignement doit être au moins 1."
 
 #: src/escputil/escputil.c:376
 #, c-format
 msgid "Alignment passes must be at least 1."
-msgstr "Le nombre de passes d'alignement doit être au moins de 1."
+msgstr "Le nombre de passes d'alignement doit être au moins de 1."
 
 #: src/escputil/escputil.c:381
 #, c-format
@@ -6828,7 +6992,7 @@ msgstr "Tapez  `%s -h' pour plus d'information.\n"
 #: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
-msgstr "Impossible d'ouvrir le périphérique %s : %s\n"
+msgstr "Impossible d'ouvrir le périphérique %s : %s\n"
 
 #: src/escputil/escputil.c:482
 #, c-format
@@ -6838,17 +7002,17 @@ msgstr "Impossible d'imprimer sur l'imprimante %s avec %s\n"
 #: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
-msgstr "Impossible d'envoyer la commande à l'imprimante\n"
+msgstr "Impossible d'envoyer la commande à l'imprimante\n"
 
 #: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
-msgstr "Lecture données de l'imprimante: temps excédé\n"
+msgstr "Lecture données de l'imprimante: temps excédé\n"
 
 #: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
-msgstr "Impossible de lire à partir de %s : %s\n"
+msgstr "Impossible de lire à partir de %s : %s\n"
 
 #: src/escputil/escputil.c:747
 #, c-format
@@ -6858,12 +7022,12 @@ msgstr ""
 #: src/escputil/escputil.c:754
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
-msgstr "Impossible d'ouvrir %s en lecture/écriture : %s\n"
+msgstr "Impossible d'ouvrir %s en lecture/écriture : %s\n"
 
 #: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
 #, c-format
 msgid "Cannot write to %s: %s\n"
-msgstr "Impossible d'écrire sur %s : %s\n"
+msgstr "Impossible d'écrire sur %s : %s\n"
 
 #: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
 #: src/escputil/escputil.c:1511
@@ -6873,7 +7037,7 @@ msgid ""
 "Cannot write to %s: %s\n"
 msgstr ""
 "\n"
-"Impossible d'écrire sur %s : %s\n"
+"Impossible d'écrire sur %s : %s\n"
 
 #: src/escputil/escputil.c:885
 #, c-format
@@ -6883,8 +7047,8 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 "\n"
-"Impossible de détecter le type de l'imprimante.\n"
-"Veuillez utiliser -m pour spécifier le modèle de votre imprimante.\n"
+"Impossible de détecter le type de l'imprimante.\n"
+"Veuillez utiliser -m pour spécifier le modèle de votre imprimante.\n"
 
 #: src/escputil/escputil.c:983 src/escputil/escputil.c:989
 #: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
@@ -6909,7 +7073,7 @@ msgstr "Etat: auto-impression\n"
 #: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Busy\n"
-msgstr "Etat: occupé\n"
+msgstr "Etat: occupé\n"
 
 #: src/escputil/escputil.c:1036
 #, c-format
@@ -6939,7 +7103,7 @@ msgstr "Etat: Configuration usine\n"
 #: src/escputil/escputil.c:1051
 #, c-format
 msgid "Status: Shutting down\n"
-msgstr "Etat: Arrêt en cours\n"
+msgstr "Etat: Arrêt en cours\n"
 
 #: src/escputil/escputil.c:1054
 #, c-format
@@ -6954,7 +7118,7 @@ msgstr "Erreur: Erreur fatale\n"
 #: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Other interface is selected\n"
-msgstr "Erreur: une autre interface est sélectionnée\n"
+msgstr "Erreur: une autre interface est sélectionnée\n"
 
 #: src/escputil/escputil.c:1071
 #, c-format
@@ -6979,7 +7143,7 @@ msgstr "Erreur: Pas de papier\n"
 #: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
-msgstr "Erreur: Attente retour à la position de repos\n"
+msgstr "Erreur: Attente retour à la position de repos\n"
 
 #: src/escputil/escputil.c:1086
 #, c-format
@@ -6989,12 +7153,12 @@ msgstr "Erreur: double chargement\n"
 #: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
-msgstr "Erreur: Erreur massicot non récupérable\n"
+msgstr "Erreur: Erreur massicot non récupérable\n"
 
 #: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
-msgstr "Erreur: bourrage massicot (récupérable)\n"
+msgstr "Erreur: bourrage massicot (récupérable)\n"
 
 #: src/escputil/escputil.c:1095
 #, c-format
@@ -7061,26 +7225,26 @@ msgstr "niveau d'encres"
 
 #: src/escputil/escputil.c:1350
 msgid "status"
-msgstr "état"
+msgstr "état"
 
 #: src/escputil/escputil.c:1355
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
-"Obtenir %s demande d'utiliser un périphérique en mode caractère (raw "
+"Obtenir %s demande d'utiliser un périphérique en mode caractère (raw "
 "device).\n"
 
 #: src/escputil/escputil.c:1461
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
-"Obtenir les niveaux d'encre demande d'utiliser un périphérique en mode "
-"caractère (raw device)\n"
+"Obtenir les niveaux d'encre demande d'utiliser un périphérique en mode "
+"caractère (raw device)\n"
 
 #: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
 #: src/escputil/escputil.c:1646
 msgid "Part number"
-msgstr "Numéro de pièce"
+msgstr "Numéro de pièce"
 
 #: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
 #: src/escputil/escputil.c:1647
@@ -7091,24 +7255,24 @@ msgstr "Date"
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
-"L'identification de l'imprimante demande d'utiliser un périphérique "
-"caractère (raw devive)\n"
+"L'identification de l'imprimante demande d'utiliser un périphérique "
+"caractère (raw devive)\n"
 
 #: src/escputil/escputil.c:1693
 #, c-format
 msgid "Cannot identify printer model.\n"
-msgstr "Ne paut pas identifier le modèle d'imprimante.\n"
+msgstr "Ne paut pas identifier le modèle d'imprimante.\n"
 
 #: src/escputil/escputil.c:1713
 #, c-format
 msgid "Cleaning heads...\n"
-msgstr "Nettoyage des têtes...\n"
+msgstr "Nettoyage des têtes...\n"
 
 #: src/escputil/escputil.c:1728
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
-"Vérification des buses, s'il vous plait assurez-vous qu'il y ait du papier "
+"Vérification des buses, s'il vous plait assurez-vous qu'il y ait du papier "
 "dans l'imprimante\n"
 
 #: src/escputil/escputil.c:1732
@@ -7149,51 +7313,51 @@ msgid ""
 "It is essential that you not turn your printer off during this procedure.\n"
 "\n"
 msgstr ""
-"S'il vous plait lisez ces instructions avec attention avant de procéder.\n"
+"S'il vous plait lisez ces instructions avec attention avant de procéder.\n"
 "\n"
-"Cet utilitaire vous permet d'aligner les têtes d'impression de votre \n"
+"Cet utilitaire vous permet d'aligner les têtes d'impression de votre \n"
 "imprimante jet d'encre Eson Stylus. Une mauvaise utilisation de cet "
 "utilitaire\n"
-"peut dégrader la qualité d'impression de votre imprimante et endommager "
+"peut dégrader la qualité d'impression de votre imprimante et endommager "
 "votre\n"
-"imprimante. Cet utilitaire n'a pas été contrôlé par Epson Seiko et il "
+"imprimante. Cet utilitaire n'a pas été contrôlé par Epson Seiko et il "
 "n'offre\n"
-"aucune garantie. L'entière responsabilité de son utilisation vous incombe. \n"
+"aucune garantie. L'entière responsabilité de son utilisation vous incombe. \n"
 "\n"
-"Cet utilitaire imprime %d trames de test. Chaque trame apparait très "
+"Cet utilitaire imprime %d trames de test. Chaque trame apparait très "
 "similaire.\n"
-"Les trames sont constituées d'une série de paire de lignes verticales qui "
+"Les trames sont constituées d'une série de paire de lignes verticales qui "
 "se\n"
 "superposent. Sous chaque paire de lignes il y a un nombre compris entre %d "
 "et %d.\n"
 "\n"
 "Quand vous inspectez les paires de lignes, vous devriez trouver la paire "
 "de \n"
-"lignes qui est la mieux alignée, c'est à dire celle qui forme le mieux une\n"
+"lignes qui est la mieux alignée, c'est à dire celle qui forme le mieux une\n"
 "simple ligne verticale. Inspectez les paires avec tout votre attention pour\n"
 "trouver la meilleure. Utilisez une loupe ou un verre grossisseur et "
-"recommandé\n"
-"pour cet inspection critique. Il est aussi suggéré que vous utilisiez un \n"
-"papier de bonne qualité pour le test, de façon à ce que les lignes soient\n"
-"bien formées et ne se diffusent pas au travers du papier. Après le choix\n"
-"du nombre correspondant à la meilleure paire, placez le papier à nouveau "
+"recommandé\n"
+"pour cet inspection critique. Il est aussi suggéré que vous utilisiez un \n"
+"papier de bonne qualité pour le test, de façon à ce que les lignes soient\n"
+"bien formées et ne se diffusent pas au travers du papier. Après le choix\n"
+"du nombre correspondant à la meilleure paire, placez le papier à nouveau "
 "dans\n"
 "le chargeur avant de le taper.\n"
 "\n"
-"Chaque trame est similaire, mais les dernières trames utilisent des points \n"
+"Chaque trame est similaire, mais les dernières trames utilisent des points \n"
 "plus fins pour un alignement plus critique. Vous devez lancer toutes les\n"
-"passes pour aligner corectement votre imprimante. Après avoir lancé toutes \n"
-"les passes, la trame d'alignement va être imprimée encore une fois. Vous\n"
+"passes pour aligner corectement votre imprimante. Après avoir lancé toutes \n"
+"les passes, la trame d'alignement va être imprimée encore une fois. Vous\n"
 "devriez trouver que la paire la plus au milieu (#%d en dehors de %d) est\n"
 "la meilleure pour toute les trames.\n"
 "\n"
-"Après que les passes seront imprimées encore une fois, vous devrez choisir\n"
-"entre (s)auvegarder le résultat dans l'imprimante, (r)épéter l'opération,\n"
-"ou (q)uitter sans enregistrer. Quitter ne va pas restaurer les réglages\n"
-"précédents mais éteindre et rallumer l'imprimante le fera. Si vous\n"
-"quittez vous devez répéter entièrement l'opération si vous voulez sauver\n"
-"les résultats. Il est essentiel de ne pas éteindre votre imprimante \n"
-"durant cette opération.\n"
+"Après que les passes seront imprimées encore une fois, vous devrez choisir\n"
+"entre (s)auvegarder le résultat dans l'imprimante, (r)épéter l'opération,\n"
+"ou (q)uitter sans enregistrer. Quitter ne va pas restaurer les réglages\n"
+"précédents mais éteindre et rallumer l'imprimante le fera. Si vous\n"
+"quittez vous devez répéter entièrement l'opération si vous voulez sauver\n"
+"les résultats. Il est essentiel de ne pas éteindre votre imprimante \n"
+"durant cette opération.\n"
 "\n"
 
 #: src/escputil/escputil.c:1767
@@ -7231,51 +7395,51 @@ msgid ""
 "this procedure.\n"
 "\n"
 msgstr ""
-"S'il vous plait lisez ces instructions avec attention avant de procéder.\n"
+"S'il vous plait lisez ces instructions avec attention avant de procéder.\n"
 "\n"
-"Cet utilitaire vous permet d'aligner les têtes d'impression de votre \n"
+"Cet utilitaire vous permet d'aligner les têtes d'impression de votre \n"
 "imprimante jet d'encre Eson Stylus. Une mauvaise utilisation de cet "
 "utilitaire\n"
-"peut dégrader la qualité d'impression de votre imprimante et endommager "
+"peut dégrader la qualité d'impression de votre imprimante et endommager "
 "votre\n"
-"imprimante. Cet utilitaire n'a pas été contrôlé par Epson Seiko et il "
+"imprimante. Cet utilitaire n'a pas été contrôlé par Epson Seiko et il "
 "n'offre\n"
-"aucune garantie. L'entière responsabilité de son utilisation vous incombe. \n"
+"aucune garantie. L'entière responsabilité de son utilisation vous incombe. \n"
 "\n"
-"Cet utilitaire imprime une trame de test.constituée d'une série de paire "
+"Cet utilitaire imprime une trame de test.constituée d'une série de paire "
 "de \n"
 "lignes verticales qui se superposent. Sous chaque paire de lignes il y a \n"
 "un nombre compris entre %d et %d.\n"
 "\n"
 "Quand vous inspectez les paires de lignes, vous devriez trouver la paire "
 "de \n"
-"lignes qui est la mieux alignée, c'est à dire celle qui forme le mieux une\n"
+"lignes qui est la mieux alignée, c'est à dire celle qui forme le mieux une\n"
 "simple ligne verticale. Inspectez les paires avec tout votre attention pour\n"
 "trouver la meilleure. Utilisez une loupe ou un verre grossisseur et "
-"recommandé\n"
-"pour cet inspection critique. Il est aussi suggéré que vous utilisiez un \n"
-"papier de bonne qualité pour le test, de façon à ce que les lignes soient\n"
-"bien formées et ne se diffusent pas au travers du papier. Après le choix\n"
-"du nombre correspondant à la meilleure paire, placez le papier à nouveau "
+"recommandé\n"
+"pour cet inspection critique. Il est aussi suggéré que vous utilisiez un \n"
+"papier de bonne qualité pour le test, de façon à ce que les lignes soient\n"
+"bien formées et ne se diffusent pas au travers du papier. Après le choix\n"
+"du nombre correspondant à la meilleure paire, placez le papier à nouveau "
 "dans\n"
 "le chargeur avant de le taper.\n"
 "\n"
-"Après avoir lancé la trame d'alignement, elle va être imprimée encore une "
+"Après avoir lancé la trame d'alignement, elle va être imprimée encore une "
 "fois.\n"
 "Vous devriez trouver que la paire la plus au milieu (#%d en dehors de %d)\n"
 "est la meilleure pour toute les trames. Ensuite vous devrez choisir\n"
-"entre (s)auvegarder le résultat dans l'imprimante, (r)épéter l'opération,\n"
-"ou (q)uitter sans enregistrer. Quitter ne va pas restaurer les réglages\n"
-"précédents mais éteindre et rallumer l'imprimante le fera. Si vous\n"
-"quittez vous devez répéter entièrement l'opération si vous voulez sauver\n"
-"les résultats. Il est essentiel de ne pas éteindre votre imprimante \n"
-"durant cette opération.\n"
+"entre (s)auvegarder le résultat dans l'imprimante, (r)épéter l'opération,\n"
+"ou (q)uitter sans enregistrer. Quitter ne va pas restaurer les réglages\n"
+"précédents mais éteindre et rallumer l'imprimante le fera. Si vous\n"
+"quittez vous devez répéter entièrement l'opération si vous voulez sauver\n"
+"les résultats. Il est essentiel de ne pas éteindre votre imprimante \n"
+"durant cette opération.\n"
 "\n"
 
 #: src/escputil/escputil.c:1811
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
-msgstr "Impossible d'envoyer la commande à l'imprimante, abandon.\n"
+msgstr "Impossible d'envoyer la commande à l'imprimante, abandon.\n"
 
 #: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
 #, c-format
@@ -7294,13 +7458,13 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 "S'il vous plait inspectez la sortie finale avec attention pour vous\n"
-"assurez que votre imprimante est correctement alignée. Vous\n"
-"pouvez maintenant :\n"
+"assurez que votre imprimante est correctement alignée. Vous\n"
+"pouvez maintenant :\n"
 "  (s)auvegarder les rsulats dans votre imprimante\n"
-"  (q)uitter sans enregistrer les résultats, ou\n"
-"  (r)épéter entièrement l'opération depuis le début.\n"
-"Il vous sera ensuite demandé de confirmer votre choix\n"
-"Que voulez-vous faire (s, q, r) ?\n"
+"  (q)uitter sans enregistrer les résultats, ou\n"
+"  (r)épéter entièrement l'opération depuis le début.\n"
+"Il vous sera ensuite demandé de confirmer votre choix\n"
+"Que voulez-vous faire (s, q, r) ?\n"
 
 #: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
 #: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
@@ -7313,8 +7477,8 @@ msgstr "> "
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
-"Veuillez presser la touche « q » si vous souhaitez vraiment quitter sans "
-"enregistrer :\n"
+"Veuillez presser la touche « q » si vous souhaitez vraiment quitter sans "
+"enregistrer :\n"
 
 #: src/escputil/escputil.c:1850
 #, c-format
@@ -7322,9 +7486,9 @@ msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
-"OK, votre imprimante est alignée, mais l'alignement n'a pas été enregistré.\n"
-"Si vous souhaitez enregistrer l'alignement, vous devez répéter cette "
-"opération.\n"
+"OK, votre imprimante est alignée, mais l'alignement n'a pas été enregistré.\n"
+"Si vous souhaitez enregistrer l'alignement, vous devez répéter cette "
+"opération.\n"
 
 #: src/escputil/escputil.c:1857
 #, c-format
@@ -7332,13 +7496,13 @@ msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
-"S'il vous plait confirmez en tapant à nouveau 'r' que vous voulez\n"
-"reprendre l'opération d'alignement.\n"
+"S'il vous plait confirmez en tapant à nouveau 'r' que vous voulez\n"
+"reprendre l'opération d'alignement.\n"
 
 #: src/escputil/escputil.c:1865
 #, c-format
 msgid "Repeating the alignment process.\n"
-msgstr "Répétition de l'opération d'alignement.\n"
+msgstr "Répétition de l'opération d'alignement.\n"
 
 #: src/escputil/escputil.c:1871
 #, c-format
@@ -7349,21 +7513,21 @@ msgid ""
 "Please confirm by typing 's' again that you wish to save the settings\n"
 "to your printer:\n"
 msgstr ""
-"Ceci va altérer la configuration de votre imprimante.\n"
-"ATTENTION cette opération n'a pas été approuvée par EPSON Seikp\n"
-"et elle peut endommager votre imprimante; Procéder ?\n"
-"Veuillez taper « s » de nouveau pour confirmer que vous voulez\n"
-"enregistrer les réglages de votre imprimante.\n"
+"Ceci va altérer la configuration de votre imprimante.\n"
+"ATTENTION cette opération n'a pas été approuvée par EPSON Seikp\n"
+"et elle peut endommager votre imprimante; Procéder ?\n"
+"Veuillez taper « s » de nouveau pour confirmer que vous voulez\n"
+"enregistrer les réglages de votre imprimante.\n"
 
 #: src/escputil/escputil.c:1883
 #, c-format
 msgid "About to save settings..."
-msgstr "À propos de l'enregistrement des réglages..."
+msgstr "À propos de l'enregistrement des réglages..."
 
 #: src/escputil/escputil.c:1889
 #, c-format
 msgid "failed!\n"
-msgstr "Échec !\n"
+msgstr "Échec !\n"
 
 #: src/escputil/escputil.c:1890
 #, c-format
@@ -7371,18 +7535,18 @@ msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
-"Vos réglages n'ont pas été sauvegardés avec succès. Vous devez répéter\n"
-"l'opération d'alignement.\n"
+"Vos réglages n'ont pas été sauvegardés avec succès. Vous devez répéter\n"
+"l'opération d'alignement.\n"
 
 #: src/escputil/escputil.c:1894
 #, c-format
 msgid "succeeded!\n"
-msgstr "Succès !\n"
+msgstr "Succès !\n"
 
 #: src/escputil/escputil.c:1895
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
-msgstr "Vos réglages d'alignement ont été enregistrés dans l'imprimante.\n"
+msgstr "Vos réglages d'alignement ont été enregistrés dans l'imprimante.\n"
 
 #: src/escputil/escputil.c:1900
 #, c-format
@@ -7392,7 +7556,7 @@ msgstr "Commande non reconnue.\n"
 #: src/escputil/escputil.c:1903
 #, c-format
 msgid "Final command was not confirmed.\n"
-msgstr "La dernière commande n'a pas été confirmée.\n"
+msgstr "La dernière commande n'a pas été confirmée.\n"
 
 #: src/escputil/escputil.c:1908
 #, c-format
@@ -7404,17 +7568,17 @@ msgid ""
 "Please place a sheet of paper in your printer to begin the head\n"
 "alignment procedure.\n"
 msgstr ""
-"Cette opération prend en compte que votre imprimante est une Epson %s.\n"
-"Si ce n'est pas votre modèle d'imprimante, s'il vous plait tapez Control-C\n"
-"et choisissez votre modèle actuel d'imprimante.\n"
+"Cette opération prend en compte que votre imprimante est une Epson %s.\n"
+"Si ce n'est pas votre modèle d'imprimante, s'il vous plait tapez Control-C\n"
+"et choisissez votre modèle actuel d'imprimante.\n"
 "\n"
 "S'il vous plait placez une feuillle de papier dans votre imprimante\n"
-"pour commencer l'opération d'ailgnement des têtes.\n"
+"pour commencer l'opération d'ailgnement des têtes.\n"
 
 #: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
 #: src/escputil/escputil.c:2047
 msgid "Press enter to continue > "
-msgstr "Pressez Entrée pour continuer > "
+msgstr "Pressez Entrée pour continuer > "
 
 #: src/escputil/escputil.c:1980
 #, c-format
@@ -7425,7 +7589,7 @@ msgid ""
 msgstr ""
 "S'il vous plait inspectez l'impression et choisissez la meilleure paire de "
 "lignes dans chaque trame.\n"
-"Tapez un nombre de paire, '?' pourl'aide ou 'r' pour répéter l'opération.\n"
+"Tapez un nombre de paire, '?' pourl'aide ou 'r' pour répéter l'opération.\n"
 
 #: src/escputil/escputil.c:1993
 #, c-format
@@ -7435,32 +7599,32 @@ msgstr "Passe #%d"
 #: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Veuillez insérer une feuille de papier vierge.\n"
+msgstr "Veuillez insérer une feuille de papier vierge.\n"
 
 #: src/escputil/escputil.c:2020
 #, c-format
 msgid "Number out of range!\n"
-msgstr "Nombre hors-intervalle !\n"
+msgstr "Nombre hors-intervalle !\n"
 
 #: src/escputil/escputil.c:2025
 #, c-format
 msgid "I cannot understand what you typed!\n"
-msgstr "Je ne comprends pas ce que vous avez tapé !\n"
+msgstr "Je ne comprends pas ce que vous avez tapé !\n"
 
 #: src/escputil/escputil.c:2031
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "La meilleure paire de lignes doit être comprise entre 1 et %d.\n"
+msgstr "La meilleure paire de lignes doit être comprise entre 1 et %d.\n"
 
 #: src/escputil/escputil.c:2038
 #, c-format
 msgid "Attempting to set alignment..."
-msgstr "Tentative de réglage de l'alignement..."
+msgstr "Tentative de réglage de l'alignement..."
 
 #: src/escputil/escputil.c:2041
 #, c-format
 msgid "succeeded.\n"
-msgstr "Succès.\n"
+msgstr "Succès.\n"
 
 #: src/escputil/escputil.c:2042
 #, c-format
@@ -7470,15 +7634,15 @@ msgid ""
 "pattern %d.  If it is not, you should repeat the process to get the best\n"
 "quality printing.\n"
 msgstr ""
-"S'il vous plait vérifiez que l'alignement est correct. après que la trame\n"
-"d'alignement soit imprimée à nouveau, assurez-vous que la meilleure\n"
+"S'il vous plait vérifiez que l'alignement est correct. après que la trame\n"
+"d'alignement soit imprimée à nouveau, assurez-vous que la meilleure\n"
 "trame pour chaque ligne est la trame %d. Si ce n'est pas le cas, vous\n"
-"devriez répéter l'opération pour obtenir la meilleure qulité d'impression.\n"
+"devriez répéter l'opération pour obtenir la meilleure qulité d'impression.\n"
 
 #: src/escputil/escputil.c:2088
 #, c-format
 msgid "Error in input\n"
-msgstr "Erreur en entrée\n"
+msgstr "Erreur en entrée\n"
 
 #: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
@@ -7504,7 +7668,7 @@ msgstr ""
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr ""
-"Erreur: ijsgutenprint: Mauvais espace de couleur : bps %d canaux %d espace %"
+"Erreur: ijsgutenprint: Mauvais espace de couleur : bps %d canaux %d espace %"
 "s\n"
 
 #: src/ghost/ijsgutenprint.c:199
@@ -7517,19 +7681,19 @@ msgstr "Erreur: ijsgutenprint: Pas de buffer de ligne\n"
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
 msgstr ""
-"Erreur: ijsgutenprint: Impossible d'interpréter le paramètre %s=%s (un "
+"Erreur: ijsgutenprint: Impossible d'interpréter le paramètre %s=%s (un "
 "nombre est attendu)\n"
 
 #: src/ghost/ijsgutenprint.c:498
 #, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
 msgstr ""
-"Erreur: ijsgutenprint:L'imprimante doit être spécifiée avec -sDeviceModel\n"
+"Erreur: ijsgutenprint:L'imprimante doit être spécifiée avec -sDeviceModel\n"
 
 #: src/ghost/ijsgutenprint.c:500
 #, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
-msgstr "Erreur: ijsgutenprint: L'imprimante %s n'est pas un modèle connu\n"
+msgstr "Erreur: ijsgutenprint: L'imprimante %s n'est pas un modèle connu\n"
 
 #: src/ghost/ijsgutenprint.c:656
 #, c-format
@@ -7569,12 +7733,12 @@ msgstr "Erreur: ijsgutenprint: ne peut pas analyser %s dimension %s\n"
 #: src/ghost/ijsgutenprint.c:830
 #, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
-msgstr "Erreur: ijsgutenprint: ne peut pas analyser %s booléen %s\n"
+msgstr "Erreur: ijsgutenprint: ne peut pas analyser %s booléen %s\n"
 
 #: src/ghost/ijsgutenprint.c:841
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
-msgstr "Erreur: ijsgutenprint: mauvais paramètre  %s %d\n"
+msgstr "Erreur: ijsgutenprint: mauvais paramètre  %s %d\n"
 
 #: src/ghost/ijsgutenprint.c:867
 #, c-format
@@ -7584,18 +7748,18 @@ msgstr "Erreur: ijsgutenprint: mauvais code (clef) %d\n"
 #: src/ghost/ijsgutenprint.c:1308
 #, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
-msgstr "Erreur: ijsgutenprint: image_init échec %d\n"
+msgstr "Erreur: ijsgutenprint: image_init échec %d\n"
 
 #: src/ghost/ijsgutenprint.c:1319
 #, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
 msgstr ""
-"Erreur: ijsgutenprint: Impossible d'ouvrir le descripteur de fichier : %s\n"
+"Erreur: ijsgutenprint: Impossible d'ouvrir le descripteur de fichier : %s\n"
 
 #: src/ghost/ijsgutenprint.c:1331
 #, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-msgstr "Erreur: ijsgutenprint: Impossible d'ouvrir %s : %s\n"
+msgstr "Erreur: ijsgutenprint: Impossible d'ouvrir %s : %s\n"
 
 #: src/ghost/ijsgutenprint.c:1344
 #, c-format
@@ -7605,12 +7769,230 @@ msgstr "Erreur: ijsgutenprint: Imprimante inconnue %s\n"
 #: src/ghost/ijsgutenprint.c:1516
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-msgstr "Erreur: ijsgutenprint: Mauvais paramètres, ne peut pas continuer !\n"
+msgstr "Erreur: ijsgutenprint: Mauvais paramètres, ne peut pas continuer !\n"
 
 #: src/ghost/ijsgutenprint.c:1534
 #, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
-msgstr "Erreur: ijsgutenprint: Obtenir la ligne suivante à échoué à %.0f\n"
+msgstr "Erreur: ijsgutenprint: Obtenir la ligne suivante à échoué à %.0f\n"
+
+#, fuzzy
+#~ msgid "Model Name"
+#~ msgstr "Nom des canaux"
+
+#, fuzzy
+#~ msgid "Canon MULTIPASS MP500"
+#~ msgstr "Canon S500"
+
+#, fuzzy
+#~ msgid "Canon MULTIPASS MP760"
+#~ msgstr "Canon LBP-1760"
+
+#~ msgid "Cassette"
+#~ msgstr "Cassette"
+
+#~ msgid "CD tray"
+#~ msgstr "support CD"
+
+#~ msgid " Gamma"
+#~ msgstr "Gamma"
+
+#~ msgid " Curve"
+#~ msgstr "Courbe"
+
+#~ msgid "1440 x 1440"
+#~ msgstr "1440 x 1440"
+
+#~ msgid "1440 x 1440 DPI High Quality"
+#~ msgstr "1440 x 1440 ppp Haute qualité"
+
+#~ msgid "1440 x 1440 DPI Highest Quality"
+#~ msgstr "1440 x 1440 ppp Qualité maximale"
+
+#~ msgid "2880 x 1440 DPI High Quality"
+#~ msgstr "2880 x 720 ppp Haute qualité"
+
+#~ msgid "2880 x 1440 DPI Highest Quality"
+#~ msgstr "2880 x 1440 ppp Qualité maximale"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "and the rest of the Gutenprint Development Team.\n"
+#~ "\n"
+#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "et le reste de l'équipe de développement de Gimp-Print.\n"
+#~ "\n"
+#~ "Vistitez notre site web à http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "Ce programme est un logiciel libre, vous pouvez le redistribuer et/ou le "
+#~ "modifier\n"
+#~ "sous les termes de la licence GNU GPL General Public License telle que "
+#~ "publiée\n"
+#~ "par la Free Software Foundation, soit la version 2 de la licence, ou (à "
+#~ "votre choix)\n"
+#~ "toute version ultérieure.\n"
+#~ "\n"
+#~ "Ce programme est distribuée dans l'espoir qu'il sera utile, mais SANS\n"
+#~ "GARANTIE; sans même la garantie impliquée par la COMMERCIALISATION \n"
+#~ "ou l'ACCORD POUR UN USAGE PARTICULIER. Voyez la licence GNU General "
+#~ "Public License\n"
+#~ "pour plus de détails.\n"
+#~ "\n"
+#~ "Vous devriez avoir reçu une copie de la GNU General Public License "
+#~ "fournie\n"
+#~ "avec le programme; si ce n'est pas le cas, écrivez à la Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, "
+#~ "USA.\n"
+
+#~ msgid ""
+#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
+#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
+#~ "l'\n"
+#~ "This is free software, and you are welcome to redistribute it\n"
+#~ "under certain conditions; type 'escputil -l' for details.\n"
+#~ msgstr ""
+#~ ", Copyright © 2000-2006 Robert Krawitz\n"
+#~ "Escputil ; pour plus de détails, tapez « escputil -l »\n"
+#~ "Ce logiciel est un logiciel libre, vous pouvez le redistribuer\n"
+#~ "sous certaines conditions; tapez « escputil -l » pour plus de détails.\n"
+
+#~ msgid "90x90 DPI"
+#~ msgstr "90x90 PPP"
+
+#~ msgid "90x90 DPI DMT"
+#~ msgstr "90x90 PPP DMT"
+
+#~ msgid "180x180 DPI"
+#~ msgstr "180x180 PPP"
+
+#~ msgid "180x180 DPI DMT"
+#~ msgstr "180x180 PPP DMT"
+
+#~ msgid "360x360 DPI"
+#~ msgstr "360x360 PPP"
+
+#~ msgid "360x360 DPI DMT"
+#~ msgstr "360x360 PPP DMT"
+
+#~ msgid "720x360 DPI"
+#~ msgstr "720x360 PPP"
+
+#~ msgid "720x360 DPI DMT"
+#~ msgstr "720x360 PPP DMT"
+
+#~ msgid "720x720 DPI"
+#~ msgstr "720x720 PPP"
+
+#~ msgid "720x720 DPI DMT"
+#~ msgstr "720x720 PPP DMT"
+
+#~ msgid "1440x720 DPI"
+#~ msgstr "1440x720 PPP"
+
+#~ msgid "1440x720 DPI DMT"
+#~ msgstr "1440x720 PPP DMT"
+
+#~ msgid "1440x1440 DPI"
+#~ msgstr "1440x1440 PPP"
+
+#~ msgid "1440x1440 DPI DMT"
+#~ msgstr "1440x1440 PPP DMT"
+
+#~ msgid "2880x2880 DPI"
+#~ msgstr "2880x2880 PPP"
+
+#~ msgid "2880x2880 DPI DMT"
+#~ msgstr "2880x2880 PPP DMT"
+
+#~ msgid "150x150 DPI DMT"
+#~ msgstr "150x150 PPP DMT"
+
+#~ msgid "300x300 DPI DMT"
+#~ msgstr "300x300 PPP DMT"
+
+#~ msgid "600x300 DPI DMT"
+#~ msgstr "600x300 PPP DMT"
+
+#~ msgid "600x600 DPI DMT"
+#~ msgstr "600x600 PPP DMT"
+
+#~ msgid "1200x600 DPI DMT"
+#~ msgstr "1200x600 PPP DMT"
+
+#~ msgid "1200x1200 DPI"
+#~ msgstr "1200x1200 PPP"
+
+#~ msgid "1200x1200 DPI DMT"
+#~ msgstr "1200x1200 PPP DMT"
+
+#~ msgid "2400x2400 DPI"
+#~ msgstr "2400x2400 PPP"
+
+#~ msgid "2400x2400 DPI DMT"
+#~ msgstr "2400x2400 PPP DMT"
+
+#~ msgid "Plain Paper PIXMA"
+#~ msgstr "Papier PIXMA"
+
+#~ msgid "Back Print Film"
+#~ msgstr "Film back print"
+
+#~ msgid "Fabric Sheets"
+#~ msgstr "Support tissu"
+
+#~ msgid "Envelope"
+#~ msgstr "Enveloppe"
+
+#~ msgid "High Resolution Paper"
+#~ msgstr "Papier haute résolution"
+
+#~ msgid "T-Shirt Transfers"
+#~ msgstr "Transferts T-Shirt"
+
+#~ msgid "High Gloss Film"
+#~ msgstr "Film très brillant"
+
+#~ msgid "Glossy Photo Paper"
+#~ msgstr "Papier brillant qualité photo"
+
+#~ msgid "Glossy Photo Cards"
+#~ msgstr "Cartes brillantes qualité photo"
+
+#~ msgid "Photo Paper Pro"
+#~ msgstr "Papier Photo Pro"
+
+#~ msgid "Photo CcMmYK Color"
+#~ msgstr "Photo couleur CcMmJN"
+
+#~ msgid "Photo CcMmY Color"
+#~ msgstr "Photo couleur CcMmJ"
+
+#~ msgid "CMYK Color"
+#~ msgstr "Couleur CMJN"
+
+#~ msgid "CMY Color"
+#~ msgstr "Couleur CMJ"
 
 #~ msgid "Gutenprint"
 #~ msgstr "Gutenprint"
diff --git a/po/gutenprint.pot b/po/gutenprint.pot
index 46fb489..6dc42f6 100644
--- a/po/gutenprint.pot
+++ b/po/gutenprint.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\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"
@@ -19,7 +19,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 msgid "Default"
 msgstr ""
 
@@ -78,18 +78,18 @@ msgstr ""
 msgid "Density"
 msgstr ""
 
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -136,459 +136,296 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr ""
 
-#: src/main/print-canon.c:1382
-msgid "90x90 DPI"
-msgstr ""
-
-#: src/main/print-canon.c:1382
-msgid "90x90 DPI DMT"
-msgstr ""
-
-#: src/main/print-canon.c:1383
-msgid "180x180 DPI"
-msgstr ""
-
-#: src/main/print-canon.c:1383
-msgid "180x180 DPI DMT"
-msgstr ""
-
-#: src/main/print-canon.c:1384
-msgid "360x360 DPI"
-msgstr ""
-
-#: src/main/print-canon.c:1384
-msgid "360x360 DPI DMT"
-msgstr ""
-
-#: src/main/print-canon.c:1385
-msgid "720x360 DPI"
-msgstr ""
-
-#: src/main/print-canon.c:1385
-msgid "720x360 DPI DMT"
-msgstr ""
-
-#: src/main/print-canon.c:1386
-msgid "720x720 DPI"
-msgstr ""
-
-#: src/main/print-canon.c:1386
-msgid "720x720 DPI DMT"
-msgstr ""
-
-#: src/main/print-canon.c:1387
-msgid "1440x720 DPI"
-msgstr ""
-
-#: src/main/print-canon.c:1387
-msgid "1440x720 DPI DMT"
-msgstr ""
-
-#: src/main/print-canon.c:1388
-msgid "1440x1440 DPI"
-msgstr ""
-
-#: src/main/print-canon.c:1388
-msgid "1440x1440 DPI DMT"
-msgstr ""
-
-#: src/main/print-canon.c:1389
-msgid "2880x2880 DPI"
-msgstr ""
-
-#: src/main/print-canon.c:1389
-msgid "2880x2880 DPI DMT"
-msgstr ""
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr ""
-
-#: src/main/print-canon.c:1390
-msgid "150x150 DPI DMT"
-msgstr ""
-
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
-msgstr ""
-
-#: src/main/print-canon.c:1391
-msgid "300x300 DPI DMT"
-msgstr ""
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr ""
-
-#: src/main/print-canon.c:1392
-msgid "600x300 DPI DMT"
-msgstr ""
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr ""
-
-#: src/main/print-canon.c:1393
-msgid "600x600 DPI DMT"
-msgstr ""
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr ""
-
-#: src/main/print-canon.c:1394
-msgid "1200x600 DPI DMT"
-msgstr ""
-
-#: src/main/print-canon.c:1395
-msgid "1200x1200 DPI"
-msgstr ""
-
-#: src/main/print-canon.c:1395
-msgid "1200x1200 DPI DMT"
-msgstr ""
-
-#: src/main/print-canon.c:1396
-msgid "2400x2400 DPI"
-msgstr ""
-
-#: src/main/print-canon.c:1396
-msgid "2400x2400 DPI DMT"
-msgstr ""
-
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-msgid "Plain Paper"
-msgstr ""
-
-#: src/main/print-canon.c:1448
-msgid "Plain Paper PIXMA"
-msgstr ""
-
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-msgid "Transparencies"
-msgstr ""
-
-#: src/main/print-canon.c:1450
-msgid "Back Print Film"
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
+msgid "Page Size"
 msgstr ""
 
-#: src/main/print-canon.c:1451
-msgid "Fabric Sheets"
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
+msgid "Basic Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1452
-msgid "Envelope"
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
+msgid "Size of the paper being printed to"
 msgstr ""
 
-#: src/main/print-canon.c:1453
-msgid "High Resolution Paper"
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
+msgid "Media Type"
 msgstr ""
 
-#: src/main/print-canon.c:1454
-msgid "T-Shirt Transfers"
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
+msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
+msgid "Media Source"
 msgstr ""
 
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
+msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
-msgid "Page Size"
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
-msgid "Basic Printer Setup"
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
-msgid "Size of the paper being printed to"
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+msgid "Variable adjustment to the inner hub of the CD"
 msgstr ""
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
-msgid "Media Type"
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
-msgid "Type of media (plain paper, photo paper, etc.)"
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
-msgid "Media Source"
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
-msgid "Source (input slot) of the media"
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
 msgstr ""
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
 msgstr ""
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr ""
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr ""
-
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr ""
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr ""
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 msgid "Cyan Density"
 msgstr ""
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 msgid "Magenta Density"
 msgstr ""
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 msgid "Yellow Density"
 msgstr ""
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 msgid "Black Density"
 msgstr ""
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 msgid "Adjust the black density"
 msgstr ""
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 msgid "Light Cyan Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
-msgid "Short Edge (Flip)"
-msgstr ""
-
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-msgid "Auto Sheet Feeder"
-msgstr ""
-
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-msgid "Manual with Pause"
-msgstr ""
-
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
-msgstr ""
-
-#: src/main/print-canon.c:1923
-msgid "Cassette"
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:1924
-msgid "CD tray"
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:2049
-msgid "Photo CcMmYK Color"
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:2052
-msgid "Photo CcMmY Color"
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:2055
-msgid "CMYK Color"
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
+msgid "CD - Custom"
 msgstr ""
 
-#: src/main/print-canon.c:2058
-msgid "CMY Color"
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
 msgstr ""
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr ""
@@ -625,9 +462,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr ""
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
 msgstr ""
 
@@ -655,10 +492,6 @@ msgstr ""
 msgid "Channel "
 msgstr ""
 
-#: src/main/print-color.c:165
-msgid " Gamma"
-msgstr ""
-
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
 #: src/main/print-color.c:266 src/main/print-color.c:274
@@ -711,7 +544,7 @@ msgid "Output image type"
 msgstr ""
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
 msgstr ""
 
@@ -769,13 +602,13 @@ msgstr ""
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
@@ -785,13 +618,13 @@ msgstr ""
 msgid "Adjust the cyan gamma"
 msgstr ""
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 msgid "Magenta"
@@ -801,13 +634,13 @@ msgstr ""
 msgid "Adjust the magenta gamma"
 msgstr ""
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
@@ -817,9 +650,9 @@ msgstr ""
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
 msgstr ""
@@ -828,8 +661,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr ""
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
 msgstr ""
 
@@ -837,9 +670,9 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
 msgstr ""
@@ -848,11 +681,23 @@ msgstr ""
 msgid "Adjust the blue gamma"
 msgstr ""
 
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr ""
+
 #: src/main/print-color.c:315
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
 msgstr ""
 
@@ -865,7 +710,7 @@ msgstr ""
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 msgid "Magenta Balance"
 msgstr ""
 
@@ -873,7 +718,7 @@ msgstr ""
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 msgid "Yellow Balance"
 msgstr ""
 
@@ -897,9 +742,9 @@ msgstr ""
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 msgid "Advanced Output Control"
 msgstr ""
 
@@ -931,10 +776,6 @@ msgstr ""
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:446
-msgid " Curve"
-msgstr ""
-
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
@@ -1048,530 +889,354 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:516 src/main/printers.c:521
+#: src/main/printers.c:519 src/main/printers.c:524
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr ""
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:673
+#: src/main/printers.c:676
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr ""
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr ""
 
-#: src/main/printers.c:755
+#: src/main/printers.c:761
 msgid "Page size is not valid\n"
 msgstr ""
 
-#: src/main/printers.c:776
+#: src/main/printers.c:782
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:782
+#: src/main/printers.c:788
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:788
+#: src/main/printers.c:794
 msgid "Height must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:794
+#: src/main/printers.c:800
 msgid "Width must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr ""
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-msgid "Roll Feed"
-msgstr ""
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-msgid "Manual Feed"
-msgstr ""
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-msgid "Print to CD"
-msgstr ""
-
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-msgid "Manual Sheet Guide"
-msgstr ""
-
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-msgid "Manual Feed (Front)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:554
-msgid "Rear Tray"
-msgstr ""
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr ""
-
-#: src/main/print-escp2-data.c:581
-msgid "Photo Board"
-msgstr ""
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr ""
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr ""
-
-#: src/main/print-escp2-data.c:638
-msgid "Cut Sheet Autoselect"
-msgstr ""
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr ""
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr ""
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-msgid "High"
-msgstr ""
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-msgid "Photo"
-msgstr ""
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-msgid "Super Photo"
-msgstr ""
-
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-msgid "Ultra Photo"
-msgstr ""
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-msgid "Light Cyan"
-msgstr ""
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-msgid "Light Magenta"
-msgstr ""
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-msgid "Light Black"
-msgstr ""
-
-#: src/main/print-escp2-data.c:811
-msgid "Dark Yellow"
-msgstr ""
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-msgid "Matte Black"
-msgstr ""
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-msgid "Photo Black"
-msgstr ""
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-msgid "Gloss Optimizer"
-msgstr ""
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-msgid "Light Light Black"
-msgstr ""
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr ""
 
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr ""
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr ""
-
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr ""
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:214
+#: src/main/print-escp2.c:228
 msgid "Resolution of the print"
 msgstr ""
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:236
+#: src/main/print-escp2.c:250
 msgid "Ink Set"
 msgstr ""
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 msgid "Output Order"
 msgstr ""
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 msgid "Ink change command"
 msgstr ""
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 msgid "Alternate Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 msgid "Channel Names"
 msgstr ""
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:346
 msgid "Cyan Map"
 msgstr ""
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:347
 msgid "Adjust the cyan map"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:352
 msgid "Magenta Map"
 msgstr ""
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:353
 msgid "Adjust the magenta map"
 msgstr ""
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:358
 msgid "Yellow Map"
 msgstr ""
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:359
 msgid "Adjust the yellow map"
 msgstr ""
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:364
 msgid "Blue Map"
 msgstr ""
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:365
 msgid "Adjust the blue map"
 msgstr ""
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:371
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:447
+#: src/main/print-escp2.c:464
 msgid "Red Density"
 msgstr ""
 
-#: src/main/print-escp2.c:448
+#: src/main/print-escp2.c:465
 msgid "Adjust the red density"
 msgstr ""
 
-#: src/main/print-escp2.c:455
+#: src/main/print-escp2.c:472
 msgid "Blue Density"
 msgstr ""
 
-#: src/main/print-escp2.c:456
+#: src/main/print-escp2.c:473
 msgid "Adjust the blue density"
 msgstr ""
 
-#: src/main/print-escp2.c:463
+#: src/main/print-escp2.c:480
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:481
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 msgid "Light Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:527
+#: src/main/print-escp2.c:544
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:528
+#: src/main/print-escp2.c:545
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr ""
-
-#: src/main/print-escp2.c:1564
-msgid "Print To Hub"
-msgstr ""
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr ""
+
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 msgid "Automatic"
 msgstr ""
 
-#: src/main/print-escp2.c:1701
+#: src/main/print-escp2.c:1829
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1703
+#: src/main/print-escp2.c:1831
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2168
+#: src/main/print-escp2.c:2313
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1625,247 +1290,300 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+msgid "Plain Paper"
+msgstr ""
+
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
 msgstr ""
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+msgid "Transparencies"
+msgstr ""
+
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 msgid "Envelopes"
 msgstr ""
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 msgid "Matte Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 msgid "Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-olympus.c:265
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr ""
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr ""
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr ""
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr ""
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:861
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 msgid "Matte"
 msgstr ""
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1331
+#: src/main/print-olympus.c:1627
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1339
+#: src/main/print-olympus.c:1635
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1347
+#: src/main/print-olympus.c:1643
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1354
+#: src/main/print-olympus.c:1650
 msgid "Black Balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1355
+#: src/main/print-olympus.c:1651
 msgid "Adjust the black balance"
 msgstr ""
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 msgid "Plain"
 msgstr ""
 
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 msgid "Bond"
 msgstr ""
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 msgid "Premium"
 msgstr ""
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 msgid "Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
 msgstr ""
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 msgid "Tray 1"
 msgstr ""
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 msgid "Tray 2"
 msgstr ""
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 msgid "Tray 3"
 msgstr ""
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 msgid "Tray 4"
 msgstr ""
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
 msgstr ""
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 msgid "Desktop Sheet Feeder"
 msgstr ""
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 msgid "Tray"
 msgstr ""
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 msgid "Optional Source"
 msgstr ""
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 msgid "Autoselect"
 msgstr ""
 
 #: src/main/print-pcl.c:256
-msgid "600x600 DPI monochrome"
+msgid "150x150 DPI"
+msgstr ""
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr ""
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
 msgstr ""
 
 #: src/main/print-pcl.c:259
+msgid "600x600 DPI monochrome"
+msgstr ""
+
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr ""
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr ""
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
 msgstr ""
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr ""
-
 #: src/main/print-ps.c:97
 msgid "PPDFile"
 msgstr ""
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 msgid "PPD File"
 msgstr ""
 
@@ -1873,164 +1591,267 @@ msgstr ""
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 msgid "Two Level Grayscale"
 msgstr ""
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 msgid "Three Level Grayscale"
 msgstr ""
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 msgid "Seven Color Photo"
 msgstr ""
 
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 msgid "Seven Color Enhanced"
 msgstr ""
 
-#: src/main/escp2-channels.c:1535
+#: src/main/escp2-channels.c:1649
 msgid "Eight Color Photo"
 msgstr ""
 
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 msgid "One Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1695
+#: src/main/escp2-channels.c:1809
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 msgid "Two Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 msgid "Three Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1762
+#: src/main/escp2-channels.c:1876
 msgid "Three Color Raw Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 msgid "Four Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1884
+#: src/main/escp2-channels.c:2017
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 msgid "Six Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1962
+#: src/main/escp2-channels.c:2109
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 msgid "Seven Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2024
+#: src/main/escp2-channels.c:2187
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2042
+#: src/main/escp2-channels.c:2205
 msgid "Eight Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 msgid "UltraChrome Photo Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+msgid "Photo Black"
+msgstr ""
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+msgid "Matte Black"
+msgstr ""
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+msgid "Light Cyan"
+msgstr ""
+
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+msgid "Light Magenta"
+msgstr ""
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+msgid "Light Black"
+msgstr ""
+
+#: src/main/escp2-channels.c:2981
+msgid "Dark Yellow"
+msgstr ""
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+msgid "Gloss Optimizer"
+msgstr ""
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+msgid "Light Light Black"
+msgstr ""
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 msgid "Plain Paper Fast Load"
 msgstr ""
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr ""
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 msgid "Matte Paper Heavyweight"
 msgstr ""
 
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 msgid "ColorLife Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 msgid "Archival Matte Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+msgid "Roll Feed"
+msgstr ""
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+msgid "Manual Feed"
+msgstr ""
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+msgid "Print to CD"
+msgstr ""
+
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+msgid "Manual Sheet Guide"
+msgstr ""
+
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+msgid "Manual Feed (Front)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1859
+msgid "Rear Tray"
+msgstr ""
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/escp2-papers.c:1886
+msgid "Photo Board"
+msgstr ""
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr ""
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr ""
+
+#: src/main/escp2-papers.c:1943
+msgid "Cut Sheet Autoselect"
+msgstr ""
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr ""
+
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
@@ -2064,121 +1885,145 @@ msgstr ""
 msgid "720 x 360 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
+msgid "720 x 360 DPI Enhanced"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 msgid "720 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:94
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 msgid "720 DPI High Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:97
+#: src/main/escp2-resolutions.c:103
 msgid "720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:100
+#: src/main/escp2-resolutions.c:106
 msgid "720 x 720 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 msgid "1440 x 720 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:116
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 msgid "1440 x 720 DPI Transposed"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 msgid "2880 x 720 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:129
+#: src/main/escp2-resolutions.c:135
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
-msgid "1440 x 1440 DPI"
-msgstr ""
-
-#: src/main/escp2-resolutions.c:142
-msgid "1440 x 1440"
-msgstr ""
-
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
 #: src/main/escp2-resolutions.c:145
-msgid "1440 x 1440 DPI High Quality"
-msgstr ""
-
-#: src/main/escp2-resolutions.c:148
-msgid "1440 x 1440 DPI Highest Quality"
+msgid "1440 x 1440 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 msgid "2880 x 1440 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:158
+#: src/main/escp2-resolutions.c:155
 msgid "2880 x 1440 DPI Transposed"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:164
-msgid "2880 x 1440 DPI High Quality"
-msgstr ""
-
-#: src/main/escp2-resolutions.c:167
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr ""
-
-#: src/main/escp2-resolutions.c:171
+#: src/main/escp2-resolutions.c:162
 msgid "5760 x 1440 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 msgid "2880 x 2880 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 msgid "5760 x 2880 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 msgid "Interleave"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 msgid "Interleave 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:584
+#: src/main/escp2-resolutions.c:594
 msgid "Eight Pass"
 msgstr ""
 
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+msgid "High"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+msgid "Photo"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+msgid "Super Photo"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+msgid "Ultra Photo"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr ""
+
 #: src/main/generic-options.c:46
 msgid "Text"
 msgstr ""
@@ -2247,3672 +2092,3952 @@ msgstr ""
 msgid "Executive"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:10
+#: src/main/xmli18n-tmp.h:11
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:25
+#: src/main/xmli18n-tmp.h:26
 msgid "22x30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:31
+#: src/main/xmli18n-tmp.h:32
 msgid "Super A0"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 msgid "RA0"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 msgid "RA1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 msgid "RA2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 msgid "RA3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 msgid "RA4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 msgid "SRA4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:66
+#: src/main/xmli18n-tmp.h:67
 msgid "Super B0 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 msgid "DL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 msgid "ArchA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 msgid "ArchB"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 msgid "ArchC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 msgid "ArchD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 msgid "ArchE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 msgid "American foolscap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 msgid "European foolscap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:108
+#: src/main/xmli18n-tmp.h:109
 msgid "ISO A4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 msgid "Small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 msgid "A2 Invitation"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:125
+#: src/main/xmli18n-tmp.h:126
 msgid "Monarch Envelope"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:127
+#: src/main/xmli18n-tmp.h:128
 msgid "4x7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:130
+#: src/main/xmli18n-tmp.h:131
 msgid "Wide Postcard"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 msgid "Custom"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:144
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:145
+#: src/main/xmli18n-tmp.h:146
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:146
+#: src/main/xmli18n-tmp.h:147
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:147
+#: src/main/xmli18n-tmp.h:148
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/main/xmli18n-tmp.h:149
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:149
+#: src/main/xmli18n-tmp.h:150
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/main/xmli18n-tmp.h:151
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/main/xmli18n-tmp.h:152
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:152
+#: src/main/xmli18n-tmp.h:153
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/main/xmli18n-tmp.h:154
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/main/xmli18n-tmp.h:155
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
+#: src/main/xmli18n-tmp.h:156
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:156
+#: src/main/xmli18n-tmp.h:157
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:157
+#: src/main/xmli18n-tmp.h:158
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:158
+#: src/main/xmli18n-tmp.h:159
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:159
+#: src/main/xmli18n-tmp.h:160
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:160
+#: src/main/xmli18n-tmp.h:161
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:161
+#: src/main/xmli18n-tmp.h:162
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:162
+#: src/main/xmli18n-tmp.h:163
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:163
+#: src/main/xmli18n-tmp.h:164
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:164
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:173
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
-msgid "Canon iP4000"
+#: src/main/xmli18n-tmp.h:181
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:182
+msgid "Canon PIXMA iP3000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:183
+msgid "Canon PIXMA iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:184
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:185
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:186
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:187
+msgid "Canon PIXMA iP4300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:188
+msgid "Canon PIXMA iP5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
+msgid "Canon PIXMA iP6700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:191
+msgid "Canon PIXMA MP150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:192
+msgid "Canon PIXMA MP500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:193
+msgid "Canon PIXMA MP700"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:194
+msgid "Canon PIXMA MP730"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:195
+msgid "Canon PIXMA MP750"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:196
+msgid "Canon PIXMA MP760"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:197
+msgid "Canon PIXMA MP770"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:198
+msgid "Canon PIXMA MP780"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:199
+msgid "Canon PIXMA MP790"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:200
+msgid "Canon PIXMA MP830"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:201
+msgid "Canon PIXUS iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:202
+msgid "Canon PIXUS iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:203
+msgid "Canon i560"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:204
+msgid "Canon i850"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:205
+msgid "Canon i860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:206
+msgid "Canon i865"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:207
 msgid "Epson Stylus C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:208
 msgid "Epson Stylus C20SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:209
 msgid "Epson Stylus C20UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:210
 msgid "Epson Stylus C40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:211
 msgid "Epson Stylus C40SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:212
 msgid "Epson Stylus C40UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:213
 msgid "Epson Stylus C41"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:214
 msgid "Epson Stylus C41SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:215
 msgid "Epson Stylus C41UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:216
 msgid "Epson Stylus C42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:217
 msgid "Epson Stylus C42SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:218
 msgid "Epson Stylus C42UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:219
 msgid "Epson Stylus C43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:220
 msgid "Epson Stylus C43SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:221
 msgid "Epson Stylus C43UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:222
 msgid "Epson Stylus C44"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:223
 msgid "Epson Stylus C44SX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:224
 msgid "Epson Stylus C44UX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:225
 msgid "Epson Stylus C45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:226
 msgid "Epson Stylus C46"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:227
 msgid "Epson Stylus C48"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:228
 msgid "Epson Stylus C50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:229
 msgid "Epson Stylus C60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:230
 msgid "Epson Stylus C61"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:231
 msgid "Epson Stylus C62"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:232
 msgid "Epson Stylus C63"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:233
 msgid "Epson Stylus C64"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:234
 msgid "Epson Stylus C65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:235
 msgid "Epson Stylus C66"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:236
 msgid "Epson Stylus C68"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:237
 msgid "Epson Stylus C70"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:238
+msgid "Epson Stylus C79"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:239
 msgid "Epson Stylus C80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:240
 msgid "Epson Stylus C82"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:241
 msgid "Epson Stylus C83"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:242
 msgid "Epson Stylus C84"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:243
 msgid "Epson Stylus C85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:244
 msgid "Epson Stylus C86"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:245
+msgid "Epson Stylus C87"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:246
 msgid "Epson Stylus C88"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:247
 msgid "Epson Stylus Color"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:248
 msgid "Epson Stylus Color I"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:249
 msgid "Epson Stylus Color II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:250
 msgid "Epson Stylus Color IIs"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:251
 msgid "Epson Stylus Color PRO"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:252
 msgid "Epson Stylus Pro XL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:253
 msgid "Epson Stylus Color 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:254
 msgid "Epson Stylus Color 440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:255
 msgid "Epson Stylus Color 460"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:256
 msgid "Epson Stylus Color 480"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:257
 msgid "Epson Stylus Color 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:258
 msgid "Epson Stylus Color 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:259
 msgid "Epson Stylus Color 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:260
 msgid "Epson Stylus Color 640"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:261
 msgid "Epson Stylus Color 660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:262
 msgid "Epson Stylus Color 670"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:263
 msgid "Epson Stylus Color 680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:264
 msgid "Epson Stylus Color 740"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:265
 msgid "Epson Stylus Color 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:266
 msgid "Epson Stylus Color 777"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:267
 msgid "Epson Stylus Color 800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:268
 msgid "Epson Stylus Color 850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:269
 msgid "Epson Stylus Color 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:270
 msgid "Epson Stylus Color 880"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:271
 msgid "Epson Stylus Color 8 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:272
 msgid "Epson Stylus Color 900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:273
 msgid "Epson Stylus Color 980"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:274
 msgid "Epson Stylus Color 1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:275
 msgid "Epson Stylus Color 1500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:276
 msgid "Epson Stylus Color 1520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:277
 msgid "Epson Stylus Color 3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:278
 msgid "Epson Stylus Photo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:279
 msgid "Epson Stylus Photo 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:280
 msgid "Epson Stylus Photo EX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:281
 msgid "Epson Stylus Photo EX3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:282
 msgid "Epson Stylus Photo 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:283
 msgid "Epson Stylus Photo 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:284
 msgid "Epson Stylus Photo 780"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:285
 msgid "Epson Stylus Photo 785"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:286
 msgid "Epson Stylus Photo 790"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:287
 msgid "Epson Stylus Photo 810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:288
 msgid "Epson Stylus Photo 820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:289
 msgid "Epson Stylus Photo 825"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:290
 msgid "Epson Stylus Photo 830"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:291
 msgid "Epson Stylus Photo 830U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:292
 msgid "Epson Stylus Photo 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:293
 msgid "Epson Stylus Photo 875"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:294
 msgid "Epson Stylus Photo 890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:295
 msgid "Epson Stylus Photo 895"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:296
 msgid "Epson Stylus Photo 900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:297
 msgid "Epson Stylus Photo 915"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:298
 msgid "Epson Stylus Photo 925"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:299
 msgid "Epson Stylus Photo 935"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:300
 msgid "Epson Stylus Photo 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:301
 msgid "Epson Stylus Photo 960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:302
 msgid "Epson Stylus Photo 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:303
 msgid "Epson Stylus Photo 1270"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:304
 msgid "Epson Stylus Photo 1280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:305
 msgid "Epson Stylus Photo 1290"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:306
+msgid "Epson Stylus Photo 1400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:307
+msgid "Epson Stylus Photo 1410"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:308
 msgid "Epson Stylus Photo 2000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:309
 msgid "Epson Stylus Photo 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:310
 msgid "Epson Stylus Photo 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:311
 msgid "Epson Stylus Photo R200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:312
 msgid "Epson Stylus Photo R210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:313
 msgid "Epson Stylus Photo R220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:314
+msgid "Epson Stylus Photo R230"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:315
+msgid "Epson Stylus Photo R240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:316
+msgid "Epson Stylus Photo R245"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:317
+msgid "Epson Stylus Photo R260"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:318
+msgid "Epson Stylus Photo R265"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:319
+msgid "Epson Stylus Photo R270"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:320
 msgid "Epson Stylus Photo R300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:321
 msgid "Epson Stylus Photo R310"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:322
 msgid "Epson Stylus Photo R320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:323
 msgid "Epson Stylus Photo R340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:324
+msgid "Epson Stylus Photo R350"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:325
+msgid "Epson Stylus Photo R360"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:326
+msgid "Epson Stylus Photo R380"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:327
+msgid "Epson Stylus Photo R390"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:328
 msgid "Epson Stylus Photo RX400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:329
 msgid "Epson Stylus Photo RX420"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:330
 msgid "Epson Stylus Photo RX425"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:331
 msgid "Epson Stylus Photo RX430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:332
 msgid "Epson Stylus Photo RX500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:333
 msgid "Epson Stylus Photo RX510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:334
+msgid "Epson Stylus Photo RX560"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:335
+msgid "Epson Stylus Photo RX580"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:336
+msgid "Epson Stylus Photo RX590"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:337
 msgid "Epson Stylus Photo RX600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:338
 msgid "Epson Stylus Photo RX620"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:339
 msgid "Epson Stylus Photo RX630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:340
+msgid "Epson Stylus Photo RX640"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:341
 msgid "Epson Stylus Photo RX700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:342
 msgid "Epson Stylus Photo R800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:343
 msgid "Epson Stylus Photo R1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:344
 msgid "Epson Stylus Photo R2400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:345
 msgid "Epson Stylus Pro 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:346
 msgid "Epson Stylus Pro 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:347
 msgid "Epson Stylus Pro 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:348
 msgid "Epson Stylus Pro 7500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:349
 msgid "Epson Stylus Pro 7600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:350
 msgid "Epson Stylus Pro 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:351
 msgid "Epson Stylus Pro 9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:352
 msgid "Epson Stylus Pro 9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:353
 msgid "Epson Stylus Pro 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:354
 msgid "Epson Stylus Scan 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:355
 msgid "Epson Stylus Scan 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:356
 msgid "Epson Stylus CX1500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:357
 msgid "Epson Stylus CX3100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:358
 msgid "Epson Stylus CX3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:359
 msgid "Epson Stylus CX3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:360
 msgid "Epson Stylus CX3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:361
 msgid "Epson Stylus CX3650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:362
 msgid "Epson Stylus CX3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:363
 msgid "Epson Stylus CX3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:364
 msgid "Epson Stylus CX3805"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:365
 msgid "Epson Stylus CX3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:366
 msgid "Epson Stylus CX4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:367
 msgid "Epson Stylus CX4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:368
 msgid "Epson Stylus CX4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:369
 msgid "Epson Stylus CX4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:370
 msgid "Epson Stylus CX4700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:371
 msgid "Epson Stylus CX4800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:372
+msgid "Epson Stylus CX5000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:373
+msgid "Epson Stylus CX5000F"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:374
 msgid "Epson Stylus CX5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:375
 msgid "Epson Stylus CX5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:376
 msgid "Epson Stylus CX5300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:377
 msgid "Epson Stylus CX5400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:378
 msgid "Epson Stylus CX5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:379
 msgid "Epson Stylus CX5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:380
+msgid "Epson Stylus CX6000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:381
 msgid "Epson Stylus CX6300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:382
 msgid "Epson Stylus CX6400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:383
 msgid "Epson Stylus CX6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:384
 msgid "Epson Stylus CX6600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:385
+msgid "Epson Stylus CX7000F"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:386
 msgid "Epson Stylus CX7700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:387
 msgid "Epson Stylus CX7800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:388
 msgid "Epson Stylus CX8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:389
 msgid "Epson Stylus CX8400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:390
 msgid "Epson Stylus D68"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:391
 msgid "Epson Stylus D88"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:392
 msgid "Epson Stylus DX3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:393
 msgid "Epson Stylus DX3850"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:394
 msgid "Epson Stylus DX4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:395
 msgid "Epson Stylus DX4250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:396
 msgid "Epson Stylus DX4800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:397
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:399
+msgid "Epson PictureMate Flash"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:400
+msgid "Epson PictureMate Pal"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:401
+msgid "Epson PictureMate Snap"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:402
+msgid "Epson PictureMate 200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:403
+msgid "Epson PictureMate 210"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:404
+msgid "Epson PictureMate 240"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:405
+msgid "Epson PictureMate 250"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:406
+msgid "Epson PictureMate 280"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:411
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:414
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:417
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:426
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:427
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:428
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:429
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:430
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:448
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:454
+msgid "Epson PM A820"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM D750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM D770"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:462
+msgid "Epson PM D870"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM D1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM G700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM G720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM G800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM G820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
+msgid "Epson PM G850"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:470
+msgid "Epson PM G4500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PX G900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PX G920"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PX G5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PX V500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:476
 msgid "Epson PX V600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:549
 msgid "Generic PCL 4 Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:550
 msgid "Generic PCL 5 Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:551
 msgid "Generic PCL 5c Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:552
 msgid "Generic PCL 5e Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:802
 msgid "HP e-printer e20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+msgid "Lexmark Optra E220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:913
 msgid "Star LaserPrinter 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:924
+msgid "Xerox WorkCentre M118"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:926
+msgid "Lexmark X73"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+msgid "Olympus P-S100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:942
+msgid "Canon CP-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:943
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:953
+msgid "Sony DPP-EX5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:957
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:960
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Points"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "Set the base unit of measurement to millimetres"
 msgstr ""
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
 msgstr ""
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Standard Command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Custom Command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
 msgstr ""
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Print to a file"
 msgstr ""
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 msgid "Set Default"
 msgstr ""
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
 msgstr ""
 
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, c-format
 msgid "%s -- Print v%s"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 msgid ""
 "Print and\n"
 "Save Settings"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 msgid ""
 "Save\n"
 "Settings"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -5926,438 +6051,415 @@ msgid ""
 "to its original position."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 msgid "Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 msgid "Width of the paper that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 msgid "Height of the paper that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 msgid "Automatic Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 msgid "Image Position"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 msgid "Upside down"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 msgid "Orientation:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 msgid "Distance from the left of the paper to the right of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Center:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Horizontal"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 msgid "Vertical"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Center the image vertically on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 msgid "Printer Make:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 msgid "Select the make of your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 msgid "Printer Model:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 msgid "Select your printer model"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 msgid "PPD File:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 msgid "Printer Queue:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 msgid "Enter the correct command to print to your printer. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 msgid "File to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 msgid "Print To File"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 msgid "Define New Printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 msgid "Printer Name:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 msgid "Enter the name you wish to give this logical printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 msgid "About Gutenprint "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 msgid "Gutenprint Version "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
-
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 msgid "Printer Settings"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 msgid "Setup Printer..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 msgid "New Printer..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 msgid "Image Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 msgid "Scaling:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 msgid "Set the scale (size) of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 msgid "Scale the print to the size of the page"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid "PPI"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 msgid "Set the width of the print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 msgid "Set the height of the print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the print size to the size of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 msgid "Print Color Adjust"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 msgid "Set Defaults"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 msgid "Image preview"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 msgid "Output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 msgid "Output Type:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 msgid "Select the desired output type"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 msgid "Size Units:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 msgid " "
 msgstr ""
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 msgid "Units:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 msgid "Select the base unit of measurement for printing"
 msgstr ""
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
 msgstr ""
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
 msgstr ""
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
 msgstr ""
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 msgid "Printer"
 msgstr ""
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 msgid "(Default Printer)"
 msgstr ""
 
@@ -6405,59 +6507,83 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:133
+#: src/cups/genppd.c:146
 msgid "Printer Features"
 msgstr ""
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:139
+#: src/cups/genppd.c:152
 msgid "Common"
 msgstr ""
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:153
 msgid "Extra 1"
 msgstr ""
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:154
 msgid "Extra 2"
 msgstr ""
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:155
 msgid "Extra 3"
 msgstr ""
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:156
 msgid "Extra 4"
 msgstr ""
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 msgid "ISOLatin1"
 msgstr ""
 
-#: src/cups/genppd.c:1465
+#: src/cups/genppd.c:1613
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1717
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1719
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1497
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1756
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -6465,14 +6591,6 @@ msgstr ""
 msgid "Escputil version "
 msgstr ""
 
-#: src/escputil/escputil.c:71
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-
 #: src/escputil/escputil.c:76
 msgid ""
 "Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
diff --git a/po/hu.gmo b/po/hu.gmo
index eeaa038..8d1d576 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index bac0e23..acabb51 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint 5.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\n"
 "PO-Revision-Date: 2006-06-16 16:40+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 msgid "Default"
 msgstr "Alapértelmezett"
 
@@ -80,18 +80,18 @@ msgstr "Előszórt bemenet"
 msgid "Density"
 msgstr "Sűrűség"
 
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
 msgstr "Kimeneti szint igazítása"
 
@@ -152,459 +152,299 @@ msgstr "Színátalakítási modul"
 msgid "Dither algorithm"
 msgstr "Szórási algoritmus"
 
-#: src/main/print-canon.c:1382
-msgid "90x90 DPI"
-msgstr "90x90 DPI"
-
-#: src/main/print-canon.c:1382
-msgid "90x90 DPI DMT"
-msgstr "90x90 DPI DMT"
-
-#: src/main/print-canon.c:1383
-msgid "180x180 DPI"
-msgstr "180x180 DPI"
-
-#: src/main/print-canon.c:1383
-msgid "180x180 DPI DMT"
-msgstr "180x180 DPI DMT"
-
-#: src/main/print-canon.c:1384
-msgid "360x360 DPI"
-msgstr "360x360 DPI"
-
-#: src/main/print-canon.c:1384
-msgid "360x360 DPI DMT"
-msgstr "360x360 DPI DMT"
-
-#: src/main/print-canon.c:1385
-msgid "720x360 DPI"
-msgstr "720x360 DPI"
-
-#: src/main/print-canon.c:1385
-msgid "720x360 DPI DMT"
-msgstr "720x360 DPI DMT"
-
-#: src/main/print-canon.c:1386
-msgid "720x720 DPI"
-msgstr "720x720 DPI"
-
-#: src/main/print-canon.c:1386
-msgid "720x720 DPI DMT"
-msgstr "720x720 DPI DMT"
-
-#: src/main/print-canon.c:1387
-msgid "1440x720 DPI"
-msgstr "1440x720 DPI"
-
-#: src/main/print-canon.c:1387
-msgid "1440x720 DPI DMT"
-msgstr "1440x720 DPI DMT"
-
-#: src/main/print-canon.c:1388
-msgid "1440x1440 DPI"
-msgstr "1440x1440 DPI"
-
-#: src/main/print-canon.c:1388
-msgid "1440x1440 DPI DMT"
-msgstr "1440x1440 DPI DMT"
-
-#: src/main/print-canon.c:1389
-msgid "2880x2880 DPI"
-msgstr "2880x2880 DPI"
-
-#: src/main/print-canon.c:1389
-msgid "2880x2880 DPI DMT"
-msgstr "2880x2880 DPI DMT"
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1390
-msgid "150x150 DPI DMT"
-msgstr "150x150 DPI DMT"
-
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1391
-msgid "300x300 DPI DMT"
-msgstr "300x300 DPI DMT"
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1392
-msgid "600x300 DPI DMT"
-msgstr "600x300 DPI DMT"
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1393
-msgid "600x600 DPI DMT"
-msgstr "600x600 DPI DMT"
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1394
-msgid "1200x600 DPI DMT"
-msgstr "1200x600 DPI DMT"
-
-#: src/main/print-canon.c:1395
-msgid "1200x1200 DPI"
-msgstr "1200x1200 DPI"
-
-#: src/main/print-canon.c:1395
-msgid "1200x1200 DPI DMT"
-msgstr "1200x1200 DPI DMT"
-
-#: src/main/print-canon.c:1396
-msgid "2400x2400 DPI"
-msgstr "2400x2400 DPI"
-
-#: src/main/print-canon.c:1396
-msgid "2400x2400 DPI DMT"
-msgstr "2400x2400 DPI DMT"
-
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-msgid "Plain Paper"
-msgstr "Egyszerű lap"
-
-#: src/main/print-canon.c:1448
-msgid "Plain Paper PIXMA"
-msgstr "Egyszerű PIXMA lap"
-
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-msgid "Transparencies"
-msgstr "�tlátszóságok"
-
-#: src/main/print-canon.c:1450
-msgid "Back Print Film"
-msgstr "Hátulnyomásos film"
-
-#: src/main/print-canon.c:1451
-msgid "Fabric Sheets"
-msgstr "Szövet"
-
-#: src/main/print-canon.c:1452
-msgid "Envelope"
-msgstr "Boríték"
-
-#: src/main/print-canon.c:1453
-msgid "High Resolution Paper"
-msgstr "Magas felbontású papír"
-
-#: src/main/print-canon.c:1454
-msgid "T-Shirt Transfers"
-msgstr "Pólóra vasalható"
-
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
-msgstr "Magasfényű film"
-
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
-msgstr "Fényes fotópapír"
-
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
-msgstr "Fényes fotókártya"
-
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
-msgstr "Fotópapír pro"
-
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
-msgstr "Egyéb"
-
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 msgid "Page Size"
 msgstr "Oldalméret"
 
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
 msgid "Basic Printer Setup"
 msgstr "Nyomtató alapbeállításai"
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 msgid "Size of the paper being printed to"
 msgstr "A nyomtatáshoz használt papír mérete"
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
 msgid "Media Type"
 msgstr "Papír típusa"
 
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "A hordozó típusa (egyszerű lap, fotópapír, stb.)"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
 msgid "Media Source"
 msgstr "Papír forrása"
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
 msgid "Source (input slot) of the media"
 msgstr "A nyomtatáshoz használt hordozó forrása"
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
+msgstr "CD középpontjának mérete"
+
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr "Csak a CD középpontján kívülre nyomtatás, vagy a lyuk felé vezető úton"
+
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
+msgstr ""
+
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
+
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+#, fuzzy
+msgid "CD Hub Size (Custom)"
+msgstr "CD középpontjának mérete"
+
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#, fuzzy
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "Nyomat méretezése a lap mérete szerint"
+
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
+msgstr "CD vízszintes finomhangolása"
+
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
+msgstr "Haladó nyomtatóbeállítások"
+
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr "Finomhangolás a vízszintes pozícióig a CD-re nyomtatáshoz"
+
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
+msgstr "CD függőleges finomhangolása"
+
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
 msgstr "Felbontás"
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
 msgstr "A nyomtatás felbontása és minősége"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tinta típusa"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr "Haladó nyomtatóbeállítások"
-
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "A nyomtatóban levő tinta típusa"
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr "Tintacsatornák"
 
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr "Haladó nyomtatófunkciók"
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Nyomtatási mód"
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Alap paraméter"
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Nyomtatás kimeneti módja"
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr "Kétoldalas nyomtatás"
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr "Kétoldalas/fordítva beállítás"
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 msgid "Cyan Density"
 msgstr "Ciánkék sűrűsége"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 msgid "Adjust the cyan density"
 msgstr "A nyomat ciánkék-sűrűségének beállítása"
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 msgid "Magenta Density"
 msgstr "Bíborvörös sűrűsége"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 msgid "Adjust the magenta density"
 msgstr "A nyomat bíborvörös-sűrűségének beállítása"
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 msgid "Yellow Density"
 msgstr "Sárga sűrűsége"
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 msgid "Adjust the yellow density"
 msgstr "A nyomat sárga-sűrűségének beállítása"
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 msgid "Black Density"
 msgstr "Fekete sűrűsége"
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 msgid "Adjust the black density"
 msgstr "A nyomat fekete-sűrűségének beállítása"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 msgid "Light Cyan Transition"
 msgstr "Világos ciánkék átmenet"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr "Haladó tintabeállítás"
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 msgid "Light Magenta Transition"
 msgstr "Világos bíborvörös átmenet"
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 msgid "Light Yellow Transition"
 msgstr "Világossárga átmenet"
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
 msgstr "Kikapcsolva"
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
+msgstr "hosszabbik él (szabvány)"
+
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr "Rövidebbik él (tükrözve)"
 
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-msgid "Auto Sheet Feeder"
-msgstr "Automatikus lapadagoló"
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
+msgstr "5 hüvelykes CD"
 
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-msgid "Manual with Pause"
-msgstr "Kézzel szünetekkel"
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
+msgstr "3 hüvelykes CD"
 
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
-msgstr "Kézzel szünetek nélkül"
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
+#, fuzzy
+msgid "CD - Custom"
+msgstr "Egyéni"
 
-#: src/main/print-canon.c:1923
-msgid "Cassette"
-msgstr "Kazetta"
-
-#: src/main/print-canon.c:1924
-msgid "CD tray"
-msgstr "CD tálca"
-
-#: src/main/print-canon.c:2049
-msgid "Photo CcMmYK Color"
-msgstr "Fotó CcMmYK szín"
-
-#: src/main/print-canon.c:2052
-msgid "Photo CcMmY Color"
-msgstr "Fotó CcMmY szín"
-
-#: src/main/print-canon.c:2055
-msgid "CMYK Color"
-msgstr "CMYK szín"
-
-#: src/main/print-canon.c:2058
-msgid "CMY Color"
-msgstr "CMY szín"
-
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
-msgstr "Fekete"
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
+msgstr "Normál"
 
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+msgid "Print To Hub"
+msgstr "Nyomtatás a középpontig"
+
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
 msgstr "Színes"
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Fekete-fehér"
@@ -641,9 +481,9 @@ msgstr "Nyers"
 msgid "Pre-Dithered"
 msgstr "Előszórt"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
 msgstr "Szürkeárnyalatos"
 
@@ -671,10 +511,6 @@ msgstr "KCMY"
 msgid "Channel "
 msgstr "Csatorna "
 
-#: src/main/print-color.c:165
-msgid " Gamma"
-msgstr " Gamma"
-
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
 #: src/main/print-color.c:266 src/main/print-color.c:274
@@ -727,7 +563,7 @@ msgid "Output image type"
 msgstr "Kimeneti kép típusa"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
 msgstr "Nyers csatornák"
 
@@ -787,13 +623,13 @@ msgstr "Alkalmazás Gamma"
 msgid "Gamma value assumed by application"
 msgstr "Az alkalmazás által feltételezett gamma érték"
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
@@ -803,13 +639,13 @@ msgstr "Ciánkék"
 msgid "Adjust the cyan gamma"
 msgstr "A ciánkék gamma értékének beállítása"
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 msgid "Magenta"
@@ -819,13 +655,13 @@ msgstr "Bíborvörös"
 msgid "Adjust the magenta gamma"
 msgstr "A bíborvörös gamma értékének beállítása"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
@@ -835,9 +671,9 @@ msgstr "Sárga"
 msgid "Adjust the yellow gamma"
 msgstr "A sárga gamma értékének beállítása"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
 msgstr "Vörös"
@@ -846,8 +682,8 @@ msgstr "Vörös"
 msgid "Adjust the red gamma"
 msgstr "A vörös gamma értékének beállítása"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
 msgstr "Zöld"
 
@@ -855,9 +691,9 @@ msgstr "Zöld"
 msgid "Adjust the green gamma"
 msgstr "A zöld gamma értékének beállítása"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
 msgstr "Kék"
@@ -866,11 +702,23 @@ msgstr "Kék"
 msgid "Adjust the blue gamma"
 msgstr "A kék gamma értékének beállítása"
 
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr "Fekete"
+
 #: src/main/print-color.c:315
 msgid "Adjust the black gamma"
 msgstr "A fekete gamma értékének beállítása"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
 msgstr "Ciánkékegyensúly"
 
@@ -883,7 +731,7 @@ msgstr "Szürkeegyensúly"
 msgid "Adjust the cyan gray balance"
 msgstr "A ciánkék szürkeegyensúlyának beállítása"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 msgid "Magenta Balance"
 msgstr "Bíborvörös-egyensúly"
 
@@ -891,7 +739,7 @@ msgstr "Bíborvörös-egyensúly"
 msgid "Adjust the magenta gray balance"
 msgstr "A bíborvörös szürkeegyensúlyának beállítása"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 msgid "Yellow Balance"
 msgstr "Sárgaegyensúly"
 
@@ -918,9 +766,9 @@ msgstr "Tintakorlát"
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 msgid "Advanced Output Control"
 msgstr "Haladó kimenetvezérlés"
 
@@ -952,10 +800,6 @@ msgstr "GCR felső korlát"
 msgid "Upper bound of gray component reduction"
 msgstr "A szürkeösszetevő csökkentésének felső korlátja"
 
-#: src/main/print-color.c:446
-msgid " Curve"
-msgstr " Görbe"
-
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
@@ -1069,81 +913,81 @@ msgstr "Szürkeösszetevő-csökkentés (GCR)"
 msgid "Gray component reduction curve"
 msgstr "Szürkeösszetevő-csökkentési görbe"
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
 msgstr "Hagyományos Gutenprint színátalakítás"
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr "A(z) %s számára be kell állítani egy értéket\n"
 
-#: src/main/printers.c:516 src/main/printers.c:521
+#: src/main/printers.c:519 src/main/printers.c:524
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "\"%s\" nem érvényes %s\n"
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr "A(z) %s %f és %f között kell legyen (jelenleg %f)\n"
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr "A(z) %s %d és %d között kell legyen (jelenleg %d)\n"
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr "A(z) %s határainak %f és %f között kell lenniük\n"
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr "A(z) %s tördelési módja a következő kell legyen: %s\n"
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
 msgstr "nincs tördelés"
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
 msgstr "tördelés"
 
-#: src/main/printers.c:673
+#: src/main/printers.c:676
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Ismeretlen típusú paraméter: %s (%d)\n"
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "A(z) %s kívül esik a tartományon (érték: %d, min.: %d, max.: %d)\n"
 
-#: src/main/printers.c:755
+#: src/main/printers.c:761
 msgid "Page size is not valid\n"
 msgstr "Érvénytelen oldalméret\n"
 
-#: src/main/printers.c:776
+#: src/main/printers.c:782
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "A felső szegély kevesebb kell legyen, mint %d\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:788
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "A bal szegély nem lehet kevesebb, mint %d\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:794
 msgid "Height must be greater than zero\n"
 msgstr "A magasság nullánál nagyobb kell legyen\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:800
 msgid "Width must be greater than zero\n"
 msgstr "A szélesség nullánál nagyobb kell legyen\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -1152,7 +996,7 @@ msgstr ""
 "A kép túl széles az oldalhoz: a bal margó %d, a szélesség %d, a jobb szél %"
 "d\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1161,442 +1005,266 @@ msgstr ""
 "A kép túl magas az oldalhoz: a felső margó %d, a magasság %d, az alsó szél %"
 "d\n"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr "Szabványos"
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-msgid "Roll Feed"
-msgstr "Tekercses adagoló"
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr "Tekercses adagoló (levágás minden lap után)"
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr "Tekercses adagoló (levágás nélkül)"
-
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-msgid "Manual Feed"
-msgstr "Kézi adagolás"
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-msgid "Print to CD"
-msgstr "Nyomtatás CD-re"
-
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-msgid "Manual Sheet Guide"
-msgstr "Kézi lapvezérlő"
-
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-msgid "Manual Feed (Front)"
-msgstr "Kézi adagolás (elöl)"
-
-#: src/main/print-escp2-data.c:554
-msgid "Rear Tray"
-msgstr "Hátsó tálca"
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr "Első tálca"
-
-#: src/main/print-escp2-data.c:581
-msgid "Photo Board"
-msgstr "Fotókarton"
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr "Vágólap, 1. tálca"
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr "Vágólap, 2. tálca"
-
-#: src/main/print-escp2-data.c:638
-msgid "Cut Sheet Autoselect"
-msgstr "Vágólap, automatikus tálcaválasztás"
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr "Kézi kijelölés"
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr "Gyors, gazdaságos"
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr "Gazdaságos"
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr "Piszkozat"
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-msgid "High"
-msgstr "Magas"
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-msgid "Photo"
-msgstr "Fotó"
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-msgid "Super Photo"
-msgstr "Szuper fotó"
-
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-msgid "Ultra Photo"
-msgstr "Ultra fotó"
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr "Legjobb"
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-msgid "Light Cyan"
-msgstr "Világos ciánkék"
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-msgid "Light Magenta"
-msgstr "Világos bíborvörös"
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-msgid "Light Black"
-msgstr "Világos fekete"
-
-#: src/main/print-escp2-data.c:811
-msgid "Dark Yellow"
-msgstr "Sötétsárga"
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-msgid "Matte Black"
-msgstr "Matt fekete"
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-msgid "Photo Black"
-msgstr "Fotófekete"
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-msgid "Gloss Optimizer"
-msgstr "Fényességoptimalizáló"
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-msgid "Light Light Black"
-msgstr "Világosszürke"
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
 msgstr "Automatikus nyomtatási mód"
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr "Alap kimenetvezérlés"
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
 msgstr "Automatikus nyomtatási mód"
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Nyomtatási minőség"
 
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr "CD középpontjának mérete"
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr "Csak a CD középpontján kívülre nyomtatás, vagy a lyuk felé vezető úton"
-
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr "CD vízszintes finomhangolása"
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr "Finomhangolás a vízszintes pozícióig a CD-re nyomtatáshoz"
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr "CD függőleges finomhangolása"
-
-#: src/main/print-escp2.c:214
+#: src/main/print-escp2.c:228
 msgid "Resolution of the print"
 msgstr "A nyomat felbontása"
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
 msgstr "Kiterjesztett fényesség"
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
 msgstr "Fényességkiterjesztés hozzáadása"
 
-#: src/main/print-escp2.c:236
+#: src/main/print-escp2.c:250
 msgid "Ink Set"
 msgstr "Tintakészlet"
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
 msgstr "Nyomtatás iránya"
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
 msgstr "Haladó kimenetvezérlés"
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr "Nyomtatás iránya (az egyirányú jobb minőségű, de lassabb)"
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
 msgstr "Szegély nélküli"
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
 msgstr "Nyomtatás szegélyek nélkül"
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
 msgstr "Kihagyási módszer"
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
 msgstr "A használandó kihagyásminta"
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
 msgstr "Hangolja szükség szerint a pontméretet"
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr "Hangolja szükség szerint a pontméretet a kívánt sűrűség eléréséhez"
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 msgid "Output Order"
 msgstr "Kimeneti sorrend"
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
 msgstr "Igazítási lépések"
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
 msgstr "Igazítási lehetőségek"
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 msgid "Ink change command"
 msgstr "Tintacsere parancsa"
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
 msgstr "Alternatív igazítási lépések"
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 msgid "Alternate Alignment Choices"
 msgstr "Alternatív igazítási lehetőségek"
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
 msgstr "Támogatja a csomag módot"
 
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 msgid "Channel Names"
 msgstr "Csatornanevek"
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
 msgstr "Nyers csatornaszám"
 
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:346
 msgid "Cyan Map"
 msgstr "Ciánkék-leképezés"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:347
 msgid "Adjust the cyan map"
 msgstr "A ciánkék-leképezés beállítása"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:352
 msgid "Magenta Map"
 msgstr "Bíborvörös-leképezés"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:353
 msgid "Adjust the magenta map"
 msgstr "A bíborvörös-leképezés beállítása"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:358
 msgid "Yellow Map"
 msgstr "Sárga-leképezés"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:359
 msgid "Adjust the yellow map"
 msgstr "A sárga-leképezés beállítása"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:364
 msgid "Blue Map"
 msgstr "Kék-leképezés"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:365
 msgid "Adjust the blue map"
 msgstr "A kék-leképezés beállítása"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
 msgstr "Vörös-leképezés"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:371
 msgid "Adjust the red map"
 msgstr "A vörös-leképezés beállítása"
 
-#: src/main/print-escp2.c:447
+#: src/main/print-escp2.c:464
 msgid "Red Density"
 msgstr "Vörös sűrűsége"
 
-#: src/main/print-escp2.c:448
+#: src/main/print-escp2.c:465
 msgid "Adjust the red density"
 msgstr "A vörös sűrűségének beállítása"
 
-#: src/main/print-escp2.c:455
+#: src/main/print-escp2.c:472
 msgid "Blue Density"
 msgstr "Kék sűrűsége"
 
-#: src/main/print-escp2.c:456
+#: src/main/print-escp2.c:473
 msgid "Adjust the blue density"
 msgstr "A kék sűrűségének beállítása"
 
-#: src/main/print-escp2.c:463
+#: src/main/print-escp2.c:480
 msgid "Gloss Level"
 msgstr "Fényesség szintje"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:481
 msgid "Adjust the gloss level"
 msgstr "A fényesség szintjének beállítása"
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
 msgstr "Sötétsárga átmenet"
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
 msgstr "Szürkeátmenet"
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 msgid "Light Gray Transition"
 msgstr "Világosszürke-átmenet"
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 msgid "Dark Gray Transition"
 msgstr "Sötétszürke-átmenet"
 
-#: src/main/print-escp2.c:527
+#: src/main/print-escp2.c:544
 msgid "Mid Gray Transition"
 msgstr "Középsőszürke-átmenet"
 
-#: src/main/print-escp2.c:528
+#: src/main/print-escp2.c:545
 msgid "Medium Gray Transition"
 msgstr "Közepesszürke-átmenet"
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 msgid "Full Manual Control"
 msgstr "Teljesen kézi vezérlés"
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
 msgstr "Automatikus beállításvezérlés"
 
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr "5 hüvelykes CD"
-
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr "3 hüvelykes CD"
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr "Normál"
-
-#: src/main/print-escp2.c:1564
-msgid "Print To Hub"
-msgstr "Nyomtatás a középpontig"
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Kézi vezérlés"
 
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr "Szabványos"
+
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: src/main/print-escp2.c:1701
+#: src/main/print-escp2.c:1829
 msgid "Bidirectional"
 msgstr "Kétirányú"
 
-#: src/main/print-escp2.c:1703
+#: src/main/print-escp2.c:1831
 msgid "Unidirectional"
 msgstr "Egyirányú"
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
 msgstr "Alternatív kitöltés"
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
 msgstr "Növekvő kitöltés"
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
 msgstr "Csökkenő kitöltés"
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
 msgstr "Növekvő dupla"
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
 msgstr "Legközelebbi szomszéd elkerülése"
 
-#: src/main/print-escp2.c:2168
+#: src/main/print-escp2.c:2313
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Ez a nyomtató nem támogatja a nyers kimenetet a(z) %d mélységben\n"
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr "A nyomtatási beállítások nincsenek ellenőrizve, nem lehet nyomtatni.\n"
@@ -1650,247 +1318,300 @@ msgid "test print"
 msgstr "próbanyomtatás"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
 msgstr "Négyszínű szabvány"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
 msgstr "Háromszínű kompozit"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
 msgstr "Hatszínes fénykép"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
 msgstr "Ötszínes fénykép (kompozit)"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+msgid "Plain Paper"
+msgstr "Egyszerű lap"
+
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
 msgstr "Fényes film"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+msgid "Transparencies"
+msgstr "�tlátszóságok"
+
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 msgid "Envelopes"
 msgstr "Borítékok"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 msgid "Matte Paper"
 msgstr "Matt papír"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
 msgstr "Inkjet papír"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotó minőségű Inkjet papír"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 msgid "Photo Paper"
 msgstr "Fotópapír"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
 msgstr "Kiváló minőségű fényes fotópapír"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Luster fotópapír"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
 msgstr "Fotó minőségű fényes papír"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
 msgstr "Ilford-féle nehéz papír"
 
-#: src/main/print-olympus.c:265
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr "Egyéb"
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr "Automatikus lapadagoló"
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr "Kézzel szünetekkel"
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr "Kézzel szünetek nélkül"
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
 msgstr "Bevont"
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
 msgstr "Nincs"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 msgid "Glossy"
 msgstr "Fényes"
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
 msgstr "Textúra"
 
-#: src/main/print-olympus.c:861
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 msgid "Matte"
 msgstr "Matt"
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
 msgstr "Laminált minta"
 
-#: src/main/print-olympus.c:1331
+#: src/main/print-olympus.c:1627
 msgid "Adjust the cyan balance"
 msgstr "A ciánkék-egyensúly beállítása"
 
-#: src/main/print-olympus.c:1339
+#: src/main/print-olympus.c:1635
 msgid "Adjust the magenta balance"
 msgstr "A bíborvörös-egyensúly beállítása"
 
-#: src/main/print-olympus.c:1347
+#: src/main/print-olympus.c:1643
 msgid "Adjust the yellow balance"
 msgstr "A sárgaegyensúly beállítása"
 
-#: src/main/print-olympus.c:1354
+#: src/main/print-olympus.c:1650
 msgid "Black Balance"
 msgstr "Feketeegyensúly"
 
-#: src/main/print-olympus.c:1355
+#: src/main/print-olympus.c:1651
 msgid "Adjust the black balance"
 msgstr "A feketeegyensúly beállítása"
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 msgid "Plain"
 msgstr "Egyszerű"
 
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 msgid "Bond"
 msgstr "Bond"
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 msgid "Premium"
 msgstr "Kiváló minőségű"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
 msgstr "Fényes fotó"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 msgid "Transparency"
 msgstr "�tlátszóság"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
 msgstr "Gyorsan száradó fénykép"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 msgid "Quick-dry Transparency"
 msgstr "Gyorsan száradó fólia"
 
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
 msgstr "Kézi"
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 msgid "Tray 1"
 msgstr "1. tálca"
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 msgid "Tray 2"
 msgstr "2. tálca"
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 msgid "Tray 3"
 msgstr "3. tálca"
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 msgid "Tray 4"
 msgstr "4. tálca"
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
 msgstr "Hordozható lapadagoló"
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 msgid "Desktop Sheet Feeder"
 msgstr "Asztali lapadagoló"
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 msgid "Tray"
 msgstr "Tálca"
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 msgid "Optional Source"
 msgstr "Opcionális forrás"
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 msgid "Autoselect"
 msgstr "Automatikus választás"
 
 #: src/main/print-pcl.c:256
+msgid "150x150 DPI"
+msgstr "150x150 DPI"
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr "300x300 DPI"
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
+msgstr "600x300 DPI"
+
+#: src/main/print-pcl.c:259
 msgid "600x600 DPI monochrome"
 msgstr "600x600 DPI fekete-fehér"
 
-#: src/main/print-pcl.c:259
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr "600x600 DPI"
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr "1200x600 DPI"
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
 msgstr "Színes + fekete patron"
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
 msgstr "Színes + fotó patronok"
 
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr "hosszabbik él (szabvány)"
-
 #: src/main/print-ps.c:97
 msgid "PPDFile"
 msgstr "PPD fájl"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 msgid "PPD File"
 msgstr "PPD fájl"
 
@@ -1898,164 +1619,267 @@ msgstr "PPD fájl"
 msgid "Image dimensions must match paper dimensions"
 msgstr "A kép méretének meg kell felelnie a papír méretének"
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 msgid "Two Level Grayscale"
 msgstr "Kétszintű szürkeárnyalatos"
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 msgid "Three Level Grayscale"
 msgstr "Háromszintű szürkeárnyalatos"
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
 msgstr "Hatszínes (továbbfejlesztett, kompozit)"
 
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 msgid "Seven Color Photo"
 msgstr "Hétszínes fénykép"
 
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 msgid "Seven Color Enhanced"
 msgstr "Hétszínes (továbbfejlesztett)"
 
-#: src/main/escp2-channels.c:1535
+#: src/main/escp2-channels.c:1649
 msgid "Eight Color Photo"
 msgstr "Nyolcszínes fénykép"
 
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 msgid "One Color Raw"
 msgstr "Egyszínű nyers"
 
-#: src/main/escp2-channels.c:1695
+#: src/main/escp2-channels.c:1809
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Egyszínű nyers (továbbfejlesztett fényesség)"
 
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 msgid "Two Color Raw"
 msgstr "Kétszínű nyers"
 
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 msgid "Three Color Raw"
 msgstr "Háromszínű nyers"
 
-#: src/main/escp2-channels.c:1762
+#: src/main/escp2-channels.c:1876
 msgid "Three Color Raw Gloss"
 msgstr "Háromszínű nyers fényes"
 
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 msgid "Four Color Raw"
 msgstr "Négyszínű nyers"
 
-#: src/main/escp2-channels.c:1884
+#: src/main/escp2-channels.c:2017
 msgid "Four Color Raw Gloss"
 msgstr "Négyszínű nyers fényes"
 
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 msgid "Five Color Raw"
 msgstr "Ötszínes nyers"
 
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 msgid "Six Color Raw"
 msgstr "Hatszínes nyers"
 
-#: src/main/escp2-channels.c:1962
+#: src/main/escp2-channels.c:2109
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Hatszínes továbbfejlesztett, fényes nyers"
 
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 msgid "Seven Color Raw"
 msgstr "Hétszínes nyers"
 
-#: src/main/escp2-channels.c:2024
+#: src/main/escp2-channels.c:2187
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Hétszínes továbbfejlesztett, fényes nyers"
 
-#: src/main/escp2-channels.c:2042
+#: src/main/escp2-channels.c:2205
 msgid "Eight Color Raw"
 msgstr "Nyolcszínes nyers"
 
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
 msgstr "Epson szabvány tinták"
 
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome fotó fekete"
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
 msgstr "UltraChrome matt fekete"
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+msgid "Photo Black"
+msgstr "Fotófekete"
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+msgid "Matte Black"
+msgstr "Matt fekete"
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+msgid "Light Cyan"
+msgstr "Világos ciánkék"
+
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+msgid "Light Magenta"
+msgstr "Világos bíborvörös"
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+msgid "Light Black"
+msgstr "Világos fekete"
+
+#: src/main/escp2-channels.c:2981
+msgid "Dark Yellow"
+msgstr "Sötétsárga"
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+msgid "Gloss Optimizer"
+msgstr "Fényességoptimalizáló"
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+msgid "Light Light Black"
+msgstr "Világosszürke"
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 msgid "Plain Paper Fast Load"
 msgstr "Egyszerű papír, gyors betöltéssel"
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Levelezőlap"
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 msgid "Back Light Film"
 msgstr "Hátulról megvilágított film"
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 msgid "Matte Paper Heavyweight"
 msgstr "Matt papír, nehéz"
 
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 msgid "Premium Semigloss Photo Paper"
 msgstr "Kiváló minőségű félig fényes fotópapír"
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 msgid "ColorLife Paper"
 msgstr "ColorLife papír"
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 msgid "Archival Matte Paper"
 msgstr "Archiválási matt papír"
 
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
 msgstr "Vízfesték papír - Ragyogó fehér"
 
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+msgid "Roll Feed"
+msgstr "Tekercses adagoló"
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr "Tekercses adagoló (levágás minden lap után)"
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr "Tekercses adagoló (levágás nélkül)"
+
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+msgid "Manual Feed"
+msgstr "Kézi adagolás"
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+msgid "Print to CD"
+msgstr "Nyomtatás CD-re"
+
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+msgid "Manual Sheet Guide"
+msgstr "Kézi lapvezérlő"
+
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+msgid "Manual Feed (Front)"
+msgstr "Kézi adagolás (elöl)"
+
+#: src/main/escp2-papers.c:1859
+msgid "Rear Tray"
+msgstr "Hátsó tálca"
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr "Első tálca"
+
+#: src/main/escp2-papers.c:1886
+msgid "Photo Board"
+msgstr "Fotókarton"
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr "Vágólap, 1. tálca"
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr "Vágólap, 2. tálca"
+
+#: src/main/escp2-papers.c:1943
+msgid "Cut Sheet Autoselect"
+msgstr "Vágólap, automatikus tálcaválasztás"
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr "Kézi kijelölés"
+
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
 msgstr "360 x 90 DPI Gyors, gazdaságos"
@@ -2089,121 +1913,146 @@ msgstr "360 DPI"
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/main/escp2-resolutions.c:94
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 msgid "720 DPI High Quality"
 msgstr "720 DPI Jó minőségű"
 
-#: src/main/escp2-resolutions.c:97
+#: src/main/escp2-resolutions.c:103
 msgid "720 DPI Highest Quality"
 msgstr "720 DPI Legjobb minőségű"
 
-#: src/main/escp2-resolutions.c:100
+#: src/main/escp2-resolutions.c:106
 msgid "720 x 720 DPI"
 msgstr "720 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:116
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 720 DPI Legjobb minőségű"
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI felcserélt"
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:129
+#: src/main/escp2-resolutions.c:135
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 DPI Legjobb minőségű"
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
+#: src/main/escp2-resolutions.c:145
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:142
-msgid "1440 x 1440"
-msgstr "1440 x 1440"
-
-#: src/main/escp2-resolutions.c:145
-msgid "1440 x 1440 DPI High Quality"
-msgstr "1440 x 1440 DPI Jó minőségű"
-
-#: src/main/escp2-resolutions.c:148
-msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1440 x 1440 DPI Legjobb minőségű"
-
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:158
+#: src/main/escp2-resolutions.c:155
 msgid "2880 x 1440 DPI Transposed"
 msgstr "2880 x 1440 DPI felcserélt"
 
-#: src/main/escp2-resolutions.c:164
-msgid "2880 x 1440 DPI High Quality"
-msgstr "2880 x 720 DPI Jó minőségű"
-
-#: src/main/escp2-resolutions.c:167
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr "2880 x 720 DPI Legjobb minőségű"
-
-#: src/main/escp2-resolutions.c:171
+#: src/main/escp2-resolutions.c:162
 msgid "5760 x 1440 DPI"
 msgstr "5760 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 msgid "5760 x 2880 DPI"
 msgstr "5760 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
 msgstr "Be"
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 msgid "Interleave"
 msgstr "Kihagyás"
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
 msgstr "Teljes átfedés"
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
 msgstr "Négymenetes"
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
 msgstr "Teljes átfedés 2"
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 msgid "Interleave 2"
 msgstr "Kihagyás 2"
 
-#: src/main/escp2-resolutions.c:584
+#: src/main/escp2-resolutions.c:594
 msgid "Eight Pass"
 msgstr "Nyolclépéses"
 
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr "Gyors, gazdaságos"
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr "Gazdaságos"
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr "Piszkozat"
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+msgid "High"
+msgstr "Magas"
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+msgid "Photo"
+msgstr "Fotó"
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+msgid "Super Photo"
+msgstr "Szuper fotó"
+
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+msgid "Ultra Photo"
+msgstr "Ultra fotó"
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr "Legjobb"
+
 #: src/main/generic-options.c:46
 msgid "Text"
 msgstr "Szöveg"
@@ -2272,3652 +2121,4000 @@ msgstr "Tabloid"
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/main/xmli18n-tmp.h:11
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6-os fotópapír (letéphető szegélyek)"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
 msgstr "Mérnöki C 17x22"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/main/xmli18n-tmp.h:26
 msgid "22x30"
 msgstr "22x30"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/main/xmli18n-tmp.h:32
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
 msgstr "A4"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/main/xmli18n-tmp.h:67
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 msgid "ArchA transposed"
 msgstr "ArchA felcserélt"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 msgid "ArchB transposed"
 msgstr "ArchB felcserélt"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 msgid "ArchC transposed"
 msgstr "ArchC felcserélt"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 msgid "ArchD transposed"
 msgstr "ArchD felcserélt"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 msgid "ArchE transposed"
 msgstr "ArchE felcserélt"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 msgid "American foolscap"
 msgstr "Amerikai írólap"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 msgid "European foolscap"
 msgstr "Európai írólap"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 msgid "Large Crown Quarto"
 msgstr "Nagy Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/main/xmli18n-tmp.h:109
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 msgid "Large Crown Octavo"
 msgstr "Nagy Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
 msgstr "ISO A5"
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 msgid "Small paperback"
 msgstr "Kis paperback"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 msgid "Penguin small paperback"
 msgstr "Penguin, kis paperback"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 msgid "Penguin large paperback"
 msgstr "Penguin, nagy paperback"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 msgid "Hagaki Card"
 msgstr "Hagaki kártya"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
 msgstr "Oufuku kártya"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
 msgstr "Japán hosszú boríték #3"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
 msgstr "Japán hosszú boríték #4"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 msgid "Japanese Kaku envelope #4"
 msgstr "Japán Kaku boríték #4"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 msgid "A2 Invitation"
 msgstr "A2 meghívó"
 
-#: src/main/xmli18n-tmp.h:125
+#: src/main/xmli18n-tmp.h:126
 msgid "Monarch Envelope"
 msgstr "Monarch boríték"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/main/xmli18n-tmp.h:128
 msgid "4x7"
 msgstr "4x7"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
 msgstr "Kártya"
 
-#: src/main/xmli18n-tmp.h:130
+#: src/main/xmli18n-tmp.h:131
 msgid "Wide Postcard"
 msgstr "Széles levelezőlap"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
 msgstr "Chilei Office"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
 msgstr "Chilei dupla levél"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
 msgstr "Chilei dupla Office"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 msgid "Custom"
 msgstr "Egyéni"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
 msgstr "89mm-es papírtekercs"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
 msgstr "4 hüvelykes papírtekercs"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
 msgstr "5 hüvelykes papírtekercs"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
 msgstr "210 mm-es papírtekercs"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
 msgstr "13 hüvelykes papírtekercs"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
 msgstr "22 hüvelykes papírtekercs"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
 msgstr "24 hüvelykes papírtekercs"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
 msgstr "36 hüvelykes papírtekercs"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
 msgstr "44 hüvelykes papírtekercs"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 1"
 msgstr "1. szintű PostScript"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/main/xmli18n-tmp.h:146
 msgid "PostScript Level 2"
 msgstr "2. szintű PostScript"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/main/xmli18n-tmp.h:147
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/main/xmli18n-tmp.h:148
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/main/xmli18n-tmp.h:148
+#: src/main/xmli18n-tmp.h:149
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/main/xmli18n-tmp.h:150
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/main/xmli18n-tmp.h:150
+#: src/main/xmli18n-tmp.h:151
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:151
+#: src/main/xmli18n-tmp.h:152
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/main/xmli18n-tmp.h:153
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/main/xmli18n-tmp.h:153
+#: src/main/xmli18n-tmp.h:154
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/main/xmli18n-tmp.h:154
+#: src/main/xmli18n-tmp.h:155
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/main/xmli18n-tmp.h:155
+#: src/main/xmli18n-tmp.h:156
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/main/xmli18n-tmp.h:156
+#: src/main/xmli18n-tmp.h:157
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/main/xmli18n-tmp.h:158
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/main/xmli18n-tmp.h:159
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/main/xmli18n-tmp.h:160
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/main/xmli18n-tmp.h:161
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/main/xmli18n-tmp.h:162
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/main/xmli18n-tmp.h:163
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/main/xmli18n-tmp.h:164
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:173
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:180
-msgid "Canon iP4000"
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:182
+#, fuzzy
+msgid "Canon PIXMA iP3000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:183
+#, fuzzy
+msgid "Canon PIXMA iP3100"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "Canon PIXMA iP4000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:185
+#, fuzzy
+msgid "Canon PIXMA iP4100"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:186
+#, fuzzy
+msgid "Canon PIXMA iP4200"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:187
+#, fuzzy
+msgid "Canon PIXMA iP4300"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:188
+#, fuzzy
+msgid "Canon PIXMA iP5000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "Canon PIXMA iP5200"
+msgstr "Canon CP-200"
+
+#: src/main/xmli18n-tmp.h:190
+#, fuzzy
+msgid "Canon PIXMA iP6700"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA MP150"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:192
+#, fuzzy
+msgid "Canon PIXMA MP500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:193
+#, fuzzy
+msgid "Canon PIXMA MP700"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA MP730"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:195
+#, fuzzy
+msgid "Canon PIXMA MP750"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA MP760"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA MP770"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA MP780"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:199
+#, fuzzy
+msgid "Canon PIXMA MP790"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP830"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXUS iP3100"
+msgstr "Canon S100"
+
+#: src/main/xmli18n-tmp.h:202
+#, fuzzy
+msgid "Canon PIXUS iP4100"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon i560"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:204
+#, fuzzy
+msgid "Canon i850"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon i860"
+msgstr "Canon S600"
+
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon BJC-85"
+
+#: src/main/xmli18n-tmp.h:207
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:208
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:209
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:210
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:211
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:212
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:213
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:214
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:215
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:216
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:217
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:218
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:219
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:220
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:221
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:222
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:223
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:224
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:225
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:226
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:227
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:228
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:229
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:230
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:231
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:232
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:233
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:234
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:235
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:236
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:237
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:238
+#, fuzzy
+msgid "Epson Stylus C79"
+msgstr "Epson Stylus C70"
+
+#: src/main/xmli18n-tmp.h:239
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:240
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:241
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:242
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:243
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:244
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:245
+#, fuzzy
+msgid "Epson Stylus C87"
+msgstr "Epson Stylus C48"
+
+#: src/main/xmli18n-tmp.h:246
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:247
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:248
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:249
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:250
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:251
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:252
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:253
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:254
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:255
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:256
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:257
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:258
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:259
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:260
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:261
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:262
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:263
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:264
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:265
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:266
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:267
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:268
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:269
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:270
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:271
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:272
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:273
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:274
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:275
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:276
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:277
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:278
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:279
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:280
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:281
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:282
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:283
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:284
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:285
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:286
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:287
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:288
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:289
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:290
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:291
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:292
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:293
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:294
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:295
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:296
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:297
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:298
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:299
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:300
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:301
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:302
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:303
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:304
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:305
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "Epson Stylus Photo 1400"
+msgstr "Epson Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "Epson Stylus Photo 1410"
+msgstr "Epson Stylus Photo 810"
+
+#: src/main/xmli18n-tmp.h:308
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:309
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:310
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:311
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:312
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:313
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:314
+#, fuzzy
+msgid "Epson Stylus Photo R230"
+msgstr "Epson Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:315
+#, fuzzy
+msgid "Epson Stylus Photo R240"
+msgstr "Epson Stylus Photo R2400"
+
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "Epson Stylus Photo R245"
+msgstr "Epson Stylus Photo RX425"
+
+#: src/main/xmli18n-tmp.h:317
+#, fuzzy
+msgid "Epson Stylus Photo R260"
+msgstr "Epson Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Epson Stylus Photo R265"
+msgstr "Epson Stylus Photo RX425"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "Epson Stylus Photo R270"
+msgstr "Epson Stylus Photo 1270"
+
+#: src/main/xmli18n-tmp.h:320
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:321
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:322
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:323
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "Epson Stylus Photo R350"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "Epson Stylus Photo R360"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "Epson Stylus Photo R380"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "Epson Stylus Photo R390"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:329
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:330
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:331
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:332
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:333
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Epson Stylus Photo RX560"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:335
+#, fuzzy
+msgid "Epson Stylus Photo RX580"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:336
+#, fuzzy
+msgid "Epson Stylus Photo RX590"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:337
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:338
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:339
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:340
+#, fuzzy
+msgid "Epson Stylus Photo RX640"
+msgstr "Epson Stylus Photo RX400"
+
+#: src/main/xmli18n-tmp.h:341
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:342
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:343
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:344
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:345
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:346
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:347
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:348
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:349
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:350
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:351
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:352
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:353
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:354
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:355
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:356
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:357
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:358
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:359
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:360
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:361
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:362
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:363
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:364
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:365
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:366
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:367
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:368
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:369
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:370
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:371
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:372
+#, fuzzy
+msgid "Epson Stylus CX5000"
+msgstr "Epson Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:373
+#, fuzzy
+msgid "Epson Stylus CX5000F"
+msgstr "Epson Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:374
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:375
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:376
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:377
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:378
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:379
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:380
+#, fuzzy
+msgid "Epson Stylus CX6000"
+msgstr "Epson Stylus CX3600"
+
+#: src/main/xmli18n-tmp.h:381
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:382
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:383
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:384
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX7000F"
+msgstr "Epson Stylus CX3700"
+
+#: src/main/xmli18n-tmp.h:386
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:387
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:388
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:389
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:390
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:391
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:392
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:393
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:394
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:395
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:396
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:397
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:399
+#, fuzzy
+msgid "Epson PictureMate Flash"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:400
+#, fuzzy
+msgid "Epson PictureMate Pal"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:401
+#, fuzzy
+msgid "Epson PictureMate Snap"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:402
+#, fuzzy
+msgid "Epson PictureMate 200"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:403
+#, fuzzy
+msgid "Epson PictureMate 210"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:404
+#, fuzzy
+msgid "Epson PictureMate 240"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:405
+#, fuzzy
+msgid "Epson PictureMate 250"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson PictureMate 280"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:411
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:414
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:417
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:426
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:427
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:428
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:429
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:430
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:448
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:454
+#, fuzzy
+msgid "Epson PM A820"
+msgstr "Epson PM A890"
+
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:462
+#, fuzzy
+msgid "Epson PM D870"
+msgstr "Epson PM 870C"
+
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
+#, fuzzy
+msgid "Epson PM G850"
+msgstr "Epson PM G800"
+
+#: src/main/xmli18n-tmp.h:470
+#, fuzzy
+msgid "Epson PM G4500"
+msgstr "Epson PM G700"
+
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:476
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:549
 msgid "Generic PCL 4 Printer"
 msgstr "�ltalános PCL 4 nyomtató"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:550
 msgid "Generic PCL 5 Printer"
 msgstr "�ltalános PCL 5 nyomtató"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:551
 msgid "Generic PCL 5c Printer"
 msgstr "�ltalános PCL 5c nyomtató"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:552
 msgid "Generic PCL 5e Printer"
 msgstr "�ltalános PCL 5e nyomtató"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "�ltalános PCL 6/PCL XL nyomtató"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P PCL5 támogatással"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P PS támogatással"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:802
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+#, fuzzy
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Optra E"
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
 msgstr "Okidata OL400"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
 msgstr "Okidata OL400e"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
 msgstr "Okidata OL410e"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
 msgstr "Okidata OL600e"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
 msgstr "Okidata OL800"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:913
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:924
+#, fuzzy
+msgid "Xerox WorkCentre M118"
+msgstr "Xerox Document Centre 400"
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:926
+#, fuzzy
+msgid "Lexmark X73"
+msgstr "Lexmark Z43"
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+#, fuzzy
+msgid "Olympus P-S100"
+msgstr "Olympus P-10"
+
+#: src/main/xmli18n-tmp.h:942
+#, fuzzy
+msgid "Canon CP-10"
+msgstr "Canon CP-100"
+
+#: src/main/xmli18n-tmp.h:943
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:953
+#, fuzzy
+msgid "Sony DPP-EX5"
+msgstr "Sony UP-DR150"
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+#, fuzzy
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DR150"
+
+#: src/main/xmli18n-tmp.h:957
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:960
+#, fuzzy
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm Printpix-CX-400"
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
 msgstr "NYERS ADAT 16 bit"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
 msgstr "NYERS ADAT 8 bit"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Inch"
 msgstr "Hüvelyk"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
 msgstr "Az alapmértékegység hüvelykre állítása"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Az alapmértékegység centiméterre állítása"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Points"
 msgstr "Pont"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Az alapmértékegység pontra (1/72 hüvelyk) állítása"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
 msgstr "mm"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Az alapmértékegység milliméterre állítása"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
 msgstr "Pica"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Az alapmértékegység pica-ra (1/12 hüvelyk) állítása"
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color output"
 msgstr "Színes kimenet"
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
 msgstr "A szürke szín árnyalataival való nyomtatás fekete tintával"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Standard Command"
 msgstr "Szabványos parancs"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
 msgstr "Szabványos nyomtatóparancs használata"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Custom Command"
 msgstr "Egyéni parancs"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
 msgstr "Egyéni nyomtatóparancs használata"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
 msgstr "Fájl"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Print to a file"
 msgstr "Nyomtatás fájlba"
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
 msgstr "Görbe szerkesztése..."
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 msgid "Set Default"
 msgstr "Alapértelmezés beállítása"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
 msgstr "Előző helyreállítása"
 
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- nyomtatás v%s"
 
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
 msgstr "Névjegy"
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -5925,7 +6122,7 @@ msgstr ""
 "Nyomtatás és a\n"
 "beállítások mentése"
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 msgid ""
 "Save\n"
 "Settings"
@@ -5933,15 +6130,15 @@ msgstr ""
 "Beállítások\n"
 "mentése"
 
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
 msgstr "Előnézet"
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -5966,73 +6163,73 @@ msgstr ""
 "Ha húzás közben lenyom egy másik egérgombot, akkor a kép visszakerül az "
 "eredeti helyére."
 
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 msgid "Paper Size"
 msgstr "Papírméret"
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
 msgstr "Minden papírméret mutatása"
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
 msgstr "Méretek:"
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
 msgstr "Szélesség:"
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 msgid "Width of the paper that you wish to print to"
 msgstr "A nyomtatáshoz használt papír szélessége"
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
 msgstr "Magasság:"
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 msgid "Height of the paper that you wish to print to"
 msgstr "A nyomtatáshoz használt papír magassága"
 
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 msgid "Automatic Paper Size"
 msgstr "Automatikus papírméret"
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
 msgstr "Példányszám"
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr "Válassza ki a nyomtatandó példányok számát, 1 és 100 között"
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 msgid "Image Position"
 msgstr "Képpozíció"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
 msgstr "Automatikus"
 
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
 msgstr "�lló"
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
 msgstr "Fekvő"
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 msgid "Upside down"
 msgstr "Fejjel lefelé"
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
 msgstr "Ellenkező fekvő"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -6040,119 +6237,120 @@ msgstr ""
 "Válasszon irányt: álló, fekvő, fejjel lefelé levő vagy fordított fekvő "
 "(fejjel lefelé levő fekvő)"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 msgid "Orientation:"
 msgstr "Elhelyezkedés:"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
 msgstr "Bal:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
 msgstr "A képnek a papír bal oldalától mért távolsága"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
 msgstr "Jobb:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "A kép jobb oldalának a papír bal oldalától mért távolsága"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
 msgstr "A képnek a papír jobb oldalától mért távolsága"
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
 msgstr "Fent:"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
 msgstr "A képnek a papír tetejétől mért távolsága"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
 msgstr "Lent:"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "A kép aljának a papír tetejétől mért távolsága"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
 msgstr "A képnek a papír aljától mért távolsága"
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Center:"
 msgstr "Középre:"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Horizontal"
 msgstr "Vízszintes"
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
 msgstr "A kép középre igazítása vízszintes irányban a papíron"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
 msgstr "Mindkettő"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image on the paper"
 msgstr "A kép középre igazítása a papíron"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 msgid "Vertical"
 msgstr "Függőleges"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Center the image vertically on the paper"
 msgstr "A kép középre igazítása függőleges irányban a papíron"
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
 msgstr "Nyomtató beállítása"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 msgid "Printer Make:"
 msgstr "Nyomtató gyártója:"
 
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 msgid "Select the make of your printer"
 msgstr "Válassza ki a nyomtató gyártóját"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 msgid "Printer Model:"
 msgstr "Nyomtató típusa:"
 
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 msgid "Select your printer model"
 msgstr "Válassza ki a nyomtató típusát"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 msgid "PPD File:"
 msgstr "PPD fájl:"
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Adja meg a nyomtatóhoz tartozó PPD fájl nevét"
 
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
 msgstr "Tallózás"
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Válassza ki a nyomtatóhoz tartozó PPD fájl nevét"
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
@@ -6160,96 +6358,52 @@ msgstr ""
 "Adja meg azon kimeneti sor nevét (ne a nyomtató típusát vagy a modelljét), "
 "amelyikbe nyomtatni kíván"
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 msgid "Printer Queue:"
 msgstr "Nyomtatási sor:"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 msgid "Enter the correct command to print to your printer. "
 msgstr "Adja meg a nyomtatójára való nyomtatáshoz használandó parancsot. "
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
 msgstr "Adja meg a fájlt, amelybe nyomtatni kíván. "
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 msgid "File to print to"
 msgstr "Nyomtatás ebbe a fájlba"
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 msgid "Print To File"
 msgstr "Nyomtatás fájlba"
 
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 msgid "Define New Printer"
 msgstr "Új nyomtató meghatározása"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 msgid "Printer Name:"
 msgstr "Nyomtató neve:"
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Adja meg a logikai nyomtatóhoz használandó nevet"
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 msgid "About Gutenprint "
 msgstr "A Gutenprint névjegye "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 msgid "Gutenprint Version "
 msgstr "Gutenprint verzió: "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
-"\n"
-"\n"
-"Copyright (C) 1997-2001, Michael Sweet, Robert Krawitz\n"
-"és a Gutenprint fejlesztőcsapat többi tagja.\n"
-"\n"
-"A szerzők weblapja: http://gimp-print.sourceforge.net\n"
-"\n"
-"Ez a program szabad szoftver; terjeszthető és/vagy módosítható\n"
-"a Free Software Foundation által publikált GNU General Public\n"
-"License 2. vagy annál újabb verziója alapján.\n"
-"\n"
-"A program annak reményében kerül terjesztésre, hogy hasznosnak\n"
-"bizonyul, de GARANCIA NÉLKÜL; még a PIACKÉPESSÉG illetve\n"
-"egy BIZONYOS CÉLRA VALÓ ALKALMASS�G sincs garantálva. További\n"
-"részletek a GNU General Public License-ben.\n"
-"\n"
-"A programmal együtt Önnek kapnia kellett egy példányt a GNU General\n"
-"Public License-ből; ha nem így történt, írjon a következő címre:\n"
-"Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n"
-"MA 02111-1307, USA.\n"
-
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 msgid "Printer Settings"
 msgstr "Nyomtató beállításai"
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6257,21 +6411,21 @@ msgstr ""
 "Adja meg annak a nyomtatónak a nevét (ne a gyártmányt vagy a modellt), "
 "amelyikre nyomtatni kíván"
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 msgid "Setup Printer..."
 msgstr "Nyomtató beállítása..."
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr "A nyomtatómodell, a PPD-fájl és a nyomtatást végző parancs megadása"
 
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 msgid "New Printer..."
 msgstr "Új nyomtató..."
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6279,23 +6433,23 @@ msgstr ""
 "Új logikai nyomtató felvétele. Egy olyan beállítási állapot elnevezésére "
 "használható, amelyet a jövőben is kíván használni."
 
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 msgid "Image Size"
 msgstr "Képméret"
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 msgid "Scaling:"
 msgstr "Méretezés:"
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 msgid "Set the scale (size) of the image"
 msgstr "Megadja a kép méretezését (méretét)"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
 msgstr "Méretezés:"
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6303,31 +6457,31 @@ msgstr ""
 "Megadja, hogy a méretezés a lapméret százalékában legyen-e mérve vagy a "
 "kimeneti pont/hüvelyk értékben"
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
 msgstr "Százalék"
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 msgid "Scale the print to the size of the page"
 msgstr "Nyomat méretezése a lap mérete szerint"
 
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
 msgstr "Nyomat méretezése pont/hüvelyk érték szerint"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 msgid "Set the width of the print"
 msgstr "A nyomat szélessége"
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 msgid "Set the height of the print"
 msgstr "A nyomat magassága"
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6335,103 +6489,103 @@ msgstr ""
 "Eredeti képméret\n"
 "használata"
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the print size to the size of the image"
 msgstr "A nyomat méretének beállítása a kép méretére"
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 msgid "Print Color Adjust"
 msgstr "Nyomat színeinek beállítása"
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 msgid "Set Defaults"
 msgstr "Alapértelmezések beállítása"
 
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
 msgstr "Bezárás"
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 msgid "Image preview"
 msgstr "Előnézeti kép"
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
 msgstr "Kimeneti csatornák megjelenítése:"
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 msgid "Output"
 msgstr "Kimenet"
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 msgid "Output Type:"
 msgstr "Kimenet típusa:"
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 msgid "Select the desired output type"
 msgstr "Válassza ki a kívánt kimeneti típust"
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
 msgstr "Kimenet beállítása..."
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Színegyensúly, fényesség, kontraszt, telítettség és a színszórási módszer "
 "beállítása"
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 msgid "Size Units:"
 msgstr "Mértékegységek:"
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 msgid " "
 msgstr " "
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 msgid "Units:"
 msgstr "Mértékegységek:"
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 msgid "Select the base unit of measurement for printing"
 msgstr "Válassza ki a nyomtatáshoz használt alapmértékegységet"
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
 msgstr "System V lp"
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
 msgstr "CUPS"
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
 msgstr "Berkeley lpd (/etc/lpc)"
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
 msgstr "Berkeley lpd (/usr/bsd/lpc)"
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
 msgstr "Berkeley lpd (/usr/etc/lpc"
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
 msgstr "Berkeley lpd (/usr/libexec/lpc)"
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 msgid "Printer"
 msgstr "Nyomtató"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 msgid "(Default Printer)"
 msgstr "(Alapértelmezett nyomtató)"
 
@@ -6479,59 +6633,85 @@ msgstr "Y maximális lehetséges értéke"
 msgid "_Gamma value"
 msgstr "_Gamma érték"
 
-#: src/cups/genppd.c:133
+#: src/cups/genppd.c:146
 msgid "Printer Features"
 msgstr "Nyomtató szolgáltatásai"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 msgid "Output Control"
 msgstr "Kimenetvezérlés"
 
-#: src/cups/genppd.c:139
+#: src/cups/genppd.c:152
 msgid "Common"
 msgstr "Közös"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:153
 msgid "Extra 1"
 msgstr "1. extra"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:154
 msgid "Extra 2"
 msgstr "2. extra"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:155
 msgid "Extra 3"
 msgstr "3. extra"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:156
 msgid "Extra 4"
 msgstr "4. extra"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
 msgstr "5. extra"
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr "Hungarian"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 msgid "ISOLatin1"
 msgstr "ISOLatin2"
 
-#: src/cups/genppd.c:1465
+#: src/cups/genppd.c:1613
+#, fuzzy
+msgid "2-Sided Printing"
+msgstr "Kétoldalas nyomtatás"
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1717
 msgid "No"
 msgstr "Nem"
 
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1719
 msgid "Yes"
 msgstr "Igen"
 
-#: src/cups/genppd.c:1497
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#, fuzzy
+msgid "Value"
+msgstr "Kék"
+
+#: src/cups/genppd.c:1756
 msgid "Fine Adjustment"
 msgstr "Finomhangolás"
 
@@ -6539,21 +6719,6 @@ msgstr "Finomhangolás"
 msgid "Escputil version "
 msgstr "Escputil verzió "
 
-#: src/escputil/escputil.c:71
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Az Escputil-ra NINCS GARANCIA, a részletekért adja ki a következő "
-"parancsot:\n"
-" 'escputil -l'\n"
-"Ez egy szabad szoftver és örülünk, ha bizonyos feltételek mellett "
-"terjeszti,\n"
-"a részletekért adja ki a következő parancsot: 'escputil -l'.\n"
-
 #: src/escputil/escputil.c:76
 msgid ""
 "Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
@@ -7392,5 +7557,220 @@ msgstr "HIBA: ijsgutenprint: Hibás paraméterek, nem lehet folytatni!\n"
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "HIBA: ijsgutenprint: A következő sor lekérése meghiúsult itt: %.0f\n"
 
+#, fuzzy
+#~ msgid "Model Name"
+#~ msgstr "Csatornanevek"
+
+#, fuzzy
+#~ msgid "Canon MULTIPASS MP500"
+#~ msgstr "Canon S500"
+
+#, fuzzy
+#~ msgid "Canon MULTIPASS MP760"
+#~ msgstr "Canon LBP-1760"
+
+#~ msgid "Cassette"
+#~ msgstr "Kazetta"
+
+#~ msgid "CD tray"
+#~ msgstr "CD tálca"
+
+#~ msgid " Gamma"
+#~ msgstr " Gamma"
+
+#~ msgid " Curve"
+#~ msgstr " Görbe"
+
+#~ msgid "1440 x 1440"
+#~ msgstr "1440 x 1440"
+
+#~ msgid "1440 x 1440 DPI High Quality"
+#~ msgstr "1440 x 1440 DPI Jó minőségű"
+
+#~ msgid "1440 x 1440 DPI Highest Quality"
+#~ msgstr "1440 x 1440 DPI Legjobb minőségű"
+
+#~ msgid "2880 x 1440 DPI High Quality"
+#~ msgstr "2880 x 720 DPI Jó minőségű"
+
+#~ msgid "2880 x 1440 DPI Highest Quality"
+#~ msgstr "2880 x 720 DPI Legjobb minőségű"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "and the rest of the Gutenprint Development Team.\n"
+#~ "\n"
+#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2001, Michael Sweet, Robert Krawitz\n"
+#~ "és a Gutenprint fejlesztőcsapat többi tagja.\n"
+#~ "\n"
+#~ "A szerzők weblapja: http://gimp-print.sourceforge.net\n"
+#~ "\n"
+#~ "Ez a program szabad szoftver; terjeszthető és/vagy módosítható\n"
+#~ "a Free Software Foundation által publikált GNU General Public\n"
+#~ "License 2. vagy annál újabb verziója alapján.\n"
+#~ "\n"
+#~ "A program annak reményében kerül terjesztésre, hogy hasznosnak\n"
+#~ "bizonyul, de GARANCIA NÉLKÜL; még a PIACKÉPESSÉG illetve\n"
+#~ "egy BIZONYOS CÉLRA VALÓ ALKALMASS�G sincs garantálva. További\n"
+#~ "részletek a GNU General Public License-ben.\n"
+#~ "\n"
+#~ "A programmal együtt Önnek kapnia kellett egy példányt a GNU General\n"
+#~ "Public License-ből; ha nem így történt, írjon a következő címre:\n"
+#~ "Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n"
+#~ "MA 02111-1307, USA.\n"
+
+#~ msgid ""
+#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
+#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
+#~ "l'\n"
+#~ "This is free software, and you are welcome to redistribute it\n"
+#~ "under certain conditions; type 'escputil -l' for details.\n"
+#~ msgstr ""
+#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
+#~ "Az Escputil-ra NINCS GARANCIA, a részletekért adja ki a következő "
+#~ "parancsot:\n"
+#~ " 'escputil -l'\n"
+#~ "Ez egy szabad szoftver és örülünk, ha bizonyos feltételek mellett "
+#~ "terjeszti,\n"
+#~ "a részletekért adja ki a következő parancsot: 'escputil -l'.\n"
+
+#~ msgid "90x90 DPI"
+#~ msgstr "90x90 DPI"
+
+#~ msgid "90x90 DPI DMT"
+#~ msgstr "90x90 DPI DMT"
+
+#~ msgid "180x180 DPI"
+#~ msgstr "180x180 DPI"
+
+#~ msgid "180x180 DPI DMT"
+#~ msgstr "180x180 DPI DMT"
+
+#~ msgid "360x360 DPI"
+#~ msgstr "360x360 DPI"
+
+#~ msgid "360x360 DPI DMT"
+#~ msgstr "360x360 DPI DMT"
+
+#~ msgid "720x360 DPI"
+#~ msgstr "720x360 DPI"
+
+#~ msgid "720x360 DPI DMT"
+#~ msgstr "720x360 DPI DMT"
+
+#~ msgid "720x720 DPI"
+#~ msgstr "720x720 DPI"
+
+#~ msgid "720x720 DPI DMT"
+#~ msgstr "720x720 DPI DMT"
+
+#~ msgid "1440x720 DPI"
+#~ msgstr "1440x720 DPI"
+
+#~ msgid "1440x720 DPI DMT"
+#~ msgstr "1440x720 DPI DMT"
+
+#~ msgid "1440x1440 DPI"
+#~ msgstr "1440x1440 DPI"
+
+#~ msgid "1440x1440 DPI DMT"
+#~ msgstr "1440x1440 DPI DMT"
+
+#~ msgid "2880x2880 DPI"
+#~ msgstr "2880x2880 DPI"
+
+#~ msgid "2880x2880 DPI DMT"
+#~ msgstr "2880x2880 DPI DMT"
+
+#~ msgid "150x150 DPI DMT"
+#~ msgstr "150x150 DPI DMT"
+
+#~ msgid "300x300 DPI DMT"
+#~ msgstr "300x300 DPI DMT"
+
+#~ msgid "600x300 DPI DMT"
+#~ msgstr "600x300 DPI DMT"
+
+#~ msgid "600x600 DPI DMT"
+#~ msgstr "600x600 DPI DMT"
+
+#~ msgid "1200x600 DPI DMT"
+#~ msgstr "1200x600 DPI DMT"
+
+#~ msgid "1200x1200 DPI"
+#~ msgstr "1200x1200 DPI"
+
+#~ msgid "1200x1200 DPI DMT"
+#~ msgstr "1200x1200 DPI DMT"
+
+#~ msgid "2400x2400 DPI"
+#~ msgstr "2400x2400 DPI"
+
+#~ msgid "2400x2400 DPI DMT"
+#~ msgstr "2400x2400 DPI DMT"
+
+#~ msgid "Plain Paper PIXMA"
+#~ msgstr "Egyszerű PIXMA lap"
+
+#~ msgid "Back Print Film"
+#~ msgstr "Hátulnyomásos film"
+
+#~ msgid "Fabric Sheets"
+#~ msgstr "Szövet"
+
+#~ msgid "Envelope"
+#~ msgstr "Boríték"
+
+#~ msgid "High Resolution Paper"
+#~ msgstr "Magas felbontású papír"
+
+#~ msgid "T-Shirt Transfers"
+#~ msgstr "Pólóra vasalható"
+
+#~ msgid "High Gloss Film"
+#~ msgstr "Magasfényű film"
+
+#~ msgid "Glossy Photo Paper"
+#~ msgstr "Fényes fotópapír"
+
+#~ msgid "Glossy Photo Cards"
+#~ msgstr "Fényes fotókártya"
+
+#~ msgid "Photo Paper Pro"
+#~ msgstr "Fotópapír pro"
+
+#~ msgid "Photo CcMmYK Color"
+#~ msgstr "Fotó CcMmYK szín"
+
+#~ msgid "Photo CcMmY Color"
+#~ msgstr "Fotó CcMmY szín"
+
+#~ msgid "CMYK Color"
+#~ msgstr "CMYK szín"
+
+#~ msgid "CMY Color"
+#~ msgstr "CMY szín"
+
 #~ msgid "Gutenprint"
 #~ msgstr "Gutenprint"
diff --git a/po/ja.gmo b/po/ja.gmo
index db72bc1..ac5dbc4 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index bb5e066..15a5b02 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,30 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print Version 4.2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\n"
 "PO-Revision-Date: 2002-10-07 19:10+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=euc-jp\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 #, fuzzy
 msgid "Default"
-msgstr "½é´üÃͤËÌ᤹"
+msgstr "�期値�戻�"
 
 #: src/main/dither-main.c:47
 msgid "EvenTone"
-msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°"
+msgstr "イベントトーン方�"
 
 #: src/main/dither-main.c:48
 #, fuzzy
 msgid "Hybrid EvenTone"
-msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°"
+msgstr "イベントトーン方�"
 
 #. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
 #. * names, not descriptive.
@@ -37,17 +37,17 @@ msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°"
 #: src/main/dither-main.c:53
 #, fuzzy
 msgid "EvenBetter"
-msgstr "¥ì¥¿¡¼"
+msgstr "レター"
 
 #: src/main/dither-main.c:54
 #, fuzzy
 msgid "Hybrid EvenBetter"
-msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°"
+msgstr "イベントトーン方�"
 
 #: src/main/dither-main.c:60
 #, fuzzy
 msgid "UniTone"
-msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°"
+msgstr "イベントトーン方�"
 
 #: src/main/dither-main.c:61
 msgid "Hybrid UniTone"
@@ -55,23 +55,23 @@ msgstr ""
 
 #: src/main/dither-main.c:63
 msgid "Adaptive Hybrid"
-msgstr "¥¢¥À¥×¥Æ¥£¥Ö¡¦¥Ï¥¤¥Ö¥ê¥Ã¥ÉÊý¼°"
+msgstr "アダプティブ・�イブリッド方�"
 
 #: src/main/dither-main.c:64
 msgid "Ordered"
-msgstr "Ŭ±þ½ç½øÊý¼°"
+msgstr "�応順�方�"
 
 #: src/main/dither-main.c:65
 msgid "Fast"
-msgstr "¹â®Êý¼°"
+msgstr "高速方�"
 
 #: src/main/dither-main.c:66
 msgid "Very Fast"
-msgstr "Ķ¹â®Êý¼°"
+msgstr "超高速方�"
 
 #: src/main/dither-main.c:67
 msgid "Hybrid Floyd-Steinberg"
-msgstr "¥Ï¥¤¥Ö¥ê¥Ã¥É¡¦¥Õ¥í¥¤¥É-¥¹¥¿¥¤¥ó¥Ð¡¼¥°Êý¼°"
+msgstr "�イブリッド・フロイド-スタイン�ーグ方�"
 
 #: src/main/dither-main.c:68
 msgid "Predithered Input"
@@ -80,20 +80,20 @@ msgstr ""
 #: src/main/dither-main.c:88 src/main/print-color.c:56
 #, fuzzy
 msgid "Density"
-msgstr "Ç»ÅÙ:"
-
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+msgstr "濃度:"
+
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -103,13 +103,13 @@ msgid ""
 "ink bleeds through the paper or smears; increase the density if black "
 "regions are not solid."
 msgstr ""
-"°õºþ»þ¤ÎÇ»ÅÙ (¥¤¥ó¥¯¤ÎÎÌ) ¤òÄ´À°¤·¤Þ¤¹¡£\n"
-"ÍÑ»æ¤ËÂçÎ̤Υ¤¥ó¥¯¤¬ÉÕ¤¤¤¿¤ê±ø¤ì¤¿¤ê¤¹¤ë¾ì¹ç¤ÏÇ»ÅÙ¤òÄ㤯¤·¤Æ²¼¤µ¤¤;\n"
-"¹õ¤ÎÉôʬ¤¬¤Þ¤Ð¤é¤Ë¤Ê¤ë¾ì¹ç¤ÏÇ»ÅÙ¤ò¹â¤¯¤·¤Æ²¼¤µ¤¤¡£"
+"�刷時�濃度 (インク��) を調整���。\n"
+"用紙�大��インク�付��り汚れ�り�る場��濃度を低���下��;\n"
+"黒�部分���ら��る場��濃度を高���下��。"
 
 #: src/main/dither-main.c:97
 msgid "Dither Algorithm"
-msgstr "¥Ç¥£¥¶Êý¼°"
+msgstr "ディザ方�"
 
 #: src/main/dither-main.c:97
 msgid "Screening Adjustment"
@@ -127,13 +127,13 @@ msgid ""
 "art.\n"
 "Hybrid Floyd-Steinberg generally produces inferior output."
 msgstr ""
-"»ÈÍѤ¹¤ë¥Ç¥£¥¶¥ê¥ó¥°Êý¼°¤òÁªÂò¤·¤Þ¤¹¡£\n"
-"\"¥¢¥À¥×¥Æ¥£¥Ö¡¦¥Ï¥¤¥Ö¥ê¥Ã¥ÉÊý¼°\": °ìÈÌŪ¤ËºÇŬ¤ÊÉʼÁ¤òÄ󶡤·¤Þ¤¹¡£\n"
-"\"Ŭ±þ½ç½øÊý¼°\": ¹â®¤Ç¼Ì¿¿¤Ê¤É¤Î¹âÉʼÁ¤Ê½ÐÎϤòÄ󶡤·¤Þ¤¹¡£\n"
-"\"¹â®Êý¼°\",\"Ķ¹â®Êý¼°\": ¤«¤Ê¤ê¹â®¤Ë°õºþ¤·¡¢¥Æ¥­¥¹¥È¤ä¥é¥¤¥ó¥¢¡¼¥È¤ËŬ¤·"
-"¤Æ¤¤¤Þ¤¹¡£\n"
-"\"¥Ï¥¤¥Ö¥ê¥Ã¥É¡¦¥Õ¥í¥¤¥É-¥¹¥¿¥¤¥ó¥Ð¡¼¥°Êý¼°\": °ìÈÌŪ¤ËÄãÉʼÁ¤Ê½ÐÎϤòÄ󶡤·¤Þ"
-"¤¹¡£"
+"使用�るディザリング方�を�択���。\n"
+"\"アダプティブ・�イブリッド方�\": 一般的�最���質を�供���。\n"
+"\"�応順�方�\": 高速�写真���高�質�出力を�供���。\n"
+"\"高速方�\",\"超高速方�\": ��り高速��刷��テキストやラインアート���"
+"����。\n"
+"\"�イブリッド・フロイド-スタイン�ーグ方�\": 一般的�低�質�出力を�供��"
+"�。"
 
 #: src/main/module.c:52
 msgid "Miscellaneous (unclassified)"
@@ -150,509 +150,322 @@ msgstr ""
 #: src/main/module.c:55
 #, fuzzy
 msgid "Dither algorithm"
-msgstr "¥Ç¥£¥¶Êý¼°"
+msgstr "ディザ方�"
 
-#: src/main/print-canon.c:1382
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
-msgid "90x90 DPI"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1382
-#, fuzzy
-msgid "90x90 DPI DMT"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI DMT"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI DMT"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI"
-msgstr "720 x 360 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI DMT"
-msgstr "720 x 360 DPI MW2"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI DMT"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI"
-msgstr "1440 x 720 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI DMT"
-msgstr "1440 x 720 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI DMT"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI DMT"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1390
-#, fuzzy
-msgid "150x150 DPI DMT"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1391
-#, fuzzy
-msgid "300x300 DPI DMT"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1392
-#, fuzzy
-msgid "600x300 DPI DMT"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1393
-#, fuzzy
-msgid "600x600 DPI DMT"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1394
-#, fuzzy
-msgid "1200x600 DPI DMT"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1395
+msgid "Page Size"
+msgstr "画��サイズ"
+
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
 #, fuzzy
-msgid "1200x1200 DPI"
-msgstr "1200x600 DPI"
+msgid "Basic Printer Setup"
+msgstr "プリンタ�設定"
 
-#: src/main/print-canon.c:1395
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 #, fuzzy
-msgid "1200x1200 DPI DMT"
-msgstr "1200x600 DPI"
+msgid "Size of the paper being printed to"
+msgstr "�刷�る用紙�サイズ��。"
 
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI"
-msgstr "2400x600 DPI"
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
+msgid "Media Type"
+msgstr "用紙�種類"
 
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI DMT"
-msgstr "2400x600 DPI"
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
+msgid "Type of media (plain paper, photo paper, etc.)"
+msgstr ""
 
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-msgid "Plain Paper"
-msgstr "Ä̾ï¤ÎÍÑ»æ"
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
+msgid "Media Source"
+msgstr "給紙方法"
 
-#: src/main/print-canon.c:1448
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
 #, fuzzy
-msgid "Plain Paper PIXMA"
-msgstr "Ä̾ï¤ÎÍÑ»æ"
-
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-msgid "Transparencies"
-msgstr "¥¹¥é¥¤¥ÉÍÑ»æ"
-
-#: src/main/print-canon.c:1450
-msgid "Back Print Film"
-msgstr "ÇØ·Ê°õºþÍÑ¥Õ¥£¥ë¥à"
-
-#: src/main/print-canon.c:1451
-msgid "Fabric Sheets"
-msgstr "Á¡°Ý¼Á¤ÎÍÑ»æ"
-
-#: src/main/print-canon.c:1452
-msgid "Envelope"
-msgstr "ÉõÅû"
-
-#: src/main/print-canon.c:1453
-msgid "High Resolution Paper"
-msgstr "¹â²òÁüÅÙ¤ÎÍÑ»æ"
-
-#: src/main/print-canon.c:1454
-msgid "T-Shirt Transfers"
-msgstr "T-¥·¥ã¥Ä¤ÎÌÏÍÍ"
-
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
-msgstr "¹â±ð¥Õ¥£¥ë¥à"
+msgid "Source (input slot) of the media"
+msgstr "�刷時�給紙方���。"
 
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
-msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
+msgstr ""
 
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
-msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥È¡¦¥«¡¼¥É"
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr ""
 
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
-msgstr "¥Õ¥©¥ÈÍÑ»æ Pro"
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
+msgstr ""
 
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
-msgstr "¤½¤Î¾"
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
 
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
-#, fuzzy
-msgid "Page Size"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
-
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
-#, fuzzy
-msgid "Basic Printer Setup"
-msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+msgid "CD Hub Size (Custom)"
+msgstr ""
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
 #, fuzzy
-msgid "Size of the paper being printed to"
-msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¥µ¥¤¥º¤Ç¤¹¡£"
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "用紙サイズを 100 ���場��比率��。"
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
-msgid "Media Type"
-msgstr "ÍÑ»æ¤Î¼ïÎà"
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
+msgstr ""
 
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
-msgid "Type of media (plain paper, photo paper, etc.)"
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
-msgid "Media Source"
-msgstr "µë»æÊýË¡"
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr ""
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
-#, fuzzy
-msgid "Source (input slot) of the media"
-msgstr "°õºþ»þ¤Îµë»æÊý¼°¤Ç¤¹¡£"
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
+msgstr ""
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
-msgstr "²òÁüÅÙ"
+msgstr "解�度"
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
-msgstr "°õºþ»þ¤Î²òÁüÅÙ¤ÈÉʼÁ¤Ç¤¹¡£"
+msgstr "�刷時�解�度��質��。"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
-msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
+msgstr "インク�種類"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr ""
-
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
-msgstr "°õºþ»þ¤Î¥¤¥ó¥¯¤Î¼ïÎà¤Ç¤¹¡£"
+msgstr "�刷時�インク�種類��。"
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
-msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
+msgstr "プリンタ�型�:"
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "ColorLife Paper"
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
-msgstr "Ç»ÅÙ:"
+msgstr "濃度:"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 #, fuzzy
 msgid "Adjust the cyan density"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�シアン色��ランスを調整���。"
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr "マゼンタ (M)"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 #, fuzzy
 msgid "Adjust the magenta density"
-msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�マゼンタ色��ランスを調整���。"
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
-msgstr "Ç»ÅÙ:"
+msgstr "濃度:"
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Adjust the yellow density"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�黄色��ランスを調整���。"
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
-msgstr "Ç»ÅÙ:"
+msgstr "濃度:"
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 #, fuzzy
 msgid "Adjust the black density"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�シアン色��ランスを調整���。"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 #, fuzzy
 msgid "Light Cyan Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
-
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+msgstr "明る�シアン"
+
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 #, fuzzy
 msgid "Light Magenta Transition"
-msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
+msgstr "明る�マゼンタ"
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 #, fuzzy
 msgid "Light Yellow Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
-msgid "Short Edge (Flip)"
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-msgid "Auto Sheet Feeder"
-msgstr "¼«Æ°µë»æ"
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+msgid "Short Edge (Flip)"
+msgstr ""
 
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-msgid "Manual with Pause"
-msgstr "¥Ý¡¼¥ºÉÕ¤­¼êÆ°µë»æ"
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
+msgstr ""
 
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
-msgstr "¥Ý¡¼¥º¤Ê¤·¼êÆ°µë»æ"
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
+msgstr ""
 
-#: src/main/print-canon.c:1923
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
 #, fuzzy
-msgid "Cassette"
-msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
+msgid "CD - Custom"
+msgstr "カスタム"
 
-#: src/main/print-canon.c:1924
-msgid "CD tray"
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:2049
-msgid "Photo CcMmYK Color"
-msgstr "¥Õ¥©¥È CcMmYK ¿§"
-
-#: src/main/print-canon.c:2052
-msgid "Photo CcMmY Color"
-msgstr "¥Õ¥©¥È CcMmY ¿§"
-
-#: src/main/print-canon.c:2055
-msgid "CMYK Color"
-msgstr "CMYK ¿§"
-
-#: src/main/print-canon.c:2058
-msgid "CMY Color"
-msgstr "CMY ¿§"
-
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
-msgstr "¹õ¿§"
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#, fuzzy
+msgid "Print To Hub"
+msgstr "ファイル��刷����？"
 
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
-msgstr "¥«¥é¡¼"
+msgstr "カラー"
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
-msgstr "¹õ¤ÈÇò"
+msgstr "黒�白"
 
 #: src/main/print-color.c:50
 msgid "High Accuracy"
@@ -661,7 +474,7 @@ msgstr ""
 #: src/main/print-color.c:51
 #, fuzzy
 msgid "Bright Colors"
-msgstr "°õºþ¥«¥é¡¼Ä´À°"
+msgstr "�刷カラー調整"
 
 #: src/main/print-color.c:52
 msgid "Correct Hue Only"
@@ -686,18 +499,18 @@ msgstr ""
 #: src/main/print-color.c:58
 #, fuzzy
 msgid "Pre-Dithered"
-msgstr "°õºþ"
+msgstr "�刷"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr "グレースケール"
 
 #: src/main/print-color.c:123
 #, fuzzy
 msgid "Whitescale"
-msgstr "²«¿§ (Y)"
+msgstr "黄色 (Y)"
 
 #: src/main/print-color.c:125
 msgid "RGB"
@@ -718,12 +531,7 @@ msgstr ""
 #: src/main/print-color.c:165 src/main/print-color.c:446
 #, fuzzy
 msgid "Channel "
-msgstr "¼è¤ê¾Ã¤·"
-
-#: src/main/print-color.c:165
-#, fuzzy
-msgid " Gamma"
-msgstr "¥¬¥ó¥Þ:"
+msgstr "�り消�"
 
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
@@ -733,7 +541,7 @@ msgstr "¥¬¥ó¥Þ:"
 #: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 #, fuzzy
 msgid "Gamma"
-msgstr "¥¬¥ó¥Þ:"
+msgstr "ガンマ:"
 
 #: src/main/print-color.c:166
 msgid "Gamma for raw channel "
@@ -764,32 +572,32 @@ msgstr ""
 #: src/main/print-color.c:192
 #, fuzzy
 msgid "Input Image Type"
-msgstr "²èÁü¤Î¼ïÎà"
+msgstr "画��種類"
 
 #: src/main/print-color.c:193
 #, fuzzy
 msgid "Input image type"
-msgstr "²èÁü¤Î¼ïÎà"
+msgstr "画��種類"
 
 #: src/main/print-color.c:200
 #, fuzzy
 msgid "Output Image Type"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力�種類:"
 
 #: src/main/print-color.c:201
 #, fuzzy
 msgid "Output image type"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力�種類:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
 msgstr ""
 
 #: src/main/print-color.c:216
 #, fuzzy
 msgid "SimpleGamma"
-msgstr "¥¬¥ó¥Þ:"
+msgstr "ガンマ:"
 
 #: src/main/print-color.c:217
 msgid "Do not correct for screen gamma"
@@ -798,17 +606,17 @@ msgstr ""
 #: src/main/print-color.c:224
 #, fuzzy
 msgid "Brightness"
-msgstr "ÌÀ¤ë¤µ:"
+msgstr "明る�:"
 
 #: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
-msgstr "°õºþ»þ¤Î¹â¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
+msgstr "�刷時�高�をセット���。"
 
 #: src/main/print-color.c:232
 #, fuzzy
 msgid "Contrast"
-msgstr "¥³¥ó¥È¥é¥¹¥È:"
+msgstr "コントラスト:"
 
 #: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
@@ -821,7 +629,7 @@ msgstr ""
 #: src/main/print-color.c:240
 #, fuzzy
 msgid "Advanced Image Control"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力�種類:"
 
 #: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
@@ -837,73 +645,73 @@ msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
 msgstr ""
-"°õºþ»þ¤Î¥¬¥ó¥ÞÃͤòÄ´À°¤·¤Þ¤¹¡£\n"
-"ÃͤòÂ礭¤¯¤¹¤ë¤È°ìÈÌŪ¤ËÌÀ¤ë¤¤°õºþ¤Ë¤Ê¤ê¡¢¾®¤µ¤¯¤¹¤ë¤È°Å¤¤°õºþ¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
-"ÌÀ¤ë¤µ¤ÎÄ´À°¤È¤Ï°Û¤Ê¤ê¡¢¹õ¿§¤ÈÇò¿§¤ÏƱ¤¸¤Þ¤Þ¤Ç¤¹¡£"
+"�刷時�ガンマ値を調整���。\n"
+"値を大���る�一般的�明る��刷��り�����る�暗��刷��り��。\n"
+"明る��調整��異�り�黒色�白色�������。"
 
 #: src/main/print-color.c:258
 #, fuzzy
 msgid "AppGamma"
-msgstr "¥¬¥ó¥Þ:"
+msgstr "ガンマ:"
 
 #: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
-msgstr "¥·¥¢¥ó (C)"
+msgstr "シアン (C)"
 
 #: src/main/print-color.c:267
 #, fuzzy
 msgid "Adjust the cyan gamma"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+msgstr "�刷時�シアン色��ランスを調整���。"
+
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 msgid "Magenta"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr "マゼンタ (M)"
 
 #: src/main/print-color.c:275
 #, fuzzy
 msgid "Adjust the magenta gamma"
-msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
-
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+msgstr "�刷時�マゼンタ色��ランスを調整���。"
+
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
-msgstr "²«¿§ (Y)"
+msgstr "黄色 (Y)"
 
 #: src/main/print-color.c:283
 #, fuzzy
 msgid "Adjust the yellow gamma"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�黄色��ランスを調整���。"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
 msgstr ""
@@ -911,21 +719,21 @@ msgstr ""
 #: src/main/print-color.c:291
 #, fuzzy
 msgid "Adjust the red gamma"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�黄色��ランスを調整���。"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
 msgstr ""
 
 #: src/main/print-color.c:299
 #, fuzzy
 msgid "Adjust the green gamma"
-msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�マゼンタ色��ランスを調整���。"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
 msgstr ""
@@ -933,14 +741,26 @@ msgstr ""
 #: src/main/print-color.c:307
 #, fuzzy
 msgid "Adjust the blue gamma"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�シアン色��ランスを調整���。"
+
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr "黒色"
 
 #: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�シアン色��ランスを調整���。"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
 msgstr ""
 
@@ -948,59 +768,59 @@ msgstr ""
 #: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr "グレースケール"
 
 #: src/main/print-color.c:323
 #, fuzzy
 msgid "Adjust the cyan gray balance"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�シアン色��ランスを調整���。"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 #, fuzzy
 msgid "Magenta Balance"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr "マゼンタ (M)"
 
 #: src/main/print-color.c:331
 #, fuzzy
 msgid "Adjust the magenta gray balance"
-msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�マゼンタ色��ランスを調整���。"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 #, fuzzy
 msgid "Yellow Balance"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�黄色��ランスを調整���。"
 
 #: src/main/print-color.c:339
 #, fuzzy
 msgid "Adjust the yellow gray balance"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�黄色��ランスを調整���。"
 
 #: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
-msgstr "ºÌÅÙ:"
+msgstr "彩度:"
 
 #: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
-"°õºþ»þ¤ÎºÌÅÙ (¥«¥é¡¼¡¦¥Ð¥é¥ó¥¹) ¤òÄ´À°¤·¤Þ¤¹¡£\n"
-"¥«¥é¡¼¤È¹õ¤ÎξÊý¤Î¥¤¥ó¥¯¤ò»È¤Ã¤Æ¥°¥ì¡¼¥¹¥±¡¼¥ë½ÐÎϤ¹¤ë¾ì¹ç¤Ï 0 ¤Ë¤·¤Æ²¼¤µ¤¤¡£"
+"�刷時�彩度 (カラー・�ランス) を調整���。\n"
+"カラー�黒�両方�インクを使��グレースケール出力�る場�� 0 ���下��。"
 
 #: src/main/print-color.c:357
 #, fuzzy
 msgid "Ink Limit"
-msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
+msgstr "インク�種類"
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 #, fuzzy
 msgid "Advanced Output Control"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力�種類:"
 
 #: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
@@ -1030,11 +850,6 @@ msgstr ""
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:446
-#, fuzzy
-msgid " Curve"
-msgstr "¹õ¿§"
-
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
@@ -1042,7 +857,7 @@ msgstr "¹õ¿§"
 #: src/main/print-color.c:513
 #, fuzzy
 msgid "Output Curves"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力�種類:"
 
 #: src/main/print-color.c:447
 msgid "Curve for raw channel "
@@ -1055,77 +870,77 @@ msgstr ""
 #: src/main/print-color.c:458
 #, fuzzy
 msgid "Cyan curve"
-msgstr "¼è¤ê¾Ã¤·"
+msgstr "�り消�"
 
 #: src/main/print-color.c:465
 #, fuzzy
 msgid "Magenta Curve"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr "マゼンタ (M)"
 
 #: src/main/print-color.c:466
 #, fuzzy
 msgid "Magenta curve"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr "マゼンタ (M)"
 
 #: src/main/print-color.c:473
 #, fuzzy
 msgid "Yellow Curve"
-msgstr "²«¿§ (Y)"
+msgstr "黄色 (Y)"
 
 #: src/main/print-color.c:474
 #, fuzzy
 msgid "Yellow curve"
-msgstr "²«¿§ (Y)"
+msgstr "黄色 (Y)"
 
 #: src/main/print-color.c:481
 #, fuzzy
 msgid "Black Curve"
-msgstr "¹õ¿§"
+msgstr "黒色"
 
 #: src/main/print-color.c:482
 #, fuzzy
 msgid "Black curve"
-msgstr "¹õ¿§"
+msgstr "黒色"
 
 #: src/main/print-color.c:489
 #, fuzzy
 msgid "Red Curve"
-msgstr "²«¿§ (Y)"
+msgstr "黄色 (Y)"
 
 #: src/main/print-color.c:490
 #, fuzzy
 msgid "Red curve"
-msgstr "²«¿§ (Y)"
+msgstr "黄色 (Y)"
 
 #: src/main/print-color.c:497
 #, fuzzy
 msgid "Green Curve"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr "マゼンタ (M)"
 
 #: src/main/print-color.c:498
 #, fuzzy
 msgid "Green curve"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr "マゼンタ (M)"
 
 #: src/main/print-color.c:505
 #, fuzzy
 msgid "Blue Curve"
-msgstr "¹õ¿§"
+msgstr "黒色"
 
 #: src/main/print-color.c:506
 #, fuzzy
 msgid "Blue curve"
-msgstr "¹õ¿§"
+msgstr "黒色"
 
 #: src/main/print-color.c:513
 #, fuzzy
 msgid "White Curve"
-msgstr "²«¿§ (Y)"
+msgstr "黄色 (Y)"
 
 #: src/main/print-color.c:514
 #, fuzzy
 msgid "White curve"
-msgstr "²«¿§ (Y)"
+msgstr "黄色 (Y)"
 
 #: src/main/print-color.c:521
 msgid "Hue Map"
@@ -1143,7 +958,7 @@ msgstr ""
 #: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
-msgstr "ºÌÅÙ:"
+msgstr "彩度:"
 
 #: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
@@ -1165,584 +980,388 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:516 src/main/printers.c:521
+#: src/main/printers.c:519 src/main/printers.c:524
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
-msgstr "%s ¤Ï¼ïÎà %s ¤ËÂФ¹¤ëŬÀڤʥѥé¥á¡¼¥¿¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "%s �種類 %s �対�る�切�パラメータ���り��ん\n"
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:673
+#: src/main/printers.c:676
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
-msgstr "¥×¥ê¥ó¥¿ %s ¤¬ÉÔÌÀ¤Ç¤¹\n"
+msgstr "プリンタ %s ��明��\n"
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
-msgstr "%s ¤ÎÈϰϤò±Û¤¨¤Þ¤·¤¿ (¸½ºß¤ÎÃÍ %d, ºÇ¾® %d, ºÇÂç %d)\n"
+msgstr "%s �範囲を越���� (�在�値 %d, 最� %d, 最大 %d)\n"
 
-#: src/main/printers.c:755
+#: src/main/printers.c:761
 #, fuzzy
 msgid "Page size is not valid\n"
-msgstr "²èÁü¥µ¥¤¥º¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "画�サイズ�正���り��ん\n"
 
-#: src/main/printers.c:776
+#: src/main/printers.c:782
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
-msgstr "¾å¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n"
+msgstr "上マージン� 0 より�������下��\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:788
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
-msgstr "º¸¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n"
+msgstr "左マージン� 0 より�������下��\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:794
 #, fuzzy
 msgid "Height must be greater than zero\n"
-msgstr "º¸¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n"
+msgstr "左マージン� 0 より�������下��\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:800
 #, fuzzy
 msgid "Width must be greater than zero\n"
-msgstr "¾å¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n"
+msgstr "上マージン� 0 より�������下��\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr "ɸ½à"
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-msgid "Roll Feed"
-msgstr "¥í¡¼¥ë¼°µë»æ"
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-#, fuzzy
-msgid "Manual Feed"
-msgstr "¼êÆ°"
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-#, fuzzy
-msgid "Print to CD"
-msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
-
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-#, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "¼êÆ°"
-
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-#, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "¼êÆ°"
-
-#: src/main/print-escp2-data.c:554
-#, fuzzy
-msgid "Rear Tray"
-msgstr "¥È¥ì¥¤"
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr ""
-
-#: src/main/print-escp2-data.c:581
-#, fuzzy
-msgid "Photo Board"
-msgstr "¥Õ¥©¥ÈÍÑ»æ"
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr ""
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr ""
-
-#: src/main/print-escp2-data.c:638
-#, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "¼«Æ°ÁªÂò"
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr ""
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr ""
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-#, fuzzy
-msgid "High"
-msgstr "¹â¤µ:"
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-#, fuzzy
-msgid "Photo"
-msgstr "¼Ì¿¿"
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-#, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
-
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-#, fuzzy
-msgid "Ultra Photo"
-msgstr "Six Color Photo"
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-#, fuzzy
-msgid "Light Cyan"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-#, fuzzy
-msgid "Light Magenta"
-msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-#, fuzzy
-msgid "Light Black"
-msgstr "¹õ¿§"
-
-#: src/main/print-escp2-data.c:811
-#, fuzzy
-msgid "Dark Yellow"
-msgstr "²«¿§ (Y)"
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-#, fuzzy
-msgid "Matte Black"
-msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-#, fuzzy
-msgid "Photo Black"
-msgstr "¥Õ¥©¥ÈÍÑ»æ"
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-#, fuzzy
-msgid "Gloss Optimizer"
-msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-#, fuzzy
-msgid "Light Light Black"
-msgstr "¹õ¿§"
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 #, fuzzy
 msgid "Print Quality"
 msgstr "720 DPI Highest Quality"
 
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr ""
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr ""
-
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr ""
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:214
+#: src/main/print-escp2.c:228
 #, fuzzy
 msgid "Resolution of the print"
-msgstr "°õºþ»þ¤Î²òÁüÅÙ¤ÈÉʼÁ¤Ç¤¹¡£"
+msgstr "�刷時�解�度��質��。"
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:236
+#: src/main/print-escp2.c:250
 #, fuzzy
 msgid "Ink Set"
-msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
+msgstr "インク�種類"
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 #, fuzzy
 msgid "Output Order"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力�種類:"
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 #, fuzzy
 msgid "Ink change command"
-msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥³¥Þ¥ó¥É¤Ç¤¹¡£\n"
+msgstr "�識����コマンド��。\n"
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 #, fuzzy
 msgid "Alternate Alignment Choices"
-msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò·«¤êÊÖ¤·¤Þ¤¹¡£\n"
+msgstr "間隔補正�設定を繰り返���。\n"
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 #, fuzzy
 msgid "Channel Names"
-msgstr "¼è¤ê¾Ã¤·"
+msgstr "�り消�"
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:346
 #, fuzzy
 msgid "Cyan Map"
-msgstr "¥·¥¢¥ó (C)"
+msgstr "シアン (C)"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:347
 #, fuzzy
 msgid "Adjust the cyan map"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�シアン色��ランスを調整���。"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:352
 #, fuzzy
 msgid "Magenta Map"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr "マゼンタ (M)"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Adjust the magenta map"
-msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�マゼンタ色��ランスを調整���。"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:358
 #, fuzzy
 msgid "Yellow Map"
-msgstr "²«¿§ (Y)"
+msgstr "黄色 (Y)"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Adjust the yellow map"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�黄色��ランスを調整���。"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:364
 #, fuzzy
 msgid "Blue Map"
-msgstr "¹õ¤ÈÇò"
+msgstr "黒�白"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Adjust the blue map"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�シアン色��ランスを調整���。"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Adjust the red map"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�黄色��ランスを調整���。"
 
-#: src/main/print-escp2.c:447
+#: src/main/print-escp2.c:464
 #, fuzzy
 msgid "Red Density"
-msgstr "Ç»ÅÙ:"
+msgstr "濃度:"
 
-#: src/main/print-escp2.c:448
+#: src/main/print-escp2.c:465
 #, fuzzy
 msgid "Adjust the red density"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�黄色��ランスを調整���。"
 
-#: src/main/print-escp2.c:455
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Blue Density"
-msgstr "Ç»ÅÙ:"
+msgstr "濃度:"
 
-#: src/main/print-escp2.c:456
+#: src/main/print-escp2.c:473
 #, fuzzy
 msgid "Adjust the blue density"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�シアン色��ランスを調整���。"
 
-#: src/main/print-escp2.c:463
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Gloss Level"
-msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
+msgstr "光沢付�フイルム"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:481
 #, fuzzy
 msgid "Adjust the gloss level"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�黄色��ランスを調整���。"
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 #, fuzzy
 msgid "Light Gray Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 #, fuzzy
 msgid "Dark Gray Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
-#: src/main/print-escp2.c:527
+#: src/main/print-escp2.c:544
 #, fuzzy
 msgid "Mid Gray Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
-#: src/main/print-escp2.c:528
+#: src/main/print-escp2.c:545
 #, fuzzy
 msgid "Medium Gray Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 #, fuzzy
 msgid "Full Manual Control"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力�種類:"
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr ""
-
-#: src/main/print-escp2.c:1564
-#, fuzzy
-msgid "Print To Hub"
-msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力�種類:"
+
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr "標準"
 
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 #, fuzzy
 msgid "Automatic"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr "画��サイズ"
 
-#: src/main/print-escp2.c:1701
+#: src/main/print-escp2.c:1829
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1703
+#: src/main/print-escp2.c:1831
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2168
+#: src/main/print-escp2.c:2313
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
-msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
+msgstr "プリンタ�カラー�刷をサ�ート�����ん\n"
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1757,7 +1376,7 @@ msgstr "600 DPI"
 
 #: src/main/print-lexmark.c:579 src/main/print-lexmark.c:655
 msgid "600 DPI high quality"
-msgstr "600 DPI ¹âÉʼÁ"
+msgstr "600 DPI 高�質"
 
 #: src/main/print-lexmark.c:580 src/main/print-lexmark.c:656
 msgid "600 DPI Unidirectional"
@@ -1769,11 +1388,11 @@ msgstr "1200 DPI"
 
 #: src/main/print-lexmark.c:582 src/main/print-lexmark.c:658
 msgid "1200 DPI high quality"
-msgstr "1200 DPI ¹âÉʼÁ"
+msgstr "1200 DPI 高�質"
 
 #: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659
 msgid "1200 DPI highest quality"
-msgstr "1200 DPI ¹âÉʼÁ"
+msgstr "1200 DPI 高�質"
 
 #: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660
 msgid "1200 DPI  Unidirectional"
@@ -1785,452 +1404,623 @@ msgstr "2400 DPI x 1200 DPI"
 
 #: src/main/print-lexmark.c:586
 msgid "2400 DPI x 1200 DPI high quality"
-msgstr "2400 DPI x 1200 DPI ¹âÉʼÁ"
+msgstr "2400 DPI x 1200 DPI 高�質"
 
 #: src/main/print-lexmark.c:587
 msgid "2400 DPI x 1200 DPI highest quality"
-msgstr "2400 DPI x 1200 DPI ¹âÉʼÁ"
+msgstr "2400 DPI x 1200 DPI 高�質"
 
 #: src/main/print-lexmark.c:589
 msgid "test print"
-msgstr "¥Æ¥¹¥È°õºþ"
+msgstr "テスト�刷"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
 msgstr "Four Color Standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
 msgstr "Three Color Composite"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
 msgstr "Six Color Photo"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
 msgstr "Five Color Photo Composite"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+msgid "Plain Paper"
+msgstr "通常�用紙"
+
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
-msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
+msgstr "光沢付�フイルム"
+
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+msgid "Transparencies"
+msgstr "スライド用紙"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 msgid "Envelopes"
-msgstr "ÉõÅû"
+msgstr "�筒"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 msgid "Matte Paper"
-msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
+msgstr "マット用紙"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
-msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ"
+msgstr "インクジェット用紙"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
-msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)"
+msgstr "インクジェット用紙 (フォト用高�質)"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 msgid "Photo Paper"
-msgstr "¥Õ¥©¥ÈÍÑ»æ"
+msgstr "フォト用紙"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
-msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
+msgstr "高級光沢付�フォト用紙"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
-msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ"
+msgstr "高級�や出�フォト用紙"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
-msgstr "¸÷ÂôÉÕ¤­ÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)"
+msgstr "光沢付�用紙 (フォト用高�質)"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
-#: src/main/print-olympus.c:265
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr "��他"
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr "自動給紙"
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr "�ーズ付�手動給紙"
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr "�ーズ��手動給紙"
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 #, fuzzy
 msgid "Glossy"
-msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
+msgstr "光沢付�フイルム"
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:861
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 #, fuzzy
 msgid "Matte"
-msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
+msgstr "マット用紙"
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1331
+#: src/main/print-olympus.c:1627
 #, fuzzy
 msgid "Adjust the cyan balance"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�シアン色��ランスを調整���。"
 
-#: src/main/print-olympus.c:1339
+#: src/main/print-olympus.c:1635
 #, fuzzy
 msgid "Adjust the magenta balance"
-msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�マゼンタ色��ランスを調整���。"
 
-#: src/main/print-olympus.c:1347
+#: src/main/print-olympus.c:1643
 #, fuzzy
 msgid "Adjust the yellow balance"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�黄色��ランスを調整���。"
 
-#: src/main/print-olympus.c:1354
+#: src/main/print-olympus.c:1650
 #, fuzzy
 msgid "Black Balance"
-msgstr "¹õ¤ÈÇò"
+msgstr "黒�白"
 
-#: src/main/print-olympus.c:1355
+#: src/main/print-olympus.c:1651
 #, fuzzy
 msgid "Adjust the black balance"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�シアン色��ランスを調整���。"
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 msgid "Plain"
-msgstr "Ä̾ï"
+msgstr "通常"
 
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 msgid "Bond"
 msgstr "Bond"
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 msgid "Premium"
-msgstr "¹âµé"
+msgstr "高級"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
-msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥È"
+msgstr "光沢付�フォト"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 msgid "Transparency"
-msgstr "¥¹¥é¥¤¥É"
+msgstr "スライド"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
-msgstr "¨´¥¥Õ¥©¥È"
+msgstr "�乾フォト"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 msgid "Quick-dry Transparency"
-msgstr "¨´¥¥¹¥é¥¤¥É"
+msgstr "�乾スライド"
 
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
-msgstr "¼êÆ°"
+msgstr "手動"
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 msgid "Tray 1"
-msgstr "¥È¥ì¥¤£±"
+msgstr "トレイ１"
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 msgid "Tray 2"
-msgstr "¥È¥ì¥¤£²"
+msgstr "トレイ２"
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 msgid "Tray 3"
-msgstr "¥È¥ì¥¤£³"
+msgstr "トレイ３"
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 msgid "Tray 4"
-msgstr "¥È¥ì¥¤£´"
+msgstr "トレイ４"
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
-msgstr "·ÈÂÓ¼°µë»æ"
+msgstr "�帯�給紙"
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 msgid "Desktop Sheet Feeder"
-msgstr "¥Ç¥¹¥¯¥È¥Ã¥×µë»æ"
+msgstr "デスクトップ給紙"
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 msgid "Tray"
-msgstr "¥È¥ì¥¤"
+msgstr "トレイ"
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 msgid "Optional Source"
-msgstr "¥ª¥×¥·¥ç¥ó"
+msgstr "オプション"
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 msgid "Autoselect"
-msgstr "¼«Æ°ÁªÂò"
+msgstr "自動�択"
 
 #: src/main/print-pcl.c:256
-msgid "600x600 DPI monochrome"
-msgstr "600x600 DPI ¥â¥Î¥¯¥í"
+msgid "150x150 DPI"
+msgstr "150x150 DPI"
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr "300x300 DPI"
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
+msgstr "600x300 DPI"
 
 #: src/main/print-pcl.c:259
+msgid "600x600 DPI monochrome"
+msgstr "600x600 DPI モノクロ"
+
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr "600x600 DPI"
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr "1200x600 DPI"
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
-msgstr "¥«¥é¡¼ + ¹õ¥«¡¼¥È¥ê¥Ã¥¸"
+msgstr "カラー + 黒カートリッジ"
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
-msgstr "¥«¥é¡¼ + ¥Õ¥©¥È¡¦¥«¡¼¥È¥ê¥Ã¥¸"
-
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr ""
+msgstr "カラー + フォト・カートリッジ"
 
 #: src/main/print-ps.c:97
 #, fuzzy
 msgid "PPDFile"
-msgstr "PPD ¥Õ¥¡¥¤¥ë:"
+msgstr "PPD ファイル:"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 #, fuzzy
 msgid "PPD File"
-msgstr "PPD ¥Õ¥¡¥¤¥ë¤Ç¤¹¤«¡©"
+msgstr "PPD ファイル���？"
 
 #: src/main/print-raw.c:223
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 msgid "Two Level Grayscale"
 msgstr "Two Level Grayscale"
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 #, fuzzy
 msgid "Three Level Grayscale"
 msgstr "Two Level Grayscale"
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
 msgstr "Six Color Enhanced Composite"
 
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 msgid "Seven Color Photo"
 msgstr "Seven Color Photo"
 
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 msgid "Seven Color Enhanced"
 msgstr "Seven Color Enhanced"
 
-#: src/main/escp2-channels.c:1535
+#: src/main/escp2-channels.c:1649
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Six Color Photo"
 
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Seven Color Photo"
 
-#: src/main/escp2-channels.c:1695
+#: src/main/escp2-channels.c:1809
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Seven Color Enhanced"
 
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Four Color Standard"
 
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Three Color Composite"
 
-#: src/main/escp2-channels.c:1762
+#: src/main/escp2-channels.c:1876
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Three Color Composite"
 
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Four Color Standard"
 
-#: src/main/escp2-channels.c:1884
+#: src/main/escp2-channels.c:2017
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Four Color Standard"
 
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Seven Color Photo"
 
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Six Color Photo"
 
-#: src/main/escp2-channels.c:1962
+#: src/main/escp2-channels.c:2109
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Six Color Enhanced Composite"
 
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Seven Color Photo"
 
-#: src/main/escp2-channels.c:2024
+#: src/main/escp2-channels.c:2187
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Seven Color Enhanced"
 
-#: src/main/escp2-channels.c:2042
+#: src/main/escp2-channels.c:2205
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Six Color Photo"
 
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Six Color Photo"
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#, fuzzy
+msgid "Photo Black"
+msgstr "フォト用紙"
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+#, fuzzy
+msgid "Matte Black"
+msgstr "マット用紙"
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+#, fuzzy
+msgid "Light Cyan"
+msgstr "明る�シアン"
+
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+#, fuzzy
+msgid "Light Magenta"
+msgstr "明る�マゼンタ"
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+#, fuzzy
+msgid "Light Black"
+msgstr "黒色"
+
+#: src/main/escp2-channels.c:2981
+#, fuzzy
+msgid "Dark Yellow"
+msgstr "黄色 (Y)"
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#, fuzzy
+msgid "Gloss Optimizer"
+msgstr "光沢付�フイルム"
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#, fuzzy
+msgid "Light Light Black"
+msgstr "黒色"
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 msgid "Plain Paper Fast Load"
-msgstr "Ä̾ïÍÑ»æ¤Î¹â®Æɹþ¤ß"
+msgstr "通常用紙�高速読込�"
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
-msgstr "¤Ï¤¬¤­"
+msgstr "���"
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 msgid "Back Light Film"
-msgstr "¥Ð¥Ã¥¯¥é¥¤¥È¡¦¥Õ¥£¥ë¥à"
+msgstr "�ックライト・フィルム"
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 #, fuzzy
 msgid "Matte Paper Heavyweight"
-msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
+msgstr "マット用紙"
 
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
-msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
+msgstr "高級光沢付�フォト用紙"
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "ColorLife Paper"
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 #, fuzzy
 msgid "Archival Matte Paper"
-msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
+msgstr "マット用紙"
 
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+msgid "Roll Feed"
+msgstr "ロール�給紙"
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#, fuzzy
+msgid "Manual Feed"
+msgstr "手動"
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+#, fuzzy
+msgid "Print to CD"
+msgstr "ファイル��刷����？"
+
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "手動"
+
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "手動"
+
+#: src/main/escp2-papers.c:1859
+#, fuzzy
+msgid "Rear Tray"
+msgstr "トレイ"
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/escp2-papers.c:1886
+#, fuzzy
+msgid "Photo Board"
+msgstr "フォト用紙"
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr ""
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr ""
+
+#: src/main/escp2-papers.c:1943
+#, fuzzy
+msgid "Cut Sheet Autoselect"
+msgstr "自動�択"
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr ""
+
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
@@ -2238,7 +2028,7 @@ msgstr ""
 #: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
 #, fuzzy
 msgid "360 x 120 DPI Economy"
-msgstr "600x600 DPI ¥â¥Î¥¯¥í"
+msgstr "600x600 DPI モノクロ"
 
 #: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
 msgid "180 DPI Economy"
@@ -2257,7 +2047,7 @@ msgstr "600x600 DPI"
 #: src/main/escp2-resolutions.c:68
 #, fuzzy
 msgid "360 DPI High Quality"
-msgstr "600 DPI ¹âÉʼÁ"
+msgstr "600 DPI 高�質"
 
 #: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
 #: src/main/escp2-resolutions.c:77
@@ -2270,143 +2060,167 @@ msgstr "600 DPI"
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:94
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 #, fuzzy
 msgid "720 DPI High Quality"
-msgstr "1200 DPI ¹âÉʼÁ"
+msgstr "1200 DPI 高�質"
 
-#: src/main/escp2-resolutions.c:97
+#: src/main/escp2-resolutions.c:103
 #, fuzzy
 msgid "720 DPI Highest Quality"
-msgstr "1200 DPI ¹âÉʼÁ"
+msgstr "1200 DPI 高�質"
 
-#: src/main/escp2-resolutions.c:100
+#: src/main/escp2-resolutions.c:106
 #, fuzzy
 msgid "720 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
-msgstr "1200 DPI ¹âÉʼÁ"
+msgstr "1200 DPI 高�質"
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:129
+#: src/main/escp2-resolutions.c:135
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
-msgstr "1200 DPI ¹âÉʼÁ"
+msgstr "1200 DPI 高�質"
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
+#: src/main/escp2-resolutions.c:145
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:142
-#, fuzzy
-msgid "1440 x 1440"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/escp2-resolutions.c:145
-#, fuzzy
-msgid "1440 x 1440 DPI High Quality"
-msgstr "1200 DPI ¹âÉʼÁ"
-
-#: src/main/escp2-resolutions.c:148
-#, fuzzy
-msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1200 DPI ¹âÉʼÁ"
-
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:158
+#: src/main/escp2-resolutions.c:155
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:164
-#, fuzzy
-msgid "2880 x 1440 DPI High Quality"
-msgstr "1200 DPI ¹âÉʼÁ"
-
-#: src/main/escp2-resolutions.c:167
-#, fuzzy
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr "1200 DPI ¹âÉʼÁ"
-
-#: src/main/escp2-resolutions.c:171
+#: src/main/escp2-resolutions.c:162
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 #, fuzzy
 msgid "Interleave"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+msgstr "プリンタ�:"
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 #, fuzzy
 msgid "Interleave 2"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+msgstr "プリンタ�:"
 
-#: src/main/escp2-resolutions.c:584
+#: src/main/escp2-resolutions.c:594
 #, fuzzy
 msgid "Eight Pass"
-msgstr "ÌÀ¤ë¤µ:"
+msgstr "明る�:"
+
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+#, fuzzy
+msgid "High"
+msgstr "高�:"
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+#, fuzzy
+msgid "Photo"
+msgstr "写真"
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+#, fuzzy
+msgid "Super Photo"
+msgstr "Stylus Photo"
+
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+#, fuzzy
+msgid "Ultra Photo"
+msgstr "Six Color Photo"
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr ""
 
 #: src/main/generic-options.c:46
 msgid "Text"
@@ -2423,16 +2237,16 @@ msgstr ""
 #: src/main/generic-options.c:49
 #, fuzzy
 msgid "Photograph"
-msgstr "¼Ì¿¿"
+msgstr "写真"
 
 #: src/main/generic-options.c:50
 msgid "Line Art"
-msgstr "¥é¥¤¥ó¡¦¥¢¡¼¥È"
+msgstr "ライン・アート"
 
 #: src/main/generic-options.c:55
 #, fuzzy
 msgid "Page"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr "画��サイズ"
 
 #: src/main/generic-options.c:56
 msgid "Job"
@@ -2441,12 +2255,12 @@ msgstr ""
 #: src/main/generic-options.c:68
 #, fuzzy
 msgid "Image Type"
-msgstr "²èÁü¤Î¼ïÎà:"
+msgstr "画��種類:"
 
 #: src/main/generic-options.c:69
 #, fuzzy
 msgid "Type of image being printed"
-msgstr "°õºþ»þ¤Î¥¤¥ó¥¯¤Î¼ïÎà¤Ç¤¹¡£"
+msgstr "�刷時�インク�種類��。"
 
 #: src/main/generic-options.c:74 src/main/generic-options.c:80
 msgid "Job Mode"
@@ -2459,3904 +2273,4228 @@ msgstr ""
 #: src/main/generic-options.c:80
 #, fuzzy
 msgid "Page Number"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr "画��サイズ"
 
 #: src/main/generic-options.c:81
 #, fuzzy
 msgid "Page number"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr "画��サイズ"
 
 #: src/main/xmli18n-tmp.h:1
 msgid "Letter"
-msgstr "¥ì¥¿¡¼"
+msgstr "レター"
 
 #: src/main/xmli18n-tmp.h:2
 msgid "Legal"
-msgstr "¥ê¡¼¥¬¥ë"
+msgstr "リーガル"
 
 #: src/main/xmli18n-tmp.h:3
 msgid "Tabloid"
-msgstr "¥¿¥Ö¥í¥¤¥É"
+msgstr "タブロイド"
 
 #: src/main/xmli18n-tmp.h:4
 msgid "Executive"
-msgstr "¥¨¥¯¥¼¥¯¥Æ¥£¥Ö"
+msgstr "エクゼクティブ"
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/main/xmli18n-tmp.h:11
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
-msgstr "EPSON 4x6 ¥Õ¥©¥ÈÍÑ»æ"
+msgstr "EPSON 4x6 フォト用紙"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
-msgstr "¥¹¡¼¥Ñ¡¼ B 13x19"
+msgstr "スーパー B 13x19"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/main/xmli18n-tmp.h:26
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
-msgstr "4AÈÇ"
+msgstr "4A版"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
-msgstr "2AÈÇ"
+msgstr "2A版"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/main/xmli18n-tmp.h:32
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
-msgstr "A0ÈÇ"
+msgstr "A0版"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
-msgstr "A1ÈÇ"
+msgstr "A1版"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
-msgstr "A2ÈÇ"
+msgstr "A2版"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
-msgstr "A3ÈÇ"
+msgstr "A3版"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
-msgstr "A4ÈÇ"
+msgstr "A4版"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
-msgstr "A5ÈÇ"
+msgstr "A5版"
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
-msgstr "A6ÈÇ"
+msgstr "A6版"
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
-msgstr "A7ÈÇ"
+msgstr "A7版"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
-msgstr "A8ÈÇ"
+msgstr "A8版"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
-msgstr "A9ÈÇ"
+msgstr "A9版"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
-msgstr "A10ÈÇ"
+msgstr "A10版"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr "4B (ISO)"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr "2B (ISO)"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr "B0 (ISO)"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr "B1 (ISO)"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr "B2 (ISO)"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr "B3 (ISO)"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr "B4 (ISO)"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr "B5 (ISO)"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr "B6 (ISO)"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr "B7 (ISO)"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr "B8 (ISO)"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr "B9 (ISO)"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr "B10 (ISO)"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/main/xmli18n-tmp.h:67
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 (JIS)"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr "B0 (JIS)"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr "B1 (JIS)"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr "B2 (JIS)"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr "B3 (JIS)"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr "B4 (JIS)"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr "B5 (JIS)"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr "B6 (JIS)"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr "B7 (JIS)"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr "B8 (JIS)"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr "B9 (JIS)"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr "B10 (JIS)"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 msgid "American foolscap"
 msgstr "American foolscap"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 msgid "European foolscap"
 msgstr "European foolscap"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/main/xmli18n-tmp.h:109
 #, fuzzy
 msgid "ISO A4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 msgid "Small paperback"
 msgstr "Small paperback"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 msgid "Penguin small paperback"
 msgstr "Penguin small paperback"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 msgid "Penguin large paperback"
 msgstr "Penguin large paperback"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 msgid "Hagaki Card"
 msgstr "Hagaki Card"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
 msgstr "Oufuku Card"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
-msgstr "ÆüËܤÎŤ¤ÉõÅû #3"
+msgstr "日本�長��筒 #3"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
-msgstr "ÆüËܤÎŤ¤ÉõÅû #4"
+msgstr "日本�長��筒 #4"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 msgid "Japanese Kaku envelope #4"
-msgstr "ÆüËܤλͳѤ¤ÉõÅû #4"
+msgstr "日本�四角��筒 #4"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/main/xmli18n-tmp.h:125
+#: src/main/xmli18n-tmp.h:126
 msgid "Monarch Envelope"
 msgstr "Monarch Envelope"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:127
+#: src/main/xmli18n-tmp.h:128
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:130
+#: src/main/xmli18n-tmp.h:131
 #, fuzzy
 msgid "Wide Postcard"
-msgstr "¤Ï¤¬¤­"
+msgstr "���"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 msgid "Custom"
-msgstr "¥«¥¹¥¿¥à"
+msgstr "カスタム"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
-msgstr "89mm ¥í¡¼¥ë»æ"
+msgstr "89mm ロール紙"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
-msgstr "4 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
+msgstr "4 イン�ロール紙"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
-msgstr "5 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
+msgstr "5 イン�ロール紙"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
-msgstr "210mm ¥¤¥ó¥Á¥í¡¼¥ë»æ"
+msgstr "210mm イン�ロール紙"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
-msgstr "13 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
+msgstr "13 イン�ロール紙"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
-msgstr "22 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
+msgstr "22 イン�ロール紙"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
-msgstr "24 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
+msgstr "24 イン�ロール紙"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
-msgstr "36 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
+msgstr "36 イン�ロール紙"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
-msgstr "44 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
+msgstr "44 イン�ロール紙"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:145
+#: src/main/xmli18n-tmp.h:146
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:146
+#: src/main/xmli18n-tmp.h:147
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:147
+#: src/main/xmli18n-tmp.h:148
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/main/xmli18n-tmp.h:149
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:149
+#: src/main/xmli18n-tmp.h:150
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/main/xmli18n-tmp.h:151
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/main/xmli18n-tmp.h:152
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:152
+#: src/main/xmli18n-tmp.h:153
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/main/xmli18n-tmp.h:154
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/main/xmli18n-tmp.h:155
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
+#: src/main/xmli18n-tmp.h:156
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:156
+#: src/main/xmli18n-tmp.h:157
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:157
+#: src/main/xmli18n-tmp.h:158
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:158
+#: src/main/xmli18n-tmp.h:159
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:159
+#: src/main/xmli18n-tmp.h:160
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:160
+#: src/main/xmli18n-tmp.h:161
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:161
+#: src/main/xmli18n-tmp.h:162
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:162
+#: src/main/xmli18n-tmp.h:163
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:163
+#: src/main/xmli18n-tmp.h:164
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:164
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:173
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
-msgid "Canon iP4000"
+#: src/main/xmli18n-tmp.h:181
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:182
+msgid "Canon PIXMA iP3000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:183
+msgid "Canon PIXMA iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:184
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:185
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:186
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:187
+#, fuzzy
+msgid "Canon PIXMA iP4300"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:188
+#, fuzzy
+msgid "Canon PIXMA iP5000"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
+#, fuzzy
+msgid "Canon PIXMA iP6700"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA MP150"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:192
+#, fuzzy
+msgid "Canon PIXMA MP500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:193
+#, fuzzy
+msgid "Canon PIXMA MP700"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA MP730"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:195
+#, fuzzy
+msgid "Canon PIXMA MP750"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA MP760"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA MP770"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA MP780"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
+#, fuzzy
+msgid "Canon PIXMA MP790"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP830"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:201
+msgid "Canon PIXUS iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:202
+msgid "Canon PIXUS iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:203
+msgid "Canon i560"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:204
+msgid "Canon i850"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:205
+msgid "Canon i860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:206
+msgid "Canon i865"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C61"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C62"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:238
+#, fuzzy
+msgid "Epson Stylus C79"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C82"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:245
+#, fuzzy
+msgid "Epson Stylus C87"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "Epson Stylus Photo 1400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "Epson Stylus Photo 1410"
+msgstr "Stylus Photo 810"
+
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:314
+#, fuzzy
+msgid "Epson Stylus Photo R230"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:315
+#, fuzzy
+msgid "Epson Stylus Photo R240"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "Epson Stylus Photo R245"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:317
+#, fuzzy
+msgid "Epson Stylus Photo R260"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Epson Stylus Photo R265"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "Epson Stylus Photo R270"
+msgstr "Stylus Photo 1270"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "Epson Stylus Photo R350"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "Epson Stylus Photo R360"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "Epson Stylus Photo R380"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "Epson Stylus Photo R390"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Epson Stylus Photo RX560"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:335
+#, fuzzy
+msgid "Epson Stylus Photo RX580"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:336
+#, fuzzy
+msgid "Epson Stylus Photo RX590"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:340
+#, fuzzy
+msgid "Epson Stylus Photo RX640"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:353
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:372
+#, fuzzy
+msgid "Epson Stylus CX5000"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:373
+#, fuzzy
+msgid "Epson Stylus CX5000F"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:380
+#, fuzzy
+msgid "Epson Stylus CX6000"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX7000F"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:397
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:399
+msgid "Epson PictureMate Flash"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:400
+msgid "Epson PictureMate Pal"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:401
+msgid "Epson PictureMate Snap"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:402
+#, fuzzy
+msgid "Epson PictureMate 200"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:403
+#, fuzzy
+msgid "Epson PictureMate 210"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:404
+#, fuzzy
+msgid "Epson PictureMate 240"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:405
+#, fuzzy
+msgid "Epson PictureMate 250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson PictureMate 280"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:411
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:414
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:417
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:426
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:427
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:428
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:429
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:430
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:448
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:451
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:454
+#, fuzzy
+msgid "Epson PM A820"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:456
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:459
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:460
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:462
+#, fuzzy
+msgid "Epson PM D870"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:463
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:464
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:465
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:467
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:468
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
+#, fuzzy
+msgid "Epson PM G850"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:470
+#, fuzzy
+msgid "Epson PM G4500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:471
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:472
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:473
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:474
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:475
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:478
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:549
 #, fuzzy
 msgid "Generic PCL 4 Printer"
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+msgstr "新��プリンタ�定義"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:550
 #, fuzzy
 msgid "Generic PCL 5 Printer"
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+msgstr "新��プリンタ�定義"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:551
 #, fuzzy
 msgid "Generic PCL 5c Printer"
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+msgstr "新��プリンタ�定義"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:552
 #, fuzzy
 msgid "Generic PCL 5e Printer"
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+msgstr "新��プリンタ�定義"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:802
 #, fuzzy
 msgid "HP e-printer e20"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+msgstr "プリンタ�:"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+msgid "Lexmark Optra E220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:913
 #, fuzzy
 msgid "Star LaserPrinter 8"
-msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò"
+msgstr "プリンタ��択"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:924
+msgid "Xerox WorkCentre M118"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:926
+msgid "Lexmark X73"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+msgid "Olympus P-S100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:942
+msgid "Canon CP-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:943
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:953
+msgid "Sony DPP-EX5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:957
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:960
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Inch"
-msgstr "¥¤¥ó¥Á"
+msgstr "イン�"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
-msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£"
+msgstr "基本��をイン�����。"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
-msgstr "¥»¥ó¥Á¥á¡¼¥È¥ë"
+msgstr "セン�メートル"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
-msgstr "´ðËÜñ°Ì¤ò¥»¥ó¥Á¥á¡¼¥È¥ë¤Ë¤·¤Þ¤¹¡£"
+msgstr "基本��をセン�メートル����。"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Points"
-msgstr "°õºþ"
+msgstr "�刷"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£"
+msgstr "基本��をイン�����。"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
-msgstr "´ðËÜñ°Ì¤ò¥»¥ó¥Á¥á¡¼¥È¥ë¤Ë¤·¤Þ¤¹¡£"
+msgstr "基本��をセン�メートル����。"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£"
+msgstr "基本��をイン�����。"
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color output"
-msgstr "¥«¥é¡¼¤Ç°õºþ¤·¤Þ¤¹¡£"
+msgstr "カラー��刷���。"
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
-msgstr "¹õ¥¤¥ó¥¯¤ò»È¤Ã¤Æ¥°¥ì¡¼¤Î±Æ¤òÉÕ¤±¤Æ°õºþ¤·¤Þ¤¹¡£"
+msgstr "黒インクを使��グレー�影を付���刷���。"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 #, fuzzy
 msgid "Standard Command"
-msgstr "ɸ½à"
+msgstr "標準"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Custom Command"
-msgstr "¥³¥Þ¥ó¥É:"
+msgstr "コマンド:"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
-msgstr "¥Õ¥¡¥¤¥ë"
+msgstr "ファイル"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Print to a file"
-msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
+msgstr "ファイル��刷����？"
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 #, fuzzy
 msgid "Set Default"
-msgstr "½é´üÃͤËÌ᤹"
+msgstr "�期値�戻�"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
-msgstr "¼è¤ê¾Ã¤·"
+msgstr "�り消�"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, c-format
 msgid "%s -- Print v%s"
-msgstr "%s -- °õºþ v%s"
+msgstr "%s -- �刷 v%s"
 
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
-msgstr "¾ðÊó"
+msgstr "情報"
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 msgid ""
 "Print and\n"
 "Save Settings"
 msgstr ""
-"°õºþ¤È\n"
-"ÀßÄê¤ÎÊݸ"
+"�刷�\n"
+"設定��存"
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 msgid ""
 "Save\n"
 "Settings"
 msgstr ""
-"ÀßÄê¤Î\n"
-"Êݸ"
+"設定�\n"
+"�存"
 
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
-msgstr "°õºþ"
+msgstr "�刷"
 
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
-msgstr "¥×¥ì¥Ó¥å¡¼"
+msgstr "プレビュー"
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6369,504 +6507,461 @@ msgid ""
 "If you click another button while dragging the mouse, the image will return "
 "to its original position."
 msgstr ""
-"°õºþ»þ¤Î²èÁü¤Î°ÌÃÖ¤òÀßÄꤷ¤Þ¤¹¡£\n"
-"¥Þ¥¦¥¹¤Îº¸¥Ü¥¿¥ó¤Ç¥É¥é¥Ã¥°¤·¤¿¾ì½ê¤Ë²èÁü¤¬ÇÛÃÖ¤µ¤ì¤Þ¤¹¡£\n"
-"¥Þ¥¦¥¹¤Î±¦¥Ü¥¿¥ó¤Ç¥É¥é¥Ã¥°¤¹¤ë¤È¡¢ºÙ¤«¤¤¥ì¥Ù¥ë¤Ç²èÁü¤ò°ÜÆ°¤·¤Þ¤¹; Ìó 1/72 ¥¤"
-"¥ó¥Áñ°Ì¤Ç°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£\n"
-"¥Þ¥¦¥¹¤ÎÃæ¥Ü¥¿¥ó¤Ç¥É¥é¥Ã¥°¤¹¤ë¤È¡¢²èÁü¤ÎÂ礭¤µ¤Îñ°Ì¤Ç°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç"
-"¤¹¡£\n"
-"[SHIFT] ¥­¡¼¤ò²¡¤·¤Ê¤¬¤é¥Þ¥¦¥¹¤ò¥É¥é¥Ã¥°¤¹¤ë¤È¡¢¿åÊ¿¤Þ¤¿¤Ï¿âľÊý¸þ¤Ë¤Î¤ß²èÁü"
-"¤ò°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£\n"
-"¥É¥é¥Ã¥°Ãæ¤ËÊ̤Υܥ¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢²èÁü¤Ï¸µ¤Î¾ì½ê¤ËÌá¤ê¤Þ¤¹¡£"
+"�刷時�画���置を設定���。\n"
+"マウス�左ボタン�ドラッグ��場所�画���置�れ��。\n"
+"マウス��ボタン�ドラッグ�る��細��レベル�画�を移動���; 約 1/72 イ"
+"ン����移動�る����能��。\n"
+"マウス�中ボタン�ドラッグ�る��画��大������移動�る����能�"
+"�。\n"
+"[SHIFT] キーを押���らマウスをドラッグ�る��水平���垂直方����画�"
+"を移動�る����能��。\n"
+"ドラッグ中�別�ボタンをクリック�る��画��元�場所�戻り��。"
 
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 #, fuzzy
 msgid "Paper Size"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr "画��サイズ"
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
-msgstr "À£Ë¡:"
+msgstr "寸法:"
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
-msgstr "Éý:"
+msgstr "å¹…:"
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 msgid "Width of the paper that you wish to print to"
-msgstr "°õºþ¤¹¤ëÍÑ»æ¤ÎÉý¤Ç¤¹¡£"
+msgstr "�刷�る用紙�幅��。"
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
-msgstr "¹â¤µ:"
+msgstr "高�:"
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 msgid "Height of the paper that you wish to print to"
-msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¹â¤µ¤Ç¤¹¡£"
+msgstr "�刷�る用紙�高���。"
 
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 #, fuzzy
 msgid "Automatic Paper Size"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr "画��サイズ"
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 #, fuzzy
 msgid "Image Position"
-msgstr "°ÌÃÖ"
+msgstr "�置"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
-msgstr "¼«Æ°"
+msgstr "自動"
 
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
-msgstr "½ÄÃÖ¤­"
+msgstr "縦置�"
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "横置�"
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 msgid "Upside down"
-msgstr "¾å²¼"
+msgstr "上下"
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
-msgstr "²£Ä¹"
+msgstr "横長"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
-"ÍÑ»æ¤ÎÊý¸þ¤òÁªÂò¤·¤Þ¤¹: ½ÄÃÖ¤­¡¢²£ÃÖ¤­¡¢¾å²¼¡¢¤Þ¤¿¤Ï²£Ä¹ (¾å²¼¤Ä¤­¤Î²£ÃÖ¤­)"
+"用紙�方�を�択���: 縦置��横置��上下����横長 (上下���横置�)"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 msgid "Orientation:"
-msgstr "ÍÑ»æ¤Î¸þ¤­:"
+msgstr "用紙���:"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
-msgstr "º¸Â¦:"
+msgstr "左�:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
-msgstr "ÍÑ»æ¤Îº¸Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+msgstr "用紙�左端�ら画�����離��。"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
-msgstr "±¦Â¦:"
+msgstr "��:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 msgid "Distance from the left of the paper to the right of the image"
-msgstr "ÍÑ»æ¤Îº¸Ã¼¤«¤é²èÁü¤Î±¦Ã¼¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+msgstr "用紙�左端�ら画���端����離��。"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
-msgstr "ÍÑ»æ¤Î±¦Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+msgstr "用紙��端�ら画�����離��。"
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
-msgstr "¾å¦:"
+msgstr "上�:"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
-msgstr "ÍÑ»æ¤Î¾åü¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+msgstr "用紙�上端�ら画�����離��。"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
-msgstr "²¼Â¦:"
+msgstr "下�:"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
-msgstr "ÍÑ»æ¤Î¾åü¤«¤é²èÁü¤Î²¼Ã¼¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+msgstr "用紙�上端�ら画��下端����離��。"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
-msgstr "ÍÑ»æ¤Î²¼Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+msgstr "用紙�下端�ら画�����離��。"
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Center:"
-msgstr "Ãæ¿´:"
+msgstr "中心:"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 #, fuzzy
 msgid "Horizontal"
-msgstr "¿åÊ¿"
+msgstr "æ°´å¹³"
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
-msgstr "ÍÑ»æ¤Î¿åÊ¿Êý¸þ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
+msgstr "用紙�水平方��中心����。"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
-msgstr "ξü"
+msgstr "両端"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image on the paper"
-msgstr "ÍÑ»æ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
+msgstr "用紙�中心����。"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 #, fuzzy
 msgid "Vertical"
-msgstr "¿âľ"
+msgstr "åž‚ç›´"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Center the image vertically on the paper"
-msgstr "ÍÑ»æ¤Î¿âľÊý¸þ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
+msgstr "用紙�垂直方��中心����。"
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
-msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò"
+msgstr "プリンタ��択"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 #, fuzzy
 msgid "Printer Make:"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+msgstr "プリンタ�:"
 
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 #, fuzzy
 msgid "Select the make of your printer"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÁªÂò¤·¤Þ¤¹¡£"
+msgstr "�使��プリンタを�択���。"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 msgid "Printer Model:"
-msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
+msgstr "プリンタ�型�:"
 
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 msgid "Select your printer model"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÁªÂò¤·¤Þ¤¹¡£"
+msgstr "�使��プリンタを�択���。"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 msgid "PPD File:"
-msgstr "PPD ¥Õ¥¡¥¤¥ë:"
+msgstr "PPD ファイル:"
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Þ¤¹¡£"
+msgstr "�使��プリンタ用� PPD ファイル�を入力���。"
 
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
-msgstr "»²¾È"
+msgstr "�照"
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë¤òÁªÂò¤·¤Þ¤¹¡£"
+msgstr "�使��プリンタ用� PPD ファイルを�択���。"
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ (¥×¥ê¥ó¥¿¤Î·¿¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó) ̾¤òÁªÂò¤·¤Þ¤¹¡£"
+msgstr "�使��プリンタ (プリンタ�型����り��ん) �を�択���。"
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 #, fuzzy
 msgid "Printer Queue:"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+msgstr "プリンタ�:"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Þ¤¹¡£"
+msgstr "�使��プリンタ用� PPD ファイル�を入力���。"
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 #, fuzzy
 msgid "File to print to"
-msgstr "¥Æ¥¹¥È°õºþ"
+msgstr "テスト�刷"
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 #, fuzzy
 msgid "Print To File"
-msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
+msgstr "ファイル��刷����？"
 
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 msgid "Define New Printer"
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+msgstr "新��プリンタ�定義"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 msgid "Printer Name:"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+msgstr "プリンタ�:"
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 msgid "Enter the name you wish to give this logical printer"
-msgstr "ÍøÍѤ¹¤ëÏÀÍý¥×¥ê¥ó¥¿Ì¾¤ò»ØÄꤷ¤Þ¤¹¡£"
+msgstr "利用�る論�プリンタ�を指定���。"
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Gimp-Print"
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 #, fuzzy
 msgid "Gutenprint Version "
-msgstr "Gimp-Print ¥Ð¡¼¥¸¥ç¥ó "
-
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
-"\n"
-"\n"
-"Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n"
-"¤½¤·¤Æ Gimp-Print ³«È¯¥Á¡¼¥à¡£\n"
-"\n"
-"¥Û¡¼¥à¥Ú¡¼¥¸ <http://gimp-print.sourceforge.net> ¤Ë¤ª±Û¤·²¼¤µ¤¤¡£\n"
-"\n"
-"¤³¤Î¥×¥í¥°¥é¥à¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹; ¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃĤ¬È¯¹Ô¤¹¤ë\n"
-"GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤ÎÂèÆóÈǤޤ¿¤Ï¤½¤ì°Ê¹ß¤ÎÈǤβ¼¤Ç²þÊÑ¡¦½¤Àµ¡¦ºÆÇÛÉÛ¤¬\n"
-"ǧ¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£\n"
-"\n"
-"¤³¤Î¥×¥í¥°¥é¥à¤ÏÊØÍø¤Ë»È¤Ã¤Æ¤â¤é¤¨¤ë¤è¤¦¤ËÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢\n"
-"´°Á´¤Ë̵ÊݾڤǤ¹; ¾¦ÍÑÍøÍѤޤ¿¤Ï¤¢¤ëÆÃÄê¤ÎÌÜŪ¤Ë¤ª¤±¤ëŬ¹çÀ­¤ÎÊݾڤâ\n"
-"¤¢¤ê¤Þ¤»¤ó¡£¾ÜºÙ¤Ï GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤ò¤´Í÷²¼¤µ¤¤¡£\n"
-"\n"
-"µ®Êý¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à¤ËŬ±þ¤·¤¿ GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤Î¥³¥Ô¡¼¤ò\n"
-"¼õ¤±¼è¤ëɬÍפ¬¤¢¤ê¤Þ¤¹; ¤â¤·¼õ¤±¼è¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢\n"
-"Free Software Foundation, Inc., 56 Temple Place - \n"
-"Suite 330, Boston, MA 02111-1307, USA ¤Þ¤ÇÏ¢Íí¤·¤Æ²¼¤µ¤¤¡£\n"
+msgstr "Gimp-Print �ージョン "
 
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 msgid "Printer Settings"
-msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
+msgstr "プリンタ�設定"
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ (¥×¥ê¥ó¥¿¤Î·¿¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó) ̾¤òÁªÂò¤·¤Þ¤¹¡£"
+msgstr "�使��プリンタ (プリンタ�型����り��ん) �を�択���。"
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 msgid "Setup Printer..."
-msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò..."
+msgstr "プリンタ��択..."
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
-msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤È PPD ¥Õ¥¡¥¤¥ë¡¢°õºþ¥³¥Þ¥ó¥É¤òÁªÂò¤·¤Þ¤¹¡£"
+msgstr "プリンタ�型�� PPD ファイル��刷コマンドを�択���。"
 
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 msgid "New Printer..."
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿..."
+msgstr "新��プリンタ..."
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr ""
-"¿·µ¬¤ËÏÀÍý¥×¥ê¥ó¥¿¤òÄêµÁ¤·¤Þ¤¹¡£¤³¤ì¤Ï¼¡²ó»ÈÍѤ¹¤ë¤¿¤á¤Ë³Ð¤¨¤Æ¤ª¤­¤¿¤¤ÀßÄê̾"
-"¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£"
+"新��論�プリンタを定義���。�れ�次回使用�る���覚������設定�"
+"�使用�れ��。"
 
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 #, fuzzy
 msgid "Image Size"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr "画��サイズ"
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 msgid "Scaling:"
-msgstr "³ÈÂç½Ì¾®:"
+msgstr "拡大縮�:"
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 msgid "Set the scale (size) of the image"
-msgstr "²èÁü¥µ¥¤¥º¤Î³ÈÂç½Ì¾®¤ò¹Ô¤¤¤Þ¤¹¡£"
+msgstr "画�サイズ�拡大縮�を行���。"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
-"³ÈÂç½Ì¾®¤Îñ°Ì¤È¤·¤Æ¡¢Íѻ極¥¤¥º¤ËÂФ¹¤ëɴʬΨ (ÈæΨ) ¤«¡¢¥É¥Ã¥È¿ô/¥¤¥ó¥Á¤òÁª"
-"Âò¤·¤Þ¤¹¡£"
+"拡大縮��������用紙サイズ�対�る百分率 (比率) ��ドット数/イン�を�"
+"択���。"
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
-msgstr "ÈæΨ"
+msgstr "比率"
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 msgid "Scale the print to the size of the page"
-msgstr "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£"
+msgstr "用紙サイズを 100 ���場��比率��。"
 
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
-msgstr "²èÁü¤Î¥É¥Ã¥È¿ô/¥¤¥ó¥Á¤Ç¤¹¡£"
+msgstr "画��ドット数/イン���。"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 msgid "Set the width of the print"
-msgstr "°õºþ»þ¤ÎÉý¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
+msgstr "�刷時�幅をセット���。"
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 msgid "Set the height of the print"
-msgstr "°õºþ»þ¤Î¹â¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
+msgstr "�刷時�高�をセット���。"
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
-"¥ª¥ê¥¸¥Ê¥ë¤Î\n"
-"¥µ¥¤¥º¤ÎÍøÍÑ"
+"オリジナル�\n"
+"サイズ�利用"
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the print size to the size of the image"
-msgstr "²èÁü¤Î¥ª¥ê¥¸¥Ê¥ë¡¦¥µ¥¤¥º¤ò°õºþ¥µ¥¤¥º¤Ë¤·¤Þ¤¹¡£"
+msgstr "画��オリジナル・サイズを�刷サイズ����。"
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 msgid "Print Color Adjust"
-msgstr "°õºþ¥«¥é¡¼Ä´À°"
+msgstr "�刷カラー調整"
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 msgid "Set Defaults"
-msgstr "½é´üÃͤËÌ᤹"
+msgstr "�期値�戻�"
 
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
-msgstr "ÊĤ¸¤ë"
+msgstr "閉�る"
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 msgid "Image preview"
-msgstr "²èÁü¤Î¥×¥ì¥Ó¥å¡¼"
+msgstr "画��プレビュー"
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 #, fuzzy
 msgid "Output"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力�種類:"
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 msgid "Output Type:"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力�種類:"
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 msgid "Select the desired output type"
-msgstr "½ÐÎϤ¹¤ë·ÁÂÖ¤òÁªÂò¤·¤Þ¤¹¡£"
+msgstr "出力�る形態を�択���。"
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
-msgstr "½ÐÎϤÎÄ´À°..."
+msgstr "出力�調整..."
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
-"¥«¥é¡¼¥Ð¥é¥ó¥¹¡¢ÌÀ¤ë¤µ¡¢¥³¥ó¥È¥é¥¹¥È¡¢ºÌÅ٤ȥǥ£¥¶¥ê¥ó¥°Êý¼°¤òÄ´À°¤·¤Þ¤¹¡£"
+"カラー�ランス�明る��コントラスト�彩度�ディザリング方�を調整���。"
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 #, fuzzy
 msgid "Size Units:"
-msgstr "ñ°Ì:"
+msgstr "��:"
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 msgid "Units:"
-msgstr "ñ°Ì:"
+msgstr "��:"
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 msgid "Select the base unit of measurement for printing"
-msgstr "°õºþ»þ¤Î´ðËÜñ°Ì¤òÁªÂò¤·¤Þ¤¹¡£"
+msgstr "�刷時�基本��を�択���。"
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
 msgstr ""
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
 msgstr ""
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
 msgstr ""
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 #, fuzzy
 msgid "Printer"
-msgstr "°õºþ"
+msgstr "�刷"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 #, fuzzy
 msgid "(Default Printer)"
-msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò"
+msgstr "プリンタ��択"
 
 #: src/gutenprintui2/curve.c:130
 #, fuzzy
 msgid "Curve type"
-msgstr "¹õ¿§"
+msgstr "黒色"
 
 #: src/gutenprintui2/curve.c:131
 msgid "Is this curve linear, spline interpolated, or free-form"
@@ -6908,85 +7003,96 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:133
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Printer Features"
-msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
+msgstr "プリンタ�設定"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 #, fuzzy
 msgid "Output Control"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力�種類:"
 
-#: src/cups/genppd.c:139
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Common"
-msgstr "¥³¥Þ¥ó¥É:"
+msgstr "コマンド:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:153
 #, fuzzy
 msgid "Extra 1"
-msgstr "¥È¥ì¥¤£±"
+msgstr "トレイ１"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Extra 2"
-msgstr "¥È¥ì¥¤£²"
+msgstr "トレイ２"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Extra 3"
-msgstr "¥È¥ì¥¤£³"
+msgstr "トレイ３"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:156
 #, fuzzy
 msgid "Extra 4"
-msgstr "¥È¥ì¥¤£´"
+msgstr "トレイ４"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr "Japanese"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 msgid "ISOLatin1"
-msgstr "ISO ¥é¥Æ¥ó£±"
+msgstr "ISO ラテン１"
+
+#: src/cups/genppd.c:1613
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
+msgstr ""
 
-#: src/cups/genppd.c:1465
+#: src/cups/genppd.c:1717
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1719
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1497
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1756
 msgid "Fine Adjustment"
 msgstr ""
 
 #: src/escputil/escputil.c:70
 msgid "Escputil version "
-msgstr "Escputil ¥Ð¡¼¥¸¥ç¥ó "
-
-#: src/escputil/escputil.c:71
-#, fuzzy
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-", Copyright (C) 2000-2001 Robert Krawitz\n"
-"Escputil ¤Ï´°Á´ÌµÊݾڤǤ¹; ¾ÜºÙ¤Ï `escputil -l` ¤Ç¤´Í÷²¼¤µ¤¤¡£\n"
-"¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¤¤¯¤Ä¤«¤Î¾ò·ï¤Î²¼¤ÇºÆÇÛÉÛ¤ò\n"
-"´¿·Þ¤·¤Þ¤¹; ¾ÜºÙ¤Ï `escputil -l` ¤Ç¤´Í÷²¼¤µ¤¤¡£\n"
+msgstr "Escputil �ージョン "
 
 #: src/escputil/escputil.c:76
 #, fuzzy
@@ -7009,18 +7115,18 @@ msgid ""
 msgstr ""
 "Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
-"¤³¤Î¥×¥í¥°¥é¥à¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹; ¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃĤ¬È¯¹Ô¤¹¤ë\n"
-"GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤ÎÂèÆóÈǤޤ¿¤Ï¤½¤ì°Ê¹ß¤ÎÈǤβ¼¤Ç²þÊÑ¡¦½¤Àµ¡¦ºÆÇÛÉÛ¤¬\n"
-"ǧ¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£\n"
+"��プログラム�フリーソフトウェア��; フリーソフトウェア財団�発行�る\n"
+"GNU 公有使用許諾契約書�第二版����れ以��版�下�改変・修正・��布�\n"
+"��られ����。\n"
 "\n"
-"¤³¤Î¥×¥í¥°¥é¥à¤ÏÊØÍø¤Ë»È¤Ã¤Æ¤â¤é¤¨¤ë¤è¤¦¤ËÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢\n"
-"´°Á´¤Ë̵ÊݾڤǤ¹; ¾¦ÍÑÍøÍѤޤ¿¤Ï¤¢¤ëÆÃÄê¤ÎÌÜŪ¤Ë¤ª¤±¤ëŬ¹çÀ­¤ÎÊݾڤâ\n"
-"¤¢¤ê¤Þ¤»¤ó¡£¾ÜºÙ¤Ï GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤ò¤´Í÷²¼¤µ¤¤¡£\n"
+"��プログラム�便利�使��もら�るよ���布�れ������\n"
+"完全�無�証��; 商用利用����る特定�目的���る��性��証も\n"
+"�り��ん。詳細� GNU 公有使用許諾契約書を�覧下��。\n"
 "\n"
-"µ®Êý¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à¤ËŬ±þ¤·¤¿ GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤Î¥³¥Ô¡¼¤ò\n"
-"¼õ¤±¼è¤ëɬÍפ¬¤¢¤ê¤Þ¤¹; ¤â¤·¼õ¤±¼è¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢\n"
+"貴方����プログラム��応�� GNU 公有使用許諾契約書�コピーを\n"
+"���る必���り��; も���������場���\n"
 "Free Software Foundation, Inc., 56 Temple Place - \n"
-"Suite 330, Boston, MA 02111-1307, USA ¤Þ¤ÇÏ¢Íí¤·¤Æ²¼¤µ¤¤¡£\n"
+"Suite 330, Boston, MA 02111-1307, USA ��連絡��下��。\n"
 
 #: src/escputil/escputil.c:119
 #, fuzzy
@@ -7068,48 +7174,48 @@ msgid ""
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
-"ÍÑË¡: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                [-P ¥×¥ê¥ó¥¿ | -r ¥Ç¥Ð¥¤¥¹Ì¾] [-u] [-q] [-m ·¿¼°]\n"
-"EPSON Stylus (R) ¥×¥ê¥ó¥¿¤Î´ÉÍý¤ò¹Ô¤¦¥Ä¡¼¥ë¤Ç¤¹¡£\n"
-"ÍÑÎã: escputil --clean-head --printer stpex-on-third-floor\n"
+"用法: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                [-P プリンタ | -r デ�イス�] [-u] [-q] [-m 型�]\n"
+"EPSON Stylus (R) プリンタ�管�を行�ツール��。\n"
+"用例: escputil --clean-head --printer stpex-on-third-floor\n"
 "          escputil --ink-level --new --raw-device /dev/lp0\n"
 "\n"
-"  ¥³¥Þ¥ó¥É:\n"
-"    -c|--clean-head    ¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤òÀ¶Áݤ¹¤ë¡£\n"
-"    -n|--nozzle-check  ¥Î¥º¥ë¤Î¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤ò°õºþ¤¹¤ë¡£\n"
-"                       ¥Î¥º¥ë¤¬±ø¤«¤Ã¤¿¤ê¡¢µÍ¤Þ¤Ã¤Æ¤¤¤ë¤È¥Ñ¥¿¡¼¥ó¤Ë¹Â¤¬É½¼¨¤µ"
-"¤ì¤Þ¤¹¡£\n"
-"                       ¹Â¤¬°õºþ¤µ¤ì¤¿¤é¡¢¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤òÀ¶Áݤ·¤Æ²¼¤µ¤¤¡£\n"
-"    -a|--align-head    ¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤롣\n"
-"                      ¡Ú·Ù¹ð¡Û: ¤³¤Î¥³¥Þ¥ó¥É¤òÍðÍѤ¹¤ë¤È¡¢\n"
-"                       °õºþ¤ÎÉʼÁ¤¬Äã²¼¤¹¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥×¥ê¥ó¥¿¸Î¾ã¤Î¸¶°ø¤Ë¤Ê"
-"¤ê¤Þ¤¹¡£\n"
-"    -o|--align-color   ¥«¥é¡¼°õºþ¤Î¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤ë (Stylus Color 480 ¤È "
-"580 ¤Î¤ß)¡£\n"
-"                      ¡Ú·Ù¹ð¡Û: ¤³¤Î¥³¥Þ¥ó¥É¤òÍðÍѤ¹¤ë¤È¡¢\n"
-"                       °õºþ¤ÎÉʼÁ¤¬Äã²¼¤¹¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥×¥ê¥ó¥¿¸Î¾ã¤Î¸¶°ø¤Ë¤Ê"
-"¤ê¤Þ¤¹¡£\n"
-"    -s|--status        ¥×¥ê¥ó¥¿¤Î¾õÂÖ¤ò¼èÆÀ¤¹¤ë¡£\n"
-"    -i|--ink-level     ¥¤¥ó¥¯¤Î¥ì¥Ù¥ë¤ò¥×¥ê¥ó¥¿¤«¤é¼èÆÀ¤¹¤ë¡£\n"
-"                       ¤³¤ì¤Ï¥×¥ê¥ó¥¿¤ÎÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤Ø¤Î\n"
-"                       ¥¢¥¯¥»¥¹¸¢ (Æɤ߽ñ¤­) ¤¬É¬ÍפǤ¹¡£\n"
-"    -d|--identify      ¥×¥ê¥ó¥¿¾ðÊó (·¿¼°¤Ê¤É) ¤òÌ䤤¹ç¤ï¤»¤ë¡£\n"
-"                       ¤³¤ì¤Ï¥×¥ê¥ó¥¿¤ÎÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤Ø¤Î\n"
-"                       ¥¢¥¯¥»¥¹¸¢ (Æɤ߽ñ¤­) ¤¬É¬ÍפǤ¹¡£\n"
-"    -l|--license       ¤³¤Î¥×¥í¥°¥é¥à¤Î¥é¥¤¥»¥ó¥¹/Ãí°Õ½ñ¤­¤òɽ¼¨¤¹¤ë¡£\n"
-"    -M|--list-models   ÍøÍѲÄǽ¤Ê¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ìÍ÷ɽ¼¨¤¹¤ë¡£\n"
-"    -h|--help          ¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë¡£\n"
-"  ¥ª¥×¥·¥ç¥ó:\n"
-"    -P|--printer-name  ¥×¥ê¥ó¥¿¤òÁàºî¤¹¤ë¤¿¤á¤Ë¡¢¥×¥ê¥ó¥¿¡¦¥­¥å¡¼¤Î̾Á°¤ò»ØÄê"
-"¤¹¤ë¡£\n"
-"                       ½é´üÃͤϡ¢¥Ç¥Õ¥©¥ë¥È¤Î¥·¥¹¥Æ¥à¡¦¥×¥ê¥ó¥¿Ì¾¤Ç¤¹¡£\n"
-"    -r|--raw-device    ¥×¥ê¥ó¥¿¡¦¥­¥å¡¼·Ðͳ¤Ç¤Ï¤Ê¤¯¡¢Ä¾Àܽñ¤­¹þ¤à¥Ç¥Ð¥¤¥¹Ì¾¤ò"
-"»ØÄꤹ¤ë¡£\n"
-"    -u|--new           ¿·¤·¤¤¥×¥ê¥ó¥¿¤Î¾ì¹ç¤Ë»ØÄꤹ¤ë (Stylus Color 740 ¤Þ¤¿"
-"¤Ï¤½¤ì°Ê¹ß)¡£\n"
-"    -q|--quiet         ¥Ð¥Ê¡¼¤òɽ¼¨¤·¤Ê¤¤¡£\n"
-"    -m|--model         ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤뤿¤á¤Ë¡¢Àµ³Î¤Ê¥×¥ê¥ó¥¿¤Î·¿¼°¤ò»ØÄê"
-"¤¹¤ë¡£\n"
+"  コマンド:\n"
+"    -c|--clean-head    プリンタ�ヘッドを清掃�る。\n"
+"    -n|--nozzle-check  ノズル�テストパターンを�刷�る。\n"
+"                       ノズル�汚���り�詰����る�パターン���表示�"
+"れ��。\n"
+"                       ���刷�れ�ら�プリンタ�ヘッドを清掃��下��。\n"
+"    -a|--align-head    プリンタ�ヘッドを一列�並�る。\n"
+"                      �警告】: ��コマンドを乱用�る��\n"
+"                       �刷��質�低下�る���る��プリンタ故障�原因��"
+"り��。\n"
+"    -o|--align-color   カラー�刷�ヘッドを一列�並�る (Stylus Color 480 � "
+"580 ��)。\n"
+"                      �警告】: ��コマンドを乱用�る��\n"
+"                       �刷��質�低下�る���る��プリンタ故障�原因��"
+"り��。\n"
+"    -s|--status        プリンタ�状態を�得�る。\n"
+"    -i|--ink-level     インク�レベルをプリンタ�ら�得�る。\n"
+"                       �れ�プリンタ�低レベル・デ�イス��\n"
+"                       アクセス権 (読�書�) �必���。\n"
+"    -d|--identify      プリンタ情報 (型���) を�����る。\n"
+"                       �れ�プリンタ�低レベル・デ�イス��\n"
+"                       アクセス権 (読�書�) �必���。\n"
+"    -l|--license       ��プログラム�ライセンス/注�書�を表示�る。\n"
+"    -M|--list-models   利用�能�プリンタ�型�を一覧表示�る。\n"
+"    -h|--help          ��メッセージを表示�る。\n"
+"  オプション:\n"
+"    -P|--printer-name  プリンタを�作�る����プリンタ・キュー���を指定"
+"�る。\n"
+"                       �期値��デフォルト�システム・プリンタ���。\n"
+"    -r|--raw-device    プリンタ・キュー経由�����直接書�込むデ�イス�を"
+"指定�る。\n"
+"    -u|--new           新��プリンタ�場��指定�る (Stylus Color 740 ��"
+"��れ以�)。\n"
+"    -q|--quiet         �ナーを表示���。\n"
+"    -m|--model         ヘッドを一列�並�る����正確�プリンタ�型�を指定"
+"�る。\n"
 
 #: src/escputil/escputil.c:161
 #, fuzzy
@@ -7155,51 +7261,51 @@ msgid ""
 "    -C Specify the number of pattern choices for alignment\n"
 "    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
-"ÍÑË¡: escputil [¥ª¥×¥·¥ç¥ó] [¥³¥Þ¥ó¥É]\n"
-"ÍÑË¡: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                [-P ¥×¥ê¥ó¥¿ | -r ¥Ç¥Ð¥¤¥¹Ì¾] [-u] [-q] [-m ·¿¼°]\n"
-"EPSON Stylus (R) ¥×¥ê¥ó¥¿¤Î´ÉÍý¤ò¹Ô¤¦¥Ä¡¼¥ë¤Ç¤¹¡£\n"
-"ÍÑÎã: escputil -c -P stpex-on-third-floor\n"
+"用法: escputil [オプション] [コマンド]\n"
+"用法: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                [-P プリンタ | -r デ�イス�] [-u] [-q] [-m 型�]\n"
+"EPSON Stylus (R) プリンタ�管�を行�ツール��。\n"
+"用例: escputil -c -P stpex-on-third-floor\n"
 "          escputil -i -u -r /dev/lp0\n"
 "\n"
-"  ¥³¥Þ¥ó¥É:\n"
-"    -c ¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤òÀ¶Áݤ¹¤ë¡£\n"
-"    -n ¥Î¥º¥ë¤Î¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤ò°õºþ¤¹¤ë¡£\n"
-"       ¥Î¥º¥ë¤¬±ø¤«¤Ã¤¿¤ê¡¢µÍ¤Þ¤Ã¤Æ¤¤¤ë¤È¥Ñ¥¿¡¼¥ó¤Ë¹Â¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£\n"
-"       ¹Â¤¬°õºþ¤µ¤ì¤¿¤é¡¢¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤òÀ¶Áݤ·¤Æ²¼¤µ¤¤¡£\n"
-"    -a ¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤롣\n"
-"       ¡Ú·Ù¹ð¡Û: ¤³¤Î¥³¥Þ¥ó¥É¤òÍðÍѤ¹¤ë¤È¡¢\n"
-"       °õºþ¤ÎÉʼÁ¤¬Äã²¼¤¹¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥×¥ê¥ó¥¿¸Î¾ã¤Î¸¶°ø¤Ë¤Ê¤ê¤Þ¤¹\n"
-"    -o ¥«¥é¡¼°õºþ¤Î¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤ë (Stylus Color 480 ¤È 580 ¤Î¤ß)¡£\n"
-"       ¡Ú·Ù¹ð¡Û: ¤³¤Î¥³¥Þ¥ó¥É¤òÍðÍѤ¹¤ë¤È¡¢\n"
-"        °õºþ¤ÎÉʼÁ¤¬Äã²¼¤¹¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥×¥ê¥ó¥¿¸Î¾ã¤Î¸¶°ø¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
-"    -s ¥×¥ê¥ó¥¿¤Î¾õÂÖ¤ò¼èÆÀ¤¹¤ë¡£\n"
-"    -i ¥¤¥ó¥¯¤Î¥ì¥Ù¥ë¤ò¥×¥ê¥ó¥¿¤«¤é¼èÆÀ¤¹¤ë¡£\n"
-"       ¤³¤ì¤Ï¥×¥ê¥ó¥¿¤ÎÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤Ø¤Î¥¢¥¯¥»¥¹¸¢ (Æɤ߽ñ¤­) ¤¬É¬ÍפÇ"
-"¤¹¡£\n"
-"    -d ¥×¥ê¥ó¥¿¾ðÊó (·¿¼°¤Ê¤É) ¤òÌ䤤¹ç¤ï¤»¤ë¡£\n"
-"       ¤³¤ì¤Ï¥×¥ê¥ó¥¿¤ÎÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤Ø¤Î\n"
-"       ¥¢¥¯¥»¥¹¸¢ (Æɤ߽ñ¤­) ¤¬É¬ÍפǤ¹¡£\n"
-"    -l ¤³¤Î¥×¥í¥°¥é¥à¤Î¥é¥¤¥»¥ó¥¹/Ãí°Õ½ñ¤­¤òɽ¼¨¤¹¤ë¡£\n"
-"    -M ÍøÍѲÄǽ¤Ê¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ìÍ÷ɽ¼¨¤¹¤ë¡£\n"
-"    -h ¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë¡£\n"
-"  ¥ª¥×¥·¥ç¥ó:\n"
-"    -P ¥×¥ê¥ó¥¿¤òÁàºî¤¹¤ë¤¿¤á¤Ë¡¢¥×¥ê¥ó¥¿¡¦¥­¥å¡¼¤Î̾Á°¤ò»ØÄꤹ¤ë¡£\n"
-"       ½é´üÃͤϡ¢¥Ç¥Õ¥©¥ë¥È¤Î¥·¥¹¥Æ¥à¡¦¥×¥ê¥ó¥¿Ì¾¤Ç¤¹¡£\n"
-"    -r ¥×¥ê¥ó¥¿¡¦¥­¥å¡¼·Ðͳ¤Ç¤Ï¤Ê¤¯¡¢Ä¾Àܽñ¤­¹þ¤à¥Ç¥Ð¥¤¥¹Ì¾¤ò»ØÄꤹ¤ë¡£\n"
-"    -u ¿·¤·¤¤¥×¥ê¥ó¥¿¤Î¾ì¹ç¤Ë»ØÄꤹ¤ë (Stylus Color 740 ¤Þ¤¿¤Ï¤½¤ì°Ê¹ß)¡£\n"
-"    -q ¥Ð¥Ê¡¼¤òɽ¼¨¤·¤Ê¤¤¡£\n"
-"    -m ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤뤿¤á¤Ë¡¢Àµ³Î¤Ê¥×¥ê¥ó¥¿¤Î·¿¼°¤ò»ØÄꤹ¤ë¡£\n"
+"  コマンド:\n"
+"    -c プリンタ�ヘッドを清掃�る。\n"
+"    -n ノズル�テストパターンを�刷�る。\n"
+"       ノズル�汚���り�詰����る�パターン���表示�れ��。\n"
+"       ���刷�れ�ら�プリンタ�ヘッドを清掃��下��。\n"
+"    -a プリンタ�ヘッドを一列�並�る。\n"
+"       �警告】: ��コマンドを乱用�る��\n"
+"       �刷��質�低下�る���る��プリンタ故障�原因��り��\n"
+"    -o カラー�刷�ヘッドを一列�並�る (Stylus Color 480 � 580 ��)。\n"
+"       �警告】: ��コマンドを乱用�る��\n"
+"        �刷��質�低下�る���る��プリンタ故障�原因��り��。\n"
+"    -s プリンタ�状態を�得�る。\n"
+"    -i インク�レベルをプリンタ�ら�得�る。\n"
+"       �れ�プリンタ�低レベル・デ�イス��アクセス権 (読�書�) �必��"
+"�。\n"
+"    -d プリンタ情報 (型���) を�����る。\n"
+"       �れ�プリンタ�低レベル・デ�イス��\n"
+"       アクセス権 (読�書�) �必���。\n"
+"    -l ��プログラム�ライセンス/注�書�を表示�る。\n"
+"    -M 利用�能�プリンタ�型�を一覧表示�る。\n"
+"    -h ��メッセージを表示�る。\n"
+"  オプション:\n"
+"    -P プリンタを�作�る����プリンタ・キュー���を指定�る。\n"
+"       �期値��デフォルト�システム・プリンタ���。\n"
+"    -r プリンタ・キュー経由�����直接書�込むデ�イス�を指定�る。\n"
+"    -u 新��プリンタ�場��指定�る (Stylus Color 740 ����れ以�)。\n"
+"    -q �ナーを表示���。\n"
+"    -m ヘッドを一列�並�る����正確�プリンタ�型�を指定�る。\n"
 
 #: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
-msgstr "¥×¥ê¥ó¥¿¤Þ¤¿¤ÏÄã¥ì¥Ù¥ë¤Î¥Ç¥Ð¥¤¥¹¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
+msgstr "プリンタ���低レベル�デ�イスを一�指定�る����能��。"
 
 #: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
-msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
+msgstr "プリンタ�型�を一�指定�る����能��。"
 
 #: src/escputil/escputil.c:369
 #, c-format
@@ -7214,7 +7320,7 @@ msgstr ""
 #: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
-msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %c\n"
+msgstr "�明�オプション %c\n"
 
 #: src/escputil/escputil.c:389
 #, c-format
@@ -7234,17 +7340,17 @@ msgstr ""
 #: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
-msgstr "¥Ç¥Ð¥¤¥¹ %s ¤ò³«¤±¤Þ¤»¤ó: %s\n"
+msgstr "デ�イス %s を開���ん: %s\n"
 
 #: src/escputil/escputil.c:482
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
-msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "プリンタ %s � %s を使���刷�る�������ん\n"
 
 #: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
-msgstr "¥×¥ê¥ó¥¿¤Ë¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "プリンタ�コマンドを�信����ん\n"
 
 #: src/escputil/escputil.c:568
 #, c-format
@@ -7254,22 +7360,22 @@ msgstr ""
 #: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
-msgstr "%s ¤«¤éÆɤ߹þ¤á¤Þ¤»¤ó: %s\n"
+msgstr "%s �ら読�込���ん: %s\n"
 
 #: src/escputil/escputil.c:747
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
-msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¤Î¾õÂÖ¤¬É¬ÍפǤ¹¡£\n"
+msgstr "低レベル・デ�イスを利用�る���プリンタ�状態�必���。\n"
 
 #: src/escputil/escputil.c:754
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
-msgstr "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó: %s\n"
+msgstr "%s を読�書�モード�開���ん: %s\n"
 
 #: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
 #, c-format
 msgid "Cannot write to %s: %s\n"
-msgstr "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó; %s\n"
+msgstr "%s �書�込���ん; %s\n"
 
 #: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
 #: src/escputil/escputil.c:1511
@@ -7279,7 +7385,7 @@ msgid ""
 "Cannot write to %s: %s\n"
 msgstr ""
 "\n"
-"%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó: %s\n"
+"%s �書�込���ん: %s\n"
 
 #: src/escputil/escputil.c:885
 #, c-format
@@ -7289,8 +7395,8 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 "\n"
-"¥×¥ê¥ó¥¿¤Î·¿¼°¤ò¸¡½Ð¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
-"¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÆÃÄꤹ¤ë¤¿¤á¤Ë '-m' ¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\n"
+"プリンタ�型�を検出����ん���。\n"
+"�使��プリンタを特定�る��� '-m' オプションを使用��下��。\n"
 
 #: src/escputil/escputil.c:983 src/escputil/escputil.c:989
 #: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
@@ -7320,7 +7426,7 @@ msgstr ""
 #: src/escputil/escputil.c:1036
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
-msgstr "ºÌÅÙ:"
+msgstr "彩度:"
 
 #: src/escputil/escputil.c:1039
 #, c-format
@@ -7375,12 +7481,12 @@ msgstr ""
 #: src/escputil/escputil.c:1077
 #, fuzzy, c-format
 msgid "Error: Ink out\n"
-msgstr "ÆþÎÏ¥¨¥é¡¼\n"
+msgstr "入力エラー\n"
 
 #: src/escputil/escputil.c:1080
 #, fuzzy, c-format
 msgid "Error: Paper out\n"
-msgstr "ÆþÎÏ¥¨¥é¡¼\n"
+msgstr "入力エラー\n"
 
 #: src/escputil/escputil.c:1083
 #, c-format
@@ -7436,13 +7542,13 @@ msgstr ""
 #: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
 #: src/escputil/escputil.c:1646
 msgid "Ink color"
-msgstr "¥¤¥ó¥¯¤Î¿§"
+msgstr "インク�色"
 
 #: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
 #: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
 #: src/escputil/escputil.c:1646
 msgid "Percent remaining"
-msgstr "»Ä¤ê¤Î³ä¹ç"
+msgstr "残り�割�"
 
 #: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
 #: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
@@ -7472,12 +7578,12 @@ msgstr ""
 #: src/escputil/escputil.c:1355
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
+msgstr "低レベル・デ�イスを利用�る���必��インク・レベルを�得���。\n"
 
 #: src/escputil/escputil.c:1461
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
+msgstr "低レベル・デ�イスを利用�る���必��インク・レベルを�得���。\n"
 
 #: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
 #: src/escputil/escputil.c:1646
@@ -7492,24 +7598,24 @@ msgstr ""
 #: src/escputil/escputil.c:1675
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
-msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¼±Ê̻Ҥ¬É¬ÍפǤ¹¡£\n"
+msgstr "低レベル・デ�イスを利用�る���プリンタ識別��必���。\n"
 
 #: src/escputil/escputil.c:1693
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
-msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
+msgstr "プリンタ�型�を一�指定�る����能��。"
 
 #: src/escputil/escputil.c:1713
 #, c-format
 msgid "Cleaning heads...\n"
-msgstr "¥Ø¥Ã¥É¤ÎÀ¶ÁÝÃæ...\n"
+msgstr "ヘッド�清掃中...\n"
 
 #: src/escputil/escputil.c:1728
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
-"¥Î¥º¥ë¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£¥×¥ê¥ó¥¿¤ÎÃæ¤ËÍѻ椬³Î¼Â¤Ë¸ºß¤·¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ"
-"²¼¤µ¤¤¡£\n"
+"ノズルを�ェック���。プリンタ�中�用紙�確実�存在���る��を確���"
+"下��。\n"
 
 #: src/escputil/escputil.c:1732
 #, c-format
@@ -7549,43 +7655,43 @@ msgid ""
 "It is essential that you not turn your printer off during this procedure.\n"
 "\n"
 msgstr ""
-"¤´ÍøÍÑÁ°¤Ë¼¡¤ÎÀâÌÀ¤òÃí°Õ¿¼¤¯¤ªÆɤ߲¼¤µ¤¤¡£\n"
+"�利用��次�説明を注�深��読�下��。\n"
 "\n"
-"¤³¤Î¥Ä¡¼¥ë¤Ï EPSON À½¤Î Stylus ¥¤¥ó¥¯¥¸¥§¥Ã¥È¼°¥×¥ê¥ó¥¿¤Î\n"
-"°õºþ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤Ƥ¯¤ì¤Þ¤¹¡£¤³¤Î¥Ä¡¼¥ë¤ò»È¤¤¤¹¤®¤ë¤È¡¢\n"
-"°õºþ¤ÎÉʼÁ¤òÄã²¼¤µ¤»¥×¥ê¥ó¥¿¤Î¸Î¾ã¤Î¸¶°ø¤ò°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£\n"
-"¤³¤Î¥Ä¡¼¥ë¤Ï SEIKO EPSON ¼Ò¤Ç¥Æ¥¹¥È¤·¤¿¤ï¤±¤Ç¤Ï¤Ê¤¤¤Î¤Ç¡¢Á´¤¯ÌµÊݾڤǤ¹¡£\n"
-"¤³¤Î¥Ä¡¼¥ë¤Î¤´»ÈÍѤˤϤ´¼«¿È¤ÎÀÕǤ²¼¤Ç¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
+"��ツール� EPSON 製� Stylus インクジェット�プリンタ�\n"
+"�刷ヘッドを一列�並���れ��。��ツールを使���る��\n"
+"�刷��質を低下��プリンタ�故障�原因を引�起���能性��り��。\n"
+"��ツール� SEIKO EPSON 社�テスト�����������全�無�証��。\n"
+"��ツール��使用���自身�責任下�行��下��。\n"
 "\n"
-"¤³¤Î¥Ä¡¼¥ë¤Ï %d ¸Ä¤Î¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤ò°õºþ¤·¤Þ¤¹¡£³Æ¥Ñ¥¿¡¼¥ó¤Ï¤È¤Æ¤â\n"
-"¥·¥ó¥×¥ë¤Ç¤¹¡£¤³¤Î¥Ä¡¼¥ë¤Ï¿âľ¥é¥¤¥ó¤ò½Å¤Í¤Ê¤¬¤é°õºþ¤·¤¿\n"
-"¥Ú¥¢¤«¤é¹½À®¤µ¤ì¤ë¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤ò°õºþ¤·¤Þ¤¹¡£\n"
-"³Æ¥Ú¥¢¡¦¥é¥¤¥ó¤Î²¼¤Ë¤Ï %d ¤È %d ¤Î´Ö¤ò¼¨¤¹ \"¥Ú¥¢ÈÖ¹æ\" ¤¬¤¢¤ê¤Þ¤¹¡£\n"
+"��ツール� %d 個�テストパターンを�刷���。�パターン���も\n"
+"シンプル��。��ツール�垂直ラインを����ら�刷��\n"
+"ペア�ら構��れるテストパターンを�刷���。\n"
+"�ペア・ライン�下�� %d � %d �間を示� \"ペア番�\" ��り��。\n"
 "\n"
-"ÆóËܤΥ饤¥ó¤ò´Ñ»¡¤¹¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥é¥¤¥ó¤Î¥Ú¥¢¤¬Åù¤·¤¤´Ö³Ö¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤ò\n"
-"³Îǧ¤·¤Æ²¼¤µ¤¤¡£¤Ä¤Þ¤ê¡¢°ìËܤΥ饤¥ó¤¬ºÇŬ¤Ê·Á¾õ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ²¼¤µ"
-"¤¤¡£\n"
-"¤½¤·¤Æ¡¢¤½¤ì¤È¥Ú¥¢¤Ë¤Ê¤ë¥é¥¤¥ó¤¬Ê¿¹Õ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤òÃí°Õ¿¼¤¯³Îǧ¤·¤Æ²¼¤µ"
-"¤¤¡£\n"
-"Ãî¥á¥¬¥Í¤ä³ÈÂç¶À¤ò»È¤Ã¤ÆºÙ¤«¤¤Éôʬ¤Î³Îǧ¤ò¤ª¾©¤á¤·¤Þ¤¹¡£\n"
+"二本�ラインを観察�る場�����ライン�ペア�等��間隔�����る�を\n"
+"確���下��。��り�一本�ライン�最��形状�����る�確���下�"
+"�。\n"
+"�����れ�ペア��るライン�平衡�����る�を注�深�確���下�"
+"�。\n"
+"虫メガ�や拡大�を使��細��部分�確�を�奨����。\n"
 "\n"
-"¤Þ¤¿¥Æ¥¹¥ÈÍѤ˹âÉʼÁ¤ÊÍÑ»æ¤ò¤ª»È¤¤¤¹¤ë¤³¤È¤â¤ª¾©¤á¤·¤Þ¤¹¡£¹âÉʼÁ¤ÊÍÑ»æ¤ò\n"
-"ÍøÍѤ¹¤ë¤È¡¢Ê£¿ô¤Î¥é¥¤¥ó¤¬¤­¤Ã¤Á¤ê¤È°õºþ¤µ¤ì¤Æ¤Ë¤¸¤ß¤¬¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£\n"
-"ºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤ÎÈÖ¹æ¤ò¹µ¤¨¤¿¸å¤Ç¡¢¤½¤ÎÍÑ»æ¤òµë»æ¥È¥ì¥¤¤ËÌᤷ¤Æ²¼¤µ¤¤¡£\n"
+"��テスト用�高�質�用紙を�使��る��も�奨����。高�質�用紙を\n"
+"利用�る��複数�ライン����り��刷�れ��������り��。\n"
+"最��ライン�ペア�番�を控��後����用紙を給紙トレイ�戻��下��。\n"
 "\n"
-"³Æ¥Ñ¥¿¡¼¥ó¤Ï»÷Ä̤äƤ¤¤Þ¤¹¤¬¡¢¼ê»æ¤Î¥Ñ¥¿¡¼¥ó¤Ï¤è¤êÈùºÙ¤ÊÇÛÃÖ¤ò¹Ô¤¦¤¿¤á¤Ë\n"
-"ºÙ¤«¤¤¥É¥Ã¥È¤òÍøÍѤ·¤Æ¤¤¤Þ¤¹¡£\n"
-"Àµ¤·¤¤Ê¤Ӥ¬°õºþ¤µ¤ì¤ë¤è¤¦¡¢Á´¤Æ¤Î¥é¥¤¥ó¤ò¥Æ¥¹¥È¤·¤Æ²¼¤µ¤¤¡£\n"
-"Á´¤Æ¤Î¥é¥¤¥ó¤ò°õºþ¤¹¤ë¤È¡¢¥é¥¤¥ó¡¦¥Ñ¥¿¡¼¥ó¤ò¤â¤¦°ìÅÙ°õºþ¤·¤Þ¤¹¡£\n"
-"Ãæ´Ö¤Ë¤¢¤ë¥é¥¤¥ó¤Î¥Ú¥¢ (#%d / %d ÈÖÌÜ) ¤¬Á´¤Æ¤Î´Ö³Ö¤ËÂФ·¤Æ\n"
-"ºÇŬ¤Ç¤¢¤ë¤³¤È¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
+"�パターン�似通�������手紙�パターン�より微細��置を行����\n"
+"細��ドットを利用�����。\n"
+"正��並���刷�れるよ��全��ラインをテスト��下��。\n"
+"全��ラインを�刷�る��ライン・パターンをも�一度�刷���。\n"
+"中間��るライン�ペア (#%d / %d 番目) �全��間隔�対��\n"
+"最���る��を確���下��。\n"
 "\n"
-"¥Ñ¥¿¡¼¥ó¤Î°õºþ¤¬´°Î»¤·¤¿¤é¡¢¤½¤Î¥×¥ê¥ó¥¿ÍѤˤ½¤ÎÀßÄê¤òÊݸ (s) ¤¹¤ë¤«¡¢\n"
-"¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤òºÆ¤Ó¼Â¹Ô¤¹¤ë (r) ¤«¡¢Êݸ¤·¤Ê¤¤¤Ç½ªÎ» (q) ¤¹¤ë¤«\n"
-"ÁªÂò¤·¤Æ²¼¤µ¤¤¡£½ªÎ»¤·¤Æ¤â°ÊÁ°¤ÎÀßÄê¤ËÌá¤ê¤Þ¤»¤ó¤¬¡¢\n"
-"¥×¥ê¥ó¥¿¤ÎÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¸Â¤êÌ᤹¤³¤È¤Ï²Äǽ¤Ç¤¹¡£½ªÎ»¤·¤¿¾ì¹ç¤Ë¡¢\n"
-"¤¢¤È¤Ç¤½¤ÎÀßÄê¤òÊݸ¤·¤¿¤¤¾ì¹ç¤Ï¡¢¤â¤¦°ìÅÙƱ¤¸¼ê½ç¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
-"¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n"
+"パターン��刷�完了��ら���プリンタ用���設定を�存 (s) �る��\n"
+"テストパターンを��実行�る (r) ���存����終了 (q) �る�\n"
+"�択��下��。終了��も以��設定�戻り��ん��\n"
+"プリンタ�電�を OFF �����り戻�����能��。終了��場���\n"
+"�����設定を�存���場���も�一度��手順を行��下��。\n"
+"��作業を行���る最中�電�を OFF �����下��。\n"
 
 #: src/escputil/escputil.c:1767
 #, c-format
@@ -7622,41 +7728,41 @@ msgid ""
 "this procedure.\n"
 "\n"
 msgstr ""
-"¤´ÍøÍÑÁ°¤Ë¼¡¤ÎÀâÌÀ¤òÃí°Õ¿¼¤¯¤ªÆɤ߲¼¤µ¤¤¡£\n"
+"�利用��次�説明を注�深��読�下��。\n"
 "\n"
-"¤³¤Î¥Ä¡¼¥ë¤Ï EPSON À½¤Î Stylus ¥¤¥ó¥¯¥¸¥§¥Ã¥È¼°¥×¥ê¥ó¥¿¤Î\n"
-"°õºþ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤Ƥ¯¤ì¤Þ¤¹¡£¤³¤Î¥Ä¡¼¥ë¤ò»È¤¤¤¹¤®¤ë¤È¡¢\n"
-"°õºþ¤ÎÉʼÁ¤òÄã²¼¤µ¤»¥×¥ê¥ó¥¿¤Î¸Î¾ã¤Î¸¶°ø¤ò°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£\n"
-"¤³¤Î¥Ä¡¼¥ë¤Ï SEIKO EPSON ¼Ò¤Ç¥Æ¥¹¥È¤·¤¿¤ï¤±¤Ç¤Ï¤Ê¤¤¤Î¤Ç¡¢Á´¤¯ÌµÊݾڤǤ¹¡£\n"
-"¤³¤Î¥Ä¡¼¥ë¤Î¤´»ÈÍѤˤϤ´¼«¿È¤ÎÀÕǤ²¼¤Ç¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
+"��ツール� EPSON 製� Stylus インクジェット�プリンタ�\n"
+"�刷ヘッドを一列�並���れ��。��ツールを使���る��\n"
+"�刷��質を低下��プリンタ�故障�原因を引�起���能性��り��。\n"
+"��ツール� SEIKO EPSON 社�テスト�����������全�無�証��。\n"
+"��ツール��使用���自身�責任下�行��下��。\n"
 "\n"
-"¤³¤Î¥Ä¡¼¥ë¤Ï¿âľ¥é¥¤¥ó¤ò½Å¤Í¤Ê¤¬¤é°õºþ¤·¤¿¥Ú¥¢¤«¤é¹½À®¤µ¤ì¤ë¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó"
-"¤ò\n"
-"°õºþ¤·¤Þ¤¹¡£³Æ¥Ú¥¢¡¦¥é¥¤¥ó¤Î²¼¤Ë¤Ï %d ¤È %d ¤Î´Ö¤ò¼¨¤¹ \"¥Ú¥¢ÈÖ¹æ\" ¤¬¤¢¤ê¤Þ"
-"¤¹¡£\n"
+"��ツール�垂直ラインを����ら�刷��ペア�ら構��れるテストパターン"
+"ã‚’\n"
+"�刷���。�ペア・ライン�下�� %d � %d �間を示� \"ペア番�\" ��り�"
+"�。\n"
 "\n"
-"ÆóËܤΥ饤¥ó¤ò´Ñ»¡¤¹¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥é¥¤¥ó¤Î¥Ú¥¢¤¬Åù¤·¤¤´Ö³Ö¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤ò\n"
-"³Îǧ¤·¤Æ²¼¤µ¤¤¡£¤Ä¤Þ¤ê¡¢°ìËܤΥ饤¥ó¤¬ºÇŬ¤Ê·Á¾õ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ²¼¤µ"
-"¤¤¡£\n"
-"¤½¤·¤Æ¡¢¤½¤ì¤È¥Ú¥¢¤Ë¤Ê¤ë¥é¥¤¥ó¤¬Ê¿¹Õ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤òÃí°Õ¿¼¤¯³Îǧ¤·¤Æ²¼¤µ"
-"¤¤¡£\n"
-"Ãî¥á¥¬¥Í¤ä³ÈÂç¶À¤ò»È¤Ã¤ÆºÙ¤«¤¤Éôʬ¤Î³Îǧ¤ò¤ª¾©¤á¤·¤Þ¤¹¡£\n"
+"二本�ラインを観察�る場�����ライン�ペア�等��間隔�����る�を\n"
+"確���下��。��り�一本�ライン�最��形状�����る�確���下�"
+"�。\n"
+"�����れ�ペア��るライン�平衡�����る�を注�深�確���下�"
+"�。\n"
+"虫メガ�や拡大�を使��細��部分�確�を�奨����。\n"
 "\n"
-"Á´¤Æ¤Î¥é¥¤¥ó¤ò°õºþ¤·¤¿¤é¡¢¥é¥¤¥ó¡¦¥Ñ¥¿¡¼¥ó¤ò¤â¤¦°ìÅÙ°õºþ¤·¤Þ¤¹¡£\n"
-"Ãæ´Ö¤Ë¤¢¤ë¥é¥¤¥ó¤Î¥Ú¥¢ (#%d / %d ÈÖÌÜ) ¤¬Á´¤Æ¤Î´Ö³Ö¤ËÂФ·¤Æ\n"
-"ºÇŬ¤Ç¤¢¤ë¤³¤È¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
-"¤½¤ì¤«¤é¡¢¤½¤Î¥×¥ê¥ó¥¿ÍѤˤ½¤ÎÀßÄê¤òÊݸ (s) ¤¹¤ë¤«¡¢\n"
-"¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤òºÆ¤Ó¼Â¹Ô¤¹¤ë (r) ¤«¡¢Êݸ¤·¤Ê¤¤¤Ç½ªÎ» (q) ¤¹¤ë¤«\n"
-"ÁªÂò¤·¤Æ²¼¤µ¤¤¡£½ªÎ»¤·¤Æ¤â°ÊÁ°¤ÎÀßÄê¤ËÌá¤ê¤Þ¤»¤ó¤¬¡¢\n"
-"¥×¥ê¥ó¥¿¤ÎÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¸Â¤êÌ᤹¤³¤È¤Ï²Äǽ¤Ç¤¹¡£\n"
-"½ªÎ»¤·¤¿¾ì¹ç¤Ë¡¢¤¢¤È¤Ç¤½¤ÎÀßÄê¤òÊݸ¤·¤¿¤¤¾ì¹ç¤Ï¡¢¤â¤¦°ìÅÙƱ¤¸¼ê½ç¤ò¹Ô¤Ã¤Æ²¼"
-"¤µ¤¤¡£\n"
-"¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n"
+"全��ラインを�刷��ら�ライン・パターンをも�一度�刷���。\n"
+"中間��るライン�ペア (#%d / %d 番目) �全��間隔�対��\n"
+"最���る��を確���下��。\n"
+"�れ�ら���プリンタ用���設定を�存 (s) �る��\n"
+"テストパターンを��実行�る (r) ���存����終了 (q) �る�\n"
+"�択��下��。終了��も以��設定�戻り��ん��\n"
+"プリンタ�電�を OFF �����り戻�����能��。\n"
+"終了��場��������設定を�存���場���も�一度��手順を行��下"
+"��。\n"
+"��作業を行���る最中�電�を OFF �����下��。\n"
 
 #: src/escputil/escputil.c:1811
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
-msgstr "¥×¥ê¥ó¥¿¤Ë¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó¡£½ªÎ»¤·¤Þ¤¹¡£\n"
+msgstr "プリンタ�コマンドを�信����ん。終了���。\n"
 
 #: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
 #, c-format
@@ -7674,13 +7780,13 @@ msgid ""
 "You will then be asked to confirm your choice.\n"
 "What do you want to do (s, q, r)?\n"
 msgstr ""
-"ºÇ½ª½ÐÎϤǥץê¥ó¥¿¤¬Àµ¤·¤¤´Ö³Ö¤Ç°õºþ¤·¤Æ¤¤¤ë¤«¤òÃí°Õ¿¼¤¯³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
-"³Îǧ¸å¡¢¼¡¤ÎÃ椫¤éÁªÂò¤·¤Æ²¼¤µ¤¤:\n"
-"  (s) ¥×¥ê¥ó¥¿¤ÎÃæ¤Ë¤³¤ÎÀßÄê¤òÊݸ¤¹¤ë\n"
-"  (q) ¤³¤ÎÀßÄê¤òÊݸ¤·¤Ê¤¤¤Ç½ªÎ»¤¹¤ë\n"
-"  (r) ºÇ½é¤ËÌá¤Ã¤ÆºÆ¤ÓÀßÄꤹ¤ë\n"
-"ÁªÂò¸å¤ËºÇ¸å¤Î³Îǧ¤¬¤¢¤ê¤Þ¤¹¡£\n"
-"ÁªÂò¤·¤Æ²¼¤µ¤¤ (s, q, r)¡£\n"
+"最終出力�プリンタ�正��間隔��刷���る�を注�深�確���下��。\n"
+"確�後�次�中�ら�択��下��:\n"
+"  (s) プリンタ�中���設定を�存�る\n"
+"  (q) ��設定を�存����終了�る\n"
+"  (r) 最��戻����設定�る\n"
+"�択後�最後�確���り��。\n"
+"�択��下�� (s, q, r)。\n"
 
 #: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
 #: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
@@ -7692,7 +7798,7 @@ msgstr "> "
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
-msgstr "ËÜÅö¤ËÀßÄê¤òÇË´þ¤·¤Æ½ªÎ»¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 'q' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
+msgstr "本当�設定を破棄��終了�る場����度 'q' を入力��下��:\n"
 
 #: src/escputil/escputil.c:1850
 #, c-format
@@ -7700,20 +7806,20 @@ msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
-"¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤¬ÊäÀµ¤µ¤ì¤Þ¤·¤¿¡£Ã¢¤·¤½¤Î´Ö³Ö¤Ï¤Þ¤ÀÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
-"¤½¤Î´Ö³Ö¤òÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢¤³¤Î¼ê½ç¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
+"�使��プリンタ�補正�れ���。但���間隔����存�れ����ん。\n"
+"��間隔を�存�る場�����手順を繰り返��下��。\n"
 
 #: src/escputil/escputil.c:1857
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
-msgstr "ËÜÅö¤Ë´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¤ä¤êľ¤¹¾ì¹ç¤Ï¡¢ºÆÅÙ 'r' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
+msgstr "本当�間隔補正�設定をやり直�場����度 'r' を入力��下��:\n"
 
 #: src/escputil/escputil.c:1865
 #, c-format
 msgid "Repeating the alignment process.\n"
-msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò·«¤êÊÖ¤·¤Þ¤¹¡£\n"
+msgstr "間隔補正�設定を繰り返���。\n"
 
 #: src/escputil/escputil.c:1871
 #, c-format
@@ -7724,22 +7830,22 @@ msgid ""
 "Please confirm by typing 's' again that you wish to save the settings\n"
 "to your printer:\n"
 msgstr ""
-"¤³¤ÎÁàºî¤Ï¡¢¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤ÎÀßÄê¤òÊѹ¹¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
-"¡Ú·Ù¹ð¡Û: ¤³¤ÎÁàºî¤Ï SEIKO EPSON ¤Î¾µÇ§¤òÆÀ¤¿¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
-"          ¤Þ¤¿¡¢¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤Ë»³²¤òÍ¿¤¨¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n"
-"ËÜÅö¤Ëµ¹¤·¤¤¤Ç¤¹¤«¡©\n"
-"¤³¤ÎÀßÄê¤ò¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤ËÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 's' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
+"���作���使��プリンタ�設定を変更�る����り��。\n"
+"�警告】: ���作� SEIKO EPSON �承�を得�も����り��ん。\n"
+"          ����使��プリンタ��害を与�る�も�れ��ん。\n"
+"本当�宜�����？\n"
+"��設定を�使��プリンタ��存�る場����度 's' を入力��下��:\n"
 "\n"
 
 #: src/escputil/escputil.c:1883
 #, c-format
 msgid "About to save settings..."
-msgstr "ÀßÄê¤ÎÊݸ¤¹¤ë¤³¤È¤Ë¤Ä¤¤¤Æ..."
+msgstr "設定��存�る������..."
 
 #: src/escputil/escputil.c:1889
 #, c-format
 msgid "failed!\n"
-msgstr "¼ºÇԤǤ¹¡ª\n"
+msgstr "失敗���\n"
 
 #: src/escputil/escputil.c:1890
 #, c-format
@@ -7747,28 +7853,28 @@ msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
-"¤¢¤Ê¤¿¤ÎÀßÄê¤ÎÊݸ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
-"ºÆÅÙ¡¢´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
+"����設定��存�失敗����。\n"
+"�度�間隔補正�設定を行��下��。\n"
 
 #: src/escputil/escputil.c:1894
 #, c-format
 msgid "succeeded!\n"
-msgstr "´°Î»¤·¤Þ¤·¤¿¡ª\n"
+msgstr "完了�����\n"
 
 #: src/escputil/escputil.c:1895
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
-msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄ꤬¥×¥ê¥ó¥¿¤ËÊݸ¤µ¤ì¤Þ¤·¤¿¡£\n"
+msgstr "間隔補正�設定�プリンタ��存�れ���。\n"
 
 #: src/escputil/escputil.c:1900
 #, c-format
 msgid "Unrecognized command.\n"
-msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥³¥Þ¥ó¥É¤Ç¤¹¡£\n"
+msgstr "�識����コマンド��。\n"
 
 #: src/escputil/escputil.c:1903
 #, c-format
 msgid "Final command was not confirmed.\n"
-msgstr "ºÇ¸å¤Î¥³¥Þ¥ó¥É¤¬³Îǧ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
+msgstr "最後�コマンド�確��れ����ん。\n"
 
 #: src/escputil/escputil.c:1908
 #, c-format
@@ -7780,17 +7886,17 @@ msgid ""
 "Please place a sheet of paper in your printer to begin the head\n"
 "alignment procedure.\n"
 msgstr ""
-"¤³¤ÎÁàºî¤Ï¡¢¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤¬ EPSON %s ¤Ç¤¢¤ë¤ÈÁÛÄꤷ¤¿¤â¤Î¤Ç¤¹¡£\n"
-"¤â¤·¥×¥ê¥ó¥¿¤Î·¿¼°¤¬°Û¤Ê¤ë¾ì¹ç¤Ï¡¢[CTRL]+C ¤òÆþÎϤ·¤ÆÃæÃǤ·¡¢\n"
-"Àµ¤·¤¤¥×¥ê¥ó¥¿¤Î·¿¼°¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n"
+"���作���使��プリンタ� EPSON %s ��る�想定��も���。\n"
+"も�プリンタ�型��異�る場���[CTRL]+C を入力��中断��\n"
+"正��プリンタ�型�を�択��下��。\n"
 "\n"
-"°õºþ¥Ø¥Ã¥É´Ö³ÖÊäÀµ¤ò³«»Ï¤¹¤ë¾ì¹ç¤Ï¡¢¥×¥ê¥ó¥¿¤Î¥È¥ì¥¤¤Ë\n"
-"ÍÑ»æ¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£\n"
+"�刷ヘッド間隔補正を開始�る場���プリンタ�トレイ�\n"
+"用紙を入れ�下��。\n"
 
 #: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
 #: src/escputil/escputil.c:2047
 msgid "Press enter to continue > "
-msgstr "²¿¤«¥­¡¼¤òÆþÎϤ¹¤ë¤È³¹Ô¤·¤Þ¤¹ > "
+msgstr "何�キーを入力�る�続行��� > "
 
 #: src/escputil/escputil.c:1980
 #, c-format
@@ -7799,44 +7905,44 @@ msgid ""
 "pattern.\n"
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
-"°õºþ·ë²Ì¤ò³Îǧ¤·¤Æ¡¢³Æ¥Ñ¥¿¡¼¥ó¤ÇºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n"
-"¤½¤Î¥Ú¥¢¤ÎÈÖ¹æ¤òÆþÎϤ«¡¢'r' ¤Ç¤³¤ÎÀßÄê¤ò¤¯¤ê¤«¤¨¤¹¤«¡¢'?' ¤Ç¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ"
-"¤¹¡£\n"
+"�刷�果を確�����パターン�最��ライン�ペアを�択��下��。\n"
+"��ペア�番�を入力��'r' ���設定を�り�����'?' �ヘルプを表示��"
+"�。\n"
 
 #: src/escputil/escputil.c:1993
 #, c-format
 msgid "Pass #%d"
-msgstr "¥Ñ¥¹ #%d"
+msgstr "パス #%d"
 
 #: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
-msgstr "¿·¤·¤¤ÍÑ»æ¤ò¥È¥ì¥¤¤ËÆþ¤ì¤Æ²¼¤µ¤¤¡£\n"
+msgstr "新��用紙をトレイ�入れ�下��。\n"
 
 #: src/escputil/escputil.c:2020
 #, c-format
 msgid "Number out of range!\n"
-msgstr "Èϰϳ°¤Î¥Ú¥¢ÈÖ¹æ¤Ç¤¹¡ª\n"
+msgstr "範囲外�ペア番����\n"
 
 #: src/escputil/escputil.c:2025
 #, c-format
 msgid "I cannot understand what you typed!\n"
-msgstr "ÆþÎϤ·¤¿¤â¤Î¤Ï̵¸ú¤Ç¤¹¡ª\n"
+msgstr "入力��も��無効���\n"
 
 #: src/escputil/escputil.c:2031
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "ºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤Ï 1 ¤È %d ¤Î´Ö¤ÎÈÖ¹æ¤Ë¤·¤Æ²¼¤µ¤¤¡£\n"
+msgstr "最��ライン�ペア� 1 � %d �間�番����下��。\n"
 
 #: src/escputil/escputil.c:2038
 #, c-format
 msgid "Attempting to set alignment..."
-msgstr "´Ö³ÖÊäÀµÃæ..."
+msgstr "間隔補正中..."
 
 #: src/escputil/escputil.c:2041
 #, c-format
 msgid "succeeded.\n"
-msgstr "´°Î»¤·¤Þ¤·¤¿¡£\n"
+msgstr "完了����。\n"
 
 #: src/escputil/escputil.c:2042
 #, c-format
@@ -7846,23 +7952,23 @@ msgid ""
 "pattern %d.  If it is not, you should repeat the process to get the best\n"
 "quality printing.\n"
 msgstr ""
-"´Ö³ÖÊäÀµ¤¬Àµ¤·¤¤¤«³Îǧ¤·¤Æ²¼¤µ¤¤¡£ºÆÅ٥ƥ¹¥È¥Ñ¥¿¡¼¥ó¤Î°õºþ¤¬´°Î»¤·¤¿¸å¤Ë\n"
-"³Æ¥é¥¤¥ó¤ÎºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤¬¥Ñ¥¿¡¼¥ó %d ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
-"¤â¤·ºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢ºÇŬ¤Ê°õºþÉʼÁ¤òÆÀ¤ë¤¿¤á¤Ë\n"
-"ƱÍͤÎÁàºî¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
+"間隔補正�正���確���下��。�度テストパターン��刷�完了��後�\n"
+"�ライン�最��パターン�パターン %d �����る�確���下��。\n"
+"も�最��パターン���場���最���刷�質を得る���\n"
+"�様��作を繰り返��下��。\n"
 
 #: src/escputil/escputil.c:2088
 #, c-format
 msgid "Error in input\n"
-msgstr "ÆþÎÏ¥¨¥é¡¼\n"
+msgstr "入力エラー\n"
 
 #: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
-msgstr "°õºþÃæ..."
+msgstr "�刷中..."
 
 #: src/gimp/print.c:133
 msgid "<Image>/File/Print..."
-msgstr "<Image>/File/°õºþ..."
+msgstr "<Image>/File/�刷..."
 
 #: src/ghost/ijsgutenprint.c:98
 #, c-format
@@ -7879,28 +7985,28 @@ msgstr ""
 #: src/ghost/ijsgutenprint.c:191
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
-msgstr "¤ª¤«¤·¤Ê¥«¥é¡¼¶õ´Ö: bps %d ¥Á¥ã¥ó¥Í¥ë %d ¶õ´Ö %s\n"
+msgstr "����カラー空間: bps %d �ャン�ル %d 空間 %s\n"
 
 #: src/ghost/ijsgutenprint.c:199
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
-msgstr "Äã¥ì¥Ù¥ë¥Ð¥Ã¥Õ¥¡¤¬¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "低レベル�ッファ��り��ん\n"
 
 #: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
-msgstr "¥Ñ¥é¥á¡¼¥¿ %s=%s (¤ª¤½¤é¤¯¿ôÃÍ) ¤ò²òÀϤǤ­¤Þ¤»¤ó\n"
+msgstr "パラメータ %s=%s (��ら�数値) を解�����ん\n"
 
 #: src/ghost/ijsgutenprint.c:498
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
-msgstr "¥×¥ê¥ó¥¿¤ò -s·¿¼° ¤ò»È¤Ã¤Æ»ØÄꤷ¤Æ²¼¤µ¤¤\n"
+msgstr "プリンタを -s型� を使��指定��下��\n"
 
 #: src/ghost/ijsgutenprint.c:500
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
-msgstr "¥×¥ê¥ó¥¿ %s ¤ÏÉÔÌÀ¤Ê·¿¼°¤Ç¤¹\n"
+msgstr "プリンタ %s ��明�型���\n"
 
 #: src/ghost/ijsgutenprint.c:656
 #, c-format
@@ -7910,85 +8016,322 @@ msgstr ""
 #: src/ghost/ijsgutenprint.c:700
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
-msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "プリンタ %s � %s を使���刷�る�������ん\n"
 
 #: src/ghost/ijsgutenprint.c:723
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
-msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "プリンタ %s � %s を使���刷�る�������ん\n"
 
 #: src/ghost/ijsgutenprint.c:795
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
-msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "プリンタ %s � %s を使���刷�る�������ん\n"
 
 #: src/ghost/ijsgutenprint.c:802
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
-msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "プリンタ %s � %s を使���刷�る�������ん\n"
 
 #: src/ghost/ijsgutenprint.c:809
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
-msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "プリンタ %s � %s を使���刷�る�������ん\n"
 
 #: src/ghost/ijsgutenprint.c:816
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
-msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "プリンタ %s � %s を使���刷�る�������ん\n"
 
 #: src/ghost/ijsgutenprint.c:830
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
-msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "プリンタ %s � %s を使���刷�る�������ん\n"
 
 #: src/ghost/ijsgutenprint.c:841
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
-msgstr "¥×¥ê¥ó¥¿ %s ¤¬ÉÔÌÀ¤Ç¤¹\n"
+msgstr "プリンタ %s ��明��\n"
 
 #: src/ghost/ijsgutenprint.c:867
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
-msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n"
+msgstr "%.0f �次�低レベルフィールドを�得���\n"
 
 #: src/ghost/ijsgutenprint.c:1308
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
-msgstr "image_init ¤Ë¼ºÇÔ %d\n"
+msgstr "image_init �失敗 %d\n"
 
 #: src/ghost/ijsgutenprint.c:1319
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-msgstr "¥Õ¥¡¥¤¥ë¡¦¥Ç¥£¥¹¥¯¥ê¥×¥¿¤ò³«¤±¤Þ¤»¤ó: %s\n"
+msgstr "ファイル・ディスクリプタを開���ん: %s\n"
 
 #: src/ghost/ijsgutenprint.c:1331
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-msgstr "%s ¤ò³«¤±¤Þ¤»¤ó: %s\n"
+msgstr "%s を開���ん: %s\n"
 
 #: src/ghost/ijsgutenprint.c:1344
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
-msgstr "¥×¥ê¥ó¥¿ %s ¤¬ÉÔÌÀ¤Ç¤¹\n"
+msgstr "プリンタ %s ��明��\n"
 
 #: src/ghost/ijsgutenprint.c:1516
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-msgstr "¤ª¤«¤·¤Ê¥Ñ¥é¥á¡¼¥¿; ³¹Ô¤Ç¤­¤Þ¤»¤ó¡ª\n"
+msgstr "����パラメータ; 続行����ん�\n"
 
 #: src/ghost/ijsgutenprint.c:1534
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
-msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n"
+msgstr "%.0f �次�低レベルフィールドを�得���\n"
+
+#, fuzzy
+#~ msgid "Model Name"
+#~ msgstr "�り消�"
+
+#, fuzzy
+#~ msgid "Cassette"
+#~ msgstr "マット用紙"
+
+#, fuzzy
+#~ msgid " Gamma"
+#~ msgstr "ガンマ:"
+
+#, fuzzy
+#~ msgid " Curve"
+#~ msgstr "黒色"
+
+#, fuzzy
+#~ msgid "1440 x 1440"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI High Quality"
+#~ msgstr "1200 DPI 高�質"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI Highest Quality"
+#~ msgstr "1200 DPI 高�質"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI High Quality"
+#~ msgstr "1200 DPI 高�質"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI Highest Quality"
+#~ msgstr "1200 DPI 高�質"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "and the rest of the Gutenprint Development Team.\n"
+#~ "\n"
+#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n"
+#~ "��� Gimp-Print 開発�ーム。\n"
+#~ "\n"
+#~ "ホームページ <http://gimp-print.sourceforge.net> ��越�下��。\n"
+#~ "\n"
+#~ "��プログラム�フリーソフトウェア��; フリーソフトウェア財団�発行�る\n"
+#~ "GNU 公有使用許諾契約書�第二版����れ以��版�下�改変・修正・��布"
+#~ "�\n"
+#~ "��られ����。\n"
+#~ "\n"
+#~ "��プログラム�便利�使��もら�るよ���布�れ������\n"
+#~ "完全�無�証��; 商用利用����る特定�目的���る��性��証も\n"
+#~ "�り��ん。詳細� GNU 公有使用許諾契約書を�覧下��。\n"
+#~ "\n"
+#~ "貴方����プログラム��応�� GNU 公有使用許諾契約書�コピーを\n"
+#~ "���る必���り��; も���������場���\n"
+#~ "Free Software Foundation, Inc., 56 Temple Place - \n"
+#~ "Suite 330, Boston, MA 02111-1307, USA ��連絡��下��。\n"
+
+#, fuzzy
+#~ msgid ""
+#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
+#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
+#~ "l'\n"
+#~ "This is free software, and you are welcome to redistribute it\n"
+#~ "under certain conditions; type 'escputil -l' for details.\n"
+#~ msgstr ""
+#~ ", Copyright (C) 2000-2001 Robert Krawitz\n"
+#~ "Escputil �完全無�証��; 詳細� `escputil -l` ��覧下��。\n"
+#~ "�れ�フリーソフトウェア�������件�下���布を\n"
+#~ "歓迎���; 詳細� `escputil -l` ��覧下��。\n"
+
+#, fuzzy
+#~ msgid "90x90 DPI"
+#~ msgstr "600 DPI"
+
+#, fuzzy
+#~ msgid "90x90 DPI DMT"
+#~ msgstr "600 DPI"
+
+#, fuzzy
+#~ msgid "180x180 DPI"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "180x180 DPI DMT"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "360x360 DPI"
+#~ msgstr "300x300 DPI"
+
+#, fuzzy
+#~ msgid "360x360 DPI DMT"
+#~ msgstr "600x600 DPI"
+
+#, fuzzy
+#~ msgid "720x360 DPI"
+#~ msgstr "720 x 360 DPI"
+
+#, fuzzy
+#~ msgid "720x360 DPI DMT"
+#~ msgstr "720 x 360 DPI MW2"
+
+#, fuzzy
+#~ msgid "720x720 DPI"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "720x720 DPI DMT"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x720 DPI"
+#~ msgstr "1440 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x720 DPI DMT"
+#~ msgstr "1440 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI DMT"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI DMT"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "150x150 DPI DMT"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "300x300 DPI DMT"
+#~ msgstr "300x300 DPI"
+
+#, fuzzy
+#~ msgid "600x300 DPI DMT"
+#~ msgstr "600x300 DPI"
+
+#, fuzzy
+#~ msgid "600x600 DPI DMT"
+#~ msgstr "600x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x600 DPI DMT"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI DMT"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI"
+#~ msgstr "2400x600 DPI"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI DMT"
+#~ msgstr "2400x600 DPI"
+
+#, fuzzy
+#~ msgid "Plain Paper PIXMA"
+#~ msgstr "通常�用紙"
+
+#~ msgid "Back Print Film"
+#~ msgstr "背景�刷用フィルム"
+
+#~ msgid "Fabric Sheets"
+#~ msgstr "繊維質�用紙"
+
+#~ msgid "Envelope"
+#~ msgstr "�筒"
+
+#~ msgid "High Resolution Paper"
+#~ msgstr "高解�度�用紙"
+
+#~ msgid "T-Shirt Transfers"
+#~ msgstr "T-シャツ�模様"
+
+#~ msgid "High Gloss Film"
+#~ msgstr "高艶フィルム"
+
+#~ msgid "Glossy Photo Paper"
+#~ msgstr "光沢付�フォト用紙"
+
+#~ msgid "Glossy Photo Cards"
+#~ msgstr "光沢付�フォト・カード"
+
+#~ msgid "Photo Paper Pro"
+#~ msgstr "フォト用紙 Pro"
+
+#~ msgid "Photo CcMmYK Color"
+#~ msgstr "フォト CcMmYK 色"
+
+#~ msgid "Photo CcMmY Color"
+#~ msgstr "フォト CcMmY 色"
+
+#~ msgid "CMYK Color"
+#~ msgstr "CMYK 色"
+
+#~ msgid "CMY Color"
+#~ msgstr "CMY 色"
 
 #, fuzzy
 #~ msgid "Gutenprint"
-#~ msgstr "¥Æ¥¹¥È°õºþ"
+#~ msgstr "テスト�刷"
 
 #, fuzzy
 #~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-#~ msgstr "ijs_server_get_page_header ¤Ë¼ºÇÔ %d\n"
+#~ msgstr "ijs_server_get_page_header �失敗 %d\n"
 
 #, fuzzy
 #~ msgid "EPSON Stylus C50"
@@ -8288,39 +8631,39 @@ msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n"
 
 #, fuzzy
 #~ msgid "Printer does not support listing ink types!\n"
-#~ msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
+#~ msgstr "プリンタ�カラー�刷をサ�ート�����ん\n"
 
 #, fuzzy
 #~ msgid "Cannot identify printer!\n"
-#~ msgstr "¥×¥ê¥ó¥¿¤«¤é¤Î½ÐÎϤò²òÀϤǤ­¤Þ¤»¤ó\n"
+#~ msgstr "プリンタ�ら�出力を解�����ん\n"
 
 #, fuzzy
 #~ msgid "Red Balance"
-#~ msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+#~ msgstr "�刷時�黄色��ランスを調整���。"
 
 #, fuzzy
 #~ msgid "Gloss Balance"
-#~ msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+#~ msgstr "�刷時�黄色��ランスを調整���。"
 
 #~ msgid ""
 #~ "Printer alignment must be done with a raw device or else\n"
 #~ "the -m option must be used to specify a printer.\n"
 #~ msgstr ""
-#~ "Åù´Ö³Ö¤Î°õºþ¤ÏÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤ò»È¤¦¤«¡¢¤¢¤ë¤¤¤Ï\n"
-#~ "'-m' ¥ª¥×¥·¥ç¥ó¤Ç¥×¥ê¥ó¥¿¤òÆÃÄꤷ¤Æ»ÈÍѤ¹¤ë¤è¤¦¤Ë¤·¤Æ²¼¤µ¤¤¡£\n"
+#~ "等間隔��刷�低レベル・デ�イスを使����る��\n"
+#~ "'-m' オプション�プリンタを特定��使用�るよ����下��。\n"
 
 #~ msgid "Attempting to detect printer model..."
-#~ msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò¸¡½ÐÃæ¤Ç¤¹..."
+#~ msgstr "プリンタ�型�を検出中��..."
 
 #~ msgid ""
 #~ "\n"
 #~ "Cannot open %s read/write: %s\n"
 #~ msgstr ""
 #~ "\n"
-#~ "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó: %s\n"
+#~ "%s を読�書�モード�開���ん: %s\n"
 
 #~ msgid "Printer model %s is not known.\n"
-#~ msgstr "¥×¥ê¥ó¥¿¤Î·¿¼° %s ¤ÏÉÔÌÀ¤Ç¤¹¡£\n"
+#~ msgstr "プリンタ�型� %s ��明��。\n"
 
 #, fuzzy
 #~ msgid "Gimp-Print"
@@ -8329,64 +8672,64 @@ msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n"
 #, fuzzy
 #~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
 #~ msgstr ""
-#~ "°õºþ¤¹¤ëÌÀ¤ë¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£\n"
-#~ "(0.0Êý¸þ: °Å¤¯ 2.0Êý¸þ: ÌÀ¤ë¤¯)"
+#~ "�刷�る明る�をセット���。\n"
+#~ "(0.0方�: 暗� 2.0方�: 明る�)"
 
 #~ msgid ""
 #~ "Enter the correct command to print to your printer. Note: Please do not "
 #~ "remove the `-l' or `-oraw' from the command string, or printing will "
 #~ "probably fail!"
 #~ msgstr ""
-#~ "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¸þ¤±¤Î°õºþ¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Þ¤¹¡£¡ÚÃíµ­¡Û: '-l' ¤Þ¤¿¤Ï '-"
-#~ "oraw' ¥ª¥×¥·¥ç¥ó¤òºï½ü¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£°õºþ¤Ë¼ºÇÔ¤·¤Þ¤¹¡ª"
+#~ "�使��プリンタ����刷コマンドを入力���。�注記】: '-l' ��� '-"
+#~ "oraw' オプションを削除����下��。�刷�失敗����"
 
 #~ msgid "PPD File?"
-#~ msgstr "PPD ¥Õ¥¡¥¤¥ë¤Ç¤¹¤«¡©"
+#~ msgstr "PPD ファイル���？"
 
 #~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '%s' ñÂΤǤϻÈÍѤǤ­¤Þ¤»¤ó\n"
+#~ msgstr "%s: オプション '%s' �体��使用����ん\n"
 
 #~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '--%s' ¤Ë¤Ï°ú¿ô¤ÏÉÔÍפǤ¹\n"
+#~ msgstr "%s: オプション '--%s' ��引数�����\n"
 
 #~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '%c%s' ¤Ë¤Ï°ú¿ô¤ÏÉÔÍפǤ¹\n"
+#~ msgstr "%s: オプション '%c%s' ��引数�����\n"
 
 #~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹\n"
+#~ msgstr "%s: オプション '%s' ��引数�必���\n"
 
 #~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó '--%s'\n"
+#~ msgstr "%s: �明�オプション '--%s'\n"
 
 #~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó '`%c%s'\n"
+#~ msgstr "%s: �明�オプション '`%c%s'\n"
 
 #~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
+#~ msgstr "%s: �正�オプション -- %c\n"
 
 #~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: ¤ª¤«¤·¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
+#~ msgstr "%s: ����オプション -- %c\n"
 
 #~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹ -- %c\n"
+#~ msgstr "%s: オプション��引数�必��� -- %c\n"
 
 #~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '-W %s' ñÂΤǤϻÈÍѤǤ­¤Þ¤»¤ó\n"
+#~ msgstr "%s: オプション '-W %s' �体��使用����ん\n"
 
 #~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '-W %s' ¤Ë¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
+#~ msgstr "%s: オプション '-W %s' ��引数�����\n"
 
 #, fuzzy
 #~ msgid "Bright"
-#~ msgstr "ÌÀ¤ë¤µ:"
+#~ msgstr "明る�:"
 
 #, fuzzy
 #~ msgid "Image is too wide for the page\n"
-#~ msgstr "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£"
+#~ msgstr "用紙サイズを 100 ���場��比率��。"
 
 #, fuzzy
 #~ msgid "Full Bleed"
-#~ msgstr "¥í¡¼¥ë¼°µë»æ"
+#~ msgstr "ロール�給紙"
 
 #, fuzzy
 #~ msgid "traditional"
@@ -8403,10 +8746,10 @@ msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n"
 
 #, fuzzy
 #~ msgid "Optimize the settings for the type of image to be printed"
-#~ msgstr "°õºþ¤¹¤ë²èÁü¤Î¼ïÎफ¤é½ÐÎÏ·ë²Ì¤òºÇŬ²½¤·¤Þ¤¹¡£"
+#~ msgstr "�刷�る画��種類�ら出力�果を最�化���。"
 
 #~ msgid "Solid Colors"
-#~ msgstr "̵ÃϤο§"
+#~ msgstr "無地�色"
 
 #~ msgid "Stylus C20sx"
 #~ msgstr "Stylus C20sx"
@@ -8470,138 +8813,138 @@ msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n"
 #~ "WARNING: THIS FUNCTION IS NOT YET TESTED!  It may not work, and it may\n"
 #~ "damage your printer!\n"
 #~ msgstr ""
-#~ "¤´ÍøÍÑÁ°¤Ë¼¡¤ÎÀâÌÀ¤òÃí°Õ¿¼¤¯¤ªÆɤ߲¼¤µ¤¤¡£\n"
+#~ "�利用��次�説明を注�深��読�下��。\n"
 #~ "\n"
-#~ "¤³¤Î¥Ä¡¼¥ë¤Ï EPSON À½¤Î Stylus ¥¤¥ó¥¯¥¸¥§¥Ã¥È¼°¥×¥ê¥ó¥¿¤Î\n"
-#~ "¥«¥é¡¼°õºþ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤Ƥ¯¤ì¤Þ¤¹¡£\n"
-#~ "¤³¤Î¥Ä¡¼¥ë¤ò»È¤¤¤¹¤®¤ë¤È¡¢°õºþ¤ÎÉʼÁ¤òÄã²¼¤µ¤»¥×¥ê¥ó¥¿¤Î¸Î¾ã¤Î¸¶°ø¤ò\n"
-#~ "°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¥Ä¡¼¥ë¤Ï SEIKO EPSON ¼Ò¤Ç¥Æ¥¹¥È¤·¤¿¤ï¤±¤Ç"
-#~ "¤Ï¤Ê¤¤¤Î¤Ç\n"
-#~ "¡¢Á´¤¯ÌµÊݾڤǤ¹¡£¤³¤Î¥Ä¡¼¥ë¤Î¤´»ÈÍѤˤϤ´¼«¿È¤ÎÀÕǤ²¼¤Ç¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
+#~ "��ツール� EPSON 製� Stylus インクジェット�プリンタ�\n"
+#~ "カラー�刷ヘッドを一列�並���れ��。\n"
+#~ "��ツールを使���る���刷��質を低下��プリンタ�故障�原因を\n"
+#~ "引�起���能性��り��。��ツール� SEIKO EPSON 社�テスト�����"
+#~ "�����\n"
+#~ "�全�無�証��。��ツール��使用���自身�責任下�行��下��。\n"
 #~ "\n"
-#~ "¤³¤Î¥Ä¡¼¥ë¤Ï°ìËç¤ÎÍÑ»æ¤Ë %d ¸Ä¤Î¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤ò½Å¤Í°õºþ¤·¤Þ¤¹¡£\n"
-#~ "¤Ä¤Þ¤ê¡¢°ì¥Ñ¥¿¡¼¥ó°õºþ¤¹¤ë¤ÈÇӻ椹¤ë¤Î¤Ç¡¢Æ±¤¸ÍÑ»æ¤òµë»æ¤·¤ÆºÆÅÙ°õºþ¤·¤Þ"
-#~ "¤¹¡£\n"
-#~ "³Æ¥Ú¥¢¡¦¥é¥¤¥ó¤Î²¼¤Ë¤Ï %d ¤È %d ¤Î´Ö¤ò¼¨¤¹ \"¥Ú¥¢ÈÖ¹æ\" ¤¬¤¢¤ê¤Þ¤¹¡£\n"
+#~ "��ツール�一枚�用紙� %d 個�テストパターンを���刷���。\n"
+#~ "��り�一パターン�刷�る�排紙�る�����用紙を給紙���度�刷��"
+#~ "�。\n"
+#~ "�ペア・ライン�下�� %d � %d �間を示� \"ペア番�\" ��り��。\n"
 #~ "\n"
-#~ "¥Ñ¥¿¡¼¥ó¤ò´Ñ»¡¤¹¤ë¾ì¹ç¤Ï¡¢°ì¤Ä¤Î¥Ñ¥Ã¥Á¤¬³ê¤é¤«¤Ê (\"γ»Ò\" ¤Ë¶á¤¤) ¥Æ¥¯¥¹"
-#~ "¥Á¥ã\n"
-#~ "¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£¤½¤ÎÃ椫¤éºÇŬ¤Ê¥Ñ¥Ã¥Á¤òÁªÂò¤¹¤ë¤¿¤á¤Ë\n"
-#~ "Ãí°Õ¿¼¤¯´Ñ»¡¤·¤Æ²¼¤µ¤¤¡£¥Õ¥©¥ÈÍѤιâÉʼÁ¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍѻ桢¤¢¤ë¤¤¤Ï\n"
-#~ "¤½¤ì¤Ë»÷¤¿¹âÉʼÁ¤ÎÍÑ»æ¤ò»È¤Ã¤Æ¥Æ¥¹¥È¤¹¤ë¤³¤È¤ò¤ª¾©¤á¤·¤Þ¤¹¡£\n"
-#~ "¤â¤·³ê¤é¤«¤Ê¥Ñ¥¿¡¼¥ó¤¬¤Ê¤¤¾ì¹ç¤Ï¡¢¤³¤Î¥Æ¥¹¥È¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
+#~ "パターンを観察�る場���一��パッ��滑ら�� (\"粒�\" �近�) テクス"
+#~ "�ャ\n"
+#~ "�����る��を確���下��。��中�ら最��パッ�を�択�る���\n"
+#~ "注�深�観察��下��。フォト用�高�質インクジェット用紙��る��\n"
+#~ "�れ�似�高�質�用紙を使��テスト�る��を�奨����。\n"
+#~ "も�滑ら��パターン���場�����テストを繰り返��下��。\n"
 #~ "\n"
-#~ "¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤Î´Ñ»¡¤¬´°Î»¤·¤¿¤é¥Ñ¥Ã¥Á¤òÀöÂõ¤·¡¢\n"
-#~ "¤½¤Î¥×¥ê¥ó¥¿ÍѤˤ½¤ÎÀßÄê¤òÊݸ (s) ¤¹¤ë¤«¡¢¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤òºÆ¤Ó¼Â¹Ô¤¹¤ë "
-#~ "(r) ¤«¡¢\n"
-#~ "Êݸ¤·¤Ê¤¤¤Ç½ªÎ» (q) ¤¹¤ë¤«ÁªÂò¤·¤Æ²¼¤µ¤¤¡£½ªÎ»¤·¤Æ¤â°ÊÁ°¤ÎÀßÄê¤ËÌá¤ê¤Þ¤»"
-#~ "¤ó¤¬¡¢\n"
-#~ "¥×¥ê¥ó¥¿¤ÎÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¸Â¤êÌ᤹¤³¤È¤Ï²Äǽ¤Ç¤¹¡£½ªÎ»¤·¤¿¾ì¹ç¤Ë¡¢\n"
-#~ "¤¢¤È¤Ç¤½¤ÎÀßÄê¤òÊݸ¤·¤¿¤¤¾ì¹ç¤Ï¡¢¤â¤¦°ìÅÙƱ¤¸¼ê½ç¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
-#~ "¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n"
+#~ "テストパターン�観察�完了��らパッ�を洗濯��\n"
+#~ "��プリンタ用���設定を�存 (s) �る��テストパターンを��実行�る "
+#~ "(r) ��\n"
+#~ "�存����終了 (q) �る��択��下��。終了��も以��設定�戻り��"
+#~ "ん��\n"
+#~ "プリンタ�電�を OFF �����り戻�����能��。終了��場���\n"
+#~ "�����設定を�存���場���も�一度��手順を行��下��。\n"
+#~ "��作業を行���る最中�電�を OFF �����下��。\n"
 #~ "\n"
-#~ "¡Ú·Ù¹ð¡Û: ¤³¤Îµ¡Ç½¤Ï¤Þ¤À¥Æ¥¹¥È¤·¤Æ¤¤¤Ê¤¤¤Î¤Ç¡¢ Æ°ºî¤·¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»"
-#~ "¤ó¡ª\n"
-#~ "          ¤Þ¤¿¡¢¥×¥ê¥ó¥¿¸Î¾ã¤Î¸¶°ø¤Ë¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡ª\n"
+#~ "�警告】: ��機能���テスト�������� 動作����も�れ��"
+#~ "ん�\n"
+#~ "          ���プリンタ故障�原因��る�も�れ��ん�\n"
 
 #~ msgid "Printer %s does not require color head alignment.\n"
-#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ï¥«¥é¡¼¡¦¥Ø¥Ã¥É´Ö³Ö¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£\n"
+#~ msgstr "プリンタ %s �カラー・ヘッド間隔�必��り��ん。\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "Please inspect the print, and choose the pattern in each set.\n"
 #~ "Type a pattern number, '?' for help, or 'r' to repeat the procedure.\n"
 #~ msgstr ""
-#~ "°õºþ·ë²Ì¤ò³Îǧ¤·¤Æ¡¢³Æ¥Ñ¥¿¡¼¥ó¤ÇºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n"
-#~ "¤½¤Î¥Ú¥¢¤ÎÈÖ¹æ¤òÆþÎϤ«¡¢'r' ¤Ç¤³¤ÎÀßÄê¤ò¤¯¤ê¤«¤¨¤¹¤«¡¢'?' ¤Ç¥Ø¥ë¥×¤òɽ¼¨¤·"
-#~ "¤Þ¤¹¡£\n"
+#~ "�刷�果を確�����パターン�最��ライン�ペアを�択��下��。\n"
+#~ "��ペア�番�を入力��'r' ���設定を�り�����'?' �ヘルプを表示�"
+#~ "��。\n"
 
 #, fuzzy
 #~ msgid "Model %d out of range.\n"
-#~ msgstr "Èϰϳ°¤Î¥Ú¥¢ÈÖ¹æ¤Ç¤¹¡ª\n"
+#~ msgstr "範囲外�ペア番����\n"
 
 #~ msgid "Right Border:"
-#~ msgstr "±¦Â¦¤Î±ï:"
+#~ msgstr "����:"
 
 #~ msgid "Bottom Border:"
-#~ msgstr "²¼Â¦¤Î±ï:"
+#~ msgstr "下���:"
 
 #~ msgid "Size"
-#~ msgstr "²èÁü¤Î¥µ¥¤¥º"
+#~ msgstr "画��サイズ"
 
 #~ msgid "Image / Output Settings"
-#~ msgstr "²èÁü / ½ÐÎÏÀßÄê"
+#~ msgstr "画� / 出力設定"
 
 #, fuzzy
 #~ msgid "GIMP-print"
-#~ msgstr "°õºþ"
+#~ msgstr "�刷"
 
 #, fuzzy
 #~ msgid "Resolutions"
-#~ msgstr "²òÁüÅÙ"
+#~ msgstr "解�度"
 
 #~ msgid "Media Type:"
-#~ msgstr "ÍÑ»æ¤Î¼ïÎà:"
+#~ msgstr "用紙�種類:"
 
 #~ msgid "Type of media you're printing to"
-#~ msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¼ïÎà¤Ç¤¹¡£"
+#~ msgstr "�刷�る用紙�種類��。"
 
 #~ msgid "Media Size:"
-#~ msgstr "Íѻ極¥¤¥º:"
+#~ msgstr "用紙サイズ:"
 
 #~ msgid "Size of paper that you wish to print to"
-#~ msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¥µ¥¤¥º¤Ç¤¹¡£"
+#~ msgstr "�刷�る用紙�サイズ��。"
 
 #~ msgid "Media Source:"
-#~ msgstr "µë»æÊýË¡:"
+#~ msgstr "給紙方法:"
 
 #~ msgid "Source (input slot) of media you're printing to"
-#~ msgstr "°õºþ»þ¤Îµë»æÊý¼°¤Ç¤¹¡£"
+#~ msgstr "�刷時�給紙方���。"
 
 #~ msgid "Ink Type:"
-#~ msgstr "¥¤¥ó¥¯¤Î¼ïÎà:"
+#~ msgstr "インク�種類:"
 
 #~ msgid "Resolution:"
-#~ msgstr "²òÁüÅÙ:"
+#~ msgstr "解�度:"
 
 #~ msgid "Print in black and white (no color, and no shades of gray)"
 #~ msgstr ""
-#~ "¹õ¿§¤ÈÇò¿§¤ò»È¤Ã¤Æ°õºþ¤·¤Þ¤¹ (¥«¥é¡¼¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£±Æ¤âÉÕ¤­¤Þ¤»¤ó)¡£"
+#~ "黒色�白色を使���刷��� (カラー���り��ん。影も付���ん)。"
 
 #~ msgid "Fastest and brightest color for text and line art"
-#~ msgstr "¥Æ¥­¥¹¥È¤ä¥é¥¤¥ó¥¢¡¼¥È¸þ¤±¤Ë°ìÈÖÌÀ¤ë¤¯¹â®°õºþ¤·¤Þ¤¹¡£"
+#~ msgstr "テキストやラインアート���一番明る�高速�刷���。"
 
 #~ msgid "Best for images dominated by regions of solid color"
-#~ msgstr "³Ê»Ò¾å¤Î¿§¤Ç¹½À®¤µ¤ì¤¿²èÁü¤òºÇŬ²½¤·¤Þ¤¹¡£"
+#~ msgstr "格�上�色�構��れ�画�を最�化���。"
 
 #~ msgid ""
 #~ "Slowest, but most accurate and smoothest color for continuous tone images "
 #~ "and photographs"
 #~ msgstr ""
-#~ "Ä㮤Ǥ¹¤¬¡¢Ï¢Â³¤·¤¿¥È¡¼¥ó²èÁü¤ä¼Ì¿¿¸þ¤±¤Ë¤â¤Ã¤È¤âÀºÌ©¤Ç³ê¤é¤«¤Ë¤·¤Þ¤¹¡£"
+#~ "低速����連続��トーン画�や写真���も��も精密�滑ら�����。"
 
 #~ msgid "Dither Algorithm:"
-#~ msgstr "¥Ç¥£¥¶¥ê¥ó¥°Êý¼°:"
+#~ msgstr "ディザリング方�:"
 
 #~ msgid ""
 #~ "\n"
 #~ "Cannot read from %s: %s\n"
 #~ msgstr ""
 #~ "\n"
-#~ "%s ¤«¤éÆɤ߹þ¤á¤Þ¤»¤ó: %s\n"
+#~ "%s �ら読�込���ん: %s\n"
 
 #~ msgid "%s out of range (value %f, min %f, max %f)\n"
-#~ msgstr "%s ¤ÎÈϰϤò±Û¤¨¤Þ¤·¤¿ (¸½ºß¤ÎÃÍ %f, ºÇ¾® %f, ºÇÂç %f)\n"
+#~ msgstr "%s �範囲を越���� (�在�値 %f, 最� %f, 最大 %f)\n"
 
 #~ msgid "%s is not a valid dither algorithm\n"
-#~ msgstr "%s ¤ÏŬÀڤʥǥ£¥¶Êý¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+#~ msgstr "%s ��切�ディザ方����り��ん\n"
 
 #~ msgid ""
 #~ "Please re-insert the same alignment sheet in the printer when it is\n"
 #~ "finished printing.\n"
 #~ msgstr ""
-#~ "°õºþ¤¬´°Î»¤·¤¿¤é¡¢\n"
-#~ "ºÆÅÙ¡¢¥×¥ê¥ó¥¿¤ËÁ°¤Ë»ÈÍѤ·¤¿´Ö³ÖÊäÀµÍÑ»æ¤òÁÞÆþ¤·¤Æ²¼¤µ¤¤¡£\n"
+#~ "�刷�完了��ら�\n"
+#~ "�度�プリンタ���使用��間隔補正用紙を挿入��下��。\n"
 
 #~ msgid ""
 #~ "Inspect the alignment sheet, and determine which pattern is the "
@@ -8611,34 +8954,34 @@ msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n"
 #~ "best pattern, and repeat the procedure.\n"
 #~ "Type a pattern number, or '?' for help.\n"
 #~ msgstr ""
-#~ "´Ö³ÖÊäÀµÍÑ»æ¤ò³Îǧ¤·¡¢¤É¤Î¥Ñ¥¿¡¼¥ó¤¬°ìÈ֤ʤá¤é¤«¤Ç¤¢¤ë¤«¤ò¥Á¥§¥Ã¥¯¤·¤Æ²¼¤µ"
-#~ "¤¤¡£\n"
-#~ "¤½¤Î¤è¤¦¤Ê¥Ñ¥¿¡¼¥ó¤Ë¤Ï°ìÈÖ¾®¤µ¤¤ \"grain\" ¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£\n"
-#~ "¤½¤Î¤è¤¦¤Ê¥Ñ¥¿¡¼¥ó¤ò³Îǧ¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢¤â¤Ã¤È¤âºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤ÎÈÖ¹æ¤òÁªÂò"
-#~ "¤·¡¢\n"
-#~ "¤³¤Î¼ê½ç¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
-#~ "¥Ñ¥¿¡¼¥ó¤ÎÈÖ¹æ¤òÆþÎϤ·¤Æ²¼¤µ¤¤ ('?' ¤Ç¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ¤¹)¡£\n"
+#~ "間隔補正用紙を確�����パターン�一番��ら���る�を�ェック��下�"
+#~ "�。\n"
+#~ "��よ��パターン��一番��� \"grain\" �表示�れ��。\n"
+#~ "��よ��パターンを確�����場���も��も最��パターン�番�を�択"
+#~ "��\n"
+#~ "��手順を繰り返��下��。\n"
+#~ "パターン�番�を入力��下�� ('?' �ヘルプを表示���)。\n"
 
 #~ msgid "The best pattern should be numbered between 1 and %d.\n"
-#~ msgstr "ºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤Ï 1 ¤È %d ¤Î´Ö¤ÎÈÖ¹æ¤Ë¤·¤Æ²¼¤µ¤¤¡£\n"
+#~ msgstr "最��パターン� 1 � %d �間�番����下��。\n"
 
 #~ msgid "Set the contrast of the print"
-#~ msgstr "°õºþ»þ¤Î¥³¥ó¥È¥é¥¹¥È¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
+#~ msgstr "�刷時�コントラストをセット���。"
 
 #~ msgid "Cyan:"
-#~ msgstr "¥·¥¢¥ó:"
+#~ msgstr "シアン:"
 
 #~ msgid "Magenta:"
-#~ msgstr "¥Þ¥¼¥ó¥¿:"
+#~ msgstr "マゼンタ:"
 
 #~ msgid "Yellow:"
-#~ msgstr "²«¿§:"
+#~ msgstr "黄色:"
 
 #~ msgid "Parameter %s out of range (value %f, min %f, max %f)\n"
-#~ msgstr "¥Ñ¥é¥á¡¼¥¿ %s ¤ÏÈϰϳ°¤Ç¤¹ (ÃÍ %f, ºÇ¾®ÃÍ %f, ºÇÂçÃÍ %f)\n"
+#~ msgstr "パラメータ %s �範囲外�� (値 %f, 最�値 %f, 最大値 %f)\n"
 
 #~ msgid "Parameter %s out of range (value %d, min %d, max %d)\n"
-#~ msgstr "¥Ñ¥é¥á¡¼¥¿ %s ¤ÏÈϰϳ°¤Ç¤¹ (ÃÍ %d, ºÇ¾®ÃÍ %d, ºÇÂçÃÍ %d)\n"
+#~ msgstr "パラメータ %s �範囲外�� (値 %d, 最�値 %d, 最大値 %d)\n"
 
 #~ msgid "Unknown option %s\n"
-#~ msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %s ¤Ç¤¹\n"
+#~ msgstr "�明�オプション %s ��\n"
diff --git a/po/nb.gmo b/po/nb.gmo
index 901d872..7a4ac10 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index 0dae2d7..0bd74c0 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,18 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\n"
 "PO-Revision-Date: 2002-07-01 19:36+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian/Bokmaal <no@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 #, fuzzy
 msgid "Default"
 msgstr "Sett til standardverdier"
@@ -79,18 +79,18 @@ msgstr ""
 msgid "Density"
 msgstr "Tetthet:"
 
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -138,498 +138,311 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Dither-algoritme"
 
-#: src/main/print-canon.c:1382
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
-msgid "90x90 DPI"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1382
-#, fuzzy
-msgid "90x90 DPI DMT"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI DMT"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI DMT"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI"
-msgstr "2400x600 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI DMT"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI"
-msgstr "1200 DPI"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI DMT"
-msgstr "1200 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI DMT"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI DMT"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI"
-msgstr "1200 DPI"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI DMT"
-msgstr "1200 DPI"
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1390
-#, fuzzy
-msgid "150x150 DPI DMT"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1391
-#, fuzzy
-msgid "300x300 DPI DMT"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1392
-#, fuzzy
-msgid "600x300 DPI DMT"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1393
-#, fuzzy
-msgid "600x600 DPI DMT"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1394
-#, fuzzy
-msgid "1200x600 DPI DMT"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1395
-#, fuzzy
-msgid "1200x1200 DPI"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1395
-#, fuzzy
-msgid "1200x1200 DPI DMT"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1396
+msgid "Page Size"
+msgstr "Størrelse"
+
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
 #, fuzzy
-msgid "2400x2400 DPI"
-msgstr "2400x600 DPI"
+msgid "Basic Printer Setup"
+msgstr "Innstillinger for parametere"
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 #, fuzzy
-msgid "2400x2400 DPI DMT"
-msgstr "2400x600 DPI"
+msgid "Size of the paper being printed to"
+msgstr "Bredde på papiret du skal skrive ut på"
 
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-msgid "Plain Paper"
-msgstr "Vanlig papir"
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
+msgid "Media Type"
+msgstr "Medietype"
 
-#: src/main/print-canon.c:1448
-#, fuzzy
-msgid "Plain Paper PIXMA"
-msgstr "Vanlig papir"
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
+msgid "Type of media (plain paper, photo paper, etc.)"
+msgstr ""
 
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-msgid "Transparencies"
-msgstr "Gjennomsiktighet"
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
+msgid "Media Source"
+msgstr "Mediekilde"
 
-#: src/main/print-canon.c:1450
-msgid "Back Print Film"
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
+msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:1451
-msgid "Fabric Sheets"
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:1452
-msgid "Envelope"
-msgstr "Konvolutt"
-
-#: src/main/print-canon.c:1453
-msgid "High Resolution Paper"
-msgstr "Høyoppløsningspapir"
-
-#: src/main/print-canon.c:1454
-msgid "T-Shirt Transfers"
-msgstr "Overføring til T-skjorte"
-
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
-msgstr "Glanset fotopapir"
-
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
-msgstr "Glansete fotokort"
-
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
-msgstr "Profesjonelt fotopapir"
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
+msgstr ""
 
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
-msgstr "Annet"
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
 
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
-#, fuzzy
-msgid "Page Size"
-msgstr "Størrelse"
-
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
-#, fuzzy
-msgid "Basic Printer Setup"
-msgstr "Innstillinger for parametere"
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+msgid "CD Hub Size (Custom)"
+msgstr ""
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
 #, fuzzy
-msgid "Size of the paper being printed to"
-msgstr "Bredde på papiret du skal skrive ut på"
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "Skaler utskriften til størrelsen på papiret"
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
-msgid "Media Type"
-msgstr "Medietype"
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
+msgstr ""
 
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
-msgid "Type of media (plain paper, photo paper, etc.)"
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
-msgid "Media Source"
-msgstr "Mediekilde"
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr ""
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
-msgid "Source (input slot) of the media"
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
-msgstr "Oppløsning"
+msgstr "Oppløsning"
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
-msgstr "Oppløsning og kvalitet på utskriften"
+msgstr "Oppløsning og kvalitet på utskriften"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Blekktype"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr ""
-
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type blekk i skriveren"
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Raskt heltall"
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Vanlig papir"
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 msgid "Adjust the black density"
 msgstr ""
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Lys magenta"
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
-msgid "Short Edge (Flip)"
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-msgid "Auto Sheet Feeder"
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-msgid "Manual with Pause"
-msgstr "Manuell med pause"
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
+msgstr ""
 
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
-msgstr "Manuell uten pause"
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
+msgstr ""
 
-#: src/main/print-canon.c:1923
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
 #, fuzzy
-msgid "Cassette"
-msgstr "Matt papir"
+msgid "CD - Custom"
+msgstr "Egendefinert"
 
-#: src/main/print-canon.c:1924
-msgid "CD tray"
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:2049
-msgid "Photo CcMmYK Color"
-msgstr "Foto CcMmYK-farge"
-
-#: src/main/print-canon.c:2052
-msgid "Photo CcMmY Color"
-msgstr "Foto CcMmY-farge"
-
-#: src/main/print-canon.c:2055
-msgid "CMYK Color"
-msgstr "CMYK-farge"
-
-#: src/main/print-canon.c:2058
-msgid "CMY Color"
-msgstr "CMY-farge"
-
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
-msgstr "Sort"
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#, fuzzy
+msgid "Print To Hub"
+msgstr "Skriv ut til fil?"
 
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
 msgstr "Farger"
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
@@ -669,11 +482,11 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Skriv ut"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
-msgstr "Gråtoner"
+msgstr "Gråtoner"
 
 #: src/main/print-color.c:123
 #, fuzzy
@@ -701,11 +514,6 @@ msgstr ""
 msgid "Channel "
 msgstr "Avbryt"
 
-#: src/main/print-color.c:165
-#, fuzzy
-msgid " Gamma"
-msgstr "Gamma:"
-
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
 #: src/main/print-color.c:266 src/main/print-color.c:274
@@ -763,7 +571,7 @@ msgid "Output image type"
 msgstr "Utskriftstype:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
 msgstr ""
 
@@ -784,7 +592,7 @@ msgstr "Lysstyrke:"
 #: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
-msgstr "Sett høyde for utskriften"
+msgstr "Sett høyde for utskriften"
 
 #: src/main/print-color.c:232
 #, fuzzy
@@ -827,13 +635,13 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
@@ -843,13 +651,13 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr ""
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 msgid "Magenta"
@@ -859,13 +667,13 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr ""
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
@@ -875,9 +683,9 @@ msgstr "Gul"
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
 msgstr ""
@@ -886,8 +694,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr ""
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
 msgstr ""
 
@@ -895,9 +703,9 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
 msgstr ""
@@ -906,11 +714,23 @@ msgstr ""
 msgid "Adjust the blue gamma"
 msgstr ""
 
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr "Sort"
+
 #: src/main/print-color.c:315
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
 msgstr ""
 
@@ -918,13 +738,13 @@ msgstr ""
 #: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
-msgstr "Gråtoner"
+msgstr "Gråtoner"
 
 #: src/main/print-color.c:323
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -933,7 +753,7 @@ msgstr "Magenta"
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Gul"
@@ -960,9 +780,9 @@ msgstr "Blekktype"
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Utskriftstype:"
@@ -995,11 +815,6 @@ msgstr ""
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:446
-#, fuzzy
-msgid " Curve"
-msgstr "Sort"
-
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
@@ -1130,573 +945,377 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:516 src/main/printers.c:521
+#: src/main/printers.c:519 src/main/printers.c:524
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "%s er ikke en gyldig dither-algoritme\n"
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:673
+#: src/main/printers.c:676
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Ukjent skriver %s\n"
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
-msgstr "%s utenfor området (verdi %d, min %d, maks %d)\n"
+msgstr "%s utenfor området (verdi %d, min %d, maks %d)\n"
 
-#: src/main/printers.c:755
+#: src/main/printers.c:761
 #, fuzzy
 msgid "Page size is not valid\n"
-msgstr "Bildestørrelsen er ikke gyldig\n"
+msgstr "Bildestørrelsen er ikke gyldig\n"
 
-#: src/main/printers.c:776
+#: src/main/printers.c:782
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
-msgstr "Toppmargen må ikke være mindre enn null\n"
+msgstr "Toppmargen må ikke være mindre enn null\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:788
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
-msgstr "Venstre marg må ikke være mindre enn null\n"
+msgstr "Venstre marg må ikke være mindre enn null\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:794
 #, fuzzy
 msgid "Height must be greater than zero\n"
-msgstr "Venstre marg må ikke være mindre enn null\n"
+msgstr "Venstre marg må ikke være mindre enn null\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:800
 #, fuzzy
 msgid "Width must be greater than zero\n"
-msgstr "Toppmargen må ikke være mindre enn null\n"
+msgstr "Toppmargen må ikke være mindre enn null\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-msgid "Roll Feed"
-msgstr ""
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-#, fuzzy
-msgid "Manual Feed"
-msgstr "Manuell"
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-#, fuzzy
-msgid "Print to CD"
-msgstr "Skriv ut til fil?"
-
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-#, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Manuell"
-
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-#, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Manuell"
-
-#: src/main/print-escp2-data.c:554
-#, fuzzy
-msgid "Rear Tray"
-msgstr "Skuff"
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr ""
-
-#: src/main/print-escp2-data.c:581
-#, fuzzy
-msgid "Photo Board"
-msgstr "Fotopapir"
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr ""
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr ""
-
-#: src/main/print-escp2-data.c:638
-#, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "Autovelg"
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr ""
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr ""
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-#, fuzzy
-msgid "High"
-msgstr "Høyde:"
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-#, fuzzy
-msgid "Photo"
-msgstr "Fotografi"
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-#, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
-
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-#, fuzzy
-msgid "Ultra Photo"
-msgstr "Stylus Photo"
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-#, fuzzy
-msgid "Light Cyan"
-msgstr "Lys cyan"
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-#, fuzzy
-msgid "Light Magenta"
-msgstr "Lys magenta"
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-#, fuzzy
-msgid "Light Black"
-msgstr "Sort"
-
-#: src/main/print-escp2-data.c:811
-#, fuzzy
-msgid "Dark Yellow"
-msgstr "Gul"
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-#, fuzzy
-msgid "Matte Black"
-msgstr "Matt papir"
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-#, fuzzy
-msgid "Photo Black"
-msgstr "Fotopapir"
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-#, fuzzy
-msgid "Gloss Optimizer"
-msgstr "Glanset film"
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-#, fuzzy
-msgid "Light Light Black"
-msgstr "Sort"
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr ""
 
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr ""
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr ""
-
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr ""
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:214
+#: src/main/print-escp2.c:228
 #, fuzzy
 msgid "Resolution of the print"
-msgstr "Oppløsning og kvalitet på utskriften"
+msgstr "Oppløsning og kvalitet på utskriften"
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:236
+#: src/main/print-escp2.c:250
 #, fuzzy
 msgid "Ink Set"
 msgstr "Blekktype"
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 #, fuzzy
 msgid "Output Order"
 msgstr "Utskriftstype:"
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 #, fuzzy
 msgid "Ink change command"
 msgstr "Kommandoen ble ikke gjenkjent.\n"
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Gjentar justeringsprosessen.\n"
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 #, fuzzy
 msgid "Channel Names"
 msgstr "Avbryt"
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:346
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Cyan"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:347
 msgid "Adjust the cyan map"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:352
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:353
 msgid "Adjust the magenta map"
 msgstr ""
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:358
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Gul"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:359
 msgid "Adjust the yellow map"
 msgstr ""
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:364
 #, fuzzy
 msgid "Blue Map"
 msgstr "Sort-hvitt"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:365
 msgid "Adjust the blue map"
 msgstr ""
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:371
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:447
+#: src/main/print-escp2.c:464
 #, fuzzy
 msgid "Red Density"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:448
+#: src/main/print-escp2.c:465
 msgid "Adjust the red density"
 msgstr ""
 
-#: src/main/print-escp2.c:455
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Blue Density"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:456
+#: src/main/print-escp2.c:473
 msgid "Adjust the blue density"
 msgstr ""
 
-#: src/main/print-escp2.c:463
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Glanset film"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:481
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:527
+#: src/main/print-escp2.c:544
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:528
+#: src/main/print-escp2.c:545
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr ""
-
-#: src/main/print-escp2.c:1564
-#, fuzzy
-msgid "Print To Hub"
-msgstr "Skriv ut til fil?"
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr "Standard"
+
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 #, fuzzy
 msgid "Automatic"
-msgstr "Størrelse"
+msgstr "Størrelse"
 
-#: src/main/print-escp2.c:1701
+#: src/main/print-escp2.c:1829
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1703
+#: src/main/print-escp2.c:1831
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2168
+#: src/main/print-escp2.c:2313
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
-msgstr "Skriver støtter ikke fargeutskrift\n"
+msgstr "Skriver støtter ikke fargeutskrift\n"
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1750,251 +1369,304 @@ msgid "test print"
 msgstr "testutskrift"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+msgid "Plain Paper"
+msgstr "Vanlig papir"
+
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
 msgstr "Glanset film"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+msgid "Transparencies"
+msgstr "Gjennomsiktighet"
+
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 msgid "Envelopes"
 msgstr "Konvolutter"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 msgid "Matte Paper"
 msgstr "Matt papir"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
 msgstr "Papir for blekkskriver"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papir med fotokvalitet for blekkskriver"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 msgid "Photo Paper"
 msgstr "Fotopapir"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-olympus.c:265
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr "Annet"
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr ""
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr "Manuell med pause"
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr "Manuell uten pause"
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 #, fuzzy
 msgid "Glossy"
 msgstr "Glanset film"
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:861
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 #, fuzzy
 msgid "Matte"
 msgstr "Matt papir"
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1331
+#: src/main/print-olympus.c:1627
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1339
+#: src/main/print-olympus.c:1635
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1347
+#: src/main/print-olympus.c:1643
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1354
+#: src/main/print-olympus.c:1650
 #, fuzzy
 msgid "Black Balance"
 msgstr "Sort-hvitt"
 
-#: src/main/print-olympus.c:1355
+#: src/main/print-olympus.c:1651
 msgid "Adjust the black balance"
 msgstr ""
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 msgid "Plain"
 msgstr "Skriv ut"
 
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 msgid "Bond"
 msgstr ""
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 msgid "Premium"
 msgstr ""
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 msgid "Transparency"
 msgstr "Gjennomsiktighet"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
 msgstr "Manuell"
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 msgid "Tray 1"
 msgstr "Skuff 1"
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 msgid "Tray 2"
 msgstr "Skuff 2"
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 msgid "Tray 3"
 msgstr "Skuff 3"
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 msgid "Tray 4"
 msgstr "Skuff 4"
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
 msgstr "Portabel arkmater"
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 msgid "Desktop Sheet Feeder"
 msgstr ""
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 msgid "Tray"
 msgstr "Skuff"
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 msgid "Optional Source"
 msgstr "Alternativ kilde"
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 msgid "Autoselect"
 msgstr "Autovelg"
 
 #: src/main/print-pcl.c:256
+msgid "150x150 DPI"
+msgstr "150x150 DPI"
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr "300x300 DPI"
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
+msgstr "600x300 DPI"
+
+#: src/main/print-pcl.c:259
 msgid "600x600 DPI monochrome"
 msgstr "600x600 DPI monokrom"
 
-#: src/main/print-pcl.c:259
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr "600x600 DPI"
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr "1200x600 DPI"
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr ""
-
 #: src/main/print-ps.c:97
 #, fuzzy
 msgid "PPDFile"
 msgstr "PPD fil:"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD/Fil?"
@@ -2003,187 +1675,305 @@ msgstr "PPD/Fil?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 #, fuzzy
 msgid "Two Level Grayscale"
-msgstr "Gråtoner"
+msgstr "Gråtoner"
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 #, fuzzy
 msgid "Three Level Grayscale"
-msgstr "Gråtoner"
+msgstr "Gråtoner"
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 #, fuzzy
 msgid "Seven Color Enhanced"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1535
+#: src/main/escp2-channels.c:1649
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1695
+#: src/main/escp2-channels.c:1809
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1762
+#: src/main/escp2-channels.c:1876
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:1884
+#: src/main/escp2-channels.c:2017
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:1962
+#: src/main/escp2-channels.c:2109
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:2024
+#: src/main/escp2-channels.c:2187
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:2042
+#: src/main/escp2-channels.c:2205
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#, fuzzy
+msgid "Photo Black"
+msgstr "Fotopapir"
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+#, fuzzy
+msgid "Matte Black"
+msgstr "Matt papir"
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+#, fuzzy
+msgid "Light Cyan"
+msgstr "Lys cyan"
+
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+#, fuzzy
+msgid "Light Magenta"
+msgstr "Lys magenta"
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+#, fuzzy
+msgid "Light Black"
+msgstr "Sort"
+
+#: src/main/escp2-channels.c:2981
+#, fuzzy
+msgid "Dark Yellow"
+msgstr "Gul"
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#, fuzzy
+msgid "Gloss Optimizer"
+msgstr "Glanset film"
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Sort"
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 #, fuzzy
 msgid "Plain Paper Fast Load"
 msgstr "Vanlig papir"
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postkort"
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Matt papir"
 
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Glanset fotopapir"
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Vanlig papir"
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matt papir"
 
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+msgid "Roll Feed"
+msgstr ""
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#, fuzzy
+msgid "Manual Feed"
+msgstr "Manuell"
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+#, fuzzy
+msgid "Print to CD"
+msgstr "Skriv ut til fil?"
+
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Manuell"
+
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Manuell"
+
+#: src/main/escp2-papers.c:1859
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Skuff"
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/escp2-papers.c:1886
+#, fuzzy
+msgid "Photo Board"
+msgstr "Fotopapir"
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr ""
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr ""
+
+#: src/main/escp2-papers.c:1943
+#, fuzzy
+msgid "Cut Sheet Autoselect"
+msgstr "Autovelg"
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr ""
+
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
@@ -2222,140 +2012,164 @@ msgstr "600 DPI"
 msgid "720 x 360 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "2400x600 DPI"
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:94
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 msgid "720 DPI High Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:97
+#: src/main/escp2-resolutions.c:103
 msgid "720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:100
+#: src/main/escp2-resolutions.c:106
 #, fuzzy
 msgid "720 x 720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:116
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:129
+#: src/main/escp2-resolutions.c:135
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
-#, fuzzy
-msgid "1440 x 1440 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/escp2-resolutions.c:142
-#, fuzzy
-msgid "1440 x 1440"
-msgstr "150x150 DPI"
-
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
 #: src/main/escp2-resolutions.c:145
 #, fuzzy
-msgid "1440 x 1440 DPI High Quality"
-msgstr "150x150 DPI"
-
-#: src/main/escp2-resolutions.c:148
-#, fuzzy
-msgid "1440 x 1440 DPI Highest Quality"
+msgid "1440 x 1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:158
+#: src/main/escp2-resolutions.c:155
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:164
-#, fuzzy
-msgid "2880 x 1440 DPI High Quality"
-msgstr "150x150 DPI"
-
-#: src/main/escp2-resolutions.c:167
-#, fuzzy
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr "150x150 DPI"
-
-#: src/main/escp2-resolutions.c:171
+#: src/main/escp2-resolutions.c:162
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 #, fuzzy
 msgid "Interleave"
 msgstr "Skrivernavn:"
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Skrivernavn:"
 
-#: src/main/escp2-resolutions.c:584
+#: src/main/escp2-resolutions.c:594
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Lysstyrke:"
 
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+#, fuzzy
+msgid "High"
+msgstr "Høyde:"
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografi"
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+#, fuzzy
+msgid "Super Photo"
+msgstr "Stylus Photo"
+
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+#, fuzzy
+msgid "Ultra Photo"
+msgstr "Stylus Photo"
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr ""
+
 #: src/main/generic-options.c:46
 msgid "Text"
 msgstr ""
@@ -2375,12 +2189,12 @@ msgstr "Fotografi"
 
 #: src/main/generic-options.c:50
 msgid "Line Art"
-msgstr "Lineær"
+msgstr "Lineær"
 
 #: src/main/generic-options.c:55
 #, fuzzy
 msgid "Page"
-msgstr "Størrelse"
+msgstr "Størrelse"
 
 #: src/main/generic-options.c:56
 msgid "Job"
@@ -2407,12 +2221,12 @@ msgstr ""
 #: src/main/generic-options.c:80
 #, fuzzy
 msgid "Page Number"
-msgstr "Størrelse"
+msgstr "Størrelse"
 
 #: src/main/generic-options.c:81
 #, fuzzy
 msgid "Page number"
-msgstr "Størrelse"
+msgstr "Størrelse"
 
 #: src/main/xmli18n-tmp.h:1
 msgid "Letter"
@@ -2430,3858 +2244,4182 @@ msgstr "Tabloid"
 msgid "Executive"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/main/xmli18n-tmp.h:11
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Fotopapir"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/main/xmli18n-tmp.h:26
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/main/xmli18n-tmp.h:32
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
 msgstr "A4"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/main/xmli18n-tmp.h:67
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 msgid "ArchA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 msgid "ArchB"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 msgid "ArchC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 msgid "ArchD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 msgid "ArchE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 msgid "American foolscap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 msgid "European foolscap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:108
+#: src/main/xmli18n-tmp.h:109
 #, fuzzy
 msgid "ISO A4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 msgid "Small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 msgid "A2 Invitation"
 msgstr "A2 invitasjon"
 
-#: src/main/xmli18n-tmp.h:125
+#: src/main/xmli18n-tmp.h:126
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Konvolutt"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:127
+#: src/main/xmli18n-tmp.h:128
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:130
+#: src/main/xmli18n-tmp.h:131
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Postkort"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:144
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:145
+#: src/main/xmli18n-tmp.h:146
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:146
+#: src/main/xmli18n-tmp.h:147
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:147
+#: src/main/xmli18n-tmp.h:148
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/main/xmli18n-tmp.h:149
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:149
+#: src/main/xmli18n-tmp.h:150
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/main/xmli18n-tmp.h:151
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/main/xmli18n-tmp.h:152
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:152
+#: src/main/xmli18n-tmp.h:153
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/main/xmli18n-tmp.h:154
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/main/xmli18n-tmp.h:155
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
+#: src/main/xmli18n-tmp.h:156
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:156
+#: src/main/xmli18n-tmp.h:157
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:157
+#: src/main/xmli18n-tmp.h:158
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:158
+#: src/main/xmli18n-tmp.h:159
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:159
+#: src/main/xmli18n-tmp.h:160
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:160
+#: src/main/xmli18n-tmp.h:161
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:161
+#: src/main/xmli18n-tmp.h:162
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:162
+#: src/main/xmli18n-tmp.h:163
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:163
+#: src/main/xmli18n-tmp.h:164
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:164
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:173
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
-msgid "Canon iP4000"
+#: src/main/xmli18n-tmp.h:181
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:182
+msgid "Canon PIXMA iP3000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:183
+msgid "Canon PIXMA iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:184
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:185
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:186
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:187
+#, fuzzy
+msgid "Canon PIXMA iP4300"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:188
+#, fuzzy
+msgid "Canon PIXMA iP5000"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
+#, fuzzy
+msgid "Canon PIXMA iP6700"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA MP150"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:192
+#, fuzzy
+msgid "Canon PIXMA MP500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:193
+#, fuzzy
+msgid "Canon PIXMA MP700"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA MP730"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:195
+#, fuzzy
+msgid "Canon PIXMA MP750"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA MP760"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA MP770"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA MP780"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
+#, fuzzy
+msgid "Canon PIXMA MP790"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP830"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:201
+msgid "Canon PIXUS iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:202
+msgid "Canon PIXUS iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:203
+msgid "Canon i560"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:204
+msgid "Canon i850"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:205
+msgid "Canon i860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:206
+msgid "Canon i865"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:238
+#, fuzzy
+msgid "Epson Stylus C79"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:245
+#, fuzzy
+msgid "Epson Stylus C87"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 770"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "Epson Stylus Photo 1400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "Epson Stylus Photo 1410"
+msgstr "Stylus Photo 810"
+
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:314
+#, fuzzy
+msgid "Epson Stylus Photo R230"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:315
+#, fuzzy
+msgid "Epson Stylus Photo R240"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "Epson Stylus Photo R245"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:317
+#, fuzzy
+msgid "Epson Stylus Photo R260"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Epson Stylus Photo R265"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "Epson Stylus Photo R270"
+msgstr "Stylus Photo 1270"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "Epson Stylus Photo R350"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "Epson Stylus Photo R360"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "Epson Stylus Photo R380"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "Epson Stylus Photo R390"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Epson Stylus Photo RX560"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:335
+#, fuzzy
+msgid "Epson Stylus Photo RX580"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:336
+#, fuzzy
+msgid "Epson Stylus Photo RX590"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:340
+#, fuzzy
+msgid "Epson Stylus Photo RX640"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:353
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:372
+#, fuzzy
+msgid "Epson Stylus CX5000"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:373
+#, fuzzy
+msgid "Epson Stylus CX5000F"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:380
+#, fuzzy
+msgid "Epson Stylus CX6000"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX7000F"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:397
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:399
+msgid "Epson PictureMate Flash"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:400
+msgid "Epson PictureMate Pal"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:401
+msgid "Epson PictureMate Snap"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:402
+#, fuzzy
+msgid "Epson PictureMate 200"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:403
+#, fuzzy
+msgid "Epson PictureMate 210"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:404
+#, fuzzy
+msgid "Epson PictureMate 240"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:405
+#, fuzzy
+msgid "Epson PictureMate 250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson PictureMate 280"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:411
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:414
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:417
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:426
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:427
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:428
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:429
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:430
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:448
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:451
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:454
+#, fuzzy
+msgid "Epson PM A820"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:456
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:459
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:460
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:462
+#, fuzzy
+msgid "Epson PM D870"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:463
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:464
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:465
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:467
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:468
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
+#, fuzzy
+msgid "Epson PM G850"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:470
+#, fuzzy
+msgid "Epson PM G4500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:471
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:472
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:473
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:474
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:475
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:478
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:549
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:550
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:551
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:552
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definer ny skriver"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:802
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Skrivernavn:"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+msgid "Lexmark Optra E220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:913
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Sett opp skriver"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:924
+msgid "Xerox WorkCentre M118"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:926
+msgid "Lexmark X73"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+msgid "Olympus P-S100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:942
+msgid "Canon CP-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:943
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:953
+msgid "Sony DPP-EX5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:957
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:960
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Inch"
 msgstr "Tomme"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
-msgstr "Sett basis måleenhet til tommer"
+msgstr "Sett basis måleenhet til tommer"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
-msgstr "Sett basis måleenhet til centimeter"
+msgstr "Sett basis måleenhet til centimeter"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Points"
 msgstr "Skriv ut"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Sett basis måleenhet til tommer"
+msgstr "Sett basis måleenhet til tommer"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
-msgstr "Sett basis måleenhet til centimeter"
+msgstr "Sett basis måleenhet til centimeter"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Sett basis måleenhet til tommer"
+msgstr "Sett basis måleenhet til tommer"
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color output"
 msgstr "Fargeutskrift"
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
 msgstr ""
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 #, fuzzy
 msgid "Standard Command"
 msgstr "Standard"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Custom Command"
 msgstr "Kommando:"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
 msgstr "Fil"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Print to a file"
 msgstr "Skriv ut til fil?"
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 #, fuzzy
 msgid "Set Default"
 msgstr "Sett til standardverdier"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Skriv ut v%s"
 
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
 msgstr "Om"
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6289,7 +6427,7 @@ msgstr ""
 "Skriv ut og\n"
 "lagre innstillinger"
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 msgid ""
 "Save\n"
 "Settings"
@@ -6297,15 +6435,15 @@ msgstr ""
 "Lagre\n"
 "innstillinger"
 
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
-msgstr "Forhåndsvisning"
+msgstr "Forhåndsvisning"
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6319,459 +6457,436 @@ msgid ""
 "to its original position."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 #, fuzzy
 msgid "Paper Size"
-msgstr "Størrelse"
+msgstr "Størrelse"
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
-msgstr "Størrelse:"
+msgstr "Størrelse:"
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
 msgstr "Bredde:"
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 msgid "Width of the paper that you wish to print to"
-msgstr "Bredde på papiret du skal skrive ut på"
+msgstr "Bredde på papiret du skal skrive ut på"
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
-msgstr "Høyde:"
+msgstr "Høyde:"
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 msgid "Height of the paper that you wish to print to"
-msgstr "Høyde på papiret du skal skrive ut på"
+msgstr "Høyde på papiret du skal skrive ut på"
 
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 #, fuzzy
 msgid "Automatic Paper Size"
-msgstr "Størrelse"
+msgstr "Størrelse"
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 #, fuzzy
 msgid "Image Position"
 msgstr "Posisjon"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
 msgstr "Portrett"
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
 msgstr "Landskap"
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 msgid "Upside down"
 msgstr "Opp-ned"
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
 msgstr "Landskap"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 msgid "Orientation:"
 msgstr "Orientering:"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
 msgstr "Venstre:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
 msgstr "Avstand fra venstre kant av arket til bildet"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
-msgstr "Høyre:"
+msgstr "Høyre:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 msgid "Distance from the left of the paper to the right of the image"
-msgstr "Avstand fra venstre kant av arket til høyre kant av bildet"
+msgstr "Avstand fra venstre kant av arket til høyre kant av bildet"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
-msgstr "Avstand fra høyre kant av arket til bildet"
+msgstr "Avstand fra høyre kant av arket til bildet"
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
-msgstr "Øverst:"
+msgstr "Øverst:"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
 msgstr "Avstand fra toppen av arket til bildet"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
 msgstr "Nederst:"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Avstand fra toppen av arket til nedre kant av bildet"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Avstand fra nedre kant av arket til bildet"
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Center:"
 msgstr "Sentrer:"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horisontalt"
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
-msgstr "Sentrer bildet horisontalt på arket"
+msgstr "Sentrer bildet horisontalt på arket"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
 msgstr "Begge"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image on the paper"
-msgstr "Sentrer bildet på arket"
+msgstr "Sentrer bildet på arket"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 #, fuzzy
 msgid "Vertical"
 msgstr "Vertikalt"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Center the image vertically on the paper"
-msgstr "Sentrer bildet vertikalt på arket"
+msgstr "Sentrer bildet vertikalt på arket"
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
 msgstr "Sett opp skriver"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Skrivernavn:"
 
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Velg din skrivermodell"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 msgid "Printer Model:"
 msgstr "Raskt heltall"
 
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 msgid "Select your printer model"
 msgstr "Velg din skrivermodell"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 msgid "PPD File:"
 msgstr "PPD fil:"
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Skriv inn korrekt PPD-filnavn for din skriver"
 
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
 msgstr "Bla gjennom"
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Velg korrekt PPD-filnavn for din skriver"
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Skrivernavn:"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Skriv inn korrekt PPD-filnavn for din skriver"
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 #, fuzzy
 msgid "File to print to"
 msgstr "testutskrift"
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 #, fuzzy
 msgid "Print To File"
 msgstr "Skriv ut til fil?"
 
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 msgid "Define New Printer"
 msgstr "Definer ny skriver"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 msgid "Printer Name:"
 msgstr "Skrivernavn:"
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 msgid "Enter the name you wish to give this logical printer"
-msgstr "Skriv inn navnet du ønsker å gi til denne logiske skriveren"
+msgstr "Skriv inn navnet du ønsker å gi til denne logiske skriveren"
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Om Gimp-Print"
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Gimp-Print versjon "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
-
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 msgid "Printer Settings"
 msgstr "Innstillinger for parametere"
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 msgid "Setup Printer..."
 msgstr "Sett opp skriver..."
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 msgid "New Printer..."
 msgstr "Ny skriver..."
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 #, fuzzy
 msgid "Image Size"
-msgstr "Størrelse"
+msgstr "Størrelse"
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 msgid "Scaling:"
 msgstr "Skalering"
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 msgid "Set the scale (size) of the image"
-msgstr "Sett skalering (størrelse) på bildet"
+msgstr "Sett skalering (størrelse) på bildet"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
 msgstr "Prosent"
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 msgid "Scale the print to the size of the page"
-msgstr "Skaler utskriften til størrelsen på papiret"
+msgstr "Skaler utskriften til størrelsen på papiret"
 
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
 msgstr "Skaler utskriften til antall punkter per tomme"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 msgid "Set the width of the print"
-msgstr "Sett bredde på utskriften"
+msgstr "Sett bredde på utskriften"
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 msgid "Set the height of the print"
-msgstr "Sett høyde for utskriften"
+msgstr "Sett høyde for utskriften"
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
 "Bruk opprinnelig\n"
-"bildestørrelse"
+"bildestørrelse"
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the print size to the size of the image"
-msgstr "Sett størrelsen på utskriften til størrelsen på bildet"
+msgstr "Sett størrelsen på utskriften til størrelsen på bildet"
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 msgid "Print Color Adjust"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 msgid "Set Defaults"
 msgstr "Sett til standardverdier"
 
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
 msgstr "Lukk"
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 msgid "Image preview"
-msgstr "Forhåndsvisning av bilde"
+msgstr "Forhåndsvisning av bilde"
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 #, fuzzy
 msgid "Output"
 msgstr "Utskriftstype:"
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 msgid "Output Type:"
 msgstr "Utskriftstype:"
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 msgid "Select the desired output type"
-msgstr "Velg ønsket type for utdata"
+msgstr "Velg ønsket type for utdata"
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
 msgstr "Juster utskrift..."
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 #, fuzzy
 msgid "Size Units:"
 msgstr "Enheter:"
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 #, fuzzy
 msgid " "
 msgstr ">"
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 msgid "Units:"
 msgstr "Enheter:"
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 msgid "Select the base unit of measurement for printing"
-msgstr "Velg basis måleenhet for utskrift"
+msgstr "Velg basis måleenhet for utskrift"
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
 msgstr ""
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
 msgstr ""
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
 msgstr ""
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 #, fuzzy
 msgid "Printer"
 msgstr "Skriv ut"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Sett opp skriver"
@@ -6821,66 +6936,90 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:133
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Printer Features"
 msgstr "Innstillinger for parametere"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 #, fuzzy
 msgid "Output Control"
 msgstr "Utskriftstype:"
 
-#: src/cups/genppd.c:139
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Common"
 msgstr "Kommando:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:153
 #, fuzzy
 msgid "Extra 1"
 msgstr "Skuff 1"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Extra 2"
 msgstr "Skuff 2"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Extra 3"
 msgstr "Skuff 3"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:156
 #, fuzzy
 msgid "Extra 4"
 msgstr "Skuff 4"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr "Norwegian"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1465
+#: src/cups/genppd.c:1613
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1717
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1719
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1497
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1756
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -6888,14 +7027,6 @@ msgstr ""
 msgid "Escputil version "
 msgstr ""
 
-#: src/escputil/escputil.c:71
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-
 #: src/escputil/escputil.c:76
 msgid ""
 "Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
@@ -7008,12 +7139,12 @@ msgstr ""
 #: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
-msgstr "Du kan kun spesifisere én skriver eller rå enhet."
+msgstr "Du kan kun spesifisere én skriver eller rå enhet."
 
 #: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
-msgstr "Du kan kun oppgi én skrivermodell."
+msgstr "Du kan kun oppgi én skrivermodell."
 
 #: src/escputil/escputil.c:369
 #, c-format
@@ -7048,7 +7179,7 @@ msgstr ""
 #: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
-msgstr "Kan ikke åpne enhet %s: %s\n"
+msgstr "Kan ikke åpne enhet %s: %s\n"
 
 #: src/escputil/escputil.c:482
 #, c-format
@@ -7073,12 +7204,12 @@ msgstr "Kan ikke lese fra %s: %s\n"
 #: src/escputil/escputil.c:747
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
-msgstr "Skriverstatus krever bruk av en rå enhet.\n"
+msgstr "Skriverstatus krever bruk av en rå enhet.\n"
 
 #: src/escputil/escputil.c:754
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
-msgstr "Kan ikke åpne %s med lese-/skriverettigheter: %s\n"
+msgstr "Kan ikke åpne %s med lese-/skriverettigheter: %s\n"
 
 #: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
 #, c-format
@@ -7104,7 +7235,7 @@ msgid ""
 msgstr ""
 "\n"
 "Kan ikke finne skrivertype.\n"
-"Vennligst bruk -m for å spesifisere din skrivermodell.\n"
+"Vennligst bruk -m for å spesifisere din skrivermodell.\n"
 
 #: src/escputil/escputil.c:983 src/escputil/escputil.c:989
 #: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
@@ -7256,7 +7387,7 @@ msgstr "Blekkfarge"
 #: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
 #: src/escputil/escputil.c:1646
 msgid "Percent remaining"
-msgstr "Prosent gjenstående"
+msgstr "Prosent gjenstående"
 
 #: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
 #: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
@@ -7286,12 +7417,12 @@ msgstr ""
 #: src/escputil/escputil.c:1355
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Du må bruke en rå enhet for å hente blekknivå.\n"
+msgstr "Du må bruke en rå enhet for å hente blekknivå.\n"
 
 #: src/escputil/escputil.c:1461
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Du må bruke en rå enhet for å hente blekknivå.\n"
+msgstr "Du må bruke en rå enhet for å hente blekknivå.\n"
 
 #: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
 #: src/escputil/escputil.c:1646
@@ -7306,12 +7437,12 @@ msgstr ""
 #: src/escputil/escputil.c:1675
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
-msgstr "Du må bruke en rå enhet for å identifisere skriveren.\n"
+msgstr "Du må bruke en rå enhet for å identifisere skriveren.\n"
 
 #: src/escputil/escputil.c:1693
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
-msgstr "Du kan kun oppgi én skrivermodell."
+msgstr "Du kan kun oppgi én skrivermodell."
 
 #: src/escputil/escputil.c:1713
 #, c-format
@@ -7321,7 +7452,7 @@ msgstr "Renser hoder...\n"
 #: src/escputil/escputil.c:1728
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
-msgstr "Kjører «nozzle»-sjekk, sjekk at det er papir i skriveren.\n"
+msgstr "Kjører «nozzle»-sjekk, sjekk at det er papir i skriveren.\n"
 
 #: src/escputil/escputil.c:1732
 #, c-format
@@ -7431,7 +7562,7 @@ msgstr ">"
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
-"Vennligst bekreft at du vil avslutte uten å lagre ved å skrive «q» igjen:\n"
+"Vennligst bekreft at du vil avslutte uten å lagre ved å skrive «q» igjen:\n"
 
 #: src/escputil/escputil.c:1850
 #, c-format
@@ -7440,7 +7571,7 @@ msgid ""
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
 "OK, skriveren er justert, men justeringen er ikke lagret.\n"
-"Hvis du ønsker å lagre justeringen må d\n"
+"Hvis du ønsker å lagre justeringen må d\n"
 
 #: src/escputil/escputil.c:1857
 #, c-format
@@ -7448,8 +7579,8 @@ msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
-"Vennligst bekreft at du vil gjenta justeringsprosessen ved å\n"
-"skrive «r»:\n"
+"Vennligst bekreft at du vil gjenta justeringsprosessen ved å\n"
+"skrive «r»:\n"
 
 #: src/escputil/escputil.c:1865
 #, c-format
@@ -7469,7 +7600,7 @@ msgstr ""
 #: src/escputil/escputil.c:1883
 #, c-format
 msgid "About to save settings..."
-msgstr "I ferd med å lagre innstillinger..."
+msgstr "I ferd med å lagre innstillinger..."
 
 #: src/escputil/escputil.c:1889
 #, c-format
@@ -7486,7 +7617,7 @@ msgstr ""
 #: src/escputil/escputil.c:1894
 #, c-format
 msgid "succeeded!\n"
-msgstr "fullført!\n"
+msgstr "fullført!\n"
 
 #: src/escputil/escputil.c:1895
 #, c-format
@@ -7517,7 +7648,7 @@ msgstr ""
 #: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
 #: src/escputil/escputil.c:2047
 msgid "Press enter to continue > "
-msgstr "Trykk linjeskift for å fortsette > "
+msgstr "Trykk linjeskift for å fortsette > "
 
 #: src/escputil/escputil.c:1980
 #, c-format
@@ -7540,12 +7671,12 @@ msgstr "Vennligst sett inn et nytt ark.\n"
 #: src/escputil/escputil.c:2020
 #, c-format
 msgid "Number out of range!\n"
-msgstr "Tallet er utenfor gyldig område!\n"
+msgstr "Tallet er utenfor gyldig område!\n"
 
 #: src/escputil/escputil.c:2025
 #, c-format
 msgid "I cannot understand what you typed!\n"
-msgstr "Kan ikke forstå det du skrev inn!\n"
+msgstr "Kan ikke forstå det du skrev inn!\n"
 
 #: src/escputil/escputil.c:2031
 #, c-format
@@ -7555,12 +7686,12 @@ msgstr ""
 #: src/escputil/escputil.c:2038
 #, c-format
 msgid "Attempting to set alignment..."
-msgstr "Prøver å sette justering..."
+msgstr "Prøver å sette justering..."
 
 #: src/escputil/escputil.c:2041
 #, c-format
 msgid "succeeded.\n"
-msgstr "fullført.\n"
+msgstr "fullført.\n"
 
 #: src/escputil/escputil.c:2042
 #, c-format
@@ -7680,12 +7811,12 @@ msgstr "image_init feilet %d\n"
 #: src/ghost/ijsgutenprint.c:1319
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-msgstr "Kan ikke åpne fildeskriptor: %s\n"
+msgstr "Kan ikke åpne fildeskriptor: %s\n"
 
 #: src/ghost/ijsgutenprint.c:1331
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-msgstr "Kan ikke åpne %s: %s\n"
+msgstr "Kan ikke åpne %s: %s\n"
 
 #: src/ghost/ijsgutenprint.c:1344
 #, fuzzy, c-format
@@ -7703,6 +7834,176 @@ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "Henting av neste rad feilet ved %.0f\n"
 
 #, fuzzy
+#~ msgid "Model Name"
+#~ msgstr "Avbryt"
+
+#, fuzzy
+#~ msgid "Cassette"
+#~ msgstr "Matt papir"
+
+#, fuzzy
+#~ msgid " Gamma"
+#~ msgstr "Gamma:"
+
+#, fuzzy
+#~ msgid " Curve"
+#~ msgstr "Sort"
+
+#, fuzzy
+#~ msgid "1440 x 1440"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI High Quality"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI Highest Quality"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI High Quality"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI Highest Quality"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "90x90 DPI"
+#~ msgstr "600 DPI"
+
+#, fuzzy
+#~ msgid "90x90 DPI DMT"
+#~ msgstr "600 DPI"
+
+#, fuzzy
+#~ msgid "180x180 DPI"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "180x180 DPI DMT"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "360x360 DPI"
+#~ msgstr "300x300 DPI"
+
+#, fuzzy
+#~ msgid "360x360 DPI DMT"
+#~ msgstr "600x600 DPI"
+
+#, fuzzy
+#~ msgid "720x360 DPI"
+#~ msgstr "2400x600 DPI"
+
+#, fuzzy
+#~ msgid "720x360 DPI DMT"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "720x720 DPI"
+#~ msgstr "1200 DPI"
+
+#, fuzzy
+#~ msgid "720x720 DPI DMT"
+#~ msgstr "1200 DPI"
+
+#, fuzzy
+#~ msgid "1440x720 DPI"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "1440x720 DPI DMT"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI DMT"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI"
+#~ msgstr "1200 DPI"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI DMT"
+#~ msgstr "1200 DPI"
+
+#, fuzzy
+#~ msgid "150x150 DPI DMT"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "300x300 DPI DMT"
+#~ msgstr "300x300 DPI"
+
+#, fuzzy
+#~ msgid "600x300 DPI DMT"
+#~ msgstr "600x300 DPI"
+
+#, fuzzy
+#~ msgid "600x600 DPI DMT"
+#~ msgstr "600x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x600 DPI DMT"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI DMT"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI"
+#~ msgstr "2400x600 DPI"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI DMT"
+#~ msgstr "2400x600 DPI"
+
+#, fuzzy
+#~ msgid "Plain Paper PIXMA"
+#~ msgstr "Vanlig papir"
+
+#~ msgid "Envelope"
+#~ msgstr "Konvolutt"
+
+#~ msgid "High Resolution Paper"
+#~ msgstr "Høyoppløsningspapir"
+
+#~ msgid "T-Shirt Transfers"
+#~ msgstr "Overføring til T-skjorte"
+
+#~ msgid "Glossy Photo Paper"
+#~ msgstr "Glanset fotopapir"
+
+#~ msgid "Glossy Photo Cards"
+#~ msgstr "Glansete fotokort"
+
+#~ msgid "Photo Paper Pro"
+#~ msgstr "Profesjonelt fotopapir"
+
+#~ msgid "Photo CcMmYK Color"
+#~ msgstr "Foto CcMmYK-farge"
+
+#~ msgid "Photo CcMmY Color"
+#~ msgstr "Foto CcMmY-farge"
+
+#~ msgid "CMYK Color"
+#~ msgstr "CMYK-farge"
+
+#~ msgid "CMY Color"
+#~ msgstr "CMY-farge"
+
+#, fuzzy
 #~ msgid "Gutenprint"
 #~ msgstr "testutskrift"
 
@@ -8008,7 +8309,7 @@ msgstr "Henting av neste rad feilet ved %.0f\n"
 
 #, fuzzy
 #~ msgid "Printer does not support listing ink types!\n"
-#~ msgstr "Skriver støtter ikke fargeutskrift\n"
+#~ msgstr "Skriver støtter ikke fargeutskrift\n"
 
 #, fuzzy
 #~ msgid "Cannot identify printer!\n"
@@ -8023,14 +8324,14 @@ msgstr "Henting av neste rad feilet ved %.0f\n"
 #~ msgstr "Gul"
 
 #~ msgid "Attempting to detect printer model..."
-#~ msgstr "Prøver å finne identifisere skrivermodell..."
+#~ msgstr "Prøver å finne identifisere skrivermodell..."
 
 #~ msgid ""
 #~ "\n"
 #~ "Cannot open %s read/write: %s\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Kan ikke åpne %s med lese-/skriverettigheter: %s\n"
+#~ "Kan ikke åpne %s med lese-/skriverettigheter: %s\n"
 
 #~ msgid "Printer model %s is not known.\n"
 #~ msgstr "Skrivermodell %s er ukjent.\n"
@@ -8081,7 +8382,7 @@ msgstr "Henting av neste rad feilet ved %.0f\n"
 
 #, fuzzy
 #~ msgid "Image is too wide for the page\n"
-#~ msgstr "Skaler utskriften til størrelsen på papiret"
+#~ msgstr "Skaler utskriften til størrelsen på papiret"
 
 #, fuzzy
 #~ msgid "traditional"
@@ -8129,7 +8430,7 @@ msgstr "Henting av neste rad feilet ved %.0f\n"
 
 #, fuzzy
 #~ msgid "Model %d out of range.\n"
-#~ msgstr "Tallet er utenfor gyldig område!\n"
+#~ msgstr "Tallet er utenfor gyldig område!\n"
 
 #~ msgid "Right Border:"
 #~ msgstr "Kant:"
@@ -8138,7 +8439,7 @@ msgstr "Henting av neste rad feilet ved %.0f\n"
 #~ msgstr "Nedre kant"
 
 #~ msgid "Size"
-#~ msgstr "Størrelse"
+#~ msgstr "Størrelse"
 
 #~ msgid "Image / Output Settings"
 #~ msgstr "Innstillinger for bilde / utskrift"
@@ -8169,16 +8470,16 @@ msgstr "Henting av neste rad feilet ved %.0f\n"
 
 #, fuzzy
 #~ msgid "Resolutions"
-#~ msgstr "Oppløsning"
+#~ msgstr "Oppløsning"
 
 #~ msgid "Media Type:"
 #~ msgstr "Medietype:"
 
 #~ msgid "Type of media you're printing to"
-#~ msgstr "Type media du skal skrive ut på"
+#~ msgstr "Type media du skal skrive ut på"
 
 #~ msgid "Media Size:"
-#~ msgstr "Mediestørrelse:"
+#~ msgstr "Mediestørrelse:"
 
 #~ msgid "Media Source:"
 #~ msgstr "Mediekilde:"
@@ -8187,10 +8488,10 @@ msgstr "Henting av neste rad feilet ved %.0f\n"
 #~ msgstr "Type:"
 
 #~ msgid "Resolution:"
-#~ msgstr "Oppløsning:"
+#~ msgstr "Oppløsning:"
 
 #~ msgid "Dither Algorithm:"
-#~ msgstr "Dither-størrelse:"
+#~ msgstr "Dither-størrelse:"
 
 #~ msgid ""
 #~ "\n"
@@ -8200,7 +8501,7 @@ msgstr "Henting av neste rad feilet ved %.0f\n"
 #~ "Kan ikke lese fra %s: %s\n"
 
 #~ msgid "%s out of range (value %f, min %f, max %f)\n"
-#~ msgstr "%s utenfor området (verdi %f, min %f, maks %f)\n"
+#~ msgstr "%s utenfor området (verdi %f, min %f, maks %f)\n"
 
 #~ msgid "Set the contrast of the print"
 #~ msgstr "Sett kontrast for utskriften"
diff --git a/po/nl.gmo b/po/nl.gmo
index 49e7773..4f7f954 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index d5f241b..a08264a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,65 +1,64 @@
-# Dutch translation of Gimp-print.
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>, 2002.
-# 
+# translation of gutenprint-5.0.0.po to Dutch
+# Dutch translation of Gutenprint.
+# Copyright (C) 2002, 2006, 2007 Free Software Foundation, Inc.
+#
+# Vincent van Adrighem <vincent@dirck.mine.nu>, 2002.
+# Freek de Kruijf <f.de.kruijf@hetnet.nl>, 2006, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: Gimp-print 4.2.1\n"
+"Project-Id-Version: gutenprint 5.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
-"PO-Revision-Date: 2002-03-15 20:31+0100\n"
-"Last-Translator: Hylke Witjens <hylke@wwd.nl>\n"
-"Language-Team: Dutch <nl@li.org>\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\n"
+"PO-Revision-Date: 2007-02-09 00:52+0100\n"
+"Last-Translator: Freek de Kruijf <f.de.kruijf@hetnet.nl>\n"
+"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 msgid "Default"
-msgstr ""
+msgstr "Standaard"
 
 #: src/main/dither-main.c:47
-#, fuzzy
 msgid "EvenTone"
-msgstr "Envelop"
+msgstr "EvenTone"
 
 #: src/main/dither-main.c:48
-#, fuzzy
 msgid "Hybrid EvenTone"
-msgstr "Envelop"
+msgstr "Hybride EvenTone"
 
 #. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
 #. * names, not descriptive.
 #.
 #: src/main/dither-main.c:53
-#, fuzzy
 msgid "EvenBetter"
-msgstr "Letter"
+msgstr "EvenBetter"
 
 #: src/main/dither-main.c:54
-#, fuzzy
 msgid "Hybrid EvenBetter"
-msgstr "Envelop"
+msgstr "Hybride EvenBetter"
 
 #: src/main/dither-main.c:60
-#, fuzzy
 msgid "UniTone"
-msgstr "Envelop"
+msgstr "UniTone"
 
 #: src/main/dither-main.c:61
 msgid "Hybrid UniTone"
-msgstr ""
+msgstr "Hybride UniTone"
 
 #: src/main/dither-main.c:63
 msgid "Adaptive Hybrid"
-msgstr ""
+msgstr "Adaptief Hybride"
 
 #: src/main/dither-main.c:64
 msgid "Ordered"
-msgstr "besteld"
+msgstr "Geordend"
 
 #: src/main/dither-main.c:65
 msgid "Fast"
@@ -75,27 +74,26 @@ msgstr "Hybride Floyd-Steinberg"
 
 #: src/main/dither-main.c:68
 msgid "Predithered Input"
-msgstr ""
+msgstr "Invoer met toegepast ruis-algoritme"
 
 #: src/main/dither-main.c:88 src/main/print-color.c:56
-#, fuzzy
 msgid "Density"
-msgstr "Densiteit:"
-
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+msgstr "Hoeveelheid:"
+
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
-msgstr ""
+msgstr "Aanpassing uitvoerniveau"
 
 #: src/main/dither-main.c:89
 msgid ""
@@ -103,17 +101,17 @@ msgid ""
 "ink bleeds through the paper or smears; increase the density if black "
 "regions are not solid."
 msgstr ""
-"Pas de dentisiteit (hoeveelheid inkt) van de afdruk. Verminder de "
-"dentisiteit als de inkt door het papier heenkomt of vlekt; verhoog de "
-"dentisiteit als zwarte stukken niet goed dicht zijn."
+"Pas de hoeveelheid inkt van de afdruk aan. Verminder de hoeveelheid als de "
+"inkt door het papier heen komt of vlekt; verhoog de hoeveelheid als zwarte "
+"stukken niet goed dicht zijn."
 
 #: src/main/dither-main.c:97
 msgid "Dither Algorithm"
-msgstr ""
+msgstr "Ruis-algoritme"
 
 #: src/main/dither-main.c:97
 msgid "Screening Adjustment"
-msgstr ""
+msgstr "Aanpassing aftasting"
 
 #: src/main/dither-main.c:98
 msgid ""
@@ -126,594 +124,389 @@ msgid ""
 "art.\n"
 "Hybrid Floyd-Steinberg generally produces inferior output."
 msgstr ""
+"Kies het ruis-algoritme.\n"
+"Aangepast hybride produceert meestal de beste algemene kwaliteit.\n"
+"EvenTone is een nieuw, experimenteel algoritme dat vaak een uitstekend "
+"resultaat geeft.\n"
+"Geordend is sneller en geeft bijna dezelfde kwaliteit bij foto's.\n"
+"Snel en Zeer snel zijn aanzienlijk sneller, en doen het goed bij tekst en "
+"lijntekeningen.\n"
+"Hybride Floyd-Steinberg produceert meestal een slecht resultaat."
 
 #: src/main/module.c:52
 msgid "Miscellaneous (unclassified)"
-msgstr ""
+msgstr "Diversen (niet geclassificeerd)"
 
 #: src/main/module.c:53
 msgid "Family driver"
-msgstr ""
+msgstr "Apparaatbesturing voor familie van apparaten"
 
 #: src/main/module.c:54
 msgid "Color conversion module"
-msgstr ""
+msgstr "Kleurconversie-module"
 
 #: src/main/module.c:55
 msgid "Dither algorithm"
-msgstr ""
-
-#: src/main/print-canon.c:1382
-#, fuzzy
-msgid "90x90 DPI"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1382
-#, fuzzy
-msgid "90x90 DPI DMT"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI DMT"
-msgstr "150x150 DPI"
+msgstr "Ruis-algoritme"
 
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI DMT"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI"
-msgstr "720 x 360 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI DMT"
-msgstr "720 x 360 DPI MW2"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI DMT"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI"
-msgstr "1440 x 720 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI DMT"
-msgstr "1440 x 720 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI DMT"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI DMT"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1390
-#, fuzzy
-msgid "150x150 DPI DMT"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1391
-#, fuzzy
-msgid "300x300 DPI DMT"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1392
-#, fuzzy
-msgid "600x300 DPI DMT"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1393
-#, fuzzy
-msgid "600x600 DPI DMT"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1394
-#, fuzzy
-msgid "1200x600 DPI DMT"
-msgstr "1200x600 DPI"
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
+msgid "Page Size"
+msgstr "Paginagrootte"
+
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
+msgid "Basic Printer Setup"
+msgstr "Printerinstellingen"
 
-#: src/main/print-canon.c:1395
-#, fuzzy
-msgid "1200x1200 DPI"
-msgstr "1200x600 DPI"
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
+msgid "Size of the paper being printed to"
+msgstr "Grootte van het papier waarop geprint wordt"
 
-#: src/main/print-canon.c:1395
-#, fuzzy
-msgid "1200x1200 DPI DMT"
-msgstr "1200x600 DPI"
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
+msgid "Media Type"
+msgstr "Type medium"
 
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI"
-msgstr "2400x600 DPI"
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
+msgid "Type of media (plain paper, photo paper, etc.)"
+msgstr "Type medium (blanco papier, fotopapier, etc.)"
 
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI DMT"
-msgstr "2400x600 DPI"
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
+msgid "Media Source"
+msgstr "Bronmedium"
 
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-msgid "Plain Paper"
-msgstr "Blank papier"
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
+msgid "Source (input slot) of the media"
+msgstr "Bronmedium (invoer poort)"
 
-#: src/main/print-canon.c:1448
-#, fuzzy
-msgid "Plain Paper PIXMA"
-msgstr "Blank papier"
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
+msgstr "Afmeting CD-printdeel"
 
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-msgid "Transparencies"
-msgstr "Transparanten"
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr "Druk af op het printdeel van de CD of helemaal tot het gat"
 
-#: src/main/print-canon.c:1450
-msgid "Back Print Film"
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:1451
-msgid "Fabric Sheets"
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:1452
-msgid "Envelope"
-msgstr "Envelop"
-
-#: src/main/print-canon.c:1453
-msgid "High Resolution Paper"
-msgstr "Hoog-resolutie papier"
-
-#: src/main/print-canon.c:1454
-msgid "T-Shirt Transfers"
-msgstr "T-Shirt doordrukken"
-
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
-msgstr "Hoogglans papier"
-
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
-msgstr "Glanzend fotopapier"
-
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
-msgstr "Glanzende fotokaarten"
-
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
-msgstr "Professioneel fotopapier"
-
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
-msgstr "Overige"
-
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
 #, fuzzy
-msgid "Page Size"
-msgstr "Grootte"
-
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
-#, fuzzy
-msgid "Basic Printer Setup"
-msgstr "Printerinstellingen"
+msgid "CD Hub Size (Custom)"
+msgstr "Afmeting CD-printdeel"
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
 #, fuzzy
-msgid "Size of the paper being printed to"
-msgstr "Grootte van het papaier waarop je wenst te printen"
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "Schaal de afdruk tot de afmeting van de pagina"
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
-msgid "Media Type"
-msgstr "Medium Type"
-
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
-msgid "Type of media (plain paper, photo paper, etc.)"
-msgstr ""
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
+msgstr "Horizontale fijnafstelling van CD"
+
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
+msgstr "Geavanceerde instelling van de printer"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
-msgid "Media Source"
-msgstr "Medium Bron"
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr "Fijnafstelling van de horizontale positie voor het printen op een CD"
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
-msgid "Source (input slot) of the media"
-msgstr ""
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
+msgstr "Vertikale fijnafstelling van CD"
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
 msgstr "Resolutie"
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
 msgstr "Resolutie en kwaliteit van de afdruk"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
-msgstr "Inkt type"
+msgstr "Type inkt"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr ""
-
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type inkt van de printer"
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
-msgstr ""
-
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+msgstr "Inktkanalen"
+
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
-msgstr ""
+msgstr "Geavanceerde functionaliteit van de printer"
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
-#, fuzzy
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Printing Mode"
-msgstr "Printer model:"
+msgstr "Wijze van printen"
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
-#, fuzzy
 msgid "Core Parameter"
-msgstr "Blank papier"
+msgstr "Hoofdparameters"
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
-msgstr ""
+msgstr "Manier van printen"
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
-msgstr ""
+msgstr "Dubbelzijdig printen"
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
-msgstr ""
+msgstr "Duplex/Omkeer stand"
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
-#, fuzzy
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 msgid "Cyan Density"
-msgstr "Densiteit:"
+msgstr "Hoeveelheid cyaan"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
-#, fuzzy
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 msgid "Adjust the cyan density"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
-#, fuzzy
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 msgid "Magenta Density"
-msgstr "Magenta"
+msgstr "Hoeveelheid magenta"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
-#, fuzzy
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 msgid "Adjust the magenta density"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
-#, fuzzy
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 msgid "Yellow Density"
-msgstr "Densiteit:"
+msgstr "Heoveelheid geel"
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
-#, fuzzy
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 msgid "Adjust the yellow density"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
-#, fuzzy
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 msgid "Black Density"
-msgstr "Densiteit:"
+msgstr "Hoeveelheid zwart"
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
-#, fuzzy
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 msgid "Adjust the black density"
-msgstr "Pas de hoeveelheid cyaan aan"
+msgstr "Pas de hoeveelheid zwart aan"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
-#, fuzzy
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 msgid "Light Cyan Transition"
-msgstr "Licht Cyaan"
-
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+msgstr "Lichtcyaan overgang"
+
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
-msgstr ""
+msgstr "Geavanceerde aanpassing van de inkt"
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
-#, fuzzy
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 msgid "Light Magenta Transition"
-msgstr "Licht Magenta"
+msgstr "Lichtmagenta overgang"
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
-#, fuzzy
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 msgid "Light Yellow Transition"
-msgstr "Licht Cyaan"
+msgstr "Lichtgeel overgang"
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
-msgstr ""
+msgstr "Uit"
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
-msgid "Short Edge (Flip)"
-msgstr ""
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
+msgstr "Lange zijde (standaard)"
 
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-msgid "Auto Sheet Feeder"
-msgstr "Automatische papierlader"
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+msgid "Short Edge (Flip)"
+msgstr "Korte zijde (omslaan)"
 
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-msgid "Manual with Pause"
-msgstr "Handmatig met pauze"
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
+msgstr "CD - 5 inch"
 
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
-msgstr "Handmatig zonder pauze"
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
+msgstr "CD - 3 inch"
 
-#: src/main/print-canon.c:1923
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
 #, fuzzy
-msgid "Cassette"
-msgstr "Mat papier"
+msgid "CD - Custom"
+msgstr "Gebruiker"
 
-#: src/main/print-canon.c:1924
-msgid "CD tray"
-msgstr ""
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
+msgstr "Normaal"
 
-#: src/main/print-canon.c:2049
-msgid "Photo CcMmYK Color"
-msgstr "Foto CcMmYK Kleuren"
-
-#: src/main/print-canon.c:2052
-msgid "Photo CcMmY Color"
-msgstr "Foto CcMmY kleuren"
-
-#: src/main/print-canon.c:2055
-msgid "CMYK Color"
-msgstr "CMYK Kleuren"
-
-#: src/main/print-canon.c:2058
-msgid "CMY Color"
-msgstr "CMY kleuren"
-
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
-msgstr "Zwart"
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+msgid "Print To Hub"
+msgstr "Afdrukken naar tussenstation"
 
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
 msgstr "Kleur"
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
-#, fuzzy
 msgid "Black and White"
-msgstr "Zwart en Wit"
+msgstr "Zwart en wit"
 
 #: src/main/print-color.c:50
 msgid "High Accuracy"
-msgstr ""
+msgstr "Hoge nauwkeurigheid"
 
 #: src/main/print-color.c:51
-#, fuzzy
 msgid "Bright Colors"
-msgstr "Ongerasterde kleuren"
+msgstr "Heldere kleuren"
 
 #: src/main/print-color.c:52
 msgid "Correct Hue Only"
-msgstr ""
+msgstr "Alleen juiste hue"
 
 #: src/main/print-color.c:53
 msgid "Uncorrected"
-msgstr ""
+msgstr "Ongecorrigeerd"
 
 #: src/main/print-color.c:54
 msgid "Desaturated"
-msgstr ""
+msgstr "Niet-verzadigd"
 
 #: src/main/print-color.c:55
 msgid "Threshold"
-msgstr ""
+msgstr "Grenswaarde"
 
 #: src/main/print-color.c:57 src/main/print-color.c:133
 msgid "Raw"
-msgstr ""
+msgstr "Raw"
 
 #: src/main/print-color.c:58
-#, fuzzy
 msgid "Pre-Dithered"
-msgstr "Afdrukken"
+msgstr "Voorbehandeld met ruis-algoritme"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
-msgstr "Grijswaarden"
+msgstr "Grijsschaal"
 
 #: src/main/print-color.c:123
-#, fuzzy
 msgid "Whitescale"
-msgstr "Geel"
+msgstr "Witschaal"
 
 #: src/main/print-color.c:125
 msgid "RGB"
-msgstr ""
+msgstr "RGB"
 
 #: src/main/print-color.c:127
 msgid "CMY"
-msgstr ""
+msgstr "CMY"
 
 #: src/main/print-color.c:129
 msgid "CMYK"
-msgstr ""
+msgstr "CMYK"
 
 #: src/main/print-color.c:131
 msgid "KCMY"
-msgstr ""
+msgstr "KCMY"
 
 #: src/main/print-color.c:165 src/main/print-color.c:446
-#, fuzzy
 msgid "Channel "
-msgstr "Annuleren"
-
-#: src/main/print-color.c:165
-#, fuzzy
-msgid " Gamma"
-msgstr "Gamma:"
+msgstr "Kanaal"
 
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
@@ -721,301 +514,288 @@ msgstr "Gamma:"
 #: src/main/print-color.c:282 src/main/print-color.c:290
 #: src/main/print-color.c:298 src/main/print-color.c:306
 #: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
-#, fuzzy
 msgid "Gamma"
-msgstr "Gamma:"
+msgstr "Gamma"
 
 #: src/main/print-color.c:166
 msgid "Gamma for raw channel "
-msgstr ""
+msgstr "Gamma voor het raw-kannaal "
 
 #: src/main/print-color.c:176
 msgid "Color Correction"
-msgstr ""
+msgstr "Kleurcorrectie"
 
 #: src/main/print-color.c:176 src/main/print-color.c:224
 #: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
-msgstr ""
+msgstr "Basis beeldaanpassing"
 
 #: src/main/print-color.c:177
 msgid "Color correction to be applied"
-msgstr ""
+msgstr "Toe te passen kleurcorrectie"
 
 #: src/main/print-color.c:184
 msgid "Channel Bit Depth"
-msgstr ""
+msgstr "Bitdiepte van het kanaal"
 
 #: src/main/print-color.c:185
 msgid "Bit depth per channel"
-msgstr ""
+msgstr "Bitdiepte per kanaal"
 
 #: src/main/print-color.c:192
-#, fuzzy
 msgid "Input Image Type"
-msgstr "Beeldtype"
+msgstr "Beeldtype van de invoer"
 
 #: src/main/print-color.c:193
-#, fuzzy
 msgid "Input image type"
-msgstr "Beeldtype"
+msgstr "Beeldtype van de invoer"
 
 #: src/main/print-color.c:200
-#, fuzzy
 msgid "Output Image Type"
-msgstr "Beeldtype"
+msgstr "Beeldtype van de uitvoer"
 
 #: src/main/print-color.c:201
 msgid "Output image type"
-msgstr ""
+msgstr "Beeldtype van de uitvoer"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
-msgstr ""
+msgstr "Raw-kanalen"
 
 #: src/main/print-color.c:216
-#, fuzzy
 msgid "SimpleGamma"
-msgstr "Gamma:"
+msgstr "Envoudige gamma:"
 
 #: src/main/print-color.c:217
 msgid "Do not correct for screen gamma"
-msgstr ""
+msgstr "Niet corrigeren voor het gamma van het scherm"
 
 #: src/main/print-color.c:224
-#, fuzzy
 msgid "Brightness"
-msgstr "Helderheid:"
+msgstr "Helderheid"
 
 #: src/main/print-color.c:225
-#, fuzzy
 msgid "Brightness of the print"
-msgstr "Geef de hoogte van de afdruk"
+msgstr "Helderheid van de afdruk"
 
 #: src/main/print-color.c:232
-#, fuzzy
 msgid "Contrast"
 msgstr "Contrast"
 
 #: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
-msgstr ""
+msgstr "Contrast van de afdruk (0 is volledig grijs)"
 
 #: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
-msgstr ""
+msgstr "Lineaire aanpassing van het contrast"
 
 #: src/main/print-color.c:240
-#, fuzzy
 msgid "Advanced Image Control"
-msgstr "Handmatig"
+msgstr "Geavanceerde controle van het beeld"
 
 #: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
-msgstr ""
+msgstr "Gebruik lineaire tegenover vaste eindpunt contrastaanpassing "
 
 #: src/main/print-color.c:248
 msgid "Composite Gamma"
-msgstr ""
+msgstr "Samengesteld gamma"
 
 #: src/main/print-color.c:249
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
 msgstr ""
+"Pas de gamma van de afdruk aan. Grotere waarden produceren een helderder "
+"afdruk, terwijl lagere waarden een over het geheel donkerder afdruk maken. "
 
 #: src/main/print-color.c:258
-#, fuzzy
 msgid "AppGamma"
-msgstr "Gamma:"
+msgstr "AppGamma"
 
 #: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
-msgstr ""
-
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+msgstr "Gamma-waarde verondersteld door de applicatie"
+
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
 msgstr "Cyaan"
 
 #: src/main/print-color.c:267
-#, fuzzy
 msgid "Adjust the cyan gamma"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 msgid "Magenta"
 msgstr "Magenta"
 
 #: src/main/print-color.c:275
-#, fuzzy
 msgid "Adjust the magenta gamma"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
 msgstr "Geel"
 
 #: src/main/print-color.c:283
-#, fuzzy
 msgid "Adjust the yellow gamma"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
-msgstr ""
+msgstr "Rood"
 
 #: src/main/print-color.c:291
-#, fuzzy
 msgid "Adjust the red gamma"
-msgstr "Pas de hoeveelheid geel aan"
+msgstr "Pas de hoeveelheid rood aan"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
-msgstr ""
+msgstr "Groen"
 
 #: src/main/print-color.c:299
-#, fuzzy
 msgid "Adjust the green gamma"
-msgstr "Pas de hoeveelheid magenta aan"
+msgstr "Pas de hoeveelheid groen aan"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
-msgstr ""
+msgstr "Blauw"
 
 #: src/main/print-color.c:307
-#, fuzzy
 msgid "Adjust the blue gamma"
-msgstr "Pas de hoeveelheid cyaan aan"
+msgstr "Pas de hoeveelheid blauw aan"
+
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr "Zwart"
 
 #: src/main/print-color.c:315
-#, fuzzy
 msgid "Adjust the black gamma"
-msgstr "Pas de hoeveelheid cyaan aan"
+msgstr "Pas de hoeveelheid zwart aan"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
-msgstr ""
+msgstr "Cyaanwaarde"
 
 #: src/main/print-color.c:322 src/main/print-color.c:330
 #: src/main/print-color.c:338
-#, fuzzy
 msgid "GrayBalance"
-msgstr "Grijswaarden"
+msgstr "Grijswaarde"
 
 #: src/main/print-color.c:323
-#, fuzzy
 msgid "Adjust the cyan gray balance"
-msgstr "Pas de hoeveelheid cyaan aan"
+msgstr "Pas de cyaan-grijs balans aan"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
-#, fuzzy
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 msgid "Magenta Balance"
-msgstr "Magenta"
+msgstr "Magentawaarde"
 
 #: src/main/print-color.c:331
-#, fuzzy
 msgid "Adjust the magenta gray balance"
-msgstr "Pas de hoeveelheid magenta aan"
+msgstr "Pas de hoeveelheid magenta-grijs aan"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
-#, fuzzy
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 msgid "Yellow Balance"
-msgstr "Pas de hoeveelheid geel aan"
+msgstr "Geelwaarde"
 
 #: src/main/print-color.c:339
-#, fuzzy
 msgid "Adjust the yellow gray balance"
-msgstr "Pas de hoeveelheid geel aan"
+msgstr "Pas de hoeveelheid geel-grijs aan"
 
 #: src/main/print-color.c:346
-#, fuzzy
 msgid "Saturation"
-msgstr "Gekleurdheid:"
+msgstr "Verzadiging"
 
 #: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
+"Pas de verzadiging van (kleurbalans) van de afdruk aan\n"
+"Gebruik nul-verzadiging voor een grijswaarde uitvoer door gekleurde en "
+"zwarte inkt te gebruiken"
 
 #: src/main/print-color.c:357
-#, fuzzy
 msgid "Ink Limit"
-msgstr "Inkt type"
+msgstr "Inktgrenswaarde"
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 msgid "Advanced Output Control"
-msgstr ""
+msgstr "Geavanceerde controle van uitvoer"
 
 #: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
-msgstr ""
+msgstr "Beperk de totale hoeveelheid inkt naar de pagina"
 
 #: src/main/print-color.c:365
 msgid "GCR Transition"
-msgstr ""
+msgstr "GCR-transitie"
 
 #: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
-msgstr ""
+msgstr "Pas de grijscomponent transitiesnelheid aan"
 
 #: src/main/print-color.c:373
 msgid "GCR Lower Bound"
-msgstr ""
+msgstr "GCR-ondergrens"
 
 #: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
-msgstr ""
+msgstr "Ondergrens van grijscomponent vermindering"
 
 #: src/main/print-color.c:381
 msgid "GCR Upper Bound"
-msgstr ""
+msgstr "GCR-bovengrens"
 
 #: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
-msgstr ""
-
-#: src/main/print-color.c:446
-#, fuzzy
-msgid " Curve"
-msgstr "Zwart"
+msgstr "Bovengrens van grijscomponent vermindering"
 
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
@@ -1023,708 +803,470 @@ msgstr "Zwart"
 #: src/main/print-color.c:497 src/main/print-color.c:505
 #: src/main/print-color.c:513
 msgid "Output Curves"
-msgstr ""
+msgstr "Kromme van uitvoer"
 
 #: src/main/print-color.c:447
 msgid "Curve for raw channel "
-msgstr ""
+msgstr "Kromme van 'raw'-kanaal "
 
 #: src/main/print-color.c:457
 msgid "Cyan Curve"
-msgstr ""
+msgstr "Cyaan-kromme"
 
 #: src/main/print-color.c:458
-#, fuzzy
 msgid "Cyan curve"
-msgstr "Annuleren"
+msgstr "Cyaan-kromme"
 
 #: src/main/print-color.c:465
-#, fuzzy
 msgid "Magenta Curve"
-msgstr "Magenta"
+msgstr "Magenta-kromme"
 
 #: src/main/print-color.c:466
-#, fuzzy
 msgid "Magenta curve"
-msgstr "Magenta"
+msgstr "Magenta-kromme"
 
 #: src/main/print-color.c:473
-#, fuzzy
 msgid "Yellow Curve"
-msgstr "Geel"
+msgstr "Geel-kromme"
 
 #: src/main/print-color.c:474
-#, fuzzy
 msgid "Yellow curve"
-msgstr "Geel"
+msgstr "Geel-kromme"
 
 #: src/main/print-color.c:481
-#, fuzzy
 msgid "Black Curve"
-msgstr "Zwart"
+msgstr "Zwart-kromme"
 
 #: src/main/print-color.c:482
-#, fuzzy
 msgid "Black curve"
-msgstr "Zwart"
+msgstr "Zwart-kromme"
 
 #: src/main/print-color.c:489
-#, fuzzy
 msgid "Red Curve"
-msgstr "Geel"
+msgstr "Rood-kromme"
 
 #: src/main/print-color.c:490
-#, fuzzy
 msgid "Red curve"
-msgstr "Geel"
+msgstr "Rood-kromme"
 
 #: src/main/print-color.c:497
-#, fuzzy
 msgid "Green Curve"
-msgstr "Magenta"
+msgstr "Groen-kromme"
 
 #: src/main/print-color.c:498
-#, fuzzy
 msgid "Green curve"
-msgstr "Magenta"
+msgstr "Groen-kromme"
 
 #: src/main/print-color.c:505
-#, fuzzy
 msgid "Blue Curve"
-msgstr "Zwart"
+msgstr "Blauw-kromme"
 
 #: src/main/print-color.c:506
-#, fuzzy
 msgid "Blue curve"
-msgstr "Zwart"
+msgstr "Blauw-kromme"
 
 #: src/main/print-color.c:513
-#, fuzzy
 msgid "White Curve"
-msgstr "Geel"
+msgstr "Wit-kromme"
 
 #: src/main/print-color.c:514
-#, fuzzy
 msgid "White curve"
-msgstr "Geel"
+msgstr "Wit-kromme"
 
 #: src/main/print-color.c:521
 msgid "Hue Map"
-msgstr ""
+msgstr "Hue-kaart"
 
 #: src/main/print-color.c:521 src/main/print-color.c:529
 #: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
-msgstr ""
+msgstr "Geavanceerde HSL-krommen"
 
 #: src/main/print-color.c:522
 msgid "Hue adjustment curve"
-msgstr ""
+msgstr "Hue-aanpassingskromme"
 
 #: src/main/print-color.c:529
-#, fuzzy
 msgid "Saturation Map"
-msgstr "Gekleurdheid:"
+msgstr "Verzadigingskaart"
 
 #: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
-msgstr ""
+msgstr "Verzadiging-aanpassingskromme"
 
 #: src/main/print-color.c:537
 msgid "Luminosity Map"
-msgstr ""
+msgstr "Helderheidskaart"
 
 #: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
-msgstr ""
+msgstr "Helderheid-aanpassingskromme"
 
 #: src/main/print-color.c:545
 msgid "Gray Component Reduction"
-msgstr ""
+msgstr "Grijscomponent-vermindering"
 
 #: src/main/print-color.c:546
 msgid "Gray component reduction curve"
-msgstr ""
+msgstr "Grijscomponent-verminderingskromme"
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
-msgstr ""
+msgstr "Traditionele Gutenprint kleurconversie"
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
-msgstr ""
+msgstr "Waarde moet ingesteld worden voor %s\n"
 
-#: src/main/printers.c:516 src/main/printers.c:521
-#, fuzzy, c-format
+#: src/main/printers.c:519 src/main/printers.c:524
+#, c-format
 msgid "`%s' is not a valid %s\n"
-msgstr "%s is geen juiste parameter van type %s\n"
+msgstr "`%s' is geen juiste %s\n"
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
-msgstr ""
+msgstr "%s moet liggen tussen %f en %f (is %f)\n"
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
-msgstr ""
+msgstr "%s moet liggen tussen %d en %d (is %d)\n"
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
-msgstr ""
+msgstr "grenzen van %s moeten liggen tussen %f en %f\n"
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
-msgstr ""
+msgstr "%s doorloop-modus moet zijn %s\n"
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
-msgstr ""
+msgstr "niet doorlopen (op de volgende regel)"
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
-msgstr ""
+msgstr "doorlopen (op de volgende regel)"
 
-#: src/main/printers.c:673
-#, fuzzy, c-format
+#: src/main/printers.c:676
+#, c-format
 msgid "Unknown type parameter %s (%d)\n"
-msgstr "Onbekende printer %s\n"
+msgstr "Onbekende type parameter %s (%d)\n"
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s buiten bereik (waarde %d, min %d, max %d)\n"
 
-#: src/main/printers.c:755
-#, fuzzy
+#: src/main/printers.c:761
 msgid "Page size is not valid\n"
-msgstr "Afbeelding grootte is niet juist\n"
+msgstr "Paginagrootte is niet geldig\n"
 
-#: src/main/printers.c:776
-#, fuzzy, c-format
+#: src/main/printers.c:782
+#, c-format
 msgid "Top margin must not be less than %d\n"
-msgstr "Bovenmarge mag niet minder dan nul zijn\n"
+msgstr "Bovenmarge mag niet minder dan %d zijn\n"
 
-#: src/main/printers.c:782
-#, fuzzy, c-format
+#: src/main/printers.c:788
+#, c-format
 msgid "Left margin must not be less than %d\n"
-msgstr "Linkermarge mag niet minder dan nul zijn\n"
+msgstr "Linkermarge mag niet minder dan %d zijn\n"
 
-#: src/main/printers.c:788
-#, fuzzy
+#: src/main/printers.c:794
 msgid "Height must be greater than zero\n"
-msgstr "Linkermarge mag niet minder dan nul zijn\n"
+msgstr "Hoogte moet groter dan nul zijn\n"
 
-#: src/main/printers.c:794
-#, fuzzy
+#: src/main/printers.c:800
 msgid "Width must be greater than zero\n"
-msgstr "Bovenmarge mag niet minder dan nul zijn\n"
+msgstr "Breedte moet groter dan nul zijn\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
+"Afbeelding is te breed voor de pagina: linkermarge is %d, breedte %d, "
+"rechterrand is %d\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
+"Afbeelding is te lang voor de pagina: bovenmarge is %d, hoogte %d, onderrand "
+"is %d\n"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr "Standaard"
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-msgid "Roll Feed"
-msgstr "Rolinvoer"
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-#, fuzzy
-msgid "Manual Feed"
-msgstr "Handmatig"
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-#, fuzzy
-msgid "Print to CD"
-msgstr "Afdrukken Naar Bestand"
-
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-#, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Handmatig"
-
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-#, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Handmatig"
-
-#: src/main/print-escp2-data.c:554
-#, fuzzy
-msgid "Rear Tray"
-msgstr "Lade"
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr ""
-
-#: src/main/print-escp2-data.c:581
-#, fuzzy
-msgid "Photo Board"
-msgstr "Fotopapier"
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr ""
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr ""
-
-#: src/main/print-escp2-data.c:638
-#, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "Automatisch Selecteren"
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr ""
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr ""
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-#, fuzzy
-msgid "High"
-msgstr "Hoogte: "
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-#, fuzzy
-msgid "Photo"
-msgstr "Foto"
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-#, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
-
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-#, fuzzy
-msgid "Ultra Photo"
-msgstr "Zes kleuren foto"
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-#, fuzzy
-msgid "Light Cyan"
-msgstr "Licht Cyaan"
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-#, fuzzy
-msgid "Light Magenta"
-msgstr "Licht Magenta"
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-#, fuzzy
-msgid "Light Black"
-msgstr "Zwart"
-
-#: src/main/print-escp2-data.c:811
-#, fuzzy
-msgid "Dark Yellow"
-msgstr "Geel"
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-#, fuzzy
-msgid "Matte Black"
-msgstr "Mat papier"
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-#, fuzzy
-msgid "Photo Black"
-msgstr "Fotopapier"
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-#, fuzzy
-msgid "Gloss Optimizer"
-msgstr "Glanzende laag"
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-#, fuzzy
-msgid "Light Light Black"
-msgstr "Zwart"
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
-msgstr ""
+msgstr "Automatische printmodus"
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
-msgstr ""
+msgstr "Basis uitvoeraanpassing"
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
-msgstr ""
+msgstr "Automatische printmodus"
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
-#, fuzzy
 msgid "Print Quality"
-msgstr "720 DPI Hoogste kwaliteit"
-
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr ""
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr ""
+msgstr "Printkwaliteit"
 
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr ""
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:214
-#, fuzzy
+#: src/main/print-escp2.c:228
 msgid "Resolution of the print"
-msgstr "Resolutie en kwaliteit van de afdruk"
+msgstr "Resolutie van de afdruk"
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
-msgstr ""
+msgstr "Verhoogde glans"
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
-msgstr ""
+msgstr "Voeg glansverhoging toe"
 
-#: src/main/print-escp2.c:236
-#, fuzzy
+#: src/main/print-escp2.c:250
 msgid "Ink Set"
-msgstr "Inkt type"
+msgstr "Inktsetje"
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
-msgstr ""
+msgstr "Richting van het afdrukken"
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
-msgstr ""
+msgstr "Geavanceerde aanpassing van uitvoer"
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
+"Richting van het afdrukken (unidirectioneel geeft hogere kwaliteit, echter "
+"langzamer)"
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
-msgstr ""
+msgstr "Zonder randen"
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
-msgstr ""
+msgstr "Afdrukken zonder randen"
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
-msgstr ""
+msgstr "Interleave methode"
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
-msgstr ""
+msgstr "Te gebruiken interleave patroon"
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
-msgstr ""
+msgstr "Pas de puntgrootte aan"
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
-msgstr ""
+msgstr "Pas de puntgrootte aan om de gewenste dichtheid te verkrijgen"
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 msgid "Output Order"
-msgstr ""
+msgstr "Volgorde van uitvoer"
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
-msgstr ""
+msgstr "Uitlijnstappen"
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
-msgstr ""
+msgstr "Uitlijnkeuzes"
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
-#, fuzzy
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 msgid "Ink change command"
-msgstr "Onbekend commando.\n"
+msgstr "Inkt verandercommando"
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
-msgstr ""
+msgstr "Wissel uitlijnstappen af"
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
-#, fuzzy
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 msgid "Alternate Alignment Choices"
-msgstr "Herhaal de uitlijn procedure.\n"
+msgstr "Wissel de uitlijnkeuzes"
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
-msgstr ""
+msgstr "Ondersteunt pakketmodus"
 
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
-#, fuzzy
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 msgid "Channel Names"
-msgstr "Annuleren"
+msgstr "Kanaalnamen"
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
-msgstr ""
+msgstr "Aantal raw-kanalen"
 
-#: src/main/print-escp2.c:332
-#, fuzzy
+#: src/main/print-escp2.c:346
 msgid "Cyan Map"
-msgstr "Cyaan"
+msgstr "Cyaankaart"
 
-#: src/main/print-escp2.c:333
-#, fuzzy
+#: src/main/print-escp2.c:347
 msgid "Adjust the cyan map"
-msgstr "Pas de hoeveelheid cyaan aan"
+msgstr "Pas de cyaankaart aan"
 
-#: src/main/print-escp2.c:338
-#, fuzzy
+#: src/main/print-escp2.c:352
 msgid "Magenta Map"
-msgstr "Magenta"
+msgstr "Magentakaart"
 
-#: src/main/print-escp2.c:339
-#, fuzzy
+#: src/main/print-escp2.c:353
 msgid "Adjust the magenta map"
-msgstr "Pas de hoeveelheid magenta aan"
+msgstr "Pas de magentakaart aan"
 
-#: src/main/print-escp2.c:344
-#, fuzzy
+#: src/main/print-escp2.c:358
 msgid "Yellow Map"
-msgstr "Geel"
+msgstr "Geelkaart"
 
-#: src/main/print-escp2.c:345
-#, fuzzy
+#: src/main/print-escp2.c:359
 msgid "Adjust the yellow map"
-msgstr "Pas de hoeveelheid geel aan"
+msgstr "Pas de geelkaart aan"
 
-#: src/main/print-escp2.c:350
-#, fuzzy
+#: src/main/print-escp2.c:364
 msgid "Blue Map"
-msgstr "Zwart en Wit"
+msgstr "Blauwkaart"
 
-#: src/main/print-escp2.c:351
-#, fuzzy
+#: src/main/print-escp2.c:365
 msgid "Adjust the blue map"
-msgstr "Pas de hoeveelheid cyaan aan"
+msgstr "Pas de blauwkaart aan"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
-msgstr ""
+msgstr "Roodkaart"
 
-#: src/main/print-escp2.c:357
-#, fuzzy
+#: src/main/print-escp2.c:371
 msgid "Adjust the red map"
-msgstr "Pas de hoeveelheid geel aan"
+msgstr "Pas de roodkaart aan"
 
-#: src/main/print-escp2.c:447
-#, fuzzy
+#: src/main/print-escp2.c:464
 msgid "Red Density"
-msgstr "Densiteit:"
+msgstr "Hoeveelheid rood"
 
-#: src/main/print-escp2.c:448
-#, fuzzy
+#: src/main/print-escp2.c:465
 msgid "Adjust the red density"
-msgstr "Pas de hoeveelheid geel aan"
+msgstr "Pas de hoeveelheid rood aan"
 
-#: src/main/print-escp2.c:455
-#, fuzzy
+#: src/main/print-escp2.c:472
 msgid "Blue Density"
-msgstr "Densiteit:"
+msgstr "Hoeveelheid blauw"
 
-#: src/main/print-escp2.c:456
-#, fuzzy
+#: src/main/print-escp2.c:473
 msgid "Adjust the blue density"
-msgstr "Pas de hoeveelheid cyaan aan"
+msgstr "Pas de hoeveelheid blauw aan"
 
-#: src/main/print-escp2.c:463
-#, fuzzy
+#: src/main/print-escp2.c:480
 msgid "Gloss Level"
-msgstr "Glanzende laag"
+msgstr "Glansniveau"
 
-#: src/main/print-escp2.c:464
-#, fuzzy
+#: src/main/print-escp2.c:481
 msgid "Adjust the gloss level"
-msgstr "Pas de hoeveelheid geel aan"
+msgstr "Pas het glansniveau aan"
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
-msgstr ""
+msgstr "Donkergeel overgang"
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
-msgstr ""
+msgstr "Grijs overgang"
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
-#, fuzzy
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 msgid "Light Gray Transition"
-msgstr "Licht Cyaan"
+msgstr "Lichtgrijs overgang"
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
-#, fuzzy
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 msgid "Dark Gray Transition"
-msgstr "Licht Cyaan"
+msgstr "Donkergrijs overgang"
 
-#: src/main/print-escp2.c:527
-#, fuzzy
+#: src/main/print-escp2.c:544
 msgid "Mid Gray Transition"
-msgstr "Licht Cyaan"
+msgstr "Middelgrijs overgang"
 
-#: src/main/print-escp2.c:528
-#, fuzzy
+#: src/main/print-escp2.c:545
 msgid "Medium Gray Transition"
-msgstr "Licht Cyaan"
+msgstr "Middelgrijs overgang"
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 msgid "Full Manual Control"
-msgstr ""
+msgstr "Volledig handmatige controle"
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
-msgstr ""
+msgstr "Automatische controle op instellingen"
 
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr ""
-
-#: src/main/print-escp2.c:1564
-#, fuzzy
-msgid "Print To Hub"
-msgstr "Afdrukken Naar Bestand"
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
-#, fuzzy
 msgid "Manual Control"
-msgstr "Handmatig"
+msgstr "Handmatige controle"
+
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr "Standaard"
 
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
-#, fuzzy
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 msgid "Automatic"
-msgstr "Grootte"
+msgstr "Automatisch"
 
-#: src/main/print-escp2.c:1701
-#, fuzzy
+#: src/main/print-escp2.c:1829
 msgid "Bidirectional"
-msgstr "600 DPI unidirectioneel"
+msgstr "Bidirectioneel"
 
-#: src/main/print-escp2.c:1703
-#, fuzzy
+#: src/main/print-escp2.c:1831
 msgid "Unidirectional"
-msgstr "600 DPI unidirectioneel"
+msgstr "Unidirectioneel"
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
-msgstr ""
+msgstr "Afwisselend opvullen"
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
-msgstr ""
+msgstr "Oplopend vullen"
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
-msgstr ""
+msgstr "Aflopend vullen"
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
-msgstr ""
+msgstr "Dubbel oplopend"
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
-msgstr ""
+msgstr "Vermijden van naaste buur"
 
-#: src/main/print-escp2.c:2168
-#, fuzzy, c-format
+#: src/main/print-escp2.c:2313
+#, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
-msgstr "Printer ondersteund geen kleuren\n"
+msgstr "Deze printer ondersteunt geen 'raw' printuitvoer op de diepte %d\n"
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
-msgstr ""
+msgstr "Print opties niet geverifiëerd; kan niet printen.\n"
 
 #: src/main/print-lexmark.c:577 src/main/print-lexmark.c:653
 msgid "300 DPI x 600 DPI"
@@ -1764,688 +1306,804 @@ msgstr "2400 DPI x 1200 DPI"
 
 #: src/main/print-lexmark.c:586
 msgid "2400 DPI x 1200 DPI high quality"
-msgstr ""
+msgstr "2400 DPI x 1200 DPI hoge kwaliteit"
 
 #: src/main/print-lexmark.c:587
 msgid "2400 DPI x 1200 DPI highest quality"
-msgstr ""
+msgstr "2400 DPI x 1200 DPI hoogste kwalitiet"
 
 #: src/main/print-lexmark.c:589
 msgid "test print"
 msgstr "Test afdruk"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
 msgstr "Vier kleuren standaard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
 msgstr "Drie kleuren composiet"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
 msgstr "Zes kleuren foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
 msgstr "Vijf kleuren foto composiet"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+msgid "Plain Paper"
+msgstr "Blanco papier"
+
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
 msgstr "Glanzende laag"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+msgid "Transparencies"
+msgstr "Transparanten"
+
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 msgid "Envelopes"
 msgstr "Enveloppen"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 msgid "Matte Paper"
 msgstr "Mat papier"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
 msgstr "Inkjet-papier"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotokwaliteit Inkjet-papier"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 msgid "Photo Paper"
 msgstr "Fotopapier"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium glanzend fotopapier"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Luster Photo Papier"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
 msgstr "Fotokwaliteit glanzend papier"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
-#: src/main/print-olympus.c:265
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr "Overige"
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr "Automatische papierlader"
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr "Handmatig met pauze"
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr "Handmatig zonder pauze"
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
-msgstr ""
+msgstr "Gecoat"
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
-msgstr ""
+msgstr "Geen"
 
-#: src/main/print-olympus.c:859
-#, fuzzy
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 msgid "Glossy"
-msgstr "Glanzende laag"
+msgstr "Glanzend"
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
-msgstr ""
+msgstr "Oppervlaktestructuur"
 
-#: src/main/print-olympus.c:861
-#, fuzzy
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 msgid "Matte"
-msgstr "Mat papier"
+msgstr "Mat"
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
-msgstr ""
+msgstr "Laagjespatroon"
 
-#: src/main/print-olympus.c:1331
-#, fuzzy
+#: src/main/print-olympus.c:1627
 msgid "Adjust the cyan balance"
-msgstr "Pas de hoeveelheid cyaan aan"
+msgstr "Pas de cyaanbalans aan"
 
-#: src/main/print-olympus.c:1339
-#, fuzzy
+#: src/main/print-olympus.c:1635
 msgid "Adjust the magenta balance"
-msgstr "Pas de hoeveelheid magenta aan"
+msgstr "Pas de magentabalans aan"
 
-#: src/main/print-olympus.c:1347
-#, fuzzy
+#: src/main/print-olympus.c:1643
 msgid "Adjust the yellow balance"
-msgstr "Pas de hoeveelheid geel aan"
+msgstr "Pas de geelbalans aan"
 
-#: src/main/print-olympus.c:1354
-#, fuzzy
+#: src/main/print-olympus.c:1650
 msgid "Black Balance"
-msgstr "Zwart en Wit"
+msgstr "Zwartbalans"
 
-#: src/main/print-olympus.c:1355
-#, fuzzy
+#: src/main/print-olympus.c:1651
 msgid "Adjust the black balance"
-msgstr "Pas de hoeveelheid cyaan aan"
+msgstr "Pas de zwartbalans aan"
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 msgid "Plain"
-msgstr "Blank"
+msgstr "Blanco"
 
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 msgid "Bond"
-msgstr ""
+msgstr "Zwaar"
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 msgid "Premium"
-msgstr "Premium"
+msgstr "Eerste klas"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
-msgstr "Glanzend foto"
+msgstr "Glanzende foto"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 msgid "Transparency"
-msgstr "Transparantie"
+msgstr "Transparant"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
 msgstr "Sneldrogend foto"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 msgid "Quick-dry Transparency"
 msgstr "Sneldrogend transparant"
 
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
 msgstr "Handmatig"
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 msgid "Tray 1"
 msgstr "Lade 1"
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 msgid "Tray 2"
 msgstr "Lade 2"
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 msgid "Tray 3"
 msgstr "Lade 3"
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 msgid "Tray 4"
 msgstr "Lade 4"
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
 msgstr "Draagbare Sheet Feeder"
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 msgid "Desktop Sheet Feeder"
 msgstr "Desktop Sheet Feeder"
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 msgid "Tray"
 msgstr "Lade"
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 msgid "Optional Source"
 msgstr "Optionele Bron"
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 msgid "Autoselect"
 msgstr "Automatisch Selecteren"
 
 #: src/main/print-pcl.c:256
+msgid "150x150 DPI"
+msgstr "150x150 DPI"
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr "300x300 DPI"
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
+msgstr "600x300 DPI"
+
+#: src/main/print-pcl.c:259
 msgid "600x600 DPI monochrome"
 msgstr "600x600 DPI monochrome"
 
-#: src/main/print-pcl.c:259
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr "600x600 DPI"
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr "1200x600 DPI"
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
 msgstr "Kleur + Zwarte patronen"
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
 msgstr "Kleur + Foto patronen"
 
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr ""
-
 #: src/main/print-ps.c:97
-#, fuzzy
 msgid "PPDFile"
-msgstr "PPD Bestand:"
+msgstr "PPD-bestand"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
-#, fuzzy
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 msgid "PPD File"
-msgstr "PPD Bestand?"
+msgstr "PPD-bestand"
 
 #: src/main/print-raw.c:223
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
+"Afmeting van afbeelding moet overeenkomen met de afmetingen van het papier"
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
-#, fuzzy
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 msgid "Two Level Grayscale"
-msgstr "Grijswaarden"
+msgstr "Grijsschaal met twee waarden"
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
-#, fuzzy
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 msgid "Three Level Grayscale"
-msgstr "Grijswaarden"
+msgstr "Grijsschaal met drie waarden"
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
-msgstr ""
+msgstr "Viertonig"
 
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
-msgstr "Zes kleuren verbeterd composiet"
+msgstr "Zes kleuren verbeterde samenstelling"
 
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
-#, fuzzy
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 msgid "Seven Color Photo"
-msgstr "Zes kleuren foto"
+msgstr "Zevenkleuren foto"
 
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 msgid "Seven Color Enhanced"
 msgstr "Zeven kleuren verbeterd"
 
-#: src/main/escp2-channels.c:1535
-#, fuzzy
+#: src/main/escp2-channels.c:1649
 msgid "Eight Color Photo"
-msgstr "Zes kleuren foto"
+msgstr "Achtkleuren foto"
 
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
-#, fuzzy
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 msgid "One Color Raw"
-msgstr "Zes kleuren foto"
+msgstr "Enkelkleur 'raw'"
 
-#: src/main/escp2-channels.c:1695
-#, fuzzy
+#: src/main/escp2-channels.c:1809
 msgid "One Color Raw Enhanced Gloss"
-msgstr "Zeven kleuren verbeterd"
+msgstr "Enkelkleur 'raw' verbeterde glans"
 
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
-#, fuzzy
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 msgid "Two Color Raw"
-msgstr "Vier kleuren standaard"
+msgstr "Tweekleuren 'raw'"
 
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
-#, fuzzy
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 msgid "Three Color Raw"
-msgstr "Drie kleuren composiet"
+msgstr "Driekleuren 'raw'"
 
-#: src/main/escp2-channels.c:1762
-#, fuzzy
+#: src/main/escp2-channels.c:1876
 msgid "Three Color Raw Gloss"
-msgstr "Drie kleuren composiet"
+msgstr "Driekleuren 'raw' glanzend"
 
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
-#, fuzzy
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 msgid "Four Color Raw"
-msgstr "Vier kleuren standaard"
+msgstr "Vierkleuren 'raw'"
 
-#: src/main/escp2-channels.c:1884
-#, fuzzy
+#: src/main/escp2-channels.c:2017
 msgid "Four Color Raw Gloss"
-msgstr "Vier kleuren standaard"
+msgstr "Vierkleuren 'raw' glanzend"
 
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
-#, fuzzy
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 msgid "Five Color Raw"
-msgstr "Zes kleuren foto"
+msgstr "Vijfkleuren 'raw'"
 
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
-#, fuzzy
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 msgid "Six Color Raw"
-msgstr "Zes kleuren foto"
+msgstr "Zeskleuren 'raw'"
 
-#: src/main/escp2-channels.c:1962
-#, fuzzy
+#: src/main/escp2-channels.c:2109
 msgid "Six Color Enhanced Gloss Raw"
-msgstr "Zes kleuren verbeterd composiet"
+msgstr "Zeskleuren verbeterde glans 'raw'"
 
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
-#, fuzzy
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 msgid "Seven Color Raw"
-msgstr "Zes kleuren foto"
+msgstr "Zevenkleuren 'raw'"
 
-#: src/main/escp2-channels.c:2024
-#, fuzzy
+#: src/main/escp2-channels.c:2187
 msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Zeven kleuren verbeterd"
+msgstr "Zevenkleuren verbeterde glans 'raw'"
 
-#: src/main/escp2-channels.c:2042
-#, fuzzy
+#: src/main/escp2-channels.c:2205
 msgid "Eight Color Raw"
-msgstr "Zes kleuren foto"
-
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+msgstr "Achtkleuren 'raw'"
+
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
-msgstr ""
+msgstr "EPSON standaard inkt"
 
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
-#, fuzzy
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 msgid "UltraChrome Photo Black"
-msgstr "Zes kleuren foto"
+msgstr "UltraChrome Photo Black"
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
-msgstr ""
+msgstr "UltraChrome Matte Black"
+
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+msgid "Photo Black"
+msgstr "Fotozwart"
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+msgid "Matte Black"
+msgstr "Matzwart"
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+msgid "Light Cyan"
+msgstr "Lichtcyaan"
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+msgid "Light Magenta"
+msgstr "Lichtmagenta"
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+msgid "Light Black"
+msgstr "Grijs"
+
+#: src/main/escp2-channels.c:2981
+msgid "Dark Yellow"
+msgstr "Donkergeel"
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+msgid "Gloss Optimizer"
+msgstr "Glansverbeteraar"
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+msgid "Light Light Black"
+msgstr "Lichtgrijs"
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 msgid "Plain Paper Fast Load"
-msgstr "Blak papier snellader"
+msgstr "Blanco papier snellader"
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Briefkaart"
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 msgid "Back Light Film"
-msgstr ""
+msgstr "Backlight film"
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
-#, fuzzy
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 msgid "Matte Paper Heavyweight"
-msgstr "Mat papier"
+msgstr "Zwaar mat papier"
 
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
-#, fuzzy
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 msgid "Premium Semigloss Photo Paper"
-msgstr "Premium glanzend fotopapier"
+msgstr "Premium halfglanzend fotopapier"
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
-#, fuzzy
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 msgid "ColorLife Paper"
-msgstr "Blank papier"
+msgstr "ColorLife papier"
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
-#, fuzzy
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 msgid "Archival Matte Paper"
-msgstr "Mat papier"
+msgstr "Archief mat papier"
 
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
-msgstr ""
+msgstr "Waterverfpapier - stralend wit"
+
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+msgid "Roll Feed"
+msgstr "Rolinvoer"
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr "Aanvoer vanaf rol (snij elke pagina af)"
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr "Aanvoer vanaf rol (niet afsnijden)"
+
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+msgid "Manual Feed"
+msgstr "Handmatige toevoer"
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+msgid "Print to CD"
+msgstr "Afdrukken naar CD"
+
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+msgid "Manual Sheet Guide"
+msgstr "Handmatige papiergeleider"
+
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+msgid "Manual Feed (Front)"
+msgstr "Handmatige toevoer (voorzijde)"
+
+#: src/main/escp2-papers.c:1859
+msgid "Rear Tray"
+msgstr "Lade aan achterzijde"
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr "Lade aan voorzijde"
+
+#: src/main/escp2-papers.c:1886
+msgid "Photo Board"
+msgstr "Fotobord"
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr "Lade 1 voor vellen"
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr "Lade 2 voor vellen"
+
+#: src/main/escp2-papers.c:1943
+msgid "Cut Sheet Autoselect"
+msgstr "Automatisch selecteren van vellen"
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr "Handmatig selecteren"
 
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
-msgstr ""
+msgstr "360 x 90 DPI Fast Economy"
 
 #: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
-#, fuzzy
 msgid "360 x 120 DPI Economy"
-msgstr "600x600 DPI monochrome"
+msgstr "360 x 120 DPI Economy"
 
 #: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
 msgid "180 DPI Economy"
-msgstr ""
+msgstr "180 DPI Economy"
 
 #: src/main/escp2-resolutions.c:54 src/main/escp2-resolutions.c:57
-#, fuzzy
 msgid "360 x 180 DPI Draft"
-msgstr "150x150 DPI"
+msgstr "360 x 180 DPI Draft"
 
 #: src/main/escp2-resolutions.c:61 src/main/escp2-resolutions.c:64
-#, fuzzy
 msgid "360 x 240 DPI Draft"
-msgstr "600x600 DPI"
+msgstr "360 x 240 DPI Draft"
 
 #: src/main/escp2-resolutions.c:68
-#, fuzzy
 msgid "360 DPI High Quality"
-msgstr "1440 x 360 DPI Hoge kwaliteit"
+msgstr "360 DPI hoge kwaliteit"
 
 #: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
 #: src/main/escp2-resolutions.c:77
-#, fuzzy
 msgid "360 DPI"
-msgstr "600 DPI"
+msgstr "360 DPI"
 
 #: src/main/escp2-resolutions.c:81 src/main/escp2-resolutions.c:84
-#, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
 #, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 msgid "720 DPI"
-msgstr "1200 DPI"
+msgstr "720 DPI"
 
-#: src/main/escp2-resolutions.c:94
-#, fuzzy
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 msgid "720 DPI High Quality"
-msgstr "1200 DPI hoge kwaliteit"
+msgstr "720 DPI hoge kwaliteit"
 
-#: src/main/escp2-resolutions.c:97
-#, fuzzy
+#: src/main/escp2-resolutions.c:103
 msgid "720 DPI Highest Quality"
-msgstr "1200 DPI Hoogste kwaliteit"
+msgstr "720 DPI hoogste kwaliteit"
 
-#: src/main/escp2-resolutions.c:100
-#, fuzzy
+#: src/main/escp2-resolutions.c:106
 msgid "720 x 720 DPI"
-msgstr "2880 x 720 DPI"
+msgstr "720 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
-#, fuzzy
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:110
-#, fuzzy
+#: src/main/escp2-resolutions.c:116
 msgid "1440 x 720 DPI Highest Quality"
-msgstr "1440 x 360 DPI Hoogste kwaliteit"
+msgstr "1440 x 7200 DPI hoogste kwaliteit"
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
-#, fuzzy
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 DPI"
+msgstr "1440 x 720 DPI getransponeerd"
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
-#, fuzzy
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:129
-#, fuzzy
+#: src/main/escp2-resolutions.c:135
 msgid "2880 x 720 DPI Highest Quality"
-msgstr "1440 x 360 DPI Hoogste kwaliteit"
+msgstr "2880 x 720 DPI hoogste kwaliteit"
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
-#, fuzzy
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
+#: src/main/escp2-resolutions.c:145
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:142
-#, fuzzy
-msgid "1440 x 1440"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/escp2-resolutions.c:145
-#, fuzzy
-msgid "1440 x 1440 DPI High Quality"
-msgstr "1440 x 360 DPI Hoogste kwaliteit"
-
-#: src/main/escp2-resolutions.c:148
-#, fuzzy
-msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1440 x 360 DPI Hoogste kwaliteit"
-
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
-#, fuzzy
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 msgid "2880 x 1440 DPI"
-msgstr "1440 x 1440 DPI"
+msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:158
-#, fuzzy
+#: src/main/escp2-resolutions.c:155
 msgid "2880 x 1440 DPI Transposed"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/escp2-resolutions.c:164
-#, fuzzy
-msgid "2880 x 1440 DPI High Quality"
-msgstr "1440 x 360 DPI Hoogste kwaliteit"
-
-#: src/main/escp2-resolutions.c:167
-#, fuzzy
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr "1440 x 360 DPI Hoogste kwaliteit"
+msgstr "2880 x 1440 DPI getransponeerd"
 
-#: src/main/escp2-resolutions.c:171
-#, fuzzy
+#: src/main/escp2-resolutions.c:162
 msgid "5760 x 1440 DPI"
-msgstr "1440 x 1440 DPI"
+msgstr "5760 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
-#, fuzzy
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 msgid "2880 x 2880 DPI"
-msgstr "2880 x 720 DPI"
+msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
-#, fuzzy
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 msgid "5760 x 2880 DPI"
-msgstr "2880 x 720 DPI"
+msgstr "5760 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
-msgstr ""
+msgstr "Aan"
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
-#, fuzzy
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 msgid "Interleave"
-msgstr "Printer Naam:"
+msgstr "Interleave"
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
-msgstr ""
+msgstr "Volledige overlap"
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
-msgstr ""
+msgstr "Viermaal een doorgang"
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
-msgstr ""
+msgstr "Volledige overlap 2"
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
-#, fuzzy
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 msgid "Interleave 2"
-msgstr "Printer Naam:"
+msgstr "Interleave 2"
 
-#: src/main/escp2-resolutions.c:584
-#, fuzzy
+#: src/main/escp2-resolutions.c:594
 msgid "Eight Pass"
-msgstr "Helderheid:"
+msgstr "Achtmaal doorgang"
+
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr "Snel en zuinig"
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr "Zuinig"
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr "Proefdruk"
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+msgid "High"
+msgstr "Hoog"
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+msgid "Photo"
+msgstr "Foto"
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+msgid "Super Photo"
+msgstr "Super Photo"
+
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+msgid "Ultra Photo"
+msgstr "Ultra Photo"
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr "Het best"
 
 #: src/main/generic-options.c:46
 msgid "Text"
-msgstr ""
+msgstr "Tekst"
 
 #: src/main/generic-options.c:47
 msgid "Graphics"
-msgstr ""
+msgstr "Grafisch"
 
 #: src/main/generic-options.c:48
 msgid "Mixed Text and Graphics"
-msgstr ""
+msgstr "Gemengd tekst en grafisch"
 
 #: src/main/generic-options.c:49
-#, fuzzy
 msgid "Photograph"
 msgstr "Foto"
 
 #: src/main/generic-options.c:50
 msgid "Line Art"
-msgstr "Lijn tekening"
+msgstr "Lijntekening"
 
 #: src/main/generic-options.c:55
-#, fuzzy
 msgid "Page"
-msgstr "Grootte"
+msgstr "Pagina"
 
 #: src/main/generic-options.c:56
 msgid "Job"
-msgstr ""
+msgstr "Job"
 
 #: src/main/generic-options.c:68
-#, fuzzy
 msgid "Image Type"
-msgstr "Afbeeldingstype:"
+msgstr "Afbeeldingstype"
 
 #: src/main/generic-options.c:69
-#, fuzzy
 msgid "Type of image being printed"
-msgstr "Type inkt van de printer"
+msgstr "Type afbeelding bezig op de printer"
 
 #: src/main/generic-options.c:74 src/main/generic-options.c:80
 msgid "Job Mode"
-msgstr ""
+msgstr "Jobmodus"
 
 #: src/main/generic-options.c:75
 msgid "Job vs. page mode"
-msgstr ""
+msgstr "Job versus paginamodus"
 
 #: src/main/generic-options.c:80
-#, fuzzy
 msgid "Page Number"
-msgstr "Grootte"
+msgstr "Paginanummer"
 
 #: src/main/generic-options.c:81
-#, fuzzy
 msgid "Page number"
-msgstr "Grootte"
+msgstr "Paginanummer"
 
 #: src/main/xmli18n-tmp.h:1
 msgid "Letter"
@@ -2463,3854 +2121,4000 @@ msgstr "Tabloid"
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:10
-#, fuzzy
+#: src/main/xmli18n-tmp.h:11
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
-msgstr "Epson 4x6 Fotopapier"
+msgstr "Epson 4x6 fotopapier (afscheurranden)"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
-msgstr ""
+msgstr "Engineering C 17x22"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:25
-#, fuzzy
+#: src/main/xmli18n-tmp.h:26
 msgid "22x30"
-msgstr "20x30"
+msgstr "22x30"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
-msgstr ""
+msgstr "Super A1 24x36"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:31
-#, fuzzy
+#: src/main/xmli18n-tmp.h:32
 msgid "Super A0"
-msgstr "Stylus Photo"
+msgstr "Super A0"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
 msgstr "A4"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:66
-#, fuzzy
+#: src/main/xmli18n-tmp.h:67
 msgid "Super B0 JIS"
-msgstr "B0 JIS"
+msgstr "Super B0 JIS"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 msgid "ArchA transposed"
-msgstr ""
+msgstr "ArchA getransponeerd"
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 msgid "ArchB transposed"
-msgstr ""
+msgstr "ArchB getransponeerd"
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 msgid "ArchC transposed"
-msgstr ""
+msgstr "ArchC getransponeerd"
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 msgid "ArchD transposed"
-msgstr ""
+msgstr "ArchD getransponeerd"
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 msgid "ArchE transposed"
-msgstr ""
+msgstr "ArchE getransponeerd"
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 msgid "American foolscap"
 msgstr "American foolscap"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 msgid "European foolscap"
 msgstr "European foolscap"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:108
-#, fuzzy
+#: src/main/xmli18n-tmp.h:109
 msgid "ISO A4"
-msgstr "SRA4"
+msgstr "ISO A4"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
-msgstr ""
+msgstr "ISO A5"
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 msgid "Small paperback"
 msgstr "Smalle paperback"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 msgid "Penguin small paperback"
 msgstr "Penguin smalle paperback"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 msgid "Penguin large paperback"
 msgstr "Penguin grootte paperback"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
-msgstr ""
+msgstr "10cm x 15cm"
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 msgid "Hagaki Card"
 msgstr "Hagaki Kaart"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
 msgstr "Oufuku Kaart"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
 msgstr "Japanese long envelop #3"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
 msgstr "Japanse long envelop #4"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanse Kaku envelop #4"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/main/xmli18n-tmp.h:125
-#, fuzzy
+#: src/main/xmli18n-tmp.h:126
 msgid "Monarch Envelope"
-msgstr "Envelop"
+msgstr "Monarch envelop"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
-msgstr ""
+msgstr "4x5 3/8"
 
-#: src/main/xmli18n-tmp.h:127
-#, fuzzy
+#: src/main/xmli18n-tmp.h:128
 msgid "4x7"
-msgstr "5x7"
+msgstr "4x7"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
-msgstr ""
+msgstr "CP_L"
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
-msgstr ""
+msgstr "Kaart"
 
-#: src/main/xmli18n-tmp.h:130
-#, fuzzy
+#: src/main/xmli18n-tmp.h:131
 msgid "Wide Postcard"
-msgstr "Briefkaart"
+msgstr "Brede briefkaart"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
-msgstr ""
+msgstr "Chilean Office"
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
-msgstr ""
+msgstr "Chilean Double Letter"
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
-msgstr ""
+msgstr "Chilean Double Office"
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 msgid "Custom"
-msgstr "Eigen"
+msgstr "Gebruiker"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
 msgstr "89 mm Roll Paper"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
 msgstr "4 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
 msgstr "5 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
 msgstr "210 mm Roll Paper"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
 msgstr "13 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
 msgstr "22 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
 msgstr "24 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
 msgstr "36 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
 msgstr "44 Inch Roll Paper"
 
-#: src/main/xmli18n-tmp.h:144
-msgid "PostScript Level 1"
-msgstr ""
-
 #: src/main/xmli18n-tmp.h:145
-msgid "PostScript Level 2"
-msgstr ""
+msgid "PostScript Level 1"
+msgstr "PostScript Level 1"
 
 #: src/main/xmli18n-tmp.h:146
-msgid "Canon BJ-30"
-msgstr ""
+msgid "PostScript Level 2"
+msgstr "PostScript Level 2"
 
 #: src/main/xmli18n-tmp.h:147
-msgid "Canon BJC-50"
-msgstr ""
+msgid "Canon BJ-30"
+msgstr "Canon BJ-30"
 
 #: src/main/xmli18n-tmp.h:148
-msgid "Canon BJC-55"
-msgstr ""
+msgid "Canon BJC-50"
+msgstr "Canon BJC-50"
 
 #: src/main/xmli18n-tmp.h:149
-msgid "Canon BJC-80"
-msgstr ""
+msgid "Canon BJC-55"
+msgstr "Canon BJC-55"
 
 #: src/main/xmli18n-tmp.h:150
-msgid "Canon BJC-85"
-msgstr ""
+msgid "Canon BJC-80"
+msgstr "Canon BJC-80"
 
 #: src/main/xmli18n-tmp.h:151
-msgid "Canon BJC-210"
-msgstr ""
+msgid "Canon BJC-85"
+msgstr "Canon BJC-85"
 
 #: src/main/xmli18n-tmp.h:152
-msgid "Canon BJC-240"
-msgstr ""
+msgid "Canon BJC-210"
+msgstr "Canon BJC-210"
 
 #: src/main/xmli18n-tmp.h:153
-msgid "Canon BJC-250"
-msgstr ""
+msgid "Canon BJC-240"
+msgstr "Canon BJC-240"
 
 #: src/main/xmli18n-tmp.h:154
-msgid "Canon BJC-1000"
-msgstr ""
+msgid "Canon BJC-250"
+msgstr "Canon BJC-250"
 
 #: src/main/xmli18n-tmp.h:155
-msgid "Canon BJC-2000"
-msgstr ""
+msgid "Canon BJC-1000"
+msgstr "Canon BJC-1000"
 
 #: src/main/xmli18n-tmp.h:156
-msgid "Canon BJC-2010"
-msgstr ""
+msgid "Canon BJC-2000"
+msgstr "Canon BJC-2000"
 
 #: src/main/xmli18n-tmp.h:157
-msgid "Canon BJC-2100"
-msgstr ""
+msgid "Canon BJC-2010"
+msgstr "Canon BJC-2010"
 
 #: src/main/xmli18n-tmp.h:158
-msgid "Canon BJC-2110"
-msgstr ""
+msgid "Canon BJC-2100"
+msgstr "Canon BJC-2100"
 
 #: src/main/xmli18n-tmp.h:159
-msgid "Canon BJC-3000"
-msgstr ""
+msgid "Canon BJC-2110"
+msgstr "Canon BJC-2110"
 
 #: src/main/xmli18n-tmp.h:160
-msgid "Canon BJC-4000"
-msgstr ""
+msgid "Canon BJC-3000"
+msgstr "Canon BJC-3000"
 
 #: src/main/xmli18n-tmp.h:161
-msgid "Canon BJC-4300"
-msgstr ""
+msgid "Canon BJC-4000"
+msgstr "Canon BJC-4000"
 
 #: src/main/xmli18n-tmp.h:162
-msgid "Canon BJC-4400"
-msgstr ""
+msgid "Canon BJC-4300"
+msgstr "Canon BJC-4300"
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon BJC-6000"
-msgstr ""
+msgid "Canon BJC-4400"
+msgstr "Canon BJC-4400"
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon BJC-6100"
-msgstr ""
+msgid "Canon BJC-6000"
+msgstr "Canon BJC-6000"
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon BJC-6200"
-msgstr ""
+msgid "Canon BJC-6100"
+msgstr "Canon BJC-6100"
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon BJC-6500"
-msgstr ""
+msgid "Canon BJC-6200"
+msgstr "Canon BJC-6200"
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon BJC-7000"
-msgstr ""
+msgid "Canon BJC-6500"
+msgstr "Canon BJC-6500"
 
 #: src/main/xmli18n-tmp.h:168
-msgid "Canon BJC-7100"
-msgstr ""
+msgid "Canon BJC-7000"
+msgstr "Canon BJC-7000"
 
 #: src/main/xmli18n-tmp.h:169
-msgid "Canon BJC-8200"
-msgstr ""
+msgid "Canon BJC-7100"
+msgstr "Canon BJC-7100"
 
 #: src/main/xmli18n-tmp.h:170
-msgid "Canon S100"
-msgstr ""
+msgid "Canon BJC-8200"
+msgstr "Canon BJC-8200"
 
 #: src/main/xmli18n-tmp.h:171
-msgid "Canon S200"
-msgstr ""
+msgid "Canon S100"
+msgstr "Canon S100"
 
 #: src/main/xmli18n-tmp.h:172
-msgid "Canon S300"
-msgstr ""
+msgid "Canon S200"
+msgstr "Canon S200"
 
 #: src/main/xmli18n-tmp.h:173
-msgid "Canon S400"
-msgstr ""
+msgid "Canon S300"
+msgstr "Canon S300"
 
 #: src/main/xmli18n-tmp.h:174
-msgid "Canon S450"
-msgstr ""
+msgid "Canon S400"
+msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:175
-msgid "Canon S500"
-msgstr ""
+msgid "Canon S450"
+msgstr "Canon S450"
 
 #: src/main/xmli18n-tmp.h:176
-msgid "Canon S600"
-msgstr ""
+msgid "Canon S500"
+msgstr "Canon S500"
 
 #: src/main/xmli18n-tmp.h:177
-msgid "Canon S630"
-msgstr ""
+msgid "Canon S600"
+msgstr "Canon S600"
 
 #: src/main/xmli18n-tmp.h:178
-msgid "Canon S800"
-msgstr ""
+msgid "Canon S630"
+msgstr "Canon S630"
 
 #: src/main/xmli18n-tmp.h:179
-msgid "Canon S4500"
-msgstr ""
+msgid "Canon S800"
+msgstr "Canon S800"
 
 #: src/main/xmli18n-tmp.h:180
-msgid "Canon iP4000"
-msgstr ""
+msgid "Canon S4500"
+msgstr "Canon S4500"
 
 #: src/main/xmli18n-tmp.h:181
 #, fuzzy
-msgid "Epson Stylus C20"
-msgstr "Stylus C20ux"
+msgid "Canon PIXMA iP2000"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:182
 #, fuzzy
-msgid "Epson Stylus C20SX"
-msgstr "Stylus C20ux"
+msgid "Canon PIXMA iP3000"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:183
 #, fuzzy
-msgid "Epson Stylus C20UX"
-msgstr "Stylus C20ux"
+msgid "Canon PIXMA iP3100"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:184
 #, fuzzy
-msgid "Epson Stylus C40"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA iP4000"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:185
 #, fuzzy
-msgid "Epson Stylus C40SX"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA iP4100"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:186
 #, fuzzy
-msgid "Epson Stylus C40UX"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA iP4200"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:187
 #, fuzzy
-msgid "Epson Stylus C41"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA iP4300"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:188
 #, fuzzy
-msgid "Epson Stylus C41SX"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA iP5000"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:189
 #, fuzzy
-msgid "Epson Stylus C41UX"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA iP5200"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:190
 #, fuzzy
-msgid "Epson Stylus C42"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA iP6700"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:191
 #, fuzzy
-msgid "Epson Stylus C42SX"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA MP150"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:192
 #, fuzzy
-msgid "Epson Stylus C42UX"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA MP500"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:193
 #, fuzzy
-msgid "Epson Stylus C43"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA MP700"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:194
 #, fuzzy
-msgid "Epson Stylus C43SX"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA MP730"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:195
 #, fuzzy
-msgid "Epson Stylus C43UX"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA MP750"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:196
 #, fuzzy
-msgid "Epson Stylus C44"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA MP760"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:197
 #, fuzzy
-msgid "Epson Stylus C44SX"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA MP770"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:198
 #, fuzzy
-msgid "Epson Stylus C44UX"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA MP780"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:199
 #, fuzzy
-msgid "Epson Stylus C45"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP790"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:200
 #, fuzzy
-msgid "Epson Stylus C46"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP830"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:201
 #, fuzzy
-msgid "Epson Stylus C48"
-msgstr "Stylus C60"
+msgid "Canon PIXUS iP3100"
+msgstr "Canon S100"
 
 #: src/main/xmli18n-tmp.h:202
 #, fuzzy
-msgid "Epson Stylus C50"
-msgstr "Stylus C60"
+msgid "Canon PIXUS iP4100"
+msgstr "Canon iP4000"
 
 #: src/main/xmli18n-tmp.h:203
 #, fuzzy
-msgid "Epson Stylus C60"
-msgstr "Stylus C60"
+msgid "Canon i560"
+msgstr "Canon S450"
 
 #: src/main/xmli18n-tmp.h:204
 #, fuzzy
-msgid "Epson Stylus C61"
-msgstr "Stylus C60"
+msgid "Canon i850"
+msgstr "Canon S450"
 
 #: src/main/xmli18n-tmp.h:205
 #, fuzzy
-msgid "Epson Stylus C62"
-msgstr "Stylus C60"
+msgid "Canon i860"
+msgstr "Canon S600"
 
 #: src/main/xmli18n-tmp.h:206
 #, fuzzy
-msgid "Epson Stylus C63"
-msgstr "Stylus C60"
+msgid "Canon i865"
+msgstr "Canon BJC-85"
 
 #: src/main/xmli18n-tmp.h:207
-#, fuzzy
-msgid "Epson Stylus C64"
-msgstr "Stylus C60"
+msgid "Epson Stylus C20"
+msgstr "Epson Stylus C20"
 
 #: src/main/xmli18n-tmp.h:208
-#, fuzzy
-msgid "Epson Stylus C65"
-msgstr "Stylus C60"
+msgid "Epson Stylus C20SX"
+msgstr "Epson Stylus C20SX"
 
 #: src/main/xmli18n-tmp.h:209
-#, fuzzy
-msgid "Epson Stylus C66"
-msgstr "Stylus C60"
+msgid "Epson Stylus C20UX"
+msgstr "Epson Stylus C20UX"
 
 #: src/main/xmli18n-tmp.h:210
-#, fuzzy
-msgid "Epson Stylus C68"
-msgstr "Stylus C60"
+msgid "Epson Stylus C40"
+msgstr "Epson Stylus C40"
 
 #: src/main/xmli18n-tmp.h:211
-#, fuzzy
-msgid "Epson Stylus C70"
-msgstr "Stylus C70"
+msgid "Epson Stylus C40SX"
+msgstr "Epson Stylus C40SX"
 
 #: src/main/xmli18n-tmp.h:212
-#, fuzzy
-msgid "Epson Stylus C80"
-msgstr "Stylus C80"
+msgid "Epson Stylus C40UX"
+msgstr "Epson Stylus C40UX"
 
 #: src/main/xmli18n-tmp.h:213
-#, fuzzy
-msgid "Epson Stylus C82"
-msgstr "Stylus C80"
+msgid "Epson Stylus C41"
+msgstr "Epson Stylus C41"
 
 #: src/main/xmli18n-tmp.h:214
-#, fuzzy
-msgid "Epson Stylus C83"
-msgstr "Stylus C80"
+msgid "Epson Stylus C41SX"
+msgstr "Epson Stylus C41SX"
 
 #: src/main/xmli18n-tmp.h:215
-#, fuzzy
-msgid "Epson Stylus C84"
-msgstr "Stylus C80"
+msgid "Epson Stylus C41UX"
+msgstr "Epson Stylus C41UX"
 
 #: src/main/xmli18n-tmp.h:216
-#, fuzzy
-msgid "Epson Stylus C85"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42"
+msgstr "Epson Stylus C42"
 
 #: src/main/xmli18n-tmp.h:217
-#, fuzzy
-msgid "Epson Stylus C86"
-msgstr "Stylus C60"
+msgid "Epson Stylus C42SX"
+msgstr "Epson Stylus C42SX"
 
 #: src/main/xmli18n-tmp.h:218
-#, fuzzy
-msgid "Epson Stylus C88"
-msgstr "Stylus C80"
+msgid "Epson Stylus C42UX"
+msgstr "Epson Stylus C42UX"
 
 #: src/main/xmli18n-tmp.h:219
-#, fuzzy
-msgid "Epson Stylus Color"
-msgstr "Stylus Color"
+msgid "Epson Stylus C43"
+msgstr "Epson Stylus C43"
 
 #: src/main/xmli18n-tmp.h:220
-#, fuzzy
-msgid "Epson Stylus Color I"
-msgstr "Stylus Color"
+msgid "Epson Stylus C43SX"
+msgstr "Epson Stylus C43SX"
 
 #: src/main/xmli18n-tmp.h:221
-#, fuzzy
-msgid "Epson Stylus Color II"
-msgstr "Stylus Color"
+msgid "Epson Stylus C43UX"
+msgstr "Epson Stylus C43UX"
 
 #: src/main/xmli18n-tmp.h:222
-#, fuzzy
-msgid "Epson Stylus Color IIs"
-msgstr "Stylus Color"
+msgid "Epson Stylus C44"
+msgstr "Epson Stylus C44"
 
 #: src/main/xmli18n-tmp.h:223
-#, fuzzy
-msgid "Epson Stylus Color PRO"
-msgstr "Stylus Color Pro"
+msgid "Epson Stylus C44SX"
+msgstr "Epson Stylus C44SX"
 
 #: src/main/xmli18n-tmp.h:224
-#, fuzzy
-msgid "Epson Stylus Pro XL"
-msgstr "Stylus Color Pro XL"
+msgid "Epson Stylus C44UX"
+msgstr "Epson Stylus C44UX"
 
 #: src/main/xmli18n-tmp.h:225
-#, fuzzy
-msgid "Epson Stylus Color 400"
-msgstr "Stylus Color 400"
+msgid "Epson Stylus C45"
+msgstr "Epson Stylus C45"
 
 #: src/main/xmli18n-tmp.h:226
-#, fuzzy
-msgid "Epson Stylus Color 440"
-msgstr "Stylus Color 440"
+msgid "Epson Stylus C46"
+msgstr "Epson Stylus C46"
 
 #: src/main/xmli18n-tmp.h:227
-#, fuzzy
-msgid "Epson Stylus Color 460"
-msgstr "Stylus Color 460"
+msgid "Epson Stylus C48"
+msgstr "Epson Stylus C48"
 
 #: src/main/xmli18n-tmp.h:228
-#, fuzzy
-msgid "Epson Stylus Color 480"
-msgstr "Stylus Color 480"
+msgid "Epson Stylus C50"
+msgstr "Epson Stylus C50"
 
 #: src/main/xmli18n-tmp.h:229
-#, fuzzy
-msgid "Epson Stylus Color 500"
-msgstr "Stylus Color 500"
+msgid "Epson Stylus C60"
+msgstr "Epson Stylus C60"
 
 #: src/main/xmli18n-tmp.h:230
-#, fuzzy
-msgid "Epson Stylus Color 580"
-msgstr "Stylus Color 580"
+msgid "Epson Stylus C61"
+msgstr "Epson Stylus C61"
 
 #: src/main/xmli18n-tmp.h:231
-#, fuzzy
-msgid "Epson Stylus Color 600"
-msgstr "Stylus Color 600"
+msgid "Epson Stylus C62"
+msgstr "Epson Stylus C62"
 
 #: src/main/xmli18n-tmp.h:232
-#, fuzzy
-msgid "Epson Stylus Color 640"
-msgstr "Stylus Color 640"
+msgid "Epson Stylus C63"
+msgstr "Epson Stylus C63"
 
 #: src/main/xmli18n-tmp.h:233
-#, fuzzy
-msgid "Epson Stylus Color 660"
-msgstr "Stylus Color 660"
+msgid "Epson Stylus C64"
+msgstr "Epson Stylus C64"
 
 #: src/main/xmli18n-tmp.h:234
-#, fuzzy
-msgid "Epson Stylus Color 670"
-msgstr "Stylus Color 670"
+msgid "Epson Stylus C65"
+msgstr "Epson Stylus C65"
 
 #: src/main/xmli18n-tmp.h:235
-#, fuzzy
-msgid "Epson Stylus Color 680"
-msgstr "Stylus Color 680"
+msgid "Epson Stylus C66"
+msgstr "Epson Stylus C66"
 
 #: src/main/xmli18n-tmp.h:236
-#, fuzzy
-msgid "Epson Stylus Color 740"
-msgstr "Stylus Color 740"
+msgid "Epson Stylus C68"
+msgstr "Epson Stylus C68"
 
 #: src/main/xmli18n-tmp.h:237
-#, fuzzy
-msgid "Epson Stylus Color 760"
-msgstr "Stylus Color 760"
+msgid "Epson Stylus C70"
+msgstr "Epson Stylus C70"
 
 #: src/main/xmli18n-tmp.h:238
 #, fuzzy
-msgid "Epson Stylus Color 777"
-msgstr "Stylus Color 777"
+msgid "Epson Stylus C79"
+msgstr "Epson Stylus C70"
 
 #: src/main/xmli18n-tmp.h:239
-#, fuzzy
-msgid "Epson Stylus Color 800"
-msgstr "Stylus Color 800"
+msgid "Epson Stylus C80"
+msgstr "Epson Stylus C80"
 
 #: src/main/xmli18n-tmp.h:240
-#, fuzzy
-msgid "Epson Stylus Color 850"
-msgstr "Stylus Color 850"
+msgid "Epson Stylus C82"
+msgstr "Epson Stylus C82"
 
 #: src/main/xmli18n-tmp.h:241
-#, fuzzy
-msgid "Epson Stylus Color 860"
-msgstr "Stylus Color 860"
+msgid "Epson Stylus C83"
+msgstr "Epson Stylus C83"
 
 #: src/main/xmli18n-tmp.h:242
-#, fuzzy
-msgid "Epson Stylus Color 880"
-msgstr "Stylus Color 880"
+msgid "Epson Stylus C84"
+msgstr "Epson Stylus C84"
 
 #: src/main/xmli18n-tmp.h:243
-#, fuzzy
-msgid "Epson Stylus Color 8 3"
-msgstr "Stylus Color 83"
+msgid "Epson Stylus C85"
+msgstr "Epson Stylus C85"
 
 #: src/main/xmli18n-tmp.h:244
-#, fuzzy
-msgid "Epson Stylus Color 900"
-msgstr "Stylus Color 900"
+msgid "Epson Stylus C86"
+msgstr "Epson Stylus C86"
 
 #: src/main/xmli18n-tmp.h:245
 #, fuzzy
-msgid "Epson Stylus Color 980"
-msgstr "Stylus Color 980"
+msgid "Epson Stylus C87"
+msgstr "Epson Stylus C48"
 
 #: src/main/xmli18n-tmp.h:246
-#, fuzzy
-msgid "Epson Stylus Color 1160"
-msgstr "Stylus Color 1160"
+msgid "Epson Stylus C88"
+msgstr "Epson Stylus C88"
 
 #: src/main/xmli18n-tmp.h:247
-#, fuzzy
-msgid "Epson Stylus Color 1500"
-msgstr "Stylus Color 1500"
+msgid "Epson Stylus Color"
+msgstr "Epson Stylus Color"
 
 #: src/main/xmli18n-tmp.h:248
-#, fuzzy
-msgid "Epson Stylus Color 1520"
-msgstr "Stylus Color 1520"
+msgid "Epson Stylus Color I"
+msgstr "Epson Stylus Color I"
 
 #: src/main/xmli18n-tmp.h:249
-#, fuzzy
-msgid "Epson Stylus Color 3000"
-msgstr "Stylus Color 3000"
+msgid "Epson Stylus Color II"
+msgstr "Epson Stylus Color II"
 
 #: src/main/xmli18n-tmp.h:250
-#, fuzzy
-msgid "Epson Stylus Photo"
-msgstr "Stylus Photo"
+msgid "Epson Stylus Color IIs"
+msgstr "Epson Stylus Color IIs"
 
 #: src/main/xmli18n-tmp.h:251
-#, fuzzy
-msgid "Epson Stylus Photo 700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color PRO"
+msgstr "Epson Stylus Color PRO"
 
 #: src/main/xmli18n-tmp.h:252
-#, fuzzy
-msgid "Epson Stylus Photo EX"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Pro XL"
+msgstr "Epson Stylus Pro XL"
 
 #: src/main/xmli18n-tmp.h:253
-#, fuzzy
-msgid "Epson Stylus Photo EX3"
-msgstr "Stylus Photo EX"
+msgid "Epson Stylus Color 400"
+msgstr "Epson Stylus Color 400"
 
 #: src/main/xmli18n-tmp.h:254
-#, fuzzy
-msgid "Epson Stylus Photo 720"
-msgstr "Stylus Photo 720"
+msgid "Epson Stylus Color 440"
+msgstr "Epson Stylus Color 440"
 
 #: src/main/xmli18n-tmp.h:255
-#, fuzzy
-msgid "Epson Stylus Photo 750"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Color 460"
+msgstr "Epson Stylus Color 460"
 
 #: src/main/xmli18n-tmp.h:256
-#, fuzzy
-msgid "Epson Stylus Photo 780"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 480"
+msgstr "Epson Stylus Color 480"
 
 #: src/main/xmli18n-tmp.h:257
-#, fuzzy
-msgid "Epson Stylus Photo 785"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 500"
+msgstr "Epson Stylus Color 500"
 
 #: src/main/xmli18n-tmp.h:258
-#, fuzzy
-msgid "Epson Stylus Photo 790"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Color 580"
+msgstr "Epson Stylus Color 580"
 
 #: src/main/xmli18n-tmp.h:259
-#, fuzzy
-msgid "Epson Stylus Photo 810"
-msgstr "Stylus Photo 810"
+msgid "Epson Stylus Color 600"
+msgstr "Epson Stylus Color 600"
 
 #: src/main/xmli18n-tmp.h:260
-#, fuzzy
-msgid "Epson Stylus Photo 820"
-msgstr "Stylus Photo 820"
+msgid "Epson Stylus Color 640"
+msgstr "Epson Stylus Color 640"
 
 #: src/main/xmli18n-tmp.h:261
-#, fuzzy
-msgid "Epson Stylus Photo 825"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus Color 660"
+msgstr "Epson Stylus Color 660"
 
 #: src/main/xmli18n-tmp.h:262
-#, fuzzy
-msgid "Epson Stylus Photo 830"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 670"
+msgstr "Epson Stylus Color 670"
 
 #: src/main/xmli18n-tmp.h:263
-#, fuzzy
-msgid "Epson Stylus Photo 830U"
-msgstr "Stylus Photo 780"
+msgid "Epson Stylus Color 680"
+msgstr "Epson Stylus Color 680"
 
 #: src/main/xmli18n-tmp.h:264
-#, fuzzy
-msgid "Epson Stylus Photo 870"
-msgstr "Stylus Photo 870"
+msgid "Epson Stylus Color 740"
+msgstr "Epson Stylus Color 740"
 
 #: src/main/xmli18n-tmp.h:265
-#, fuzzy
-msgid "Epson Stylus Photo 875"
-msgstr "Stylus Photo 875"
+msgid "Epson Stylus Color 760"
+msgstr "Epson Stylus Color 760"
 
 #: src/main/xmli18n-tmp.h:266
-#, fuzzy
-msgid "Epson Stylus Photo 890"
-msgstr "Stylus Photo 890"
+msgid "Epson Stylus Color 777"
+msgstr "Epson Stylus Color 777"
 
 #: src/main/xmli18n-tmp.h:267
-#, fuzzy
-msgid "Epson Stylus Photo 895"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Color 800"
+msgstr "Epson Stylus Color 800"
 
 #: src/main/xmli18n-tmp.h:268
-#, fuzzy
-msgid "Epson Stylus Photo 900"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color 850"
+msgstr "Epson Stylus Color 850"
 
 #: src/main/xmli18n-tmp.h:269
-#, fuzzy
-msgid "Epson Stylus Photo 915"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Color 860"
+msgstr "Epson Stylus Color 860"
 
 #: src/main/xmli18n-tmp.h:270
-#, fuzzy
-msgid "Epson Stylus Photo 925"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Color 880"
+msgstr "Epson Stylus Color 880"
 
 #: src/main/xmli18n-tmp.h:271
-#, fuzzy
-msgid "Epson Stylus Photo 935"
-msgstr "Stylus Photo 895"
+msgid "Epson Stylus Color 8 3"
+msgstr "Epson Stylus Color 8 3"
 
 #: src/main/xmli18n-tmp.h:272
-#, fuzzy
-msgid "Epson Stylus Photo 950"
-msgstr "Stylus Photo 750"
+msgid "Epson Stylus Color 900"
+msgstr "Epson Stylus Color 900"
 
 #: src/main/xmli18n-tmp.h:273
-#, fuzzy
-msgid "Epson Stylus Photo 960"
-msgstr "Stylus Photo 790"
+msgid "Epson Stylus Color 980"
+msgstr "Epson Stylus Color 980"
 
 #: src/main/xmli18n-tmp.h:274
-#, fuzzy
-msgid "Epson Stylus Photo 1200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Color 1160"
+msgstr "Epson Stylus Color 1160"
 
 #: src/main/xmli18n-tmp.h:275
-#, fuzzy
-msgid "Epson Stylus Photo 1270"
-msgstr "Stylus Photo 1270"
+msgid "Epson Stylus Color 1500"
+msgstr "Epson Stylus Color 1500"
 
 #: src/main/xmli18n-tmp.h:276
-#, fuzzy
-msgid "Epson Stylus Photo 1280"
-msgstr "Stylus Photo 1280"
+msgid "Epson Stylus Color 1520"
+msgstr "Epson Stylus Color 1520"
 
 #: src/main/xmli18n-tmp.h:277
-#, fuzzy
-msgid "Epson Stylus Photo 1290"
-msgstr "Stylus Photo 1290"
+msgid "Epson Stylus Color 3000"
+msgstr "Epson Stylus Color 3000"
 
 #: src/main/xmli18n-tmp.h:278
-#, fuzzy
-msgid "Epson Stylus Photo 2000P"
-msgstr "Stylus Photo 2000P"
+msgid "Epson Stylus Photo"
+msgstr "Epson Stylus Photo"
 
 #: src/main/xmli18n-tmp.h:279
-#, fuzzy
-msgid "Epson Stylus Photo 2100"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 700"
+msgstr "Epson Stylus Photo 700"
 
 #: src/main/xmli18n-tmp.h:280
-#, fuzzy
-msgid "Epson Stylus Photo 2200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo EX"
+msgstr "Epson Stylus Photo EX"
 
 #: src/main/xmli18n-tmp.h:281
-#, fuzzy
-msgid "Epson Stylus Photo R200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo EX3"
+msgstr "Epson Stylus Photo EX3"
 
 #: src/main/xmli18n-tmp.h:282
-#, fuzzy
-msgid "Epson Stylus Photo R210"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 720"
+msgstr "Epson Stylus Photo 720"
 
 #: src/main/xmli18n-tmp.h:283
-#, fuzzy
-msgid "Epson Stylus Photo R220"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 750"
+msgstr "Epson Stylus Photo 750"
 
 #: src/main/xmli18n-tmp.h:284
-#, fuzzy
-msgid "Epson Stylus Photo R300"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 780"
+msgstr "Epson Stylus Photo 780"
 
 #: src/main/xmli18n-tmp.h:285
-#, fuzzy
-msgid "Epson Stylus Photo R310"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 785"
+msgstr "Epson Stylus Photo 785"
 
 #: src/main/xmli18n-tmp.h:286
-#, fuzzy
-msgid "Epson Stylus Photo R320"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 790"
+msgstr "Epson Stylus Photo 790"
 
 #: src/main/xmli18n-tmp.h:287
-#, fuzzy
-msgid "Epson Stylus Photo R340"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 810"
+msgstr "Epson Stylus Photo 810"
 
 #: src/main/xmli18n-tmp.h:288
-#, fuzzy
-msgid "Epson Stylus Photo RX400"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 820"
+msgstr "Epson Stylus Photo 820"
 
 #: src/main/xmli18n-tmp.h:289
-#, fuzzy
-msgid "Epson Stylus Photo RX420"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 825"
+msgstr "Epson Stylus Photo 825"
 
 #: src/main/xmli18n-tmp.h:290
-#, fuzzy
-msgid "Epson Stylus Photo RX425"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 830"
+msgstr "Epson Stylus Photo 830"
 
 #: src/main/xmli18n-tmp.h:291
-#, fuzzy
-msgid "Epson Stylus Photo RX430"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 830U"
+msgstr "Epson Stylus Photo 830U"
 
 #: src/main/xmli18n-tmp.h:292
-#, fuzzy
-msgid "Epson Stylus Photo RX500"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 870"
+msgstr "Epson Stylus Photo 870"
 
 #: src/main/xmli18n-tmp.h:293
-#, fuzzy
-msgid "Epson Stylus Photo RX510"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 875"
+msgstr "Epson Stylus Photo 875"
 
 #: src/main/xmli18n-tmp.h:294
-#, fuzzy
-msgid "Epson Stylus Photo RX600"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 890"
+msgstr "Epson Stylus Photo 890"
 
 #: src/main/xmli18n-tmp.h:295
-#, fuzzy
-msgid "Epson Stylus Photo RX620"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 895"
+msgstr "Epson Stylus Photo 895"
 
 #: src/main/xmli18n-tmp.h:296
-#, fuzzy
-msgid "Epson Stylus Photo RX630"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 900"
+msgstr "Epson Stylus Photo 900"
 
 #: src/main/xmli18n-tmp.h:297
-#, fuzzy
-msgid "Epson Stylus Photo RX700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 915"
+msgstr "Epson Stylus Photo 915"
 
 #: src/main/xmli18n-tmp.h:298
-#, fuzzy
-msgid "Epson Stylus Photo R800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 925"
+msgstr "Epson Stylus Photo 925"
 
 #: src/main/xmli18n-tmp.h:299
-#, fuzzy
-msgid "Epson Stylus Photo R1800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Photo 935"
+msgstr "Epson Stylus Photo 935"
 
 #: src/main/xmli18n-tmp.h:300
-#, fuzzy
-msgid "Epson Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus Photo 950"
+msgstr "Epson Stylus Photo 950"
 
 #: src/main/xmli18n-tmp.h:301
-#, fuzzy
-msgid "Epson Stylus Pro 5000"
-msgstr "Stylus Pro 5000"
+msgid "Epson Stylus Photo 960"
+msgstr "Epson Stylus Photo 960"
 
 #: src/main/xmli18n-tmp.h:302
-#, fuzzy
-msgid "Epson Stylus Pro 5500"
-msgstr "Stylus Pro 5500"
+msgid "Epson Stylus Photo 1200"
+msgstr "Epson Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:303
-#, fuzzy
-msgid "Epson Stylus Pro 7000"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo 1270"
+msgstr "Epson Stylus Photo 1270"
 
 #: src/main/xmli18n-tmp.h:304
-#, fuzzy
-msgid "Epson Stylus Pro 7500"
-msgstr "Stylus Pro 7500"
+msgid "Epson Stylus Photo 1280"
+msgstr "Epson Stylus Photo 1280"
 
 #: src/main/xmli18n-tmp.h:305
-#, fuzzy
-msgid "Epson Stylus Pro 7600"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Photo 1290"
+msgstr "Epson Stylus Photo 1290"
 
 #: src/main/xmli18n-tmp.h:306
 #, fuzzy
-msgid "Epson Stylus Pro 9000"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo 1400"
+msgstr "Epson Stylus Photo 1200"
 
 #: src/main/xmli18n-tmp.h:307
 #, fuzzy
-msgid "Epson Stylus Pro 9500"
-msgstr "Stylus Pro 9500"
+msgid "Epson Stylus Photo 1410"
+msgstr "Epson Stylus Photo 810"
 
 #: src/main/xmli18n-tmp.h:308
-#, fuzzy
-msgid "Epson Stylus Pro 9600"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Photo 2000P"
+msgstr "Epson Stylus Photo 2000P"
 
 #: src/main/xmli18n-tmp.h:309
-#, fuzzy
-msgid "Epson Stylus Pro 10000"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus Photo 2100"
+msgstr "Epson Stylus Photo 2100"
 
 #: src/main/xmli18n-tmp.h:310
-#, fuzzy
-msgid "Epson Stylus Scan 2000"
-msgstr "Stylus Scan 2000"
+msgid "Epson Stylus Photo 2200"
+msgstr "Epson Stylus Photo 2200"
 
 #: src/main/xmli18n-tmp.h:311
-#, fuzzy
-msgid "Epson Stylus Scan 2500"
-msgstr "Stylus Scan 2500"
+msgid "Epson Stylus Photo R200"
+msgstr "Epson Stylus Photo R200"
 
 #: src/main/xmli18n-tmp.h:312
-#, fuzzy
-msgid "Epson Stylus CX1500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R210"
+msgstr "Epson Stylus Photo R210"
 
 #: src/main/xmli18n-tmp.h:313
-#, fuzzy
-msgid "Epson Stylus CX3100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R220"
+msgstr "Epson Stylus Photo R220"
 
 #: src/main/xmli18n-tmp.h:314
 #, fuzzy
-msgid "Epson Stylus CX3200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R230"
+msgstr "Epson Stylus Photo R200"
 
 #: src/main/xmli18n-tmp.h:315
 #, fuzzy
-msgid "Epson Stylus CX3500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R240"
+msgstr "Epson Stylus Photo R2400"
 
 #: src/main/xmli18n-tmp.h:316
 #, fuzzy
-msgid "Epson Stylus CX3600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R245"
+msgstr "Epson Stylus Photo RX425"
 
 #: src/main/xmli18n-tmp.h:317
 #, fuzzy
-msgid "Epson Stylus CX3650"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R260"
+msgstr "Epson Stylus Photo R200"
 
 #: src/main/xmli18n-tmp.h:318
 #, fuzzy
-msgid "Epson Stylus CX3700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R265"
+msgstr "Epson Stylus Photo RX425"
 
 #: src/main/xmli18n-tmp.h:319
 #, fuzzy
-msgid "Epson Stylus CX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R270"
+msgstr "Epson Stylus Photo 1270"
 
 #: src/main/xmli18n-tmp.h:320
-#, fuzzy
-msgid "Epson Stylus CX3805"
-msgstr "Stylus C60"
+msgid "Epson Stylus Photo R300"
+msgstr "Epson Stylus Photo R300"
 
 #: src/main/xmli18n-tmp.h:321
-#, fuzzy
-msgid "Epson Stylus CX3810"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R310"
+msgstr "Epson Stylus Photo R310"
 
 #: src/main/xmli18n-tmp.h:322
-#, fuzzy
-msgid "Epson Stylus CX4100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R320"
+msgstr "Epson Stylus Photo R320"
 
 #: src/main/xmli18n-tmp.h:323
-#, fuzzy
-msgid "Epson Stylus CX4200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R340"
+msgstr "Epson Stylus Photo R340"
 
 #: src/main/xmli18n-tmp.h:324
 #, fuzzy
-msgid "Epson Stylus CX4500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R350"
+msgstr "Epson Stylus Photo R300"
 
 #: src/main/xmli18n-tmp.h:325
 #, fuzzy
-msgid "Epson Stylus CX4600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R360"
+msgstr "Epson Stylus Photo R300"
 
 #: src/main/xmli18n-tmp.h:326
 #, fuzzy
-msgid "Epson Stylus CX4700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R380"
+msgstr "Epson Stylus Photo R300"
 
 #: src/main/xmli18n-tmp.h:327
 #, fuzzy
-msgid "Epson Stylus CX4800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R390"
+msgstr "Epson Stylus Photo R300"
 
 #: src/main/xmli18n-tmp.h:328
-#, fuzzy
-msgid "Epson Stylus CX5100"
-msgstr "Stylus C60"
+msgid "Epson Stylus Photo RX400"
+msgstr "Epson Stylus Photo RX400"
 
 #: src/main/xmli18n-tmp.h:329
-#, fuzzy
-msgid "Epson Stylus CX5200"
-msgstr "Stylus C60"
+msgid "Epson Stylus Photo RX420"
+msgstr "Epson Stylus Photo RX420"
 
 #: src/main/xmli18n-tmp.h:330
-#, fuzzy
-msgid "Epson Stylus CX5300"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX425"
+msgstr "Epson Stylus Photo RX425"
 
 #: src/main/xmli18n-tmp.h:331
-#, fuzzy
-msgid "Epson Stylus CX5400"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX430"
+msgstr "Epson Stylus Photo RX430"
 
 #: src/main/xmli18n-tmp.h:332
-#, fuzzy
-msgid "Epson Stylus CX5700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX500"
 
 #: src/main/xmli18n-tmp.h:333
-#, fuzzy
-msgid "Epson Stylus CX5800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX510"
+msgstr "Epson Stylus Photo RX510"
 
 #: src/main/xmli18n-tmp.h:334
 #, fuzzy
-msgid "Epson Stylus CX6300"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX560"
+msgstr "Epson Stylus Photo RX500"
 
 #: src/main/xmli18n-tmp.h:335
 #, fuzzy
-msgid "Epson Stylus CX6400"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX580"
+msgstr "Epson Stylus Photo RX500"
 
 #: src/main/xmli18n-tmp.h:336
 #, fuzzy
-msgid "Epson Stylus CX6500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX590"
+msgstr "Epson Stylus Photo RX500"
 
 #: src/main/xmli18n-tmp.h:337
-#, fuzzy
-msgid "Epson Stylus CX6600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX600"
+msgstr "Epson Stylus Photo RX600"
 
 #: src/main/xmli18n-tmp.h:338
-#, fuzzy
-msgid "Epson Stylus CX7700"
-msgstr "Stylus C70"
+msgid "Epson Stylus Photo RX620"
+msgstr "Epson Stylus Photo RX620"
 
 #: src/main/xmli18n-tmp.h:339
-#, fuzzy
-msgid "Epson Stylus CX7800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX630"
+msgstr "Epson Stylus Photo RX630"
 
 #: src/main/xmli18n-tmp.h:340
 #, fuzzy
-msgid "Epson Stylus CX8300"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX640"
+msgstr "Epson Stylus Photo RX400"
 
 #: src/main/xmli18n-tmp.h:341
-#, fuzzy
-msgid "Epson Stylus CX8400"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo RX700"
+msgstr "Epson Stylus Photo RX700"
 
 #: src/main/xmli18n-tmp.h:342
-#, fuzzy
-msgid "Epson Stylus D68"
-msgstr "Stylus C60"
+msgid "Epson Stylus Photo R800"
+msgstr "Epson Stylus Photo R800"
 
 #: src/main/xmli18n-tmp.h:343
-#, fuzzy
-msgid "Epson Stylus D88"
-msgstr "Stylus C80"
+msgid "Epson Stylus Photo R1800"
+msgstr "Epson Stylus Photo R1800"
 
 #: src/main/xmli18n-tmp.h:344
-#, fuzzy
-msgid "Epson Stylus DX3800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo R2400"
+msgstr "Epson Stylus Photo R2400"
 
 #: src/main/xmli18n-tmp.h:345
-#, fuzzy
-msgid "Epson Stylus DX3850"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5000"
+msgstr "Epson Stylus Pro 5000"
 
 #: src/main/xmli18n-tmp.h:346
-#, fuzzy
-msgid "Epson Stylus DX4200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 5500"
+msgstr "Epson Stylus Pro 5500"
 
 #: src/main/xmli18n-tmp.h:347
-#, fuzzy
-msgid "Epson Stylus DX4250"
-msgstr "Stylus C60"
+msgid "Epson Stylus Pro 7000"
+msgstr "Epson Stylus Pro 7000"
 
 #: src/main/xmli18n-tmp.h:348
-#, fuzzy
-msgid "Epson Stylus DX4800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Pro 7500"
+msgstr "Epson Stylus Pro 7500"
 
 #: src/main/xmli18n-tmp.h:349
-msgid "Epson PictureMate"
-msgstr ""
+msgid "Epson Stylus Pro 7600"
+msgstr "Epson Stylus Pro 7600"
 
 #: src/main/xmli18n-tmp.h:350
-msgid "Epson PictureMate Deluxe"
-msgstr ""
+msgid "Epson Stylus Pro 9000"
+msgstr "Epson Stylus Pro 9000"
 
 #: src/main/xmli18n-tmp.h:351
-msgid "Epson CL 700"
-msgstr ""
+msgid "Epson Stylus Pro 9500"
+msgstr "Epson Stylus Pro 9500"
 
 #: src/main/xmli18n-tmp.h:352
-msgid "Epson CL 750"
-msgstr ""
+msgid "Epson Stylus Pro 9600"
+msgstr "Epson Stylus Pro 9600"
 
 #: src/main/xmli18n-tmp.h:353
-msgid "Epson CL 760"
-msgstr ""
+msgid "Epson Stylus Pro 10000"
+msgstr "Epson Stylus Pro 10000"
 
 #: src/main/xmli18n-tmp.h:354
-msgid "Epson E 100"
-msgstr ""
+msgid "Epson Stylus Scan 2000"
+msgstr "Epson Stylus Scan 2000"
 
 #: src/main/xmli18n-tmp.h:355
-msgid "Epson E 150"
-msgstr ""
+msgid "Epson Stylus Scan 2500"
+msgstr "Epson Stylus Scan 2500"
 
 #: src/main/xmli18n-tmp.h:356
-msgid "Epson E 200"
-msgstr ""
+msgid "Epson Stylus CX1500"
+msgstr "Epson Stylus CX1500"
 
 #: src/main/xmli18n-tmp.h:357
-msgid "Epson EM 900C"
-msgstr ""
+msgid "Epson Stylus CX3100"
+msgstr "Epson Stylus CX3100"
 
 #: src/main/xmli18n-tmp.h:358
-msgid "Epson EM 930C"
-msgstr ""
+msgid "Epson Stylus CX3200"
+msgstr "Epson Stylus CX3200"
 
 #: src/main/xmli18n-tmp.h:359
-msgid "Epson MC 2000"
-msgstr ""
+msgid "Epson Stylus CX3500"
+msgstr "Epson Stylus CX3500"
 
 #: src/main/xmli18n-tmp.h:360
-msgid "Epson MC 5000"
-msgstr ""
+msgid "Epson Stylus CX3600"
+msgstr "Epson Stylus CX3600"
 
 #: src/main/xmli18n-tmp.h:361
-msgid "Epson MC 7000"
-msgstr ""
+msgid "Epson Stylus CX3650"
+msgstr "Epson Stylus CX3650"
 
 #: src/main/xmli18n-tmp.h:362
-msgid "Epson MC 9000"
-msgstr ""
+msgid "Epson Stylus CX3700"
+msgstr "Epson Stylus CX3700"
 
 #: src/main/xmli18n-tmp.h:363
-msgid "Epson MC 10000"
-msgstr ""
+msgid "Epson Stylus CX3800"
+msgstr "Epson Stylus CX3800"
 
 #: src/main/xmli18n-tmp.h:364
-msgid "Epson MJ 930C"
-msgstr ""
+msgid "Epson Stylus CX3805"
+msgstr "Epson Stylus CX3805"
 
 #: src/main/xmli18n-tmp.h:365
-msgid "Epson MJ 5100C"
-msgstr ""
+msgid "Epson Stylus CX3810"
+msgstr "Epson Stylus CX3810"
 
 #: src/main/xmli18n-tmp.h:366
-msgid "Epson MJ 6000C"
-msgstr ""
+msgid "Epson Stylus CX4100"
+msgstr "Epson Stylus CX4100"
 
 #: src/main/xmli18n-tmp.h:367
-msgid "Epson MJ 8000C"
-msgstr ""
+msgid "Epson Stylus CX4200"
+msgstr "Epson Stylus CX4200"
 
 #: src/main/xmli18n-tmp.h:368
-msgid "Epson PM 700C"
-msgstr ""
+msgid "Epson Stylus CX4500"
+msgstr "Epson Stylus CX4500"
 
 #: src/main/xmli18n-tmp.h:369
-msgid "Epson PM 730C"
-msgstr ""
+msgid "Epson Stylus CX4600"
+msgstr "Epson Stylus CX4600"
 
 #: src/main/xmli18n-tmp.h:370
-msgid "Epson PM 740C"
-msgstr ""
+msgid "Epson Stylus CX4700"
+msgstr "Epson Stylus CX4700"
 
 #: src/main/xmli18n-tmp.h:371
-msgid "Epson PM 750C"
-msgstr ""
+msgid "Epson Stylus CX4800"
+msgstr "Epson Stylus CX4800"
 
 #: src/main/xmli18n-tmp.h:372
-msgid "Epson PM 760C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX5000"
+msgstr "Epson Stylus CX1500"
 
 #: src/main/xmli18n-tmp.h:373
-msgid "Epson PM 770C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX5000F"
+msgstr "Epson Stylus CX1500"
 
 #: src/main/xmli18n-tmp.h:374
-msgid "Epson PM 780C"
-msgstr ""
+msgid "Epson Stylus CX5100"
+msgstr "Epson Stylus CX5100"
 
 #: src/main/xmli18n-tmp.h:375
-msgid "Epson PM 790PT"
-msgstr ""
+msgid "Epson Stylus CX5200"
+msgstr "Epson Stylus CX5200"
 
 #: src/main/xmli18n-tmp.h:376
-msgid "Epson PM 800C"
-msgstr ""
+msgid "Epson Stylus CX5300"
+msgstr "Epson Stylus CX5300"
 
 #: src/main/xmli18n-tmp.h:377
-msgid "Epson PM 850PT"
-msgstr ""
+msgid "Epson Stylus CX5400"
+msgstr "Epson Stylus CX5400"
 
 #: src/main/xmli18n-tmp.h:378
-msgid "Epson PM 870C"
-msgstr ""
+msgid "Epson Stylus CX5700"
+msgstr "Epson Stylus CX5700"
 
 #: src/main/xmli18n-tmp.h:379
-msgid "Epson PM 880C"
-msgstr ""
+msgid "Epson Stylus CX5800"
+msgstr "Epson Stylus CX5800"
 
 #: src/main/xmli18n-tmp.h:380
-msgid "Epson PM 930C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX6000"
+msgstr "Epson Stylus CX3600"
 
 #: src/main/xmli18n-tmp.h:381
-msgid "Epson PM 940C"
-msgstr ""
+msgid "Epson Stylus CX6300"
+msgstr "Epson Stylus CX6300"
 
 #: src/main/xmli18n-tmp.h:382
-msgid "Epson PM 950C"
-msgstr ""
+msgid "Epson Stylus CX6400"
+msgstr "Epson Stylus CX6400"
 
 #: src/main/xmli18n-tmp.h:383
-msgid "Epson PM 970C"
-msgstr ""
+msgid "Epson Stylus CX6500"
+msgstr "Epson Stylus CX6500"
 
 #: src/main/xmli18n-tmp.h:384
-msgid "Epson PM 980C"
-msgstr ""
+msgid "Epson Stylus CX6600"
+msgstr "Epson Stylus CX6600"
 
 #: src/main/xmli18n-tmp.h:385
-msgid "Epson PM 2000C"
-msgstr ""
+#, fuzzy
+msgid "Epson Stylus CX7000F"
+msgstr "Epson Stylus CX3700"
 
 #: src/main/xmli18n-tmp.h:386
-msgid "Epson PM 2200C"
-msgstr ""
+msgid "Epson Stylus CX7700"
+msgstr "Epson Stylus CX7700"
 
 #: src/main/xmli18n-tmp.h:387
-msgid "Epson PM 3000C"
-msgstr ""
+msgid "Epson Stylus CX7800"
+msgstr "Epson Stylus CX7800"
 
 #: src/main/xmli18n-tmp.h:388
-msgid "Epson PM 3300C"
-msgstr ""
+msgid "Epson Stylus CX8300"
+msgstr "Epson Stylus CX8300"
 
 #: src/main/xmli18n-tmp.h:389
-msgid "Epson PM 3500C"
-msgstr ""
+msgid "Epson Stylus CX8400"
+msgstr "Epson Stylus CX8400"
 
 #: src/main/xmli18n-tmp.h:390
-msgid "Epson PM 3700C"
-msgstr ""
+msgid "Epson Stylus D68"
+msgstr "Epson Stylus D68"
 
 #: src/main/xmli18n-tmp.h:391
-msgid "Epson PM 4000PX"
-msgstr ""
+msgid "Epson Stylus D88"
+msgstr "Epson Stylus D88"
 
 #: src/main/xmli18n-tmp.h:392
-msgid "Epson PM 5000C"
-msgstr ""
+msgid "Epson Stylus DX3800"
+msgstr "Epson Stylus DX3800"
 
 #: src/main/xmli18n-tmp.h:393
-msgid "Epson PM 7000C"
-msgstr ""
+msgid "Epson Stylus DX3850"
+msgstr "Epson Stylus DX3850"
 
 #: src/main/xmli18n-tmp.h:394
-msgid "Epson PM 9000C"
-msgstr ""
+msgid "Epson Stylus DX4200"
+msgstr "Epson Stylus DX4200"
 
 #: src/main/xmli18n-tmp.h:395
-#, fuzzy
-msgid "Epson PM 10000"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus DX4250"
+msgstr "Epson Stylus DX4250"
 
 #: src/main/xmli18n-tmp.h:396
-msgid "Epson PM A650"
-msgstr ""
+msgid "Epson Stylus DX4800"
+msgstr "Epson Stylus DX4800"
 
 #: src/main/xmli18n-tmp.h:397
-msgid "Epson PM A750"
-msgstr ""
+msgid "Epson PictureMate"
+msgstr "Epson PictureMate"
 
 #: src/main/xmli18n-tmp.h:398
-msgid "Epson PM A890"
-msgstr ""
+msgid "Epson PictureMate Deluxe"
+msgstr "Epson PictureMate Deluxe"
 
 #: src/main/xmli18n-tmp.h:399
 #, fuzzy
-msgid "Epson PM A900"
-msgstr "Stylus C60"
+msgid "Epson PictureMate Flash"
+msgstr "Epson PictureMate"
 
 #: src/main/xmli18n-tmp.h:400
-msgid "Epson PM A950"
-msgstr ""
+#, fuzzy
+msgid "Epson PictureMate Pal"
+msgstr "Epson PictureMate"
 
 #: src/main/xmli18n-tmp.h:401
-msgid "Epson PM D600"
-msgstr ""
+#, fuzzy
+msgid "Epson PictureMate Snap"
+msgstr "Epson PictureMate"
 
 #: src/main/xmli18n-tmp.h:402
 #, fuzzy
-msgid "Epson PM D750"
-msgstr "Stylus C60"
+msgid "Epson PictureMate 200"
+msgstr "Epson PictureMate"
 
 #: src/main/xmli18n-tmp.h:403
 #, fuzzy
-msgid "Epson PM D770"
-msgstr "Stylus C60"
+msgid "Epson PictureMate 210"
+msgstr "Epson PictureMate"
 
 #: src/main/xmli18n-tmp.h:404
-msgid "Epson PM D800"
-msgstr ""
+#, fuzzy
+msgid "Epson PictureMate 240"
+msgstr "Epson PictureMate"
 
 #: src/main/xmli18n-tmp.h:405
 #, fuzzy
-msgid "Epson PM D1000"
-msgstr "Stylus C60"
+msgid "Epson PictureMate 250"
+msgstr "Epson PictureMate"
 
 #: src/main/xmli18n-tmp.h:406
 #, fuzzy
-msgid "Epson PM G700"
-msgstr "Stylus C60"
+msgid "Epson PictureMate 280"
+msgstr "Epson PictureMate"
 
 #: src/main/xmli18n-tmp.h:407
-#, fuzzy
-msgid "Epson PM G720"
-msgstr "Stylus C60"
+msgid "Epson CL 700"
+msgstr "Epson CL 700"
 
 #: src/main/xmli18n-tmp.h:408
-msgid "Epson PM G730"
-msgstr ""
+msgid "Epson CL 750"
+msgstr "Epson CL 750"
 
 #: src/main/xmli18n-tmp.h:409
-#, fuzzy
-msgid "Epson PM G800"
-msgstr "Stylus C60"
+msgid "Epson CL 760"
+msgstr "Epson CL 760"
 
 #: src/main/xmli18n-tmp.h:410
+msgid "Epson E 100"
+msgstr "Epson E 100"
+
+#: src/main/xmli18n-tmp.h:411
+msgid "Epson E 150"
+msgstr "Epson E 150"
+
+#: src/main/xmli18n-tmp.h:412
+msgid "Epson E 200"
+msgstr "Epson E 200"
+
+#: src/main/xmli18n-tmp.h:413
+msgid "Epson EM 900C"
+msgstr "Epson EM 900C"
+
+#: src/main/xmli18n-tmp.h:414
+msgid "Epson EM 930C"
+msgstr "Epson EM 930C"
+
+#: src/main/xmli18n-tmp.h:415
+msgid "Epson MC 2000"
+msgstr "Epson MC 2000"
+
+#: src/main/xmli18n-tmp.h:416
+msgid "Epson MC 5000"
+msgstr "Epson MC 5000"
+
+#: src/main/xmli18n-tmp.h:417
+msgid "Epson MC 7000"
+msgstr "Epson MC 7000"
+
+#: src/main/xmli18n-tmp.h:418
+msgid "Epson MC 9000"
+msgstr "Epson MC 9000"
+
+#: src/main/xmli18n-tmp.h:419
+msgid "Epson MC 10000"
+msgstr "Epson MC 10000"
+
+#: src/main/xmli18n-tmp.h:420
+msgid "Epson MJ 930C"
+msgstr "Epson MJ 930C"
+
+#: src/main/xmli18n-tmp.h:421
+msgid "Epson MJ 5100C"
+msgstr "Epson MJ 5100C"
+
+#: src/main/xmli18n-tmp.h:422
+msgid "Epson MJ 6000C"
+msgstr "Epson MJ 6000C"
+
+#: src/main/xmli18n-tmp.h:423
+msgid "Epson MJ 8000C"
+msgstr "Epson MJ 8000C"
+
+#: src/main/xmli18n-tmp.h:424
+msgid "Epson PM 700C"
+msgstr "Epson PM 700C"
+
+#: src/main/xmli18n-tmp.h:425
+msgid "Epson PM 730C"
+msgstr "Epson PM 730C"
+
+#: src/main/xmli18n-tmp.h:426
+msgid "Epson PM 740C"
+msgstr "Epson PM 740C"
+
+#: src/main/xmli18n-tmp.h:427
+msgid "Epson PM 750C"
+msgstr "Epson PM 750C"
+
+#: src/main/xmli18n-tmp.h:428
+msgid "Epson PM 760C"
+msgstr "Epson PM 760C"
+
+#: src/main/xmli18n-tmp.h:429
+msgid "Epson PM 770C"
+msgstr "Epson PM 770C"
+
+#: src/main/xmli18n-tmp.h:430
+msgid "Epson PM 780C"
+msgstr "Epson PM 780C"
+
+#: src/main/xmli18n-tmp.h:431
+msgid "Epson PM 790PT"
+msgstr "Epson PM 790PT"
+
+#: src/main/xmli18n-tmp.h:432
+msgid "Epson PM 800C"
+msgstr "Epson PM 800C"
+
+#: src/main/xmli18n-tmp.h:433
+msgid "Epson PM 850PT"
+msgstr "Epson PM 850PT"
+
+#: src/main/xmli18n-tmp.h:434
+msgid "Epson PM 870C"
+msgstr "Epson PM 870C"
+
+#: src/main/xmli18n-tmp.h:435
+msgid "Epson PM 880C"
+msgstr "Epson PM 880C"
+
+#: src/main/xmli18n-tmp.h:436
+msgid "Epson PM 930C"
+msgstr "Epson PM 930C"
+
+#: src/main/xmli18n-tmp.h:437
+msgid "Epson PM 940C"
+msgstr "Epson PM 940C"
+
+#: src/main/xmli18n-tmp.h:438
+msgid "Epson PM 950C"
+msgstr "Epson PM 950C"
+
+#: src/main/xmli18n-tmp.h:439
+msgid "Epson PM 970C"
+msgstr "Epson PM 970C"
+
+#: src/main/xmli18n-tmp.h:440
+msgid "Epson PM 980C"
+msgstr "Epson PM 980C"
+
+#: src/main/xmli18n-tmp.h:441
+msgid "Epson PM 2000C"
+msgstr "Epson PM 2000C"
+
+#: src/main/xmli18n-tmp.h:442
+msgid "Epson PM 2200C"
+msgstr "Epson PM 2200C"
+
+#: src/main/xmli18n-tmp.h:443
+msgid "Epson PM 3000C"
+msgstr "Epson PM 3000C"
+
+#: src/main/xmli18n-tmp.h:444
+msgid "Epson PM 3300C"
+msgstr "Epson PM 3300C"
+
+#: src/main/xmli18n-tmp.h:445
+msgid "Epson PM 3500C"
+msgstr "Epson PM 3500C"
+
+#: src/main/xmli18n-tmp.h:446
+msgid "Epson PM 3700C"
+msgstr "Epson PM 3700C"
+
+#: src/main/xmli18n-tmp.h:447
+msgid "Epson PM 4000PX"
+msgstr "Epson PM 4000PX"
+
+#: src/main/xmli18n-tmp.h:448
+msgid "Epson PM 5000C"
+msgstr "Epson PM 5000C"
+
+#: src/main/xmli18n-tmp.h:449
+msgid "Epson PM 7000C"
+msgstr "Epson PM 7000C"
+
+#: src/main/xmli18n-tmp.h:450
+msgid "Epson PM 9000C"
+msgstr "Epson PM 9000C"
+
+#: src/main/xmli18n-tmp.h:451
+msgid "Epson PM 10000"
+msgstr "Epson PM 10000"
+
+#: src/main/xmli18n-tmp.h:452
+msgid "Epson PM A650"
+msgstr "Epson PM A650"
+
+#: src/main/xmli18n-tmp.h:453
+msgid "Epson PM A750"
+msgstr "Epson PM A750"
+
+#: src/main/xmli18n-tmp.h:454
 #, fuzzy
+msgid "Epson PM A820"
+msgstr "Epson PM A890"
+
+#: src/main/xmli18n-tmp.h:455
+msgid "Epson PM A890"
+msgstr "Epson PM A890"
+
+#: src/main/xmli18n-tmp.h:456
+msgid "Epson PM A900"
+msgstr "Epson PM A900"
+
+#: src/main/xmli18n-tmp.h:457
+msgid "Epson PM A950"
+msgstr "Epson PM A950"
+
+#: src/main/xmli18n-tmp.h:458
+msgid "Epson PM D600"
+msgstr "Epson PM D600"
+
+#: src/main/xmli18n-tmp.h:459
+msgid "Epson PM D750"
+msgstr "Epson PM D750"
+
+#: src/main/xmli18n-tmp.h:460
+msgid "Epson PM D770"
+msgstr "Epson PM D770"
+
+#: src/main/xmli18n-tmp.h:461
+msgid "Epson PM D800"
+msgstr "Epson PM D800"
+
+#: src/main/xmli18n-tmp.h:462
+#, fuzzy
+msgid "Epson PM D870"
+msgstr "Epson PM 870C"
+
+#: src/main/xmli18n-tmp.h:463
+msgid "Epson PM D1000"
+msgstr "Epson PM D1000"
+
+#: src/main/xmli18n-tmp.h:464
+msgid "Epson PM G700"
+msgstr "Epson PM G700"
+
+#: src/main/xmli18n-tmp.h:465
+msgid "Epson PM G720"
+msgstr "Epson PM G720"
+
+#: src/main/xmli18n-tmp.h:466
+msgid "Epson PM G730"
+msgstr "Epson PM G730"
+
+#: src/main/xmli18n-tmp.h:467
+msgid "Epson PM G800"
+msgstr "Epson PM G800"
+
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM G820"
-msgstr "Stylus C60"
+msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
 #, fuzzy
-msgid "Epson PX A650"
-msgstr "Stylus C60"
+msgid "Epson PM G850"
+msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:470
 #, fuzzy
+msgid "Epson PM G4500"
+msgstr "Epson PM G700"
+
+#: src/main/xmli18n-tmp.h:471
+msgid "Epson PX A650"
+msgstr "Epson PX A650"
+
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PX G900"
-msgstr "Stylus C60"
+msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:413
-#, fuzzy
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PX G920"
-msgstr "Stylus C60"
+msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:414
-#, fuzzy
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PX G5000"
-msgstr "Stylus C60"
+msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:415
-#, fuzzy
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PX V500"
-msgstr "Stylus C60"
+msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:416
-#, fuzzy
+#: src/main/xmli18n-tmp.h:476
 msgid "Epson PX V600"
-msgstr "Stylus C60"
+msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
-msgstr ""
+msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:418
-#, fuzzy
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PX 5500"
-msgstr "Stylus C60"
+msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 msgid "Epson PX 7000"
-msgstr ""
+msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PX 9000"
-msgstr ""
+msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
-msgstr ""
+msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
-msgstr ""
+msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
-msgstr ""
+msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
-msgstr ""
+msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
-msgstr ""
+msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
-msgstr ""
+msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
-msgstr ""
+msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
-msgstr ""
+msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
-msgstr ""
+msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
-msgstr ""
+msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
-msgstr ""
+msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
-msgstr ""
+msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
-msgstr ""
+msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
-msgstr ""
+msgstr "Brother HL-4Ve"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
-msgstr ""
+msgstr "Brother HL-10V"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
-msgstr ""
+msgstr "Brother HL-10h"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
-msgstr ""
+msgstr "Brother HL-630"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
-msgstr ""
+msgstr "Brother HL-660"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
-msgstr ""
+msgstr "Brother HL-760"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
-msgstr ""
+msgstr "Brother HL-960"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
-msgstr ""
+msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
-msgstr ""
+msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
-msgstr ""
+msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
-msgstr ""
+msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
-msgstr ""
+msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
-msgstr ""
+msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
-msgstr ""
+msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
-msgstr ""
+msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
-msgstr ""
+msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
-msgstr ""
+msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
-msgstr ""
+msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
-msgstr ""
+msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
-msgstr ""
+msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
-msgstr ""
+msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
-msgstr ""
+msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 msgid "Canon GP 335"
-msgstr ""
+msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 msgid "Canon LBP-4sx"
-msgstr ""
+msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 msgid "Canon LBP-430"
-msgstr ""
+msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 msgid "Canon LBP-1000"
-msgstr ""
+msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 msgid "Canon LBP-1260"
-msgstr ""
+msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 msgid "Canon LBP-1760"
-msgstr ""
+msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
-msgstr ""
+msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
-msgstr ""
+msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
-msgstr ""
+msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
-msgstr ""
+msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
-msgstr ""
+msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
-msgstr ""
+msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
-msgstr ""
+msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
-msgstr ""
+msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
-msgstr ""
+msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
-msgstr ""
+msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
-msgstr ""
+msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
-msgstr ""
+msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
-msgstr ""
+msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
-msgstr ""
+msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
-msgstr ""
+msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
-msgstr ""
+msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
-msgstr ""
+msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
-msgstr ""
+msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
-msgstr ""
+msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
-msgstr ""
+msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
-msgstr ""
+msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
-msgstr ""
+msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
-msgstr ""
+msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
-msgstr ""
+msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
-msgstr ""
+msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
-msgstr ""
+msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
-msgstr ""
+msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:489
-#, fuzzy
+#: src/main/xmli18n-tmp.h:549
 msgid "Generic PCL 4 Printer"
-msgstr "Stel nieuwe Printer in"
+msgstr "Generic PCL 4 Printer"
 
-#: src/main/xmli18n-tmp.h:490
-#, fuzzy
+#: src/main/xmli18n-tmp.h:550
 msgid "Generic PCL 5 Printer"
-msgstr "Stel nieuwe Printer in"
+msgstr "Generic PCL 5 Printer"
 
-#: src/main/xmli18n-tmp.h:491
-#, fuzzy
+#: src/main/xmli18n-tmp.h:551
 msgid "Generic PCL 5c Printer"
-msgstr "Stel nieuwe Printer in"
+msgstr "Generic PCL 5c Printer"
 
-#: src/main/xmli18n-tmp.h:492
-#, fuzzy
+#: src/main/xmli18n-tmp.h:552
 msgid "Generic PCL 5e Printer"
-msgstr "Stel nieuwe Printer in"
+msgstr "Generic PCL 5e Printer"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
-msgstr ""
+msgstr "Generic PCL 6/PCL XL Printer"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 msgid "HP Business Inkjet 2200"
-msgstr ""
+msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 msgid "HP Business Inkjet 2230"
-msgstr ""
+msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 msgid "HP Business Inkjet 2250"
-msgstr ""
+msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
-msgstr ""
+msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 msgid "HP Business Inkjet 2280"
-msgstr ""
+msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
-msgstr ""
+msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
-msgstr ""
+msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 msgid "HP Color LaserJet 2500"
-msgstr ""
+msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 msgid "HP Color LaserJet 4500"
-msgstr ""
+msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 msgid "HP Color LaserJet 4550"
-msgstr ""
+msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 msgid "HP Color LaserJet 4600"
-msgstr ""
+msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 msgid "HP Color LaserJet 5"
-msgstr ""
+msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 msgid "HP Color LaserJet 5000"
-msgstr ""
+msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 msgid "HP Color LaserJet 5500"
-msgstr ""
+msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 msgid "HP Color LaserJet 8550GN"
-msgstr ""
+msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
-msgstr ""
+msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
-msgstr ""
+msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
-msgstr ""
+msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
-msgstr ""
+msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
-msgstr ""
+msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
-msgstr ""
+msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
-msgstr ""
+msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 msgid "HP DesignJet 750C Plus"
-msgstr ""
+msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
-msgstr ""
+msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 msgid "HP DesignJet 2500CP"
-msgstr ""
+msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 msgid "HP DesignJet 3500CP"
-msgstr ""
+msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 msgid "HP DesignJet ColorPro CAD"
-msgstr ""
+msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
-msgstr ""
+msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 msgid "HP DeskJet 420C"
-msgstr ""
+msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 msgid "HP DeskJet 450"
-msgstr ""
+msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
-msgstr ""
+msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
-msgstr ""
+msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 msgid "HP DeskJet 505J Plus"
-msgstr ""
+msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 msgid "HP DeskJet 510"
-msgstr ""
+msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
-msgstr ""
+msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
-msgstr ""
+msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
-msgstr ""
+msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 msgid "HP DeskJet 5550"
-msgstr ""
+msgstr "HP DeskJet 5550"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 msgid "HP DeskJet 5551"
-msgstr ""
+msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
-msgstr ""
+msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 msgid "HP DeskJet 600"
-msgstr ""
+msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 600C"
-msgstr ""
+msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 610C"
-msgstr ""
+msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DeskJet 610CL"
-msgstr ""
+msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 6122"
-msgstr ""
+msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 6127"
-msgstr ""
+msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 612C"
-msgstr ""
+msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DeskJet 640C"
-msgstr ""
+msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DeskJet 648C"
-msgstr ""
+msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DeskJet 660C"
-msgstr ""
+msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DeskJet 670C"
-msgstr ""
+msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DeskJet 670TV"
-msgstr ""
+msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DeskJet 672C"
-msgstr ""
+msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 680C"
-msgstr ""
+msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 682C"
-msgstr ""
+msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 690C"
-msgstr ""
+msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 692C"
-msgstr ""
+msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 693C"
-msgstr ""
+msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 694C"
-msgstr ""
+msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 695C"
-msgstr ""
+msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 697C"
-msgstr ""
+msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
-msgstr ""
+msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
-msgstr ""
+msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 815C"
-msgstr ""
+msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 816C"
-msgstr ""
+msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 825C"
-msgstr ""
+msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 830C"
-msgstr ""
+msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 832C"
-msgstr ""
+msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
-msgstr ""
+msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 841C"
-msgstr ""
+msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
-msgstr ""
+msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 843C"
-msgstr ""
+msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
-msgstr ""
+msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
-msgstr ""
+msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
-msgstr ""
+msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
-msgstr ""
+msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 880C"
-msgstr ""
+msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 882C"
-msgstr ""
+msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
-msgstr ""
+msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
-msgstr ""
+msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 916C"
-msgstr ""
+msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 920C"
-msgstr ""
+msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 9300"
-msgstr ""
+msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 930C"
-msgstr ""
+msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 932C"
-msgstr ""
+msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 933C"
-msgstr ""
+msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 934C"
-msgstr ""
+msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 935C"
-msgstr ""
+msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 940C"
-msgstr ""
+msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 948C"
-msgstr ""
+msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 950C"
-msgstr ""
+msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 952C"
-msgstr ""
+msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 955C"
-msgstr ""
+msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 957C"
-msgstr ""
+msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 959C"
-msgstr ""
+msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 960C"
-msgstr ""
+msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 970C"
-msgstr ""
+msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 975C"
-msgstr ""
+msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 980C"
-msgstr ""
+msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 990C"
-msgstr ""
+msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 995C"
-msgstr ""
+msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
-msgstr ""
+msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
-msgstr ""
+msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 1125C"
-msgstr ""
+msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
-msgstr ""
+msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
-msgstr ""
+msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
-msgstr ""
+msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 1600CM"
-msgstr ""
+msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 2000"
-msgstr ""
+msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 2500"
-msgstr ""
+msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 2500CM"
-msgstr ""
+msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 340C"
-msgstr ""
+msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 3810"
-msgstr ""
+msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 3816"
-msgstr ""
+msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 3820"
-msgstr ""
+msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 3822"
-msgstr ""
+msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 msgid "HP LaserJet 2"
-msgstr ""
+msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 msgid "HP LaserJet 2D"
-msgstr ""
+msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 msgid "HP LaserJet 2P Plus"
-msgstr ""
+msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 msgid "HP LaserJet 2P"
-msgstr ""
+msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 msgid "HP LaserJet 3"
-msgstr ""
+msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 msgid "HP LaserJet 3D"
-msgstr ""
+msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 msgid "HP LaserJet 3P w/ PCL5"
-msgstr ""
+msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 msgid "HP LaserJet 3P w/PS"
-msgstr ""
+msgstr "HP LaserJet 3P w/PS"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 msgid "HP LaserJet 4 Plus"
-msgstr ""
+msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 msgid "HP LaserJet 4"
-msgstr ""
+msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
-msgstr ""
+msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 msgid "HP LaserJet 4M"
-msgstr ""
+msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 msgid "HP LaserJet 4ML"
-msgstr ""
+msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 msgid "HP LaserJet 4P"
-msgstr ""
+msgstr "HP LaserJet 4P"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
-msgstr ""
+msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
-msgstr ""
+msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 msgid "HP LaserJet 5"
-msgstr ""
+msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 msgid "HP LaserJet 5L"
-msgstr ""
+msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 msgid "HP LaserJet 5M"
-msgstr ""
+msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 msgid "HP LaserJet 5MP"
-msgstr ""
+msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 msgid "HP LaserJet 5P"
-msgstr ""
+msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
-msgstr ""
+msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 msgid "HP LaserJet 6"
-msgstr ""
+msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 msgid "HP LaserJet 6L"
-msgstr ""
+msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 msgid "HP LaserJet 6MP"
-msgstr ""
+msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 msgid "HP LaserJet 6P"
-msgstr ""
+msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 1010"
-msgstr ""
+msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 1012"
-msgstr ""
+msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 1015"
-msgstr ""
+msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 1100"
-msgstr ""
+msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 1100A"
-msgstr ""
+msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 1150"
-msgstr ""
+msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 1200"
-msgstr ""
+msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 1220"
-msgstr ""
+msgstr "HP LaserJet 1220"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 1300"
-msgstr ""
+msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 2100"
-msgstr ""
+msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 2100M"
-msgstr ""
+msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 2200"
-msgstr ""
+msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 2300"
-msgstr ""
+msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 3200"
-msgstr ""
+msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 3200m"
-msgstr ""
+msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 3200se"
-msgstr ""
+msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 3300 MFP"
-msgstr ""
+msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 3310 MFP"
-msgstr ""
+msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 3320 MFP"
-msgstr ""
+msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 3320N MFP"
-msgstr ""
+msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 3330 MFP"
-msgstr ""
+msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 4000"
-msgstr ""
+msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 4050"
-msgstr ""
+msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 4100"
-msgstr ""
+msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 4200"
-msgstr ""
+msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 4300"
-msgstr ""
+msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 5000"
-msgstr ""
+msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 5100"
-msgstr ""
+msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 8000"
-msgstr ""
+msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 msgid "HP LaserJet 8100"
-msgstr ""
+msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 8150"
-msgstr ""
+msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 9000"
-msgstr ""
+msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
-msgstr ""
+msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
-msgstr ""
+msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 msgid "HP OfficeJet 300"
-msgstr ""
+msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 msgid "HP OfficeJet 330"
-msgstr ""
+msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 msgid "HP OfficeJet 350"
-msgstr ""
+msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 msgid "HP OfficeJet 500"
-msgstr ""
+msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 msgid "HP OfficeJet 520"
-msgstr ""
+msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 msgid "HP OfficeJet 570"
-msgstr ""
+msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 msgid "HP OfficeJet 580"
-msgstr ""
+msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 msgid "HP OfficeJet 590"
-msgstr ""
+msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 msgid "HP OfficeJet 600"
-msgstr ""
+msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 msgid "HP OfficeJet 610"
-msgstr ""
+msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 msgid "HP OfficeJet 625"
-msgstr ""
+msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 msgid "HP OfficeJet 630"
-msgstr ""
+msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 msgid "HP OfficeJet 635"
-msgstr ""
+msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 msgid "HP OfficeJet 700"
-msgstr ""
+msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 msgid "HP OfficeJet 710"
-msgstr ""
+msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 msgid "HP OfficeJet 720"
-msgstr ""
+msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 msgid "HP OfficeJet 725"
-msgstr ""
+msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 msgid "HP OfficeJet 5105"
-msgstr ""
+msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 msgid "HP OfficeJet 5110"
-msgstr ""
+msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 msgid "HP OfficeJet 5110xi"
-msgstr ""
+msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 msgid "HP OfficeJet 6105"
-msgstr ""
+msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 msgid "HP OfficeJet 6110"
-msgstr ""
+msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 msgid "HP OfficeJet 7110"
-msgstr ""
+msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 msgid "HP OfficeJet 7130"
-msgstr ""
+msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 msgid "HP OfficeJet 7140"
-msgstr ""
+msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 msgid "HP OfficeJet D125"
-msgstr ""
+msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
-msgstr ""
+msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet D145"
-msgstr ""
+msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet D155"
-msgstr ""
+msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet G55"
-msgstr ""
+msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet G85"
-msgstr ""
+msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet G95"
-msgstr ""
+msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet K60"
-msgstr ""
+msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet K60xi"
-msgstr ""
+msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet K80"
-msgstr ""
+msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet K80xi"
-msgstr ""
+msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet LX"
-msgstr ""
+msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet Pro 1150C"
-msgstr ""
+msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet Pro 1170C"
-msgstr ""
+msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
-msgstr ""
+msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet R40"
-msgstr ""
+msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet R45"
-msgstr ""
+msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet R60"
-msgstr ""
+msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet R65"
-msgstr ""
+msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet R80"
-msgstr ""
+msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet T45"
-msgstr ""
+msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet T65"
-msgstr ""
+msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet V40"
-msgstr ""
+msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet V40xi"
-msgstr ""
+msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
-msgstr ""
+msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
-msgstr ""
+msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
-msgstr ""
+msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
-msgstr ""
+msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
-msgstr ""
+msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
-msgstr ""
+msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
-msgstr ""
+msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 msgid "HP PSC 2110"
-msgstr ""
+msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
-msgstr ""
+msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
-msgstr ""
+msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 msgid "HP PhotoSmart 7150"
-msgstr ""
+msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 msgid "HP PhotoSmart 7345"
-msgstr ""
+msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 msgid "HP PhotoSmart 7350"
-msgstr ""
+msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 msgid "HP PhotoSmart 7550"
-msgstr ""
+msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 msgid "HP PhotoSmart P100"
-msgstr ""
+msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 msgid "HP PhotoSmart P130"
-msgstr ""
+msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 msgid "HP PhotoSmart P230"
-msgstr ""
+msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
-msgstr ""
+msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
-msgstr ""
+msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 msgid "HP PhotoSmart P1115"
-msgstr ""
+msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 msgid "HP PhotoSmart P1215"
-msgstr ""
+msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 msgid "HP PhotoSmart P1218"
-msgstr ""
+msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 msgid "HP PhotoSmart P1315"
-msgstr ""
+msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:742
-#, fuzzy
+#: src/main/xmli18n-tmp.h:802
 msgid "HP e-printer e20"
-msgstr "Printer Naam:"
+msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
-msgstr ""
+msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
-msgstr ""
+msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
-msgstr ""
+msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
-msgstr ""
+msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
-msgstr ""
+msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
-msgstr ""
+msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
-msgstr ""
+msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
-msgstr ""
+msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
-msgstr ""
+msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
-msgstr ""
+msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
-msgstr ""
+msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
-msgstr ""
+msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
-msgstr ""
+msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
-msgstr ""
+msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
-msgstr ""
+msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
-msgstr ""
+msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
-msgstr ""
+msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
-msgstr ""
+msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
-msgstr ""
+msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
-msgstr ""
+msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
-msgstr ""
+msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
-msgstr ""
+msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
-msgstr ""
+msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
-msgstr ""
+msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
-msgstr ""
+msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
-msgstr ""
+msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
-msgstr ""
+msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
-msgstr ""
+msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
-msgstr ""
+msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
-msgstr ""
+msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
-msgstr ""
+msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
-msgstr ""
+msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
-msgstr ""
+msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
-msgstr ""
+msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
-msgstr ""
+msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
-msgstr ""
+msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
-msgstr ""
+msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
-msgstr ""
+msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
-msgstr ""
+msgstr "Kyocera FS-8000C"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
-msgstr ""
+msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
-msgstr ""
+msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
-msgstr ""
+msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
-msgstr ""
+msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
-msgstr ""
+msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
-msgstr ""
+msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
-msgstr ""
+msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
-msgstr ""
+msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
-msgstr ""
+msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
-msgstr ""
+msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
-msgstr ""
+msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
-msgstr ""
+msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
-msgstr ""
+msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
-msgstr ""
+msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 msgid "Lexmark Optra E"
-msgstr ""
+msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
-msgstr ""
+msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+#, fuzzy
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Optra E"
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
-msgstr ""
+msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
-msgstr ""
+msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
-msgstr ""
+msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
-msgstr ""
+msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
-msgstr ""
+msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
-msgstr ""
+msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
-msgstr ""
+msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
-msgstr ""
+msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
-msgstr ""
+msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
-msgstr ""
+msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
-msgstr ""
+msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
-msgstr ""
+msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
-msgstr ""
+msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
-msgstr ""
+msgstr "Okidata OL400"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
-msgstr ""
+msgstr "Okidata OL400e"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
-msgstr ""
+msgstr "Okidata OL400ex"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
-msgstr ""
+msgstr "Okidata OL410e"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
-msgstr ""
+msgstr "Okidata OL600e"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
-msgstr ""
+msgstr "Okidata OL610e/S"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
-msgstr ""
+msgstr "Okidata OL800"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
-msgstr ""
+msgstr "Okidata OL810ex"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
-msgstr ""
+msgstr "Okidata Okipage 6e"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
-msgstr ""
+msgstr "Okidata Okipage 6ex"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
-msgstr ""
+msgstr "Okidata Okipage 8p"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
-msgstr ""
+msgstr "Okidata Okipage 10e"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
-msgstr ""
+msgstr "Okidata Okipage 10ex"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
-msgstr ""
+msgstr "Okidata Okipage 14ex"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
-msgstr ""
+msgstr "Okidata Super 6e"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
-msgstr ""
+msgstr "Olivetti JP350S"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
-msgstr ""
+msgstr "Olivetti PG 306"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
-msgstr ""
+msgstr "PCPI 1030"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
-msgstr ""
+msgstr "Panasonic KX-P4410"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
-msgstr ""
+msgstr "Panasonic KX-P4450"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
-msgstr ""
+msgstr "Panasonic KX-P6150"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
-msgstr ""
+msgstr "Panasonic KX-P6500"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
-msgstr ""
+msgstr "Raven LP-410"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
-msgstr ""
+msgstr "Ricoh Aficio 220"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
-msgstr ""
+msgstr "Ricoh Aficio 401"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
-msgstr ""
+msgstr "Ricoh Aficio 700"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
-msgstr ""
+msgstr "Samsung ML-85"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
-msgstr ""
+msgstr "Samsung ML-4600"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
-msgstr ""
+msgstr "Samsung ML-5000a"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
-msgstr ""
+msgstr "Samsung ML-6000"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
-msgstr ""
+msgstr "Samsung ML-6100"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
-msgstr ""
+msgstr "Samsung ML-7000"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
-msgstr ""
+msgstr "Samsung ML-7000N"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
-msgstr ""
+msgstr "Samsung ML-7000P"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
-msgstr ""
+msgstr "Samsung ML-7050"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
-msgstr ""
+msgstr "Samsung QL-5100A"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
-msgstr ""
+msgstr "Samsung QL-6050"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
-msgstr ""
+msgstr "Seiko SpeedJET 200"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
-msgstr ""
+msgstr "Sharp AR-161"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 msgid "Sony IJP-V100"
-msgstr ""
+msgstr "Sony IJP-V100"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
-msgstr ""
+msgstr "Star LS-04"
 
-#: src/main/xmli18n-tmp.h:852
-#, fuzzy
+#: src/main/xmli18n-tmp.h:913
 msgid "Star LaserPrinter 8"
-msgstr "Stel Printer in"
+msgstr "Star LaserPrinter 8"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
-msgstr ""
+msgstr "Tally MT908"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
-msgstr ""
+msgstr "Xerox Able 1406"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
-msgstr ""
+msgstr "Xerox DocuPrint 4508"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
-msgstr ""
+msgstr "Xerox DocuPrint C20"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
-msgstr ""
+msgstr "Xerox DocuPrint N4512"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
-msgstr ""
+msgstr "Xerox DocuPrint N4512PS"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
-msgstr ""
+msgstr "Xerox DocuPrint P12"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
-msgstr ""
+msgstr "Xerox DocuPrint P1202"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
-msgstr ""
+msgstr "Xerox DocuPrint P8e"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
+msgstr "Xerox Document Centre 400"
+
+#: src/main/xmli18n-tmp.h:924
+#, fuzzy
+msgid "Xerox WorkCentre M118"
+msgstr "Xerox Document Centre 400"
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:926
+#, fuzzy
+msgid "Lexmark X73"
+msgstr "Lexmark Z43"
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
-msgstr ""
+msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
-msgstr ""
+msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
-msgstr ""
+msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
-msgstr ""
+msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 msgid "Olympus P-10"
-msgstr ""
+msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 msgid "Olympus P-11"
-msgstr ""
+msgstr "Olympus P-11"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 msgid "Olympus P-200"
-msgstr ""
+msgstr "Olympus P-200"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 msgid "Olympus P-300"
-msgstr ""
+msgstr "Olympus P-300"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 msgid "Olympus P-300E"
-msgstr ""
+msgstr "Olympus P-300E"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 msgid "Olympus P-300U"
-msgstr ""
+msgstr "Olympus P-300U"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 msgid "Olympus P-330E"
-msgstr ""
+msgstr "Olympus P-330E"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 msgid "Olympus P-330NE"
-msgstr ""
+msgstr "Olympus P-330NE"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 msgid "Olympus P-400"
-msgstr ""
+msgstr "Olympus P-400"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 msgid "Olympus P-440"
-msgstr ""
+msgstr "Olympus P-440"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+#, fuzzy
+msgid "Olympus P-S100"
+msgstr "Olympus P-10"
+
+#: src/main/xmli18n-tmp.h:942
+#, fuzzy
+msgid "Canon CP-10"
+msgstr "Canon CP-100"
+
+#: src/main/xmli18n-tmp.h:943
 msgid "Canon CP-100"
-msgstr ""
+msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 msgid "Canon CP-200"
-msgstr ""
+msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 msgid "Canon CP-220"
-msgstr ""
+msgstr "Canon CP-220"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 msgid "Canon CP-300"
-msgstr ""
+msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 msgid "Canon CP-330"
-msgstr ""
+msgstr "Canon CP-330"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 msgid "Canon SELPHY-CP-400"
-msgstr ""
+msgstr "Canon SELPHY-CP-400"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 msgid "Canon SELPHY-CP-500"
-msgstr ""
+msgstr "Canon SELPHY-CP-500"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 msgid "Canon SELPHY-CP-510"
-msgstr ""
+msgstr "Canon SELPHY-CP-510"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 msgid "Canon SELPHY-CP-600"
-msgstr ""
+msgstr "Canon SELPHY-CP-600"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 msgid "Canon SELPHY-CP-710"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/main/xmli18n-tmp.h:953
+#, fuzzy
+msgid "Sony DPP-EX5"
+msgstr "Sony UP-DR150"
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
-msgstr ""
+msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+#, fuzzy
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DR150"
+
+#: src/main/xmli18n-tmp.h:957
 msgid "Sony UP-DR150"
-msgstr ""
+msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 msgid "Fujifilm Printpix-CX-400"
-msgstr ""
+msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 msgid "Fujifilm Printpix-CX-550"
+msgstr "Fujifilm Printpix-CX-550"
+
+#: src/main/xmli18n-tmp.h:960
+#, fuzzy
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm Printpix-CX-400"
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
-msgstr ""
+msgstr "RAW DATA 16 bit"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
-msgstr ""
+msgstr "RAW DATA 8 bit"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Inch"
-msgstr "Duim"
+msgstr "Inch"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
-msgstr ""
+msgstr "Stel de basis-meeteenheid in op inches"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
-msgstr ""
+msgstr "Stel de basis-meeteenheid in op centimeter"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
-#, fuzzy
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Points"
-msgstr "Afdrukken"
+msgstr "Punten"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Set the base unit of measurement to points (1/72\")"
-msgstr ""
+msgstr "Stel de basis-meeteenheid in op punten (1/72\")"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
-msgstr ""
+msgstr "mm"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "Set the base unit of measurement to millimetres"
-msgstr ""
+msgstr "Stel de basis-meeteenheid in op millimeter"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
-msgstr ""
+msgstr "Pica"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr ""
+msgstr "Stel de basis-meeteenheid in op pica (1/12\")"
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color output"
-msgstr ""
+msgstr "Kleuruitvoer"
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
-msgstr ""
+msgstr "Print in grijstinten met zwarte inkt"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
-#, fuzzy
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Standard Command"
-msgstr "Standaard"
+msgstr "Standaard commando"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
-msgstr ""
+msgstr "Gebruik het standaard printcommando"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
-#, fuzzy
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Custom Command"
-msgstr "Opdracht:"
+msgstr "Fabrikaat specifiek commando"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
-msgstr ""
+msgstr "Gebruik het fabrikaat specifieke commando"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
 msgstr "Bestand"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
-#, fuzzy
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Print to a file"
-msgstr "Afdrukken Naar Bestand"
+msgstr "Afdrukken naar een bestand"
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
-msgstr ""
+msgstr "Kromme aanpassen..."
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 msgid "Set Default"
-msgstr ""
+msgstr "Stel standaard in"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
-msgstr ""
+msgstr "Herstel het vorige"
 
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, c-format
 msgid "%s -- Print v%s"
-msgstr ""
+msgstr "%s -- Print v%s"
 
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
 msgstr "Info"
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6318,7 +6122,7 @@ msgstr ""
 "Afdrukken en\n"
 "instellingen opslaan"
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 msgid ""
 "Save\n"
 "Settings"
@@ -6326,15 +6130,15 @@ msgstr ""
 "Instellingen\n"
 "opslaan"
 
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
 msgstr "Afdrukken"
 
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
 msgstr "Voorbeeld"
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6347,307 +6151,261 @@ msgid ""
 "If you click another button while dragging the mouse, the image will return "
 "to its original position."
 msgstr ""
-
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
-#, fuzzy
+"Plaats de afbeelding op de pagina.\n"
+"Klik en sleep met de eerste knop om de afbeelding te plaatsen.\n"
+"Klik en sleep met de tweede knop om de afbeelding met een fijnere "
+"nauwkeurigheid te plaatsen; elke eenheid beweging verplaatst deze één punt "
+"(1/72\")\n"
+"Klik en sleep met de derde (middelste) knop om de afbeelding in eenheden van "
+"zijn grootte te verplaatsen.\n"
+"Bij het ingedrukt houden van de shift-toets tijdens klikken en slepen "
+"beperkt de beweging tot horizontaal of vertikaal.\n"
+"Als u op een andere knop klikt bij het slepen, dan keert de afbeelding terug "
+"naar zijn oorspronkelijke plaats."
+
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 msgid "Paper Size"
-msgstr "Grootte"
+msgstr "Papierafmetingen"
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
-msgstr ""
+msgstr "Toon alle papierafmetingen"
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
 msgstr "Afmetingen"
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
 msgstr "Breedte: "
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 msgid "Width of the paper that you wish to print to"
 msgstr "Breedte van het papier waarop je wenst te printen"
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
 msgstr "Hoogte: "
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 msgid "Height of the paper that you wish to print to"
 msgstr "Hoogte van het papier waarop je wenst te printen"
 
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
-#, fuzzy
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 msgid "Automatic Paper Size"
-msgstr "Grootte"
+msgstr "Automatische papierafmetingen"
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
-msgstr ""
+msgstr "Aantal kopieën"
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
-msgstr ""
+msgstr "Kies het aantal af te drukken kopieën; een waarde tussen 1 en 100"
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
-#, fuzzy
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 msgid "Image Position"
-msgstr "Positie"
+msgstr "Positie van afbeelding"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
 msgstr "Automatisch"
 
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
 msgstr "Portret"
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
 msgstr "Landschap"
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 msgid "Upside down"
 msgstr "Ondersteboven"
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
-msgstr ""
+msgstr "Seascape"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
+"Kies de orientatie: portret, landschap, ondersteboven of seascape "
+"(ondersteboven landschap)"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
-#, fuzzy
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 msgid "Orientation:"
-msgstr "Gekleurdheid:"
+msgstr "Oriëntatie:"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
 msgstr "Links:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
 msgstr "Afstand vanaf de linkerkant van het papier tot de afdruk"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
 msgstr "Rechts:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 msgid "Distance from the left of the paper to the right of the image"
 msgstr ""
 "Afstand vanaf de linkerkant van het papier tot de rechterkant van de afdruk"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
 msgstr "Afstand vanaf de rechterkant van het papier tot de afdruk"
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
 msgstr "Boven:"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
 msgstr "Afstand vanaf de bovenkant van het papier tot de afdruk"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
 msgstr "Onder:"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
-#, fuzzy
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 msgid "Distance from the top of the paper to bottom of the image"
-msgstr "Afstand vanaf de bovenkant van het papier tot de afdruk"
+msgstr ""
+"Afstand vanaf de bovenkant van het papier tot de onderkant van de afbeelding"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Afstand vanaf de onderkant van het papier tot de afdruk"
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Center:"
 msgstr "Midden X:"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
-#, fuzzy
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Horizontal"
-msgstr "Horzintaal"
+msgstr "Horzontaal"
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
 msgstr "Centreer het plaatje horizontaal op het papier"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
 msgstr "Beide"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image on the paper"
 msgstr "Centreer het plaatje op het papier"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
-#, fuzzy
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 msgid "Vertical"
 msgstr "Verticaal"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Center the image vertically on the paper"
 msgstr "Centreer het plaatje verticaal op het papier"
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
 msgstr "Stel Printer in"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
-#, fuzzy
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 msgid "Printer Make:"
-msgstr "Printer Naam:"
+msgstr "Printermerk:"
 
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
-#, fuzzy
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 msgid "Select the make of your printer"
-msgstr "Selecteer jouw printer model"
+msgstr "Selecteer het merk van uw printer"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 msgid "Printer Model:"
 msgstr "Printer model:"
 
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 msgid "Select your printer model"
 msgstr "Selecteer jouw printer model"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 msgid "PPD File:"
 msgstr "PPD Bestand:"
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Geef de juiste PPD bestandsnaam voor jouw printer"
 
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
 msgstr "Bladeren"
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Kies de juiste PPD bestandsnaam voor jouw printer"
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
-#, fuzzy
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr ""
-"Selecteer de naam van de printer (Niet het type, of model, of printer) "
-"waarna je wenst te printen"
+"Selecteer de naam van de uitvoerrij (niet het type, of model, of printer) "
+"die u wilt uitprinten"
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
-#, fuzzy
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 msgid "Printer Queue:"
-msgstr "Printer Naam:"
+msgstr "Printerrij:"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
-#, fuzzy
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 msgid "Enter the correct command to print to your printer. "
-msgstr "Geef de juiste PPD bestandsnaam voor jouw printer"
+msgstr "Geef het juiste commando om naar uw printer te printen. "
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
-msgstr ""
+msgstr "Voer de bestandsnaam in waarnaar geprint moet worden. "
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
-#, fuzzy
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 msgid "File to print to"
-msgstr "Test afdruk"
+msgstr "Bestand waar print naar toe moet"
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
-#, fuzzy
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 msgid "Print To File"
-msgstr "Afdrukken Naar Bestand"
+msgstr "Afdrukken naar bestand"
 
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 msgid "Define New Printer"
-msgstr "Stel nieuwe Printer in"
+msgstr "Stel nieuwe printer in"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 msgid "Printer Name:"
-msgstr "Printer Naam:"
+msgstr "Printernaam:"
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 msgid "Enter the name you wish to give this logical printer"
-msgstr ""
+msgstr "Voer de naam in van de logische printer"
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
-#, fuzzy
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 msgid "About Gutenprint "
-msgstr "Info over Gimp-Print"
+msgstr "Info over Gutenprint "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-#, fuzzy
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 msgid "Gutenprint Version "
-msgstr "Gimp-Print Versie"
+msgstr "Gutenprint versie"
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
-"\n"
-"\n"
-"Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n"
-"en de rest van het Gimp-Print Ontwikkelings Team.\n"
-"\n"
-"Bezoek ook onze website op http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 msgid "Printer Settings"
 msgstr "Printerinstellingen"
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6655,11 +6413,11 @@ msgstr ""
 "Selecteer de naam van de printer (Niet het type, of model, of printer) "
 "waarna je wenst te printen"
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 msgid "Setup Printer..."
 msgstr "Instellen Printer..."
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -6667,298 +6425,304 @@ msgstr ""
 "Kies het printermodel, PPD bestand, en commando die gebruikt wordt om naar "
 "deze printer af te drukken."
 
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 msgid "New Printer..."
 msgstr "Nieuwe Printer..."
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr ""
+"Definieer een logische printer. Deze kan gebruikt worden om een verzameling "
+"van instellingen die u bewaren wilt voor toekomstig gebruik."
 
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
-#, fuzzy
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 msgid "Image Size"
-msgstr "Grootte"
+msgstr "Afbeeldingsgrootte"
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 msgid "Scaling:"
-msgstr "Schaldn"
+msgstr "Schaal:"
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 msgid "Set the scale (size) of the image"
-msgstr "Geef de schaal (formaat) van het plaatje"
+msgstr "Stel de schaal (afmeting) in van het plaatje"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
-msgstr ""
+msgstr "Schalen met:"
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
+"Moet schaling gemeten worden in het percentage van de beschikbare "
+"paginagrootte of het aantal punten per inch"
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
 msgstr "Procent"
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 msgid "Scale the print to the size of the page"
-msgstr ""
+msgstr "Schaal de afdruk tot de afmeting van de pagina"
 
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
-msgstr ""
+msgstr "Schaal de afdruk tot het aantal punten per inch"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 msgid "Set the width of the print"
 msgstr "Geef de breedte van de afdruk"
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 msgid "Set the height of the print"
 msgstr "Geef de hoogte van de afdruk"
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
+"Gebruik de originele\n"
+"grootte van de afbeelding"
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the print size to the size of the image"
-msgstr ""
+msgstr "Stel de afdrukgrootte gelijk aan de grootte van de afbeelding"
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 msgid "Print Color Adjust"
-msgstr ""
+msgstr "Aanpassing van afdrukkleur"
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 msgid "Set Defaults"
-msgstr ""
+msgstr "Stel standaardwaarden in"
 
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 msgid "Image preview"
 msgstr "Afdruk voorvertoning"
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
-msgstr ""
+msgstr "Toon uitvoerkanalen:"
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 msgid "Output"
-msgstr ""
+msgstr "Uitvoer"
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 msgid "Output Type:"
-msgstr ""
+msgstr "Type uitvoer:"
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 msgid "Select the desired output type"
-msgstr ""
+msgstr "Kies het gewenste type uitvoer"
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
 msgstr "Past uitvoer aan..."
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
+"Pas de kleurbalans, helderheid, contrast, verzadiging en ruis-algoritme aan"
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
-#, fuzzy
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 msgid "Size Units:"
-msgstr "Eenheden"
+msgstr "Afmeting eenheden:"
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
-#, fuzzy
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 msgid " "
-msgstr ">"
+msgstr " "
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 msgid "Units:"
-msgstr "Eenheden"
+msgstr "Eenheden:"
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 msgid "Select the base unit of measurement for printing"
-msgstr ""
+msgstr "Kies de basiseenheid van afmeting voor het afdrukken"
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
-msgstr ""
+msgstr "System V lp"
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
-msgstr ""
+msgstr "CUPS"
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
-msgstr ""
+msgstr "Berkeley lpd (/etc/lpc)"
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
-msgstr ""
+msgstr "Berkeley lpd (/usr/bsd/lpc)"
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
-msgstr ""
+msgstr "Berkeley lpd (/usr/etc/lpc"
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
-msgstr ""
+msgstr "Berkeley lpd (/usr/libexec/lpc)"
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
-msgstr ""
+msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
-#, fuzzy
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 msgid "Printer"
-msgstr "Afdrukken"
+msgstr "Printer"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
-#, fuzzy
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 msgid "(Default Printer)"
-msgstr "Stel Printer in"
+msgstr "(Standaard printer)"
 
 #: src/gutenprintui2/curve.c:130
-#, fuzzy
 msgid "Curve type"
-msgstr "Zwart"
+msgstr "Type kromme"
 
 #: src/gutenprintui2/curve.c:131
 msgid "Is this curve linear, spline interpolated, or free-form"
-msgstr ""
+msgstr "Bij een lineaire kromme, spline geïnterpoleerd of vrije-vorm"
 
 #: src/gutenprintui2/curve.c:139
 msgid "Minimum X"
-msgstr ""
+msgstr "Kleinste X"
 
 #: src/gutenprintui2/curve.c:140
 msgid "Minimum possible value for X"
-msgstr ""
+msgstr "Kleinst mogelijke waarde voor X"
 
 #: src/gutenprintui2/curve.c:149
 msgid "Maximum X"
-msgstr ""
+msgstr "Grootste X"
 
 #: src/gutenprintui2/curve.c:150
 msgid "Maximum possible X value"
-msgstr ""
+msgstr "Grootst mogelijke waarde voor X"
 
 #: src/gutenprintui2/curve.c:159
 msgid "Minimum Y"
-msgstr ""
+msgstr "Kleinste Y"
 
 #: src/gutenprintui2/curve.c:160
 msgid "Minimum possible value for Y"
-msgstr ""
+msgstr "Kleinst mogelijke waarde van Y"
 
 #: src/gutenprintui2/curve.c:169
 msgid "Maximum Y"
-msgstr ""
+msgstr "Grootste Y"
 
 #: src/gutenprintui2/curve.c:170
 msgid "Maximum possible value for Y"
-msgstr ""
+msgstr "Grootst mogelijke waarde van Y"
 
 #: src/gutenprintui2/gammacurve.c:418
 msgid "_Gamma value"
-msgstr ""
+msgstr "_Gamma-waarde"
 
-#: src/cups/genppd.c:133
-#, fuzzy
+#: src/cups/genppd.c:146
 msgid "Printer Features"
-msgstr "Printerinstellingen"
+msgstr "Printermogelijkheden"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 msgid "Output Control"
-msgstr ""
+msgstr "Controle op uitvoer"
 
-#: src/cups/genppd.c:139
-#, fuzzy
+#: src/cups/genppd.c:152
 msgid "Common"
-msgstr "Opdracht:"
+msgstr "Gezamelijk"
 
-#: src/cups/genppd.c:140
-#, fuzzy
+#: src/cups/genppd.c:153
 msgid "Extra 1"
-msgstr "Lade 1"
+msgstr "Extra 1"
 
-#: src/cups/genppd.c:141
-#, fuzzy
+#: src/cups/genppd.c:154
 msgid "Extra 2"
-msgstr "Lade 2"
+msgstr "Extra 2"
 
-#: src/cups/genppd.c:142
-#, fuzzy
+#: src/cups/genppd.c:155
 msgid "Extra 3"
-msgstr "Lade 3"
+msgstr "Extra 3"
 
-#: src/cups/genppd.c:143
-#, fuzzy
+#: src/cups/genppd.c:156
 msgid "Extra 4"
-msgstr "Lade 4"
+msgstr "Extra 4"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
-msgstr ""
+msgstr "Extra 5"
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr "Dutch"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1465
-msgid "No"
+#: src/cups/genppd.c:1613
+#, fuzzy
+msgid "2-Sided Printing"
+msgstr "Dubbelzijdig printen"
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1467
-msgid "Yes"
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1497
-msgid "Fine Adjustment"
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
 msgstr ""
 
+#: src/cups/genppd.c:1717
+msgid "No"
+msgstr "Nee"
+
+#: src/cups/genppd.c:1719
+msgid "Yes"
+msgstr "Ja"
+
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#, fuzzy
+msgid "Value"
+msgstr "Blauw"
+
+#: src/cups/genppd.c:1756
+msgid "Fine Adjustment"
+msgstr "Fijnafstelling"
+
 #: src/escputil/escputil.c:70
 msgid "Escputil version "
 msgstr "Escputil versie"
 
-#: src/escputil/escputil.c:71
-#, fuzzy
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-", Copyright (C) 2000-2001 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; voor details type in 'escputil -"
-"l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' in voor details.\n"
-
 #: src/escputil/escputil.c:76
-#, fuzzy
 msgid ""
 "Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
@@ -6976,7 +6740,7 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 msgstr ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
 "This program is free software; you can redistribute it and/or modify it\n"
 "under the terms of the GNU General Public License as published by the Free\n"
@@ -7037,6 +6801,54 @@ msgid ""
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
+"Gebruik: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                  [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                  [-C choices] [-p patterns]\n"
+"Doe onderhoud aan de EPSON Stylus (R) printers.\n"
+"Voorbeeld: escputil --ink-level --raw-device /dev/usb/lp0\n"
+"           escputil --clean-head --new --printer-name MyQueue\n"
+"\n"
+"  Commando's:\n"
+"    -c|--clean-head    Maak de printkop schoon.\n"
+"    -n|--nozzle-check  Print een nozzle testpatroon.\n"
+"                       Vuile of verstopte nozzles vertonen zich als gaten in "
+"het\n"
+"                       patroon.  Als u een gat ziet dan moet u de printkop\n"
+"                       schoonmaken.\n"
+"    -a|--align-head    Lijn de printkop uit.  VOORZICHTIG: Misbruik van dit\n"
+"                       programma kan resulteren in een slechte "
+"printkwaliteit en/of\n"
+"                       beschadiging van de printer.\n"
+"    -s|--status        Haal de printerstatus op.\n"
+"    -i|--ink-level     Toon de inktniveaus van de printer.  Dit vereist\n"
+"                       lees/schrijf-toegang tot het raw-printerapparaat.\n"
+"    -e|--extended-ink-info     Toon de uitgebreide inktinformatie van de\n"
+"                       printer.  Dit vereist lees/schrijf-toegang tot het\n"
+"                       raw-printerapparaat.\n"
+"    -d|--identify      Vraag het merk en model van de printer. Dit vereist\n"
+"                       lees/schrijf-toegang tot het raw-printerapparaat.\n"
+"    -l|--license       Toon de licentie en garantie-bepalingen van dih "
+"programma.\n"
+"    -M|--list-models   Toon een lijst van de beschikbare printermodellen.\n"
+"    -h|--help          Toon dit hulpbericht.\n"
+"  Opties:\n"
+"    -P|--printer-name  Specificeer de naam van de printerqueue.\n"
+"                       Standaad is de standaard systeemprinter.\n"
+"    -r|--raw-device    Specificeer de naam van het apparaat waar direct "
+"naar\n"
+"                       geschreven moet worden i.p.v. via een pinterqueue.\n"
+"    -u|--new           De printer is een nieuwe printer (Stylus Color 740 "
+"of\n"
+"                       nieuwer).  Alleen noodzakelijk bij een niet-raw "
+"apparaat.\n"
+"    -q|--quiet         Onderdruk de banner.\n"
+"    -S|--short-name    Toon de korte naam van de printer met --identify.\n"
+"    -m|--model         Specificeer het preciese printermodel voor de "
+"uitlijning van de kop\n"
+"    -C|--choices       Specificeer het aantal patroonkeuzes voor de "
+"uitlijning\n"
+"    -p|--patterns      Specificeer het aantal patroonsets voor de "
+"uitlijning\n"
 
 #: src/escputil/escputil.c:161
 msgid ""
@@ -7081,6 +6893,47 @@ msgid ""
 "    -C Specify the number of pattern choices for alignment\n"
 "    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
+"Gebruik: escputil [OPTIES] [COMMANDO]\n"
+"Gebruik: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Doe onderhoud aan de EPSON Stylus (R) printers.\n"
+"Voorbeeld: escputil -i -r /dev/usb/lp0\n"
+"           escputil -c -u -P MyQueue\n"
+"\n"
+"  Commando's:\n"
+"    -c Maak de printkop schoon.\n"
+"    -n Print een spuitgaatjes testpatroon.\n"
+"          Vuile of verstopte spuitgaatjes komen te voorschijn als gaten in "
+"het\n"
+"          patroon.  Als er zo'n gat is, dan moet de printkop schoongemaakt\n"
+"          worden.\n"
+"    -a Lijn de printkop uit.  VOORZICHTIG: Misbruik van dit\n"
+"          programma kan een slechte printkwaliteit oplevren\n"
+"          en/of de printer beschadigen.\n"
+"    -s Toon de status van de printer.\n"
+"    -i Toon de inktniveau's van de printer.  Dit vereist\n"
+"          lees/schrijftoegang tot het raw-printer-device.\n"
+"    -e Toon de uitgebreide inktinformatie van de printer.\n"
+"          Alleen voor de R800-printer en gelijken. Dit vereist\n"
+"          lees/schrijftoegang tot het raw-printer-device.\n"
+"    -d Vraag het merk en model van de printer op.  Dit\n"
+"          vereist lees/schrijftoegang tot het raw-printer-device.\n"
+"    -l Toon de licentie/garantie bepalingen van dit programma.\n"
+"    -M Toon de beschikbare printermodellen.\n"
+"    -h Toon deze hulpboodschap.\n"
+"  Opties:\n"
+"    -P Specificeer de naam van de betrokken printerqueue.\n"
+"          Standaard is de standaard systeemprinter.\n"
+"    -r Specificeer de naae van het apparaat waar direct naar geschreven\n"
+"          moet worden ga niet via een printerqueue.\n"
+"    -u De printer is een nieuwe printer (Stylus Color 740 of nieuwer).\n"
+"          Alleen nodig als niet een raw-device wordt gebruikt.\n"
+"    -q Onderdruk de banner.\n"
+"    -S Print de korte naam van de printer bij -d.\n"
+"    -m Specificeer het preciese printermodel voor het uitlijnen van de kop.\n"
+"    -C Specificeer het aantal keuzes in patronen voor de uitlijning\n"
+"    -p Specificeer het aantal sets patronen voor uitlijning\n"
 
 #: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
@@ -7095,12 +6948,12 @@ msgstr "U mag maar een printermodel specificeren"
 #: src/escputil/escputil.c:369
 #, c-format
 msgid "Alignment choices must be at least 1."
-msgstr ""
+msgstr "Aantal keuzes voor uitlijning moet tenminste 1 zijn."
 
 #: src/escputil/escputil.c:376
 #, c-format
 msgid "Alignment passes must be at least 1."
-msgstr ""
+msgstr "Aantal doorgangen voor uitlijning moet tenminste 1 zijn."
 
 #: src/escputil/escputil.c:381
 #, c-format
@@ -7110,17 +6963,17 @@ msgstr "Onbekende optie %c\n"
 #: src/escputil/escputil.c:389
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
-msgstr ""
+msgstr "Gebruik: %s [OPTIES] commando\n"
 
 #: src/escputil/escputil.c:391
 #, c-format
 msgid "Type `%s --help' for more information.\n"
-msgstr ""
+msgstr "Geef `%s --help' voor meer informatie.\n"
 
 #: src/escputil/escputil.c:393
 #, c-format
 msgid "Type `%s -h' for more information.\n"
-msgstr ""
+msgstr "Geef `%s -h' voor meer informatie.\n"
 
 #: src/escputil/escputil.c:459
 #, c-format
@@ -7140,7 +6993,7 @@ msgstr "Kan de opdracht niet versturen naar de printer\n"
 #: src/escputil/escputil.c:568
 #, c-format
 msgid "Read from printer timed out\n"
-msgstr ""
+msgstr "Lezen van de duurt te lang\n"
 
 #: src/escputil/escputil.c:573
 #, c-format
@@ -7181,7 +7034,7 @@ msgid ""
 msgstr ""
 "\n"
 "Kan printer type niet vaststellen.\n"
-"Gebruik asjeblief -m om je printermodel te specificeren.\n"
+"Gebruik -m om uw printermodel te specificeren.\n"
 
 #: src/escputil/escputil.c:983 src/escputil/escputil.c:989
 #: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
@@ -7191,137 +7044,137 @@ msgstr ""
 #: src/escputil/escputil.c:1015 src/escputil/escputil.c:1016
 #: src/escputil/escputil.c:1017 src/escputil/escputil.c:1257
 msgid "Unknown"
-msgstr ""
+msgstr "Onbekend"
 
 #: src/escputil/escputil.c:1027
 #, c-format
 msgid "Status: Error\n"
-msgstr ""
+msgstr "Status: Fout\n"
 
 #: src/escputil/escputil.c:1030
 #, c-format
 msgid "Status: Self-Printing\n"
-msgstr ""
+msgstr "Status: Zelfstandig aan het printen\n"
 
 #: src/escputil/escputil.c:1033
 #, c-format
 msgid "Status: Busy\n"
-msgstr ""
+msgstr "Status: Bezig\n"
 
 #: src/escputil/escputil.c:1036
-#, fuzzy, c-format
+#, c-format
 msgid "Status: Waiting\n"
-msgstr "Gekleurdheid:"
+msgstr "Status: In de wacht\n"
 
 #: src/escputil/escputil.c:1039
 #, c-format
 msgid "Status: Idle\n"
-msgstr ""
+msgstr "Status: Idle\n"
 
 #: src/escputil/escputil.c:1042
 #, c-format
 msgid "Status: Paused\n"
-msgstr ""
+msgstr "Status: In pauze\n"
 
 #: src/escputil/escputil.c:1045
 #, c-format
 msgid "Status: Cleaning\n"
-msgstr ""
+msgstr "Status: Aan het schoonmaken\n"
 
 #: src/escputil/escputil.c:1048
 #, c-format
 msgid "Status: Factory shipment\n"
-msgstr ""
+msgstr "Status: Fabrieksinstelling\n"
 
 #: src/escputil/escputil.c:1051
 #, c-format
 msgid "Status: Shutting down\n"
-msgstr ""
+msgstr "Status: Aan het afsluiten\n"
 
 #: src/escputil/escputil.c:1054
 #, c-format
 msgid "Status: Unknown (%d)\n"
-msgstr ""
+msgstr "Status: Onbekend (%d)\n"
 
 #: src/escputil/escputil.c:1065
 #, c-format
 msgid "Error: Fatal Error\n"
-msgstr ""
+msgstr "Fout: fatale fout\n"
 
 #: src/escputil/escputil.c:1068
 #, c-format
 msgid "Error: Other interface is selected\n"
-msgstr ""
+msgstr "Fout: Het andere interface is gekozen\n"
 
 #: src/escputil/escputil.c:1071
 #, c-format
 msgid "Error: Cover Open\n"
-msgstr ""
+msgstr "Fout: Deksel is open\n"
 
 #: src/escputil/escputil.c:1074
 #, c-format
 msgid "Error: Paper jam\n"
-msgstr ""
+msgstr "Fout: Papier zit vast\n"
 
 #: src/escputil/escputil.c:1077
 #, c-format
 msgid "Error: Ink out\n"
-msgstr ""
+msgstr "Fout: Geen inkt\n"
 
 #: src/escputil/escputil.c:1080
 #, c-format
 msgid "Error: Paper out\n"
-msgstr ""
+msgstr "Fout: geen papier\n"
 
 #: src/escputil/escputil.c:1083
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
-msgstr ""
+msgstr "Fout: Wacht op signaal van de afscheurplek\n"
 
 #: src/escputil/escputil.c:1086
 #, c-format
 msgid "Error: Double feed error\n"
-msgstr ""
+msgstr "Fout: in tweezijdige doorvoer\n"
 
 #: src/escputil/escputil.c:1089
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
-msgstr ""
+msgstr "Fout: Onherstelbare fout in snij-instrument\n"
 
 #: src/escputil/escputil.c:1092
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
-msgstr ""
+msgstr "Fout: Herstelbaar snij-instrument zit vast\n"
 
 #: src/escputil/escputil.c:1095
 #, c-format
 msgid "Error: CD Tray Out\n"
-msgstr ""
+msgstr "Fout: Geen CD-lade aanwezig\n"
 
 #: src/escputil/escputil.c:1098
 #, c-format
 msgid "Error: Card loading error\n"
-msgstr ""
+msgstr "Fout: Laden van een kaart gaat fout\n"
 
 #: src/escputil/escputil.c:1101
 #, c-format
 msgid "Error: Tray cover open\n"
-msgstr ""
+msgstr "Fout: Ladedeksel is open\n"
 
 #: src/escputil/escputil.c:1104
 #, c-format
 msgid "Error: Unknown (%d)\n"
-msgstr ""
+msgstr "Fout: Onbekend (%d)\n"
 
 #: src/escputil/escputil.c:1115
 #, c-format
 msgid "Printing nozzle self-test\n"
-msgstr ""
+msgstr "Spuitmondjes zelftest\n"
 
 #: src/escputil/escputil.c:1215 src/escputil/escputil.c:1245
 #, c-format
 msgid "Ink Levels:\n"
-msgstr ""
+msgstr "Inktniveau's:\n"
 
 #: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
 #: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
@@ -7333,62 +7186,63 @@ msgstr "Kleureninkt"
 #: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
 #: src/escputil/escputil.c:1646
 msgid "Percent remaining"
-msgstr "Overblijvend percentage"
+msgstr "Percentage nog aanwezig"
 
 #: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
 #: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
 #: src/escputil/escputil.c:1303 src/escputil/escputil.c:1306
 #, c-format
 msgid "Warning: Black Ink Low\n"
-msgstr ""
+msgstr "Waarschuwing: Zwarte inkt laag\n"
 
 #: src/escputil/escputil.c:1309
 #, c-format
 msgid "Warning: Unknown (%d)\n"
-msgstr ""
+msgstr "Waarschuwing: Onbekend (%d)\n"
 
 #: src/escputil/escputil.c:1318
 #, c-format
 msgid "Job Name: "
-msgstr ""
+msgstr "Jobnaam: "
 
 #: src/escputil/escputil.c:1347
 msgid "ink levels"
-msgstr ""
+msgstr "inktniveau's"
 
 #: src/escputil/escputil.c:1350
 msgid "status"
-msgstr ""
+msgstr "status"
 
 #: src/escputil/escputil.c:1355
-#, fuzzy, c-format
+#, c-format
 msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Printer status heeft een raw device nodig.\n"
+msgstr "Verkrijgen van %s vereist een 'raw' apparaat.\n"
 
 #: src/escputil/escputil.c:1461
-#, fuzzy, c-format
+#, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Printer status heeft een raw device nodig.\n"
+msgstr ""
+"Het verkrijgen van uitgebreide inktinformatie vereist een 'raw' apparaat.\n"
 
 #: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
 #: src/escputil/escputil.c:1646
 msgid "Part number"
-msgstr ""
+msgstr "Nummer van onderdeel"
 
 #: src/escputil/escputil.c:1603 src/escputil/escputil.c:1627
 #: src/escputil/escputil.c:1647
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #: src/escputil/escputil.c:1675
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
-msgstr ""
+msgstr "Het identificeren van het printermodel vereist een 'raw' apparaat.\n"
 
 #: src/escputil/escputil.c:1693
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot identify printer model.\n"
-msgstr "U mag maar een printermodel specificeren"
+msgstr "Kan het printermodel niet identificeren.\n"
 
 #: src/escputil/escputil.c:1713
 #, c-format
@@ -7399,8 +7253,8 @@ msgstr "Bezig met het schoonmaken van de koppen..\n"
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
-"Bezig met nozzle check, let er astublief op, dat er papier in de printer "
-"zit.\n"
+"Bezig met het controleren van de spuitmondjes, let op dat er papier in de "
+"printer zit.\n"
 
 #: src/escputil/escputil.c:1732
 #, c-format
@@ -7515,45 +7369,43 @@ msgid ""
 "this procedure.\n"
 "\n"
 msgstr ""
-"Lees deze instructies heel goed voor, voodat je doorgaat.\n"
+"Lees deze instructies heel goed voor, voordat u doorgaat.\n"
 "\n"
-"Dit programma laat je de printer head van je Epson Stylus inktjet printer\n"
-"uitlijnen. Als je dit programma verkeerd gebruikt kan je print kwaliteit "
-"naar\n"
-"beneden gaan, en mogelijk je printer beschadigen. Dit programma is niet\n"
-"nagekeken door Seiko Epson voor fouten, en is aan jou aangeboden zonder\n"
-"enige garantie. Het volledige risico van het gebruiken van dit programma is\n"
-"voor jou.\n"
+"Dit programma laat u de printkop van uw Epson Stylus inktjetprinter\n"
+"uitlijnen. Als u dit programma verkeerd gebruikt kan de printkwaliteit naar\n"
+"beneden gaan en mogelijk uw printer beschadigen. Dit programma is niet\n"
+"door Seiko Epson gecontroleerd op fouten, en wordt zonder enige garantie\n"
+"ter beschikking gesteld. Het volledige risico van het gebruik van dit\n"
+" programma ligt bij u.\n"
 "\n"
-"Dit programma print een test patroon dat bestaat uit een aantal paren van\n"
+"Dit programma print een testpatroon dat bestaat uit een aantal paren van\n"
 "verticale lijnen die elkaar overlappen. Onder elk paar lijnen staat een "
 "nummer\n"
 "tussen de %d en %d.\n"
 "\n"
-"Als je deze paren bekijkt, zal je een paar lijnen vinden dat het beste is\n"
-"uitgelijnt, hetgeen betekend, dat de beste verticale lijn tesamen vormt.\n"
+"Als u deze paren bekijkt, zult u een paar lijnen vinden die het beste zijn\n"
+"uitgelijnd, hetgeen betekent dat deze lijnen het beste samen één lijn "
+"vormen.\n"
 "Bekijk de lijnen zeer zorgvuldig om het beste paar uit te zoeken. Het "
 "gebruik\n"
 "van een loupe of vergrootglas is aanbevolen voor de meest kritische\n"
-"inspectie. Het is ook aan te raden om voor deze test goede kwaliteit papier\n"
-"te gebruiken zodat de lijnen goed gevormt zijn en niet door het papier "
+"inspectie. Het is ook aan te raden om voor deze test een goede kwaliteit "
+"papier\n"
+"te gebruiken zodat de lijnen goed gevormd zijn en niet door het papier "
 "drukken.\n"
-"Nadat je het nummer hebt gekozen, dat het beste overeenkomt, plaats het\n"
-"papier terug in de printer voordat je het nummer intikt.\n"
+"Nadat u het nummer hebt gekozen, dat het beste overeenkomt, plaats u het\n"
+"papier terug in de printer voordat u het nummer intikt.\n"
 "\n"
-"Nadat het uitlijningspatroon is geprint, zal het nog een keer geprint "
+"Nadat het het uitlijnen nog eens gedaan is, zal het nog een keer geprint "
 "worden\n"
-"Je zou moeten vinden dat het meest middelste paar (#%d van de %d) het beste "
-"is.\n"
-"Je zal dan de mogelijkheid krijgen om het re(s)ultaar in de printer op te "
-"slaan,\n"
-"he(r)halen van het proces, of te (q)uiten zonder op te slaan. Stoppen zal "
+"U zou moeten vinden dat het middelste paar (#%d van de %d) het beste is.\n"
+"U krijgt dan de mogelijkheid om het resultaat in de printer op te slaan(s),\n"
+"het proces te he(r)halen of te stoppen zonder op te slaan(q). Stoppen zal "
 "niet\n"
 "de vorige instellingen terugzetten, maar de printer aan en uit zetten zal "
 "dat\n"
-"wel doen. Als je stopt, zul je het hele ciruit weer opnieuw moeten "
-"doorlopen\n"
-"om de resultaten op te slaan. Het is essentieel dat je de printer niet "
+"wel doen. Als u stopt, zult u het hele proces opnieuw moeten doorlopen\n"
+"om de resultaten op te slaan. Het is essentieel dat u de printer niet "
 "uitzet\n"
 "tijdens deze procedure.\n"
 "\n"
@@ -7561,12 +7413,13 @@ msgstr ""
 #: src/escputil/escputil.c:1811
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
-msgstr "Niet mogelijk om commando's naar de printer te sturen, eindigd.\n"
+msgstr ""
+"Onmogelijk om commando's naar de printer te sturen, bezig te stoppen.\n"
 
 #: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
 #, c-format
 msgid "Exiting\n"
-msgstr ""
+msgstr "Bezig te stoppen\n"
 
 #: src/escputil/escputil.c:1828
 #, c-format
@@ -7579,18 +7432,27 @@ msgid ""
 "You will then be asked to confirm your choice.\n"
 "What do you want to do (s, q, r)?\n"
 msgstr ""
+"U dient de uiteindelijke uitvoer zeer zorgvuldig te bekijken om er\n"
+"zeker van te zijn dat de printer juist in uitgelijnd. U kunt nu:\n"
+"  (s)ave, bewaar het resultaat in de printer,\n"
+"  (q)uit, stop zonder het resultaat te bewaren, of\n"
+"  (r)epeat, herhaal het gehele proces vanaf het begin.\n"
+"U krijgt daarna de vraag uw keuze te bevestigen.\n"
+"Wat wilt u doen (s,q, r)?\n"
 
 #: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
 #: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
 #: src/escputil/escputil.c:1994
 msgid "> "
-msgstr ">"
+msgstr "> "
 
 #: src/escputil/escputil.c:1843
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
+"Graag bevestiging dat u wilt stoppen zonder te bewaren door opnieuw 'q' te "
+"typen:\n"
 
 #: src/escputil/escputil.c:1850
 #, c-format
@@ -7598,8 +7460,8 @@ msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
-"OK, je printer is uitgelijnt, maar de uitlijnen is niet bewaard.\n"
-"Als je de uitlijning wilt bewaren, moet je het proces herhalen.\n"
+"OK, uw printer is uitgelijnt, maar de uitlijning is niet bewaard.\n"
+"Als u de uitlijning wilt bewaren, moet u het proces herhalen.\n"
 
 #: src/escputil/escputil.c:1857
 #, c-format
@@ -7607,11 +7469,13 @@ msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
+"Graag bevestiging dat u het uitlijnproces wilt herhalen door\n"
+"het typen van een 'r':\n"
 
 #: src/escputil/escputil.c:1865
 #, c-format
 msgid "Repeating the alignment process.\n"
-msgstr "Herhaal de uitlijn procedure.\n"
+msgstr "Herhaal de uitlijnprocedure.\n"
 
 #: src/escputil/escputil.c:1871
 #, c-format
@@ -7622,16 +7486,21 @@ msgid ""
 "Please confirm by typing 's' again that you wish to save the settings\n"
 "to your printer:\n"
 msgstr ""
+"Dit verandert de configuratie van uw printer permanent.\n"
+"WAARSCHUWING: deze procedure is niet goedgekeurd door Seiko Epson en\n"
+"het zou uw printer kunnen beschadigen. Doorgaan?\n"
+"Graag bevestigen door 's' opnieuw in te typen om de instellingen\n"
+"in uw printer te bewaren:\n"
 
 #: src/escputil/escputil.c:1883
 #, c-format
 msgid "About to save settings..."
-msgstr "Bezig met schrijven van instellingen..."
+msgstr "Bezig met wegschrijven van instellingen..."
 
 #: src/escputil/escputil.c:1889
 #, c-format
 msgid "failed!\n"
-msgstr "Gefaalt!\n"
+msgstr "mislukt!\n"
 
 #: src/escputil/escputil.c:1890
 #, c-format
@@ -7639,18 +7508,18 @@ msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
-"Je instellingen werden niet succesvol weggeschreven. Je moet de\n"
-"uitlijn procedure herhalen.\n"
+"Uw instellingen werden niet succesvol weggeschreven. U moet de\n"
+"uitlijnprocedure herhalen.\n"
 
 #: src/escputil/escputil.c:1894
 #, c-format
 msgid "succeeded!\n"
-msgstr "Gelukt!\n"
+msgstr "gelukt!\n"
 
 #: src/escputil/escputil.c:1895
-#, fuzzy, c-format
+#, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
-msgstr "Je uitlijn instellingen zijn bewaard door de printer.\n"
+msgstr "Uw uitlijn-instellingen zijn bewaard door de printer.\n"
 
 #: src/escputil/escputil.c:1900
 #, c-format
@@ -7672,11 +7541,17 @@ msgid ""
 "Please place a sheet of paper in your printer to begin the head\n"
 "alignment procedure.\n"
 msgstr ""
+"Deze procedure neemt aan dat uw printer een Epson %s is.\n"
+"Als dit niet uw printermodel is, type dan control-C en\n"
+"kies uw echte printermodel.\n"
+"\n"
+"Zet een vel papier in uw printer om te beginnen met de\n"
+"procedure voor het uitlijnen van de koppen.\n"
 
 #: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
 #: src/escputil/escputil.c:2047
 msgid "Press enter to continue > "
-msgstr "Druk enter om door te gaan >"
+msgstr "Druk op enter om door te gaan > "
 
 #: src/escputil/escputil.c:1980
 #, c-format
@@ -7685,19 +7560,18 @@ msgid ""
 "pattern.\n"
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
-"Kijk astublief naar de afdruk, en kies het beste paar lijnen in elk "
-"patroon.\n"
-"Tik een paar-nummer, '?' voor hulp, or 'r' om de procedure te herhalen.\n"
+"Kijk naar de afdruk, en kies het beste paar lijnen in elk patroon.\n"
+"Tik een paar-nummerin, '?' voor hulp, or 'r' om de procedure te herhalen.\n"
 
 #: src/escputil/escputil.c:1993
 #, c-format
 msgid "Pass #%d"
-msgstr ""
+msgstr "Stap #%d"
 
 #: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Voer astublief een nieuw vel papier in.\n"
+msgstr "Voer een nieuw vel papier in.\n"
 
 #: src/escputil/escputil.c:2020
 #, c-format
@@ -7707,7 +7581,7 @@ msgstr "Nummer valt buiten bereik!\n"
 #: src/escputil/escputil.c:2025
 #, c-format
 msgid "I cannot understand what you typed!\n"
-msgstr "Ik begrijp wat je zonet ingetikt hebt niet!\n"
+msgstr "Begrijp niet wat u zonjuist ingetikt hebt!\n"
 
 #: src/escputil/escputil.c:2031
 #, c-format
@@ -7717,7 +7591,7 @@ msgstr "Het beste paar lijnen zou genummerd moeten zijn tussen 1 en %d.\n"
 #: src/escputil/escputil.c:2038
 #, c-format
 msgid "Attempting to set alignment..."
-msgstr "Probeert uitlijning in te stellen."
+msgstr "Probeert de uitlijning in te stellen..."
 
 #: src/escputil/escputil.c:2041
 #, c-format
@@ -7732,15 +7606,16 @@ msgid ""
 "pattern %d.  If it is not, you should repeat the process to get the best\n"
 "quality printing.\n"
 msgstr ""
-"Kijk alstublief na of de uitlijning klopt. Nadat het uitlijnings patroon\n"
-"weer opnieuw is afgedrukt, kijk ook na of het beste patroon voor elke\n"
-"lijn patroon %d is. Als het dat niet is, zul je de procedure moeten\n"
+"Kijk alstublief na of de uitlijning klopt. Kijk, nadat het "
+"uitlijningspatroon\n"
+"weer opnieuw is afgedrukt, of het beste patroon voor elk\n"
+"lijnpatroon %d is. Als dat niet zo is dan zult u de procedure moeten\n"
 "herhalen om de beste kwaliteit te krijgen.\n"
 
 #: src/escputil/escputil.c:2088
 #, c-format
 msgid "Error in input\n"
-msgstr ""
+msgstr "Fout in de invoer\n"
 
 #: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
@@ -7748,7 +7623,7 @@ msgstr "Bezig met afdrukken..."
 
 #: src/gimp/print.c:133
 msgid "<Image>/File/Print..."
-msgstr ""
+msgstr "<Image>/File/Print..."
 
 #: src/ghost/ijsgutenprint.c:98
 #, c-format
@@ -7761,623 +7636,338 @@ msgid ""
 "ERROR: ijsgutenprint: the version of Gutenprint software installed (%s) does "
 "not match the PPD file (%s).\n"
 msgstr ""
+"ijsgutenprint: de versie van de geïstalleerde Gutenprint-software (%s)\n"
+"  klopt niet met hetPPD-bestand (%s).  Als u uw versie van Gutenprint\n"
+"  recent up-to-date hebt gebracht dan moet u alle printerqueues opnieuw\n"
+"  installeren.\n"
+"  Kijk in de documentatie van uw leverancier of het commando voor het\n"
+"  ``foomatic-ppdbestand'' voor nadere instructies.\n"
+"FOUT: ijsgutenprint: de versie van de geïnstalleerde Gutenprint software (%"
+"s) klopt niet met het PPD bestand (%s).\n"
 
 #: src/ghost/ijsgutenprint.c:191
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 msgstr ""
+"FOUT: ijsgutenprint: Verkeerde kleurruimte: bps %d kanalen %d ruimte %s\n"
 
 #: src/ghost/ijsgutenprint.c:199
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
-msgstr "Zoek volgende rij faalde op %d\n"
+msgstr "FOUT: ijsgutenprint: No rijbuffer\n"
 
 #: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
-msgstr "Lukt niet om %s:%s te openen\n"
+msgstr ""
+"FOUT: ijsgutenprint: Kan parameter %s=%s niet onleden (verwacht een nummer)\n"
 
 #: src/ghost/ijsgutenprint.c:498
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
-msgstr "Printer moet gespecificeerd worden met -sMODEL\n"
+msgstr "FOUT: ijsgutenprint: Printer moet gespecificeerd worden met -sMODEL\n"
 
 #: src/ghost/ijsgutenprint.c:500
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
-msgstr "Printer %s is geen bekend model\n"
+msgstr "FOUT: ijsgutenprint: Printer %s is geen bekend model\n"
 
 #: src/ghost/ijsgutenprint.c:656
 #, c-format
 msgid "ijsgutenprint: unknown DeviceModel %s\n"
-msgstr ""
+msgstr "ijsgutenprint: onbekend MODEL %s\n"
 
 #: src/ghost/ijsgutenprint.c:700
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
-msgstr "Kan niet printen op printer %s met %s\n"
+msgstr "FOUT: ijsgutenprint: kan Linksboven %s niet ontleden\n"
 
 #: src/ghost/ijsgutenprint.c:723
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
-msgstr "Kan niet printen op printer %s met %s\n"
+msgstr "FOUT: ijsgutenprint: kan Papierafmetingen %s niet ontleden\n"
 
 #: src/ghost/ijsgutenprint.c:795
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
-msgstr "Kan niet printen op printer %s met %s\n"
+msgstr "FOUT: ijsgutenprint: kan Kromme %s niet ontleden\n"
 
 #: src/ghost/ijsgutenprint.c:802
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
-msgstr "Kan niet printen op printer %s met %s\n"
+msgstr ""
+"FOUT: ijsgutenprint: kan %s met drijvendekomma-getal %s niet ontleden\n"
 
 #: src/ghost/ijsgutenprint.c:809
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
-msgstr "Kan niet printen op printer %s met %s\n"
+msgstr "FOUT: ijsgutenprint: kan %s geheel getal %s niet ontleden\n"
 
 #: src/ghost/ijsgutenprint.c:816
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
-msgstr "Kan niet printen op printer %s met %s\n"
+msgstr "FOUT: ijsgutenprint: kan %s dimensie %s niet ontleden\n"
 
 #: src/ghost/ijsgutenprint.c:830
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
-msgstr "Kan niet printen op printer %s met %s\n"
+msgstr "FOUT: ijsgutenprint: kan %s met logische waarde %s niet ontleden\n"
 
 #: src/ghost/ijsgutenprint.c:841
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
-msgstr "Onbekende printer %s\n"
+msgstr "FOUT: ijsgutenprint: Onjuiste parameter %s %d\n"
 
 #: src/ghost/ijsgutenprint.c:867
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
-msgstr "Zoek volgende rij faalde op %d\n"
+msgstr "FOUT: ijsgutenprint: onjuiste sleutelcode %d\n"
 
 #: src/ghost/ijsgutenprint.c:1308
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: image_init failed %d\n"
-msgstr "image_init faalde %d\n"
+msgstr "FOUT: ijsgutenprint: image_init mislukte %d\n"
 
 #: src/ghost/ijsgutenprint.c:1319
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-msgstr "Lukt niet om %s:%s te openen\n"
+msgstr ""
+"FOUT: ijsgutenprint: Het lukt niet om bestandsdescripter: %s te openen\n"
 
 #: src/ghost/ijsgutenprint.c:1331
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-msgstr "Lukt niet om %s:%s te openen\n"
+msgstr "FOUT: ijsgutenprint: Lukt niet om %s: %s te openen\n"
 
 #: src/ghost/ijsgutenprint.c:1344
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
-msgstr "Onbekende printer %s\n"
+msgstr "FOUT: ijsgutenprint: Onbekende printer %s\n"
 
 #: src/ghost/ijsgutenprint.c:1516
 #, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-msgstr ""
+msgstr "FOUT: ijsgutenprint: Foute parameters; kan niet doorgaan!\n"
 
 #: src/ghost/ijsgutenprint.c:1534
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
-msgstr "Zoek volgende rij faalde op %d\n"
-
-#, fuzzy
-#~ msgid "Gutenprint"
-#~ msgstr "Test afdruk"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-#~ msgstr "Zoek volgende rij faalde op %d\n"
-
-#, fuzzy
-#~ msgid "EPSON Stylus C50"
-#~ msgstr "Stylus C60"
-
-#, fuzzy
-#~ msgid "EPSON Stylus C60"
-#~ msgstr "Stylus C60"
-
-#, fuzzy
-#~ msgid "EPSON Stylus C61"
-#~ msgstr "Stylus C60"
-
-#, fuzzy
-#~ msgid "EPSON Stylus C62"
-#~ msgstr "Stylus C60"
-
-#, fuzzy
-#~ msgid "EPSON Stylus C70"
-#~ msgstr "Stylus C70"
-
-#, fuzzy
-#~ msgid "EPSON Stylus C80"
-#~ msgstr "Stylus C80"
-
-#, fuzzy
-#~ msgid "EPSON Stylus C82"
-#~ msgstr "Stylus C80"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color"
-#~ msgstr "Stylus Color"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color Pro"
-#~ msgstr "Stylus Color Pro"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color Pro XL"
-#~ msgstr "Stylus Color Pro XL"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 400"
-#~ msgstr "Stylus Color 400"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 440"
-#~ msgstr "Stylus Color 440"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 460"
-#~ msgstr "Stylus Color 460"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 480"
-#~ msgstr "Stylus Color 480"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 500"
-#~ msgstr "Stylus Color 500"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 580"
-#~ msgstr "Stylus Color 580"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 600"
-#~ msgstr "Stylus Color 600"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 640"
-#~ msgstr "Stylus Color 640"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 660"
-#~ msgstr "Stylus Color 660"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 670"
-#~ msgstr "Stylus Color 670"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 680"
-#~ msgstr "Stylus Color 680"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 740"
-#~ msgstr "Stylus Color 740"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 760"
-#~ msgstr "Stylus Color 760"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 777"
-#~ msgstr "Stylus Color 777"
+msgstr "FOUT: ijsgutenprint: Verkrijg volgende rij faalde op %.0f\n"
 
 #, fuzzy
-#~ msgid "EPSON Stylus Color 800"
-#~ msgstr "Stylus Color 800"
+#~ msgid "Model Name"
+#~ msgstr "Kanaalnamen"
 
 #, fuzzy
-#~ msgid "EPSON Stylus Color 850"
-#~ msgstr "Stylus Color 850"
+#~ msgid "Canon MULTIPASS MP500"
+#~ msgstr "Canon S500"
 
 #, fuzzy
-#~ msgid "EPSON Stylus Color 860"
-#~ msgstr "Stylus Color 860"
+#~ msgid "Canon MULTIPASS MP760"
+#~ msgstr "Canon LBP-1760"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Color 880"
-#~ msgstr "Stylus Color 880"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 83"
-#~ msgstr "Stylus Color 83"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 900"
-#~ msgstr "Stylus Color 900"
+#~ msgid "90x90 DPI"
+#~ msgstr "90x90 DPI"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Color 980"
-#~ msgstr "Stylus Color 980"
+#~ msgid "90x90 DPI DMT"
+#~ msgstr "90x90 DPI DMT"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Color 1160"
-#~ msgstr "Stylus Color 1160"
+#~ msgid "180x180 DPI"
+#~ msgstr "180x180 DPI"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Color 1500"
-#~ msgstr "Stylus Color 1500"
+#~ msgid "180x180 DPI DMT"
+#~ msgstr "180x180 DPI DMT"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Color 1520"
-#~ msgstr "Stylus Color 1520"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Color 3000"
-#~ msgstr "Stylus Color 3000"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Photo"
-#~ msgstr "Stylus Photo"
-
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 700"
-#~ msgstr "Stylus Photo 700"
+#~ msgid "360x360 DPI"
+#~ msgstr "360x360 DPI"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo EX"
-#~ msgstr "Stylus Photo EX"
+#~ msgid "360x360 DPI DMT"
+#~ msgstr "360x360 DPI DMT"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 720"
-#~ msgstr "Stylus Photo 720"
+#~ msgid "720x360 DPI"
+#~ msgstr "720x360 DPI"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 750"
-#~ msgstr "Stylus Photo 750"
+#~ msgid "720x360 DPI DMT"
+#~ msgstr "720x360 DPI DMT"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 780"
-#~ msgstr "Stylus Photo 780"
+#~ msgid "720x720 DPI"
+#~ msgstr "720x720 DPI"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 785EPX"
-#~ msgstr "Stylus Photo 785"
+#~ msgid "720x720 DPI DMT"
+#~ msgstr "720x720 DPI DMT"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 790"
-#~ msgstr "Stylus Photo 790"
+#~ msgid "1440x720 DPI"
+#~ msgstr "1440x720 DPI"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 810"
-#~ msgstr "Stylus Photo 810"
+#~ msgid "1440x720 DPI DMT"
+#~ msgstr "1440x720 DPI DMT"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 820"
-#~ msgstr "Stylus Photo 820"
+#~ msgid "1440x1440 DPI"
+#~ msgstr "1440x1440 DPI"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 830"
-#~ msgstr "Stylus Photo 780"
+#~ msgid "1440x1440 DPI DMT"
+#~ msgstr "1440x1440 DPI DMT"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 870"
-#~ msgstr "Stylus Photo 870"
+#~ msgid "2880x2880 DPI"
+#~ msgstr "2880x2880 DPI"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 875"
-#~ msgstr "Stylus Photo 875"
+#~ msgid "2880x2880 DPI DMT"
+#~ msgstr "2880x2880 DPI DMT"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 890"
-#~ msgstr "Stylus Photo 890"
+#~ msgid "150x150 DPI DMT"
+#~ msgstr "150x150 DPI DMT"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 895"
-#~ msgstr "Stylus Photo 895"
+#~ msgid "300x300 DPI DMT"
+#~ msgstr "300x300 DPI DMT"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 900"
-#~ msgstr "Stylus Photo 700"
+#~ msgid "600x300 DPI DMT"
+#~ msgstr "600x300 DPI DMT"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 915"
-#~ msgstr "Stylus Photo 895"
+#~ msgid "600x600 DPI DMT"
+#~ msgstr "600x600 DPI DMT"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 925"
-#~ msgstr "Stylus Photo 895"
+#~ msgid "1200x600 DPI DMT"
+#~ msgstr "1200x600 DPI DMT"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 950"
-#~ msgstr "Stylus Photo 750"
+#~ msgid "1200x1200 DPI"
+#~ msgstr "1200x1200 DPI"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 960"
-#~ msgstr "Stylus Photo 790"
+#~ msgid "1200x1200 DPI DMT"
+#~ msgstr "1200x1200 DPI DMT"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 1200"
-#~ msgstr "Stylus Photo 1200"
+#~ msgid "2400x2400 DPI"
+#~ msgstr "2400x2400 DPI"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 1270"
-#~ msgstr "Stylus Photo 1270"
+#~ msgid "2400x2400 DPI DMT"
+#~ msgstr "2400x2400 DPI DMT"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 1280"
-#~ msgstr "Stylus Photo 1280"
+#~ msgid "Plain Paper PIXMA"
+#~ msgstr "Blanco papier PIXMA"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 1290"
-#~ msgstr "Stylus Photo 1290"
+#~ msgid "Back Print Film"
+#~ msgstr "Op de achterkant te printen film"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 2000P"
-#~ msgstr "Stylus Photo 2000P"
+#~ msgid "Fabric Sheets"
+#~ msgstr "Stoffen vellen"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 2100"
-#~ msgstr "Stylus Photo 1200"
+#~ msgid "Envelope"
+#~ msgstr "Envelop"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Photo 2200"
-#~ msgstr "Stylus Photo 1200"
+#~ msgid "High Resolution Paper"
+#~ msgstr "Hoog-resolutie papier"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Pro 5000"
-#~ msgstr "Stylus Pro 5000"
+#~ msgid "T-Shirt Transfers"
+#~ msgstr "T-Shirt doordrukken"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Pro 5500"
-#~ msgstr "Stylus Pro 5500"
+#~ msgid "High Gloss Film"
+#~ msgstr "Hoogglans papier"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Pro 7000"
-#~ msgstr "Stylus Pro 7000"
+#~ msgid "Glossy Photo Paper"
+#~ msgstr "Glanzend fotopapier"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Pro 7500"
-#~ msgstr "Stylus Pro 7500"
+#~ msgid "Glossy Photo Cards"
+#~ msgstr "Glanzende fotokaarten"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Pro 7600"
-#~ msgstr "Stylus Pro 7000"
+#~ msgid "Photo Paper Pro"
+#~ msgstr "Professioneel fotopapier"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Pro 9000"
-#~ msgstr "Stylus Pro 9000"
+#~ msgid "Cassette"
+#~ msgstr "Cassette"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Pro 9500"
-#~ msgstr "Stylus Pro 9500"
+#~ msgid "CD tray"
+#~ msgstr "CD-houder"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Pro 9600"
-#~ msgstr "Stylus Pro 9000"
+#~ msgid "Photo CcMmYK Color"
+#~ msgstr "Foto CcMmYK kleuren"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Pro 10000"
-#~ msgstr "Stylus Pro 10000"
+#~ msgid "Photo CcMmY Color"
+#~ msgstr "Foto CcMmY kleuren"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Scan 2000"
-#~ msgstr "Stylus Scan 2000"
+#~ msgid "CMYK Color"
+#~ msgstr "CMYK kleuren"
 
-#, fuzzy
-#~ msgid "EPSON Stylus Scan 2500"
-#~ msgstr "Stylus Scan 2500"
+#~ msgid "CMY Color"
+#~ msgstr "CMY kleuren"
 
-#, fuzzy
-#~ msgid "EPSON E-100"
-#~ msgstr "Stylus C60"
+#~ msgid " Gamma"
+#~ msgstr " Gamma"
 
-#, fuzzy
-#~ msgid "Printer does not support listing ink types!\n"
-#~ msgstr "Printer ondersteund geen kleuren\n"
+#~ msgid " Curve"
+#~ msgstr " Kromme"
 
-#, fuzzy
-#~ msgid "Cannot identify printer!\n"
-#~ msgstr "Kan de uitvoer van de printer niet verwerken\n"
+#~ msgid "1440 x 1440"
+#~ msgstr "1440 x 1440"
 
-#, fuzzy
-#~ msgid "Red Balance"
-#~ msgstr "Pas de hoeveelheid geel aan"
+#~ msgid "1440 x 1440 DPI High Quality"
+#~ msgstr "1440 x 1440 DPI hoogste kwaliteit"
 
-#, fuzzy
-#~ msgid "Gloss Balance"
-#~ msgstr "Pas de hoeveelheid geel aan"
+#~ msgid "1440 x 1440 DPI Highest Quality"
+#~ msgstr "1440 x 1440 DPI hoogste kwaliteit"
 
-#~ msgid ""
-#~ "Printer alignment must be done with a raw device or else\n"
-#~ "the -m option must be used to specify a printer.\n"
-#~ msgstr ""
-#~ "Printer uitlijnen moet gedaan worden met een raw device of ander\n"
-#~ "moet de optie -m gebruikt worden om een printer te specificeren.\n"
+#~ msgid "2880 x 1440 DPI High Quality"
+#~ msgstr "2880 x 360 DPI hoogste kwaliteit"
 
-#~ msgid "Attempting to detect printer model..."
-#~ msgstr "Probeer printer model te detecteren..."
+#~ msgid "2880 x 1440 DPI Highest Quality"
+#~ msgstr "2880 x 1440 DPI hoogste kwaliteit"
 
 #~ msgid ""
 #~ "\n"
-#~ "Cannot open %s read/write: %s\n"
-#~ msgstr ""
 #~ "\n"
-#~ "kan %s niet openen voor lees/schrijf actie : %s\n"
-
-#~ msgid "Printer model %s is not known.\n"
-#~ msgstr "Printer model %s is niet bekend.\n"
-
-#, fuzzy
-#~ msgid "Gimp-Print"
-#~ msgstr "Info over Gimp-Print"
-
-#~ msgid ""
-#~ "Enter the correct command to print to your printer. Note: Please do not "
-#~ "remove the `-l' or `-oraw' from the command string, or printing will "
-#~ "probably fail!"
-#~ msgstr ""
-#~ "Geef het juist commando in om naar jouw printer af te drukken. Let op: "
-#~ "Verwijder alsjeblieft de `-l` of `-oraw` van de commando-string, of het "
-#~ "printen zal waarschijnlijk falen!"
-
-#~ msgid "PPD File?"
-#~ msgstr "PPD Bestand?"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: optie `%s' is ambiguous\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: optie `--%s' verwacht geen argument\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: optie `%c%s' verwacht geen argument\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: optie `%s' verwacht een argument\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: onbekende optie `--%s'\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: onbekende optie `%c%s'\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ongeldige optie -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: ongeldige optie -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: optie verwacht een argument -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: optie `-W %s' is dubbelzinnig\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: optie `-W %s' staat geen argument toe\n"
-
-#, fuzzy
-#~ msgid "Bright"
-#~ msgstr "Helderheid:"
-
-#, fuzzy
-#~ msgid "Full Bleed"
-#~ msgstr "Rolinvoer"
-
-#, fuzzy
-#~ msgid "traditional"
-#~ msgstr "600 DPI unidirectioneel"
-
-#~ msgid "24x36"
-#~ msgstr "24x36"
-
-#~ msgid "%.0f of %.0f\n"
-#~ msgstr "%.0f van %.0f\n"
-
-#~ msgid "ps2"
-#~ msgstr "ps2"
-
-#~ msgid "Stylus C20sx"
-#~ msgstr "Stylus C20sx"
-
-#~ msgid "Stylus C20ux"
-#~ msgstr "Stylus C20ux"
-
-#~ msgid "Stylus C40sx"
-#~ msgstr "Stylus C40sx"
-
-#~ msgid "Stylus C40ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C41sx"
-#~ msgstr "Stylus C40sx"
-
-#, fuzzy
-#~ msgid "Stylus C41ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid "Stylus C42sx"
-#~ msgstr "Stylus C40sx"
-
-#, fuzzy
-#~ msgid "Stylus C42ux"
-#~ msgstr "Stylus C40ux"
-
-#, fuzzy
-#~ msgid ""
-#~ "Please inspect the print, and choose the pattern in each set.\n"
-#~ "Type a pattern number, '?' for help, or 'r' to repeat the procedure.\n"
-#~ msgstr ""
-#~ "Kijk astublief naar de afdruk, en kies het beste paar lijnen in elk "
-#~ "patroon.\n"
-#~ "Tik een paar-nummer, '?' voor hulp, or 'r' om de procedure te herhalen.\n"
-
-#, fuzzy
-#~ msgid "Model %d out of range.\n"
-#~ msgstr "Nummer valt buiten bereik!\n"
-
-#~ msgid "Size"
-#~ msgstr "Grootte"
-
-#, fuzzy
-#~ msgid "GIMP-print"
-#~ msgstr "Afdrukken"
-
-#, fuzzy
-#~ msgid "Resolutions"
-#~ msgstr "Resolutie"
-
-#~ msgid "Size of paper that you wish to print to"
-#~ msgstr "Grootte van het papaier waarop je wenst te printen"
-
-#~ msgid "Ink Type:"
-#~ msgstr "Inkt Type:"
-
-#~ msgid "Resolution:"
-#~ msgstr "Resolutie:"
-
-#~ msgid "Print in black and white (no color, and no shades of gray)"
-#~ msgstr "Druk af in zwart en wit (Geen kleuren, geen grijs raster)"
-
-#~ msgid ""
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "and the rest of the Gutenprint Development Team.\n"
+#~ "\n"
+#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
 #~ "\n"
-#~ "Cannot read from %s: %s\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Kan niet lezen van %s:%s\n"
-
-#~ msgid "%s out of range (value %f, min %f, max %f)\n"
-#~ msgstr "%s buiten bereik (waarde %f, min %f, max%f)\n"
-
-#~ msgid "%s is not a valid dither algorithm\n"
-#~ msgstr "%s is geen geldige dither algorithme\n"
-
-#~ msgid "Cyan:"
-#~ msgstr "Cyaan:"
-
-#~ msgid "Magenta:"
-#~ msgstr "Magenta:"
-
-#~ msgid "Yellow:"
-#~ msgstr "Geel (Y):"
-
-#~ msgid "Parameter %s out of range (value %f, min %f, max %f)\n"
-#~ msgstr "Parameter %s ligt buiten bereik (Waarde %f, min %f, max %f)\n"
-
-#~ msgid "Unknown option %s\n"
-#~ msgstr "Onbekende optie %s\n"
-
-#~ msgid "1440 x 360 DPI"
-#~ msgstr "1440 x 360 DPI"
-
-#~ msgid "1440 x 360 DPI Unidirectional"
-#~ msgstr "1440 x 360 DPI Unidirectioneel"
+#~ "\n"
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "en de rest van het Gutenprint ontwikkelteam.\n"
+#~ "\n"
+#~ "Bezoek ook onze website op http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
 
-#~ msgid "13x19"
-#~ msgstr "13x19"
+#~ msgid "Gutenprint"
+#~ msgstr "Gutenprint"
 
-#~ msgid "HP Greeting Card"
-#~ msgstr "HP Greeting Card"
+#~ msgid ""
+#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
+#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
+#~ "l'\n"
+#~ "This is free software, and you are welcome to redistribute it\n"
+#~ "under certain conditions; type 'escputil -l' for details.\n"
+#~ msgstr ""
+#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
+#~ "Escputil comes with ABSOLUTELY NO WARRANTY; voor details type in "
+#~ "'escputil -l'\n"
+#~ "This is free software, and you are welcome to redistribute it\n"
+#~ "under certain conditions; type 'escputil -l' in voor details.\n"
diff --git a/po/pl.gmo b/po/pl.gmo
index 7b1e287..55fb9c9 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 2446e14..001f514 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,30 +1,30 @@
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Aktualn± wersjê tego pliku mo¿esz odnale¼æ w repozytorium cvs.gnome.pl
-# (:pserver:anonymous@cvs.gnome.pl:/home/cvs, puste has³o)
-# Je¶li masz jakiekolwiek uwagi odnosz±ce siê do t³umaczenia lub chcesz
-# pomóc w jego rozwijaniu i pielêgnowaniu, napisz do nas na adres:
+# Aktualną wersję tego pliku możesz odnaleźć w repozytorium cvs.gnome.pl
+# (:pserver:anonymous@cvs.gnome.pl:/home/cvs, puste hasło)
+# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz
+# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas na adres:
 # translators@gnome.pl
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\n"
 "PO-Revision-Date: 2001-10-18 11:53+0100\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 #, fuzzy
 msgid "Default"
-msgstr "Ustaw domy¶lne"
+msgstr "Ustaw domyślne"
 
 #: src/main/dither-main.c:47
 #, fuzzy
@@ -84,20 +84,20 @@ msgstr ""
 #: src/main/dither-main.c:88 src/main/print-color.c:56
 #, fuzzy
 msgid "Density"
-msgstr "Gêsto¶æ:"
-
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+msgstr "Gęstość:"
+
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -145,493 +145,306 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algorytm ditherowania"
 
-#: src/main/print-canon.c:1382
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
-msgid "90x90 DPI"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1382
-#, fuzzy
-msgid "90x90 DPI DMT"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI DMT"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI DMT"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI"
-msgstr "1440 x 360 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI DMT"
-msgstr "1440 x 360 DPI"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI DMT"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI"
-msgstr "1440 x 720 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI DMT"
-msgstr "1440 x 720 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI DMT"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI DMT"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1390
-#, fuzzy
-msgid "150x150 DPI DMT"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1391
-#, fuzzy
-msgid "300x300 DPI DMT"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1392
-#, fuzzy
-msgid "600x300 DPI DMT"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1393
-#, fuzzy
-msgid "600x600 DPI DMT"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1394
-#, fuzzy
-msgid "1200x600 DPI DMT"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1395
-#, fuzzy
-msgid "1200x1200 DPI"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1395
-#, fuzzy
-msgid "1200x1200 DPI DMT"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI"
-msgstr "2400x600 DPI"
-
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI DMT"
-msgstr "2400x600 DPI"
-
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-msgid "Plain Paper"
-msgstr "Zwyk³y papier"
+msgid "Page Size"
+msgstr "Rozmiar"
 
-#: src/main/print-canon.c:1448
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
 #, fuzzy
-msgid "Plain Paper PIXMA"
-msgstr "Zwyk³y papier"
-
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-msgid "Transparencies"
-msgstr "Przezroczyste"
+msgid "Basic Printer Setup"
+msgstr "Ustawienia drukarki"
 
-#: src/main/print-canon.c:1450
-msgid "Back Print Film"
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
+msgid "Size of the paper being printed to"
 msgstr ""
 
-#: src/main/print-canon.c:1451
-msgid "Fabric Sheets"
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
+msgid "Media Type"
 msgstr ""
 
-#: src/main/print-canon.c:1452
-msgid "Envelope"
-msgstr "Koperta"
-
-#: src/main/print-canon.c:1453
-msgid "High Resolution Paper"
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
+msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1454
-msgid "T-Shirt Transfers"
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
+msgid "Media Source"
 msgstr ""
 
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
+msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
-msgstr "Inne"
-
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
-#, fuzzy
-msgid "Page Size"
-msgstr "Rozmiar"
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
 
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
-#, fuzzy
-msgid "Basic Printer Setup"
-msgstr "Ustawienia drukarki"
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+msgid "CD Hub Size (Custom)"
+msgstr ""
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
-msgid "Size of the paper being printed to"
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+msgid "Variable adjustment to the inner hub of the CD"
 msgstr ""
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
-msgid "Media Type"
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
-msgid "Type of media (plain paper, photo paper, etc.)"
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
-msgid "Media Source"
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
-msgid "Source (input slot) of the media"
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
-msgstr "Rozdzielczo¶æ"
+msgstr "Rozdzielczość"
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
 msgstr ""
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr ""
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr ""
-
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr ""
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Model drukarki:"
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
-msgstr "Zwyk³y papier"
+msgstr "Zwykły papier"
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
-msgstr "Gêsto¶æ:"
+msgstr "Gęstość:"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Purpurowy"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
-msgstr "Gêsto¶æ:"
+msgstr "Gęstość:"
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
-msgstr "Gêsto¶æ:"
+msgstr "Gęstość:"
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 msgid "Adjust the black density"
 msgstr ""
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 msgid "Light Cyan Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
-msgid "Short Edge (Flip)"
-msgstr ""
-
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-msgid "Auto Sheet Feeder"
-msgstr ""
-
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-msgid "Manual with Pause"
-msgstr ""
-
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
-msgstr ""
-
-#: src/main/print-canon.c:1923
-msgid "Cassette"
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:1924
-msgid "CD tray"
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:2049
-msgid "Photo CcMmYK Color"
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:2052
-msgid "Photo CcMmY Color"
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:2055
-msgid "CMYK Color"
-msgstr ""
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
+#, fuzzy
+msgid "CD - Custom"
+msgstr "Automatycznie"
 
-#: src/main/print-canon.c:2058
-msgid "CMY Color"
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
-msgstr "Czarny"
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#, fuzzy
+msgid "Print To Hub"
+msgstr "Wydrukować do pliku?"
 
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
 msgstr "Kolor"
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr ""
@@ -670,16 +483,16 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Wydrukuj"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
-msgstr "Odcienie szaro¶ci"
+msgstr "Odcienie szarości"
 
 #: src/main/print-color.c:123
 #, fuzzy
 msgid "Whitescale"
-msgstr "¯ó³æ"
+msgstr "Żółć"
 
 #: src/main/print-color.c:125
 msgid "RGB"
@@ -702,11 +515,6 @@ msgstr ""
 msgid "Channel "
 msgstr "Anuluj"
 
-#: src/main/print-color.c:165
-#, fuzzy
-msgid " Gamma"
-msgstr "Gamma:"
-
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
 #: src/main/print-color.c:266 src/main/print-color.c:274
@@ -756,15 +564,15 @@ msgstr "Typ obrazu"
 #: src/main/print-color.c:200
 #, fuzzy
 msgid "Output Image Type"
-msgstr "Typ wyj¶ciowy:"
+msgstr "Typ wyjściowy:"
 
 #: src/main/print-color.c:201
 #, fuzzy
 msgid "Output image type"
-msgstr "Typ wyj¶ciowy:"
+msgstr "Typ wyjściowy:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
 msgstr ""
 
@@ -780,12 +588,12 @@ msgstr ""
 #: src/main/print-color.c:224
 #, fuzzy
 msgid "Brightness"
-msgstr "Jasno¶æ:"
+msgstr "Jasność:"
 
 #: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
-msgstr "Rozdzielczo¶æ"
+msgstr "Rozdzielczość"
 
 #: src/main/print-color.c:232
 #, fuzzy
@@ -803,7 +611,7 @@ msgstr ""
 #: src/main/print-color.c:240
 #, fuzzy
 msgid "Advanced Image Control"
-msgstr "Typ wyj¶ciowy:"
+msgstr "Typ wyjściowy:"
 
 #: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
@@ -828,13 +636,13 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
@@ -844,13 +652,13 @@ msgstr "Niebieskozielony"
 msgid "Adjust the cyan gamma"
 msgstr ""
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 msgid "Magenta"
@@ -860,25 +668,25 @@ msgstr "Purpurowy"
 msgid "Adjust the magenta gamma"
 msgstr ""
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
-msgstr "¯ó³æ"
+msgstr "Żółć"
 
 #: src/main/print-color.c:283
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
 msgstr ""
@@ -887,8 +695,8 @@ msgstr ""
 msgid "Adjust the red gamma"
 msgstr ""
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
 msgstr ""
 
@@ -896,9 +704,9 @@ msgstr ""
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
 msgstr ""
@@ -907,11 +715,23 @@ msgstr ""
 msgid "Adjust the blue gamma"
 msgstr ""
 
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr "Czarny"
+
 #: src/main/print-color.c:315
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
 msgstr ""
 
@@ -919,13 +739,13 @@ msgstr ""
 #: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
-msgstr "Odcienie szaro¶ci"
+msgstr "Odcienie szarości"
 
 #: src/main/print-color.c:323
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Purpurowy"
@@ -934,10 +754,10 @@ msgstr "Purpurowy"
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 #, fuzzy
 msgid "Yellow Balance"
-msgstr "¯ó³æ"
+msgstr "Żółć"
 
 #: src/main/print-color.c:339
 msgid "Adjust the yellow gray balance"
@@ -961,12 +781,12 @@ msgstr "Typ tuszu:"
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 #, fuzzy
 msgid "Advanced Output Control"
-msgstr "Typ wyj¶ciowy:"
+msgstr "Typ wyjściowy:"
 
 #: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
@@ -996,11 +816,6 @@ msgstr ""
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:446
-#, fuzzy
-msgid " Curve"
-msgstr "Czarny"
-
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
@@ -1008,7 +823,7 @@ msgstr "Czarny"
 #: src/main/print-color.c:513
 #, fuzzy
 msgid "Output Curves"
-msgstr "Typ wyj¶ciowy:"
+msgstr "Typ wyjściowy:"
 
 #: src/main/print-color.c:447
 msgid "Curve for raw channel "
@@ -1036,12 +851,12 @@ msgstr "Purpurowy"
 #: src/main/print-color.c:473
 #, fuzzy
 msgid "Yellow Curve"
-msgstr "¯ó³æ"
+msgstr "Żółć"
 
 #: src/main/print-color.c:474
 #, fuzzy
 msgid "Yellow curve"
-msgstr "¯ó³æ"
+msgstr "Żółć"
 
 #: src/main/print-color.c:481
 #, fuzzy
@@ -1056,12 +871,12 @@ msgstr "Czarny"
 #: src/main/print-color.c:489
 #, fuzzy
 msgid "Red Curve"
-msgstr "¯ó³æ"
+msgstr "Żółć"
 
 #: src/main/print-color.c:490
 #, fuzzy
 msgid "Red curve"
-msgstr "¯ó³æ"
+msgstr "Żółć"
 
 #: src/main/print-color.c:497
 #, fuzzy
@@ -1086,12 +901,12 @@ msgstr "Czarny"
 #: src/main/print-color.c:513
 #, fuzzy
 msgid "White Curve"
-msgstr "¯ó³æ"
+msgstr "Żółć"
 
 #: src/main/print-color.c:514
 #, fuzzy
 msgid "White curve"
-msgstr "¯ó³æ"
+msgstr "Żółć"
 
 #: src/main/print-color.c:521
 msgid "Hue Map"
@@ -1131,558 +946,368 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:516 src/main/printers.c:521
+#: src/main/printers.c:519 src/main/printers.c:524
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr ""
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:673
+#: src/main/printers.c:676
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Nieznana opcja %c\n"
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr ""
 
-#: src/main/printers.c:755
+#: src/main/printers.c:761
 msgid "Page size is not valid\n"
 msgstr ""
 
-#: src/main/printers.c:776
+#: src/main/printers.c:782
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:782
+#: src/main/printers.c:788
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr ""
 
-#: src/main/printers.c:788
+#: src/main/printers.c:794
 msgid "Height must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:794
+#: src/main/printers.c:800
 msgid "Width must be greater than zero\n"
 msgstr ""
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr ""
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-msgid "Roll Feed"
-msgstr ""
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-msgid "Manual Feed"
-msgstr ""
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-#, fuzzy
-msgid "Print to CD"
-msgstr "Wydrukowaæ do pliku?"
-
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-msgid "Manual Sheet Guide"
-msgstr ""
-
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-#, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Typ wyj¶ciowy:"
-
-#: src/main/print-escp2-data.c:554
-msgid "Rear Tray"
-msgstr ""
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr ""
-
-#: src/main/print-escp2-data.c:581
-#, fuzzy
-msgid "Photo Board"
-msgstr "Czarny"
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr ""
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr ""
-
-#: src/main/print-escp2-data.c:638
-msgid "Cut Sheet Autoselect"
-msgstr ""
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr ""
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr ""
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-#, fuzzy
-msgid "High"
-msgstr "Wysoko¶æ:"
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-#, fuzzy
-msgid "Photo"
-msgstr "Fotografia"
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-#, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
-
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-#, fuzzy
-msgid "Ultra Photo"
-msgstr "Stylus Photo"
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-msgid "Light Cyan"
-msgstr ""
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-#, fuzzy
-msgid "Light Magenta"
-msgstr "Purpurowy"
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-#, fuzzy
-msgid "Light Black"
-msgstr "Czarny"
-
-#: src/main/print-escp2-data.c:811
-#, fuzzy
-msgid "Dark Yellow"
-msgstr "¯ó³æ"
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-#, fuzzy
-msgid "Matte Black"
-msgstr "Czarny"
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-#, fuzzy
-msgid "Photo Black"
-msgstr "Czarny"
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-msgid "Gloss Optimizer"
-msgstr ""
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-#, fuzzy
-msgid "Light Light Black"
-msgstr "Czarny"
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr ""
 
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr ""
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr ""
-
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr ""
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:214
+#: src/main/print-escp2.c:228
 #, fuzzy
 msgid "Resolution of the print"
-msgstr "Rozdzielczo¶æ"
+msgstr "Rozdzielczość"
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:236
+#: src/main/print-escp2.c:250
 #, fuzzy
 msgid "Ink Set"
 msgstr "Typ tuszu:"
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 #, fuzzy
 msgid "Output Order"
-msgstr "Typ wyj¶ciowy:"
+msgstr "Typ wyjściowy:"
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 msgid "Ink change command"
 msgstr ""
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 msgid "Alternate Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 #, fuzzy
 msgid "Channel Names"
 msgstr "Anuluj"
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:346
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Niebieskozielony"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:347
 msgid "Adjust the cyan map"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:352
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Purpurowy"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:353
 msgid "Adjust the magenta map"
 msgstr ""
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:358
 #, fuzzy
 msgid "Yellow Map"
-msgstr "¯ó³æ"
+msgstr "Żółć"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:359
 msgid "Adjust the yellow map"
 msgstr ""
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:364
 #, fuzzy
 msgid "Blue Map"
-msgstr "¯ó³æ"
+msgstr "Żółć"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:365
 msgid "Adjust the blue map"
 msgstr ""
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:371
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:447
+#: src/main/print-escp2.c:464
 #, fuzzy
 msgid "Red Density"
-msgstr "Gêsto¶æ:"
+msgstr "Gęstość:"
 
-#: src/main/print-escp2.c:448
+#: src/main/print-escp2.c:465
 msgid "Adjust the red density"
 msgstr ""
 
-#: src/main/print-escp2.c:455
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Blue Density"
-msgstr "Gêsto¶æ:"
+msgstr "Gęstość:"
 
-#: src/main/print-escp2.c:456
+#: src/main/print-escp2.c:473
 msgid "Adjust the blue density"
 msgstr ""
 
-#: src/main/print-escp2.c:463
+#: src/main/print-escp2.c:480
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:481
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 msgid "Light Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:527
+#: src/main/print-escp2.c:544
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:528
+#: src/main/print-escp2.c:545
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 #, fuzzy
 msgid "Full Manual Control"
-msgstr "Typ wyj¶ciowy:"
+msgstr "Typ wyjściowy:"
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr ""
-
-#: src/main/print-escp2.c:1564
-#, fuzzy
-msgid "Print To Hub"
-msgstr "Wydrukowaæ do pliku?"
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
-msgstr "Typ wyj¶ciowy:"
+msgstr "Typ wyjściowy:"
+
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr ""
 
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 #, fuzzy
 msgid "Automatic"
 msgstr "Rozmiar"
 
-#: src/main/print-escp2.c:1701
+#: src/main/print-escp2.c:1829
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1703
+#: src/main/print-escp2.c:1831
 #, fuzzy
 msgid "Unidirectional"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2168
+#: src/main/print-escp2.c:2313
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1736,248 +1361,301 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+msgid "Plain Paper"
+msgstr "Zwykły papier"
+
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
 msgstr ""
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+msgid "Transparencies"
+msgstr "Przezroczyste"
+
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 msgid "Envelopes"
 msgstr "Koperty"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 msgid "Matte Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 msgid "Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-olympus.c:265
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr "Inne"
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr ""
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr ""
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr ""
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:861
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 msgid "Matte"
 msgstr ""
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1331
+#: src/main/print-olympus.c:1627
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1339
+#: src/main/print-olympus.c:1635
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1347
+#: src/main/print-olympus.c:1643
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1354
+#: src/main/print-olympus.c:1650
 msgid "Black Balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1355
+#: src/main/print-olympus.c:1651
 msgid "Adjust the black balance"
 msgstr ""
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 msgid "Plain"
 msgstr ""
 
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 msgid "Bond"
 msgstr ""
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 msgid "Premium"
 msgstr ""
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 msgid "Transparency"
-msgstr "Przezroczysto¶æ"
+msgstr "Przezroczystość"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
 msgstr ""
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 msgid "Tray 1"
 msgstr ""
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 msgid "Tray 2"
 msgstr ""
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 msgid "Tray 3"
 msgstr ""
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 msgid "Tray 4"
 msgstr ""
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
 msgstr ""
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 msgid "Desktop Sheet Feeder"
 msgstr ""
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 msgid "Tray"
 msgstr ""
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 msgid "Optional Source"
 msgstr ""
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 msgid "Autoselect"
 msgstr ""
 
 #: src/main/print-pcl.c:256
+msgid "150x150 DPI"
+msgstr "150x150 DPI"
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr "300x300 DPI"
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
+msgstr "600x300 DPI"
+
+#: src/main/print-pcl.c:259
 msgid "600x600 DPI monochrome"
 msgstr ""
 
-#: src/main/print-pcl.c:259
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr "600x600 DPI"
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr "1200x600 DPI"
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr ""
-
 #: src/main/print-ps.c:97
 #, fuzzy
 msgid "PPDFile"
 msgstr "Plik PPD:"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 #, fuzzy
 msgid "PPD File"
 msgstr "Plik PPD?"
@@ -1986,184 +1664,296 @@ msgstr "Plik PPD?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 #, fuzzy
 msgid "Two Level Grayscale"
-msgstr "Odcienie szaro¶ci"
+msgstr "Odcienie szarości"
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 #, fuzzy
 msgid "Three Level Grayscale"
-msgstr "Odcienie szaro¶ci"
+msgstr "Odcienie szarości"
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 #, fuzzy
 msgid "Seven Color Enhanced"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1535
+#: src/main/escp2-channels.c:1649
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1695
+#: src/main/escp2-channels.c:1809
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 #, fuzzy
 msgid "Two Color Raw"
-msgstr "Jednolite p³aszczyzny"
+msgstr "Jednolite płaszczyzny"
 
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1762
+#: src/main/escp2-channels.c:1876
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 #, fuzzy
 msgid "Four Color Raw"
-msgstr "Jednolite p³aszczyzny"
+msgstr "Jednolite płaszczyzny"
 
-#: src/main/escp2-channels.c:1884
+#: src/main/escp2-channels.c:2017
 #, fuzzy
 msgid "Four Color Raw Gloss"
-msgstr "Jednolite p³aszczyzny"
+msgstr "Jednolite płaszczyzny"
 
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 #, fuzzy
 msgid "Six Color Raw"
-msgstr "Jednolite p³aszczyzny"
+msgstr "Jednolite płaszczyzny"
 
-#: src/main/escp2-channels.c:1962
+#: src/main/escp2-channels.c:2109
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
-msgstr "Jednolite p³aszczyzny"
+msgstr "Jednolite płaszczyzny"
 
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:2024
+#: src/main/escp2-channels.c:2187
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:2042
+#: src/main/escp2-channels.c:2205
 #, fuzzy
 msgid "Eight Color Raw"
-msgstr "Jednolite p³aszczyzny"
-
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+msgstr "Jednolite płaszczyzny"
+
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#, fuzzy
+msgid "Photo Black"
+msgstr "Czarny"
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+#, fuzzy
+msgid "Matte Black"
+msgstr "Czarny"
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+msgid "Light Cyan"
+msgstr ""
+
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+#, fuzzy
+msgid "Light Magenta"
+msgstr "Purpurowy"
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+#, fuzzy
+msgid "Light Black"
+msgstr "Czarny"
+
+#: src/main/escp2-channels.c:2981
+#, fuzzy
+msgid "Dark Yellow"
+msgstr "Żółć"
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+msgid "Gloss Optimizer"
+msgstr ""
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Czarny"
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 #, fuzzy
 msgid "Plain Paper Fast Load"
-msgstr "Zwyk³y papier"
+msgstr "Zwykły papier"
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr ""
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 msgid "Matte Paper Heavyweight"
 msgstr ""
 
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 #, fuzzy
 msgid "ColorLife Paper"
-msgstr "Zwyk³y papier"
+msgstr "Zwykły papier"
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 msgid "Archival Matte Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+msgid "Roll Feed"
+msgstr ""
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+msgid "Manual Feed"
+msgstr ""
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+#, fuzzy
+msgid "Print to CD"
+msgstr "Wydrukować do pliku?"
+
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+msgid "Manual Sheet Guide"
+msgstr ""
+
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Typ wyjściowy:"
+
+#: src/main/escp2-papers.c:1859
+msgid "Rear Tray"
+msgstr ""
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/escp2-papers.c:1886
+#, fuzzy
+msgid "Photo Board"
+msgstr "Czarny"
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr ""
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr ""
+
+#: src/main/escp2-papers.c:1943
+msgid "Cut Sheet Autoselect"
+msgstr ""
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr ""
+
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
@@ -2201,139 +1991,163 @@ msgstr "600 DPI"
 msgid "720 x 360 DPI"
 msgstr "1440 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "1440 x 360 DPI"
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:94
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 msgid "720 DPI High Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:97
+#: src/main/escp2-resolutions.c:103
 msgid "720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:100
+#: src/main/escp2-resolutions.c:106
 #, fuzzy
 msgid "720 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:116
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:129
+#: src/main/escp2-resolutions.c:135
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
-#, fuzzy
-msgid "1440 x 1440 DPI"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/escp2-resolutions.c:142
-#, fuzzy
-msgid "1440 x 1440"
-msgstr "1440 x 1440 DPI"
-
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
 #: src/main/escp2-resolutions.c:145
 #, fuzzy
-msgid "1440 x 1440 DPI High Quality"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/escp2-resolutions.c:148
-#, fuzzy
-msgid "1440 x 1440 DPI Highest Quality"
+msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:158
+#: src/main/escp2-resolutions.c:155
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:164
-#, fuzzy
-msgid "2880 x 1440 DPI High Quality"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/escp2-resolutions.c:167
-#, fuzzy
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/escp2-resolutions.c:171
+#: src/main/escp2-resolutions.c:162
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 #, fuzzy
 msgid "Interleave"
 msgstr "Ustawienia drukarki"
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Ustawienia drukarki"
 
-#: src/main/escp2-resolutions.c:584
+#: src/main/escp2-resolutions.c:594
 #, fuzzy
 msgid "Eight Pass"
-msgstr "Jasno¶æ:"
+msgstr "Jasność:"
+
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+#, fuzzy
+msgid "High"
+msgstr "Wysokość:"
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografia"
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+#, fuzzy
+msgid "Super Photo"
+msgstr "Stylus Photo"
+
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+#, fuzzy
+msgid "Ultra Photo"
+msgstr "Stylus Photo"
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr ""
 
 #: src/main/generic-options.c:46
 msgid "Text"
@@ -2354,7 +2168,7 @@ msgstr "Fotografia"
 
 #: src/main/generic-options.c:50
 msgid "Line Art"
-msgstr "Rysunek kresk±"
+msgstr "Rysunek kreskÄ…"
 
 #: src/main/generic-options.c:55
 #, fuzzy
@@ -2408,3849 +2222,4173 @@ msgstr ""
 msgid "Executive"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/main/xmli18n-tmp.h:11
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/main/xmli18n-tmp.h:26
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/main/xmli18n-tmp.h:32
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
 msgstr "A4"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/main/xmli18n-tmp.h:67
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 msgid "ArchA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 msgid "ArchB"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 msgid "ArchC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 msgid "ArchD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 msgid "ArchE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 msgid "American foolscap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 msgid "European foolscap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:108
+#: src/main/xmli18n-tmp.h:109
 #, fuzzy
 msgid "ISO A4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 msgid "Small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 msgid "A2 Invitation"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:125
+#: src/main/xmli18n-tmp.h:126
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Koperta"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:127
+#: src/main/xmli18n-tmp.h:128
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:130
+#: src/main/xmli18n-tmp.h:131
 msgid "Wide Postcard"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 #, fuzzy
 msgid "Custom"
 msgstr "Automatycznie"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:144
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:145
+#: src/main/xmli18n-tmp.h:146
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:146
+#: src/main/xmli18n-tmp.h:147
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:147
+#: src/main/xmli18n-tmp.h:148
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/main/xmli18n-tmp.h:149
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:149
+#: src/main/xmli18n-tmp.h:150
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/main/xmli18n-tmp.h:151
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/main/xmli18n-tmp.h:152
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:152
+#: src/main/xmli18n-tmp.h:153
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/main/xmli18n-tmp.h:154
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/main/xmli18n-tmp.h:155
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
+#: src/main/xmli18n-tmp.h:156
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:156
+#: src/main/xmli18n-tmp.h:157
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:157
+#: src/main/xmli18n-tmp.h:158
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:158
+#: src/main/xmli18n-tmp.h:159
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:159
+#: src/main/xmli18n-tmp.h:160
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:160
+#: src/main/xmli18n-tmp.h:161
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:161
+#: src/main/xmli18n-tmp.h:162
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:162
+#: src/main/xmli18n-tmp.h:163
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:163
+#: src/main/xmli18n-tmp.h:164
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:164
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:173
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
-msgid "Canon iP4000"
+#: src/main/xmli18n-tmp.h:181
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:182
+msgid "Canon PIXMA iP3000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:183
+msgid "Canon PIXMA iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:184
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:185
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:186
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:187
+#, fuzzy
+msgid "Canon PIXMA iP4300"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:188
+#, fuzzy
+msgid "Canon PIXMA iP5000"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
+#, fuzzy
+msgid "Canon PIXMA iP6700"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA MP150"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:192
+#, fuzzy
+msgid "Canon PIXMA MP500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:193
+#, fuzzy
+msgid "Canon PIXMA MP700"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA MP730"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:195
+#, fuzzy
+msgid "Canon PIXMA MP750"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA MP760"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA MP770"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA MP780"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
+#, fuzzy
+msgid "Canon PIXMA MP790"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP830"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:201
+msgid "Canon PIXUS iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:202
+msgid "Canon PIXUS iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:203
+msgid "Canon i560"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:204
+msgid "Canon i850"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:205
+msgid "Canon i860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:206
+msgid "Canon i865"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:238
+#, fuzzy
+msgid "Epson Stylus C79"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:245
+#, fuzzy
+msgid "Epson Stylus C87"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "Epson Stylus Photo 1400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "Epson Stylus Photo 1410"
+msgstr "Stylus Photo 810"
+
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:314
+#, fuzzy
+msgid "Epson Stylus Photo R230"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:315
+#, fuzzy
+msgid "Epson Stylus Photo R240"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "Epson Stylus Photo R245"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:317
+#, fuzzy
+msgid "Epson Stylus Photo R260"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Epson Stylus Photo R265"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "Epson Stylus Photo R270"
+msgstr "Stylus Photo 1270"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "Epson Stylus Photo R350"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "Epson Stylus Photo R360"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "Epson Stylus Photo R380"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "Epson Stylus Photo R390"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Epson Stylus Photo RX560"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:335
+#, fuzzy
+msgid "Epson Stylus Photo RX580"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:336
+#, fuzzy
+msgid "Epson Stylus Photo RX590"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:340
+#, fuzzy
+msgid "Epson Stylus Photo RX640"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:353
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:372
+#, fuzzy
+msgid "Epson Stylus CX5000"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:373
+#, fuzzy
+msgid "Epson Stylus CX5000F"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:380
+#, fuzzy
+msgid "Epson Stylus CX6000"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX7000F"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:397
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:399
+msgid "Epson PictureMate Flash"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:400
+msgid "Epson PictureMate Pal"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:401
+msgid "Epson PictureMate Snap"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:402
+#, fuzzy
+msgid "Epson PictureMate 200"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:403
+#, fuzzy
+msgid "Epson PictureMate 210"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:404
+#, fuzzy
+msgid "Epson PictureMate 240"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:405
+#, fuzzy
+msgid "Epson PictureMate 250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson PictureMate 280"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:411
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:414
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:417
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:426
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:427
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:428
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:429
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:430
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:448
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:451
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:454
+#, fuzzy
+msgid "Epson PM A820"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:456
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:459
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:460
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:462
+#, fuzzy
+msgid "Epson PM D870"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:463
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:464
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:465
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:467
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:468
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
+#, fuzzy
+msgid "Epson PM G850"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:470
+#, fuzzy
+msgid "Epson PM G4500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:471
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:472
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:473
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:474
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:475
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:478
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:549
 msgid "Generic PCL 4 Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:550
 msgid "Generic PCL 5 Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:551
 msgid "Generic PCL 5c Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:552
 msgid "Generic PCL 5e Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:802
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Model drukarki:"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+msgid "Lexmark Optra E220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:913
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Ustawienia drukarki"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:924
+msgid "Xerox WorkCentre M118"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:926
+msgid "Lexmark X73"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+msgid "Olympus P-S100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:942
+msgid "Canon CP-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:943
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:953
+msgid "Sony DPP-EX5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:957
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:960
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Inch"
 msgstr "Cal"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Points"
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "Set the base unit of measurement to millimetres"
 msgstr ""
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
 msgstr ""
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Standard Command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Custom Command"
 msgstr "Polecenie:"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
 msgstr "Plik"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Print to a file"
-msgstr "Wydrukowaæ do pliku?"
+msgstr "Wydrukować do pliku?"
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 #, fuzzy
 msgid "Set Default"
-msgstr "Ustaw domy¶lne"
+msgstr "Ustaw domyślne"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Drukowanie v%s"
 
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
 msgstr "Informacje o"
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6258,7 +6396,7 @@ msgstr ""
 "Ustawienia drukowania\n"
 "i zapisu"
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 msgid ""
 "Save\n"
 "Settings"
@@ -6266,15 +6404,15 @@ msgstr ""
 "Zapisz\n"
 "ustawienia"
 
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
-msgstr "Podgl±d"
+msgstr "PodglÄ…d"
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6288,453 +6426,430 @@ msgid ""
 "to its original position."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 #, fuzzy
 msgid "Paper Size"
 msgstr "Rozmiar"
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
 msgstr "Wymiary:"
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
-msgstr "Szeroko¶æ:"
+msgstr "Szerokość:"
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 msgid "Width of the paper that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
-msgstr "Wysoko¶æ:"
+msgstr "Wysokość:"
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 msgid "Height of the paper that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Rozmiar"
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 #, fuzzy
 msgid "Image Position"
-msgstr "Po³o¿enie"
+msgstr "Położenie"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
 msgstr "Automatycznie"
 
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
 msgstr "Portret"
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
-msgstr "Pejza¿"
+msgstr "Pejzaż"
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 msgid "Upside down"
-msgstr "Z góry na dó³"
+msgstr "Z góry na dół"
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
-msgstr "Pejza¿"
+msgstr "Pejzaż"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 msgid "Orientation:"
-msgstr "U³o¿enie:"
+msgstr "Ułożenie:"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
 msgstr "Lewa:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
-msgstr "Odleg³o¶æ od lewej krawêdzi papieru do obrazu"
+msgstr "Odległość od lewej krawędzi papieru do obrazu"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
 msgstr "Prawa:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 msgid "Distance from the left of the paper to the right of the image"
-msgstr "Odleg³o¶æ od lewej krawêdzi papieru do prawej krawêdzi obrazu"
+msgstr "Odległość od lewej krawędzi papieru do prawej krawędzi obrazu"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
-msgstr "Odleg³o¶æ od prawej krawêdzi papieru do obrazu"
+msgstr "Odległość od prawej krawędzi papieru do obrazu"
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
-msgstr "Góra:"
+msgstr "Góra:"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
-msgstr "Odleg³o¶æ od górnej krawêdzi papieru do obrazu"
+msgstr "Odległość od górnej krawędzi papieru do obrazu"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
-msgstr "Dó³:"
+msgstr "Dół:"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
-msgstr "Odleg³o¶æ od górnej krawêdzi papieru do dolnej krawêdzi obrazu"
+msgstr "Odległość od górnej krawędzi papieru do dolnej krawędzi obrazu"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
-msgstr "Odleg³o¶æ od dolnej krawêdzi papieru do obrazu"
+msgstr "Odległość od dolnej krawędzi papieru do obrazu"
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Center:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 #, fuzzy
 msgid "Horizontal"
 msgstr "Poziomo"
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
 msgstr "Oba"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 #, fuzzy
 msgid "Vertical"
 msgstr "Pionowo"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Center the image vertically on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
 msgstr "Ustawienia drukarki"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Model drukarki:"
 
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 msgid "Select the make of your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 msgid "Printer Model:"
 msgstr "Model drukarki:"
 
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 msgid "Select your printer model"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 msgid "PPD File:"
 msgstr "Plik PPD:"
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
-msgstr "Przegl±daj"
+msgstr "PrzeglÄ…daj"
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Model drukarki:"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 msgid "Enter the correct command to print to your printer. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 msgid "File to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 #, fuzzy
 msgid "Print To File"
-msgstr "Wydrukowaæ do pliku?"
+msgstr "Wydrukować do pliku?"
 
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 msgid "Define New Printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 msgid "Printer Name:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 msgid "Enter the name you wish to give this logical printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
-
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 msgid "Printer Settings"
 msgstr "Ustawienia drukarki"
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 msgid "Setup Printer..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 msgid "New Printer..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 #, fuzzy
 msgid "Image Size"
 msgstr "Rozmiar"
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 msgid "Scaling:"
 msgstr "Skalowanie:"
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 msgid "Set the scale (size) of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
 msgstr "Procent"
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 msgid "Scale the print to the size of the page"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 msgid "Set the width of the print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 msgid "Set the height of the print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the print size to the size of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 msgid "Print Color Adjust"
 msgstr "Regulacja koloru wydruku"
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 msgid "Set Defaults"
-msgstr "Ustaw domy¶lne"
+msgstr "Ustaw domyślne"
 
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 msgid "Image preview"
-msgstr "Podgl±d obrazu"
+msgstr "PodglÄ…d obrazu"
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 #, fuzzy
 msgid "Output"
-msgstr "Typ wyj¶ciowy:"
+msgstr "Typ wyjściowy:"
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 msgid "Output Type:"
-msgstr "Typ wyj¶ciowy:"
+msgstr "Typ wyjściowy:"
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 msgid "Select the desired output type"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 #, fuzzy
 msgid "Size Units:"
 msgstr "Jednostki:"
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 msgid " "
 msgstr ""
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 msgid "Units:"
 msgstr "Jednostki:"
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 msgid "Select the base unit of measurement for printing"
 msgstr ""
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
 msgstr ""
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
 msgstr ""
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
 msgstr ""
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 #, fuzzy
 msgid "Printer"
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Ustawienia drukarki"
@@ -6784,62 +6899,86 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:133
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Printer Features"
 msgstr "Ustawienia drukarki"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 #, fuzzy
 msgid "Output Control"
-msgstr "Typ wyj¶ciowy:"
+msgstr "Typ wyjściowy:"
 
-#: src/cups/genppd.c:139
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Common"
 msgstr "Polecenie:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:153
 msgid "Extra 1"
 msgstr ""
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:154
 msgid "Extra 2"
 msgstr ""
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:155
 msgid "Extra 3"
 msgstr ""
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:156
 msgid "Extra 4"
 msgstr ""
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr "Polish"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 msgid "ISOLatin1"
 msgstr "ISOLatin2"
 
-#: src/cups/genppd.c:1465
+#: src/cups/genppd.c:1613
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1717
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1719
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1497
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1756
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -6847,14 +6986,6 @@ msgstr ""
 msgid "Escputil version "
 msgstr ""
 
-#: src/escputil/escputil.c:71
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-
 #: src/escputil/escputil.c:76
 msgid ""
 "Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
@@ -6967,12 +7098,12 @@ msgstr ""
 #: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
-msgstr "Mo¿na podaæ tylko jedn± drukarkê lub surowe urz±dzenie."
+msgstr "Można podać tylko jedną drukarkę lub surowe urządzenie."
 
 #: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
-msgstr "Mo¿na podaæ tylko jeden model drukarki."
+msgstr "Można podać tylko jeden model drukarki."
 
 #: src/escputil/escputil.c:369
 #, c-format
@@ -7007,17 +7138,17 @@ msgstr ""
 #: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
-msgstr "Nie mo¿na otworzyæ urz±dzenia %s: %s\n"
+msgstr "Nie można otworzyć urządzenia %s: %s\n"
 
 #: src/escputil/escputil.c:482
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
-msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
+msgstr "Nie można wydrukować na drukarce %s przy użyciu %s\n"
 
 #: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
-msgstr "Nie mo¿na wys³aæ polecenia do drukarki\n"
+msgstr "Nie można wysłać polecenia do drukarki\n"
 
 #: src/escputil/escputil.c:568
 #, c-format
@@ -7027,7 +7158,7 @@ msgstr ""
 #: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
-msgstr "Nie mo¿na odczytaæ z %s: %s\n"
+msgstr "Nie można odczytać z %s: %s\n"
 
 #: src/escputil/escputil.c:747
 #, c-format
@@ -7042,7 +7173,7 @@ msgstr ""
 #: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
 #, c-format
 msgid "Cannot write to %s: %s\n"
-msgstr "Nie mo¿na zapisaæ do %s: %s\n"
+msgstr "Nie można zapisać do %s: %s\n"
 
 #: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
 #: src/escputil/escputil.c:1511
@@ -7052,7 +7183,7 @@ msgid ""
 "Cannot write to %s: %s\n"
 msgstr ""
 "\n"
-"Nie mo¿na zapisaæ do %s: %s\n"
+"Nie można zapisać do %s: %s\n"
 
 #: src/escputil/escputil.c:885
 #, c-format
@@ -7242,12 +7373,12 @@ msgstr ""
 #: src/escputil/escputil.c:1355
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Do uzyskania stanu drukarki nale¿y u¿yæ surowego urz±dzenia.\n"
+msgstr "Do uzyskania stanu drukarki należy użyć surowego urządzenia.\n"
 
 #: src/escputil/escputil.c:1461
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Do zidentyfikowania drukarki nale¿y u¿yæ surowego urz±dzenia.\n"
+msgstr "Do zidentyfikowania drukarki należy użyć surowego urządzenia.\n"
 
 #: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
 #: src/escputil/escputil.c:1646
@@ -7262,17 +7393,17 @@ msgstr ""
 #: src/escputil/escputil.c:1675
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
-msgstr "Do zidentyfikowania drukarki nale¿y u¿yæ surowego urz±dzenia.\n"
+msgstr "Do zidentyfikowania drukarki należy użyć surowego urządzenia.\n"
 
 #: src/escputil/escputil.c:1693
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
-msgstr "Mo¿na podaæ tylko jeden model drukarki."
+msgstr "Można podać tylko jeden model drukarki."
 
 #: src/escputil/escputil.c:1713
 #, c-format
 msgid "Cleaning heads...\n"
-msgstr "Czyszczenie g³owic...\n"
+msgstr "Czyszczenie głowic...\n"
 
 #: src/escputil/escputil.c:1728
 #, c-format
@@ -7561,7 +7692,7 @@ msgstr "Nieznana opcja %c\n"
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
-msgstr "Nie mo¿na otworzyæ urz±dzenia %s: %s\n"
+msgstr "Nie można otworzyć urządzenia %s: %s\n"
 
 #: src/ghost/ijsgutenprint.c:498
 #, c-format
@@ -7581,37 +7712,37 @@ msgstr ""
 #: src/ghost/ijsgutenprint.c:700
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
-msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
+msgstr "Nie można wydrukować na drukarce %s przy użyciu %s\n"
 
 #: src/ghost/ijsgutenprint.c:723
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
-msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
+msgstr "Nie można wydrukować na drukarce %s przy użyciu %s\n"
 
 #: src/ghost/ijsgutenprint.c:795
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
-msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
+msgstr "Nie można wydrukować na drukarce %s przy użyciu %s\n"
 
 #: src/ghost/ijsgutenprint.c:802
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
-msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
+msgstr "Nie można wydrukować na drukarce %s przy użyciu %s\n"
 
 #: src/ghost/ijsgutenprint.c:809
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
-msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
+msgstr "Nie można wydrukować na drukarce %s przy użyciu %s\n"
 
 #: src/ghost/ijsgutenprint.c:816
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
-msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
+msgstr "Nie można wydrukować na drukarce %s przy użyciu %s\n"
 
 #: src/ghost/ijsgutenprint.c:830
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
-msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
+msgstr "Nie można wydrukować na drukarce %s przy użyciu %s\n"
 
 #: src/ghost/ijsgutenprint.c:841
 #, fuzzy, c-format
@@ -7631,12 +7762,12 @@ msgstr ""
 #: src/ghost/ijsgutenprint.c:1319
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-msgstr "Nie mo¿na otworzyæ urz±dzenia %s: %s\n"
+msgstr "Nie można otworzyć urządzenia %s: %s\n"
 
 #: src/ghost/ijsgutenprint.c:1331
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-msgstr "Nie mo¿na otworzyæ urz±dzenia %s: %s\n"
+msgstr "Nie można otworzyć urządzenia %s: %s\n"
 
 #: src/ghost/ijsgutenprint.c:1344
 #, fuzzy, c-format
@@ -7654,6 +7785,145 @@ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Model Name"
+#~ msgstr "Anuluj"
+
+#, fuzzy
+#~ msgid " Gamma"
+#~ msgstr "Gamma:"
+
+#, fuzzy
+#~ msgid " Curve"
+#~ msgstr "Czarny"
+
+#, fuzzy
+#~ msgid "1440 x 1440"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI High Quality"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI Highest Quality"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI High Quality"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI Highest Quality"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "90x90 DPI"
+#~ msgstr "600 DPI"
+
+#, fuzzy
+#~ msgid "90x90 DPI DMT"
+#~ msgstr "600 DPI"
+
+#, fuzzy
+#~ msgid "180x180 DPI"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "180x180 DPI DMT"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "360x360 DPI"
+#~ msgstr "300x300 DPI"
+
+#, fuzzy
+#~ msgid "360x360 DPI DMT"
+#~ msgstr "600x600 DPI"
+
+#, fuzzy
+#~ msgid "720x360 DPI"
+#~ msgstr "1440 x 360 DPI"
+
+#, fuzzy
+#~ msgid "720x360 DPI DMT"
+#~ msgstr "1440 x 360 DPI"
+
+#, fuzzy
+#~ msgid "720x720 DPI"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "720x720 DPI DMT"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x720 DPI"
+#~ msgstr "1440 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x720 DPI DMT"
+#~ msgstr "1440 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI DMT"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI DMT"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "150x150 DPI DMT"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "300x300 DPI DMT"
+#~ msgstr "300x300 DPI"
+
+#, fuzzy
+#~ msgid "600x300 DPI DMT"
+#~ msgstr "600x300 DPI"
+
+#, fuzzy
+#~ msgid "600x600 DPI DMT"
+#~ msgstr "600x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x600 DPI DMT"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI DMT"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI"
+#~ msgstr "2400x600 DPI"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI DMT"
+#~ msgstr "2400x600 DPI"
+
+#, fuzzy
+#~ msgid "Plain Paper PIXMA"
+#~ msgstr "Zwykły papier"
+
+#~ msgid "Envelope"
+#~ msgstr "Koperta"
+
+#, fuzzy
 #~ msgid "Gutenprint"
 #~ msgstr "Wydrukuj"
 
@@ -7955,15 +8225,15 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Cannot identify printer!\n"
-#~ msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
+#~ msgstr "Nie można wydrukować na drukarce %s przy użyciu %s\n"
 
 #, fuzzy
 #~ msgid "Red Balance"
-#~ msgstr "¯ó³æ"
+#~ msgstr "Żółć"
 
 #, fuzzy
 #~ msgid "Gloss Balance"
-#~ msgstr "¯ó³æ"
+#~ msgstr "Żółć"
 
 #, fuzzy
 #~ msgid "Gimp-Print"
@@ -7976,10 +8246,10 @@ msgstr ""
 #~ msgstr "%s: opcja \"%s\" jest niejednoznaczna\n"
 
 #~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: opcja \"--%s\" nie pozwala na u¿ycie argumentu\n"
+#~ msgstr "%s: opcja \"--%s\" nie pozwala na użycie argumentu\n"
 
 #~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: opcja \"%c%s\" nie pozwala na u¿ycie argumentu\n"
+#~ msgstr "%s: opcja \"%c%s\" nie pozwala na użycie argumentu\n"
 
 #~ msgid "%s: option `%s' requires an argument\n"
 #~ msgstr "%s: opcja \"%s\" wymaga argumentu\n"
@@ -8003,11 +8273,11 @@ msgstr ""
 #~ msgstr "%s: opcja \"-W %s\" jest niejednoznaczna\n"
 
 #~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: opcja \"-W %s\" nie pozwala na u¿ycie argumentu\n"
+#~ msgstr "%s: opcja \"-W %s\" nie pozwala na użycie argumentu\n"
 
 #, fuzzy
 #~ msgid "Bright"
-#~ msgstr "Jasno¶æ:"
+#~ msgstr "Jasność:"
 
 #, fuzzy
 #~ msgid "traditional"
@@ -8017,7 +8287,7 @@ msgstr ""
 #~ msgstr "24x36"
 
 #~ msgid "Solid Colors"
-#~ msgstr "Jednolite p³aszczyzny"
+#~ msgstr "Jednolite płaszczyzny"
 
 #~ msgid "Stylus C20sx"
 #~ msgstr "Stylus C20sx"
@@ -8048,17 +8318,17 @@ msgstr ""
 #~ msgstr "Stylus C40ux"
 
 #~ msgid "Right Border:"
-#~ msgstr "Prawa krawêd¼:"
+#~ msgstr "Prawa krawędź:"
 
 #~ msgid "Bottom Border:"
-#~ msgstr "Dolna krawêd¼"
+#~ msgstr "Dolna krawędź"
 
 #~ msgid "Size"
 #~ msgstr "Rozmiar"
 
 #, fuzzy
 #~ msgid "Resolutions"
-#~ msgstr "Rozdzielczo¶æ"
+#~ msgstr "Rozdzielczość"
 
 #~ msgid "Media Type:"
 #~ msgstr "Typ papieru:"
@@ -8067,10 +8337,10 @@ msgstr ""
 #~ msgstr "Rozmiar papieru:"
 
 #~ msgid "Media Source:"
-#~ msgstr "¬ród³o papieru:"
+#~ msgstr "Źródło papieru:"
 
 #~ msgid "Resolution:"
-#~ msgstr "Rozdzielczo¶æ:"
+#~ msgstr "Rozdzielczość:"
 
 #~ msgid "Dither Algorithm:"
 #~ msgstr "Algorytm ditherowania:"
@@ -8080,7 +8350,7 @@ msgstr ""
 #~ "Cannot read from %s: %s\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Nie mo¿na odczytaæ z %s: %s\n"
+#~ "Nie można odczytać z %s: %s\n"
 
 #~ msgid "Cyan:"
 #~ msgstr "Niebieskozielony:"
@@ -8089,7 +8359,7 @@ msgstr ""
 #~ msgstr "Purpurowy:"
 
 #~ msgid "Yellow:"
-#~ msgstr "¯ó³ty:"
+#~ msgstr "Żółty:"
 
 #, fuzzy
 #~ msgid "Unknown option %s\n"
diff --git a/po/pt.gmo b/po/pt.gmo
index 8e88a71..71e30d2 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index e452cc4..d81794d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,21 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimpprint 4.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\n"
 "PO-Revision-Date: 2006-05-04 07:20-0400\n"
 "Last-Translator: Filipe Maia <fmaia@gmx.net>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 #, fuzzy
 msgid "Default"
-msgstr "Definir Valores Padrão"
+msgstr "Definir Valores Padrão"
 
 #: src/main/dither-main.c:47
 msgid "EvenTone"
@@ -55,7 +55,7 @@ msgstr ""
 
 #: src/main/dither-main.c:63
 msgid "Adaptive Hybrid"
-msgstr "Híbrido Adaptativo"
+msgstr "Híbrido Adaptativo"
 
 #: src/main/dither-main.c:64
 msgid "Ordered"
@@ -63,15 +63,15 @@ msgstr "Ordenado"
 
 #: src/main/dither-main.c:65
 msgid "Fast"
-msgstr "Rápido"
+msgstr "Rápido"
 
 #: src/main/dither-main.c:66
 msgid "Very Fast"
-msgstr "Muito Rápido"
+msgstr "Muito Rápido"
 
 #: src/main/dither-main.c:67
 msgid "Hybrid Floyd-Steinberg"
-msgstr "Híbrido Floyd-Steinberg"
+msgstr "Híbrido Floyd-Steinberg"
 
 #: src/main/dither-main.c:68
 msgid "Predithered Input"
@@ -82,18 +82,18 @@ msgstr ""
 msgid "Density"
 msgstr "Densidade:"
 
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgid ""
 "ink bleeds through the paper or smears; increase the density if black "
 "regions are not solid."
 msgstr ""
-"Ajuste a densidade (quantidade de tinta) da impressão. Reduza a densidade "
+"Ajuste a densidade (quantidade de tinta) da impressão. Reduza a densidade "
 "se\n"
 "a tinta pinga ou borrata o papel, aumente a densidade se as zonas pretas\n"
-"não aparecem sólidas."
+"não aparecem sólidas."
 
 #: src/main/dither-main.c:97
 msgid "Dither Algorithm"
@@ -129,11 +129,11 @@ msgid ""
 "Hybrid Floyd-Steinberg generally produces inferior output."
 msgstr ""
 "Escolha o algoritmo de \"dither\" a ser usado.\n"
-"Híbrido Adaptativo normalmente produz a melhor qualidade.\n"
-"Ordenado é mais rápido e produz uma qualidade semelhante em fotografias.\n"
-"Rápido e Muito Rápido são consideravelmente mais rápidos, e funcionam para\n"
+"Híbrido Adaptativo normalmente produz a melhor qualidade.\n"
+"Ordenado é mais rápido e produz uma qualidade semelhante em fotografias.\n"
+"Rápido e Muito Rápido são consideravelmente mais rápidos, e funcionam para\n"
 "texto e para \"line art\".\n"
-"Híbrido Floyd-Steinber normalmente produz resultados inferiores."
+"Híbrido Floyd-Steinber normalmente produz resultados inferiores."
 
 #: src/main/module.c:52
 msgid "Miscellaneous (unclassified)"
@@ -152,503 +152,316 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmos de \"Dither\"\""
 
-#: src/main/print-canon.c:1382
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
-msgid "90x90 DPI"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1382
-#, fuzzy
-msgid "90x90 DPI DMT"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI DMT"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI DMT"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI"
-msgstr "720 x 360 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI DMT"
-msgstr "720 x 360 DPI MW2"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI DMT"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI"
-msgstr "1440 x 720 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI DMT"
-msgstr "1440 x 720 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI DMT"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI DMT"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1390
-#, fuzzy
-msgid "150x150 DPI DMT"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1391
-#, fuzzy
-msgid "300x300 DPI DMT"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1392
-#, fuzzy
-msgid "600x300 DPI DMT"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1393
-#, fuzzy
-msgid "600x600 DPI DMT"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1394
-#, fuzzy
-msgid "1200x600 DPI DMT"
-msgstr "1200x600 DPI"
+msgid "Page Size"
+msgstr "Tamanho"
 
-#: src/main/print-canon.c:1395
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
 #, fuzzy
-msgid "1200x1200 DPI"
-msgstr "1200x600 DPI"
+msgid "Basic Printer Setup"
+msgstr "Definições da Impressora"
 
-#: src/main/print-canon.c:1395
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 #, fuzzy
-msgid "1200x1200 DPI DMT"
-msgstr "1200x600 DPI"
+msgid "Size of the paper being printed to"
+msgstr "Tamanho do papel para o qual deseja imprimir"
 
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI"
-msgstr "2400x600 DPI"
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
+msgid "Media Type"
+msgstr "Tipo de Média"
 
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI DMT"
-msgstr "2400x600 DPI"
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
+msgid "Type of media (plain paper, photo paper, etc.)"
+msgstr ""
 
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-msgid "Plain Paper"
-msgstr "Papel Normal"
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
+msgid "Media Source"
+msgstr "Fonte de Média"
 
-#: src/main/print-canon.c:1448
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
 #, fuzzy
-msgid "Plain Paper PIXMA"
-msgstr "Papel Normal"
-
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-msgid "Transparencies"
-msgstr "Transparências"
-
-#: src/main/print-canon.c:1450
-msgid "Back Print Film"
-msgstr "Filme de impressão por trás"
-
-#: src/main/print-canon.c:1451
-msgid "Fabric Sheets"
-msgstr "Folhas de Fábrica"
-
-#: src/main/print-canon.c:1452
-msgid "Envelope"
-msgstr "Envelope"
-
-#: src/main/print-canon.c:1453
-msgid "High Resolution Paper"
-msgstr "Papel de Alta Resolução"
-
-#: src/main/print-canon.c:1454
-msgid "T-Shirt Transfers"
-msgstr "Transferências para T-Shirt"
-
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
-msgstr "Filme Muito Lustroso"
-
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
-msgstr "Papel de Fotografia Lustroso"
+msgid "Source (input slot) of the media"
+msgstr "Fonte do \"media\" para o qual está a imprimir"
 
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
-msgstr "Cartões de Fotografia Lustrosos"
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
+msgstr ""
 
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
-msgstr "Papel de Fotografia Profissional"
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr ""
 
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
-msgstr "Outro"
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
+msgstr ""
 
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
-#, fuzzy
-msgid "Page Size"
-msgstr "Tamanho"
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
 
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
-#, fuzzy
-msgid "Basic Printer Setup"
-msgstr "Definições da Impressora"
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+msgid "CD Hub Size (Custom)"
+msgstr ""
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
 #, fuzzy
-msgid "Size of the paper being printed to"
-msgstr "Tamanho do papel para o qual deseja imprimir"
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "Redimensionar a impressão para o tamanho da página"
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
-msgid "Media Type"
-msgstr "Tipo de Média"
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
+msgstr ""
 
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
-msgid "Type of media (plain paper, photo paper, etc.)"
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
-msgid "Media Source"
-msgstr "Fonte de Média"
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr ""
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
-#, fuzzy
-msgid "Source (input slot) of the media"
-msgstr "Fonte do \"media\" para o qual está a imprimir"
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
+msgstr ""
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
-msgstr "Resolução"
+msgstr "Resolução"
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
-msgstr "Resolução e qualidade da impressão"
+msgstr "Resolução e qualidade da impressão"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tipo de tinta"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr ""
-
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tipo de tinta na impressora"
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Modelo da Impressora:"
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Papel ColorLife"
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 #, fuzzy
 msgid "Adjust the cyan density"
-msgstr "Ajustar o equilíbrio de ciano na impressão"
+msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 #, fuzzy
 msgid "Adjust the magenta density"
-msgstr "Ajustar o equilíbrio de magenta da impressão"
+msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Adjust the yellow density"
-msgstr "Ajustar o equilíbrio de amarelo na impressão"
+msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 #, fuzzy
 msgid "Adjust the black density"
-msgstr "Ajustar o equilíbrio de ciano na impressão"
+msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Magenta Claro"
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
-msgid "Short Edge (Flip)"
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-msgid "Auto Sheet Feeder"
-msgstr "Alimentador de Folhas Automático"
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+msgid "Short Edge (Flip)"
+msgstr ""
 
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-msgid "Manual with Pause"
-msgstr "Manual com Pausa"
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
+msgstr ""
 
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
-msgstr "Manual sem Pausa"
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
+msgstr ""
 
-#: src/main/print-canon.c:1923
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
 #, fuzzy
-msgid "Cassette"
-msgstr "Papel Mate"
+msgid "CD - Custom"
+msgstr "Personalizado"
 
-#: src/main/print-canon.c:1924
-msgid "CD tray"
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:2049
-msgid "Photo CcMmYK Color"
-msgstr "Cor CcMmYK de Fotografia<"
-
-#: src/main/print-canon.c:2052
-msgid "Photo CcMmY Color"
-msgstr "Cor CcMmY de Fotografia"
-
-#: src/main/print-canon.c:2055
-msgid "CMYK Color"
-msgstr "Cor CMYK"
-
-#: src/main/print-canon.c:2058
-msgid "CMY Color"
-msgstr "Cor CMY"
-
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
-msgstr "Preto"
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#, fuzzy
+msgid "Print To Hub"
+msgstr "Imprimir para o Ficheiro?"
 
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
 msgstr "Cor"
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
@@ -661,7 +474,7 @@ msgstr ""
 #: src/main/print-color.c:51
 #, fuzzy
 msgid "Bright Colors"
-msgstr "Ajustamento da Cor de Impressão"
+msgstr "Ajustamento da Cor de Impressão"
 
 #: src/main/print-color.c:52
 msgid "Correct Hue Only"
@@ -688,9 +501,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Imprimir"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
 msgstr "Escala de Cinzento"
 
@@ -720,11 +533,6 @@ msgstr ""
 msgid "Channel "
 msgstr "Cancelar"
 
-#: src/main/print-color.c:165
-#, fuzzy
-msgid " Gamma"
-msgstr "Gama:"
-
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
 #: src/main/print-color.c:266 src/main/print-color.c:274
@@ -782,7 +590,7 @@ msgid "Output image type"
 msgstr "Tipo de Output:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
 msgstr ""
 
@@ -803,7 +611,7 @@ msgstr "Brilho:"
 #: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
-msgstr "Definir a altura da impressão"
+msgstr "Definir a altura da impressão"
 
 #: src/main/print-color.c:232
 #, fuzzy
@@ -837,9 +645,9 @@ msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
 msgstr ""
-"Ajuste a gama da impressão. Valores altos produzem geralmente impressões "
-"mais brilhantes, enquanto que valores baixos produzem impressões mais "
-"escuras. Preto e branco mantêm-se inalterados, ou contrário do caso do "
+"Ajuste a gama da impressão. Valores altos produzem geralmente impressões "
+"mais brilhantes, enquanto que valores baixos produzem impressões mais "
+"escuras. Preto e branco mantêm-se inalterados, ou contrário do caso do "
 "ajustamento do brilho."
 
 #: src/main/print-color.c:258
@@ -851,13 +659,13 @@ msgstr "Gama:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
@@ -866,15 +674,15 @@ msgstr "Ciano"
 #: src/main/print-color.c:267
 #, fuzzy
 msgid "Adjust the cyan gamma"
-msgstr "Ajustar o equilíbrio de ciano na impressão"
-
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+msgstr "Ajustar o equilíbrio de ciano na impressão"
+
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 msgid "Magenta"
@@ -883,15 +691,15 @@ msgstr "Magenta"
 #: src/main/print-color.c:275
 #, fuzzy
 msgid "Adjust the magenta gamma"
-msgstr "Ajustar o equilíbrio de magenta da impressão"
-
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+msgstr "Ajustar o equilíbrio de magenta da impressão"
+
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
@@ -900,11 +708,11 @@ msgstr "Amarelo"
 #: src/main/print-color.c:283
 #, fuzzy
 msgid "Adjust the yellow gamma"
-msgstr "Ajustar o equilíbrio de amarelo na impressão"
+msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
 msgstr ""
@@ -912,21 +720,21 @@ msgstr ""
 #: src/main/print-color.c:291
 #, fuzzy
 msgid "Adjust the red gamma"
-msgstr "Ajustar o equilíbrio de amarelo na impressão"
+msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
 msgstr ""
 
 #: src/main/print-color.c:299
 #, fuzzy
 msgid "Adjust the green gamma"
-msgstr "Ajustar o equilíbrio de magenta da impressão"
+msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
 msgstr ""
@@ -934,14 +742,26 @@ msgstr ""
 #: src/main/print-color.c:307
 #, fuzzy
 msgid "Adjust the blue gamma"
-msgstr "Ajustar o equilíbrio de ciano na impressão"
+msgstr "Ajustar o equilíbrio de ciano na impressão"
+
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr "Preto"
 
 #: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
-msgstr "Ajustar o equilíbrio de ciano na impressão"
+msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
 msgstr ""
 
@@ -954,9 +774,9 @@ msgstr "Escala de Cinzento"
 #: src/main/print-color.c:323
 #, fuzzy
 msgid "Adjust the cyan gray balance"
-msgstr "Ajustar o equilíbrio de ciano na impressão"
+msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -964,30 +784,30 @@ msgstr "Magenta"
 #: src/main/print-color.c:331
 #, fuzzy
 msgid "Adjust the magenta gray balance"
-msgstr "Ajustar o equilíbrio de magenta da impressão"
+msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 #, fuzzy
 msgid "Yellow Balance"
-msgstr "Ajustar o equilíbrio de amarelo na impressão"
+msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
 #: src/main/print-color.c:339
 #, fuzzy
 msgid "Adjust the yellow gray balance"
-msgstr "Ajustar o equilíbrio de amarelo na impressão"
+msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
 #: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
-msgstr "Saturação:"
+msgstr "Saturação:"
 
 #: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
-"Ajustar a saturação (equilíbrio de cor) da impressão\n"
-"Use saturação zero para produzir output em escala de cinzento usando tintas "
+"Ajustar a saturação (equilíbrio de cor) da impressão\n"
+"Use saturação zero para produzir output em escala de cinzento usando tintas "
 "de cor e pretas"
 
 #: src/main/print-color.c:357
@@ -997,9 +817,9 @@ msgstr "Tipo de tinta"
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Tipo de Output:"
@@ -1032,11 +852,6 @@ msgstr ""
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:446
-#, fuzzy
-msgid " Curve"
-msgstr "Preto"
-
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
@@ -1145,7 +960,7 @@ msgstr ""
 #: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
-msgstr "Saturação:"
+msgstr "Saturação:"
 
 #: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
@@ -1167,584 +982,388 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:516 src/main/printers.c:521
+#: src/main/printers.c:519 src/main/printers.c:524
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
-msgstr "%s não é um paràmetro válido do tipo %s\n"
+msgstr "%s não é um paràmetro válido do tipo %s\n"
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:673
+#: src/main/printers.c:676
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Impressora desconhecida %s\n"
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s fora do intervalo (valor %d, min %d, max %d)\n"
 
-#: src/main/printers.c:755
+#: src/main/printers.c:761
 #, fuzzy
 msgid "Page size is not valid\n"
-msgstr "Tamanho da imagem não é válido\n"
+msgstr "Tamanho da imagem não é válido\n"
 
-#: src/main/printers.c:776
+#: src/main/printers.c:782
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
-msgstr "Margem de topo não pode ser menor que zero\n"
+msgstr "Margem de topo não pode ser menor que zero\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:788
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
-msgstr "Mergem esquerda não pode ser menor que zero\n"
+msgstr "Mergem esquerda não pode ser menor que zero\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:794
 #, fuzzy
 msgid "Height must be greater than zero\n"
-msgstr "Mergem esquerda não pode ser menor que zero\n"
+msgstr "Mergem esquerda não pode ser menor que zero\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:800
 #, fuzzy
 msgid "Width must be greater than zero\n"
-msgstr "Margem de topo não pode ser menor que zero\n"
+msgstr "Margem de topo não pode ser menor que zero\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-msgid "Roll Feed"
-msgstr "Rolo de Alimentação"
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-#, fuzzy
-msgid "Manual Feed"
-msgstr "Manual"
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-#, fuzzy
-msgid "Print to CD"
-msgstr "Imprimir para o Ficheiro?"
-
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-#, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Manual"
-
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-#, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Manual"
-
-#: src/main/print-escp2-data.c:554
-#, fuzzy
-msgid "Rear Tray"
-msgstr "Tabuleiro"
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr ""
-
-#: src/main/print-escp2-data.c:581
-#, fuzzy
-msgid "Photo Board"
-msgstr "Papel de Fotografia"
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr ""
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr ""
-
-#: src/main/print-escp2-data.c:638
-#, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "Auto Seleccionar"
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr ""
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr ""
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-#, fuzzy
-msgid "High"
-msgstr "Altura"
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-#, fuzzy
-msgid "Photo"
-msgstr "Fotografia"
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-#, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
-
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-#, fuzzy
-msgid "Ultra Photo"
-msgstr "Seis Cores Foto"
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-#, fuzzy
-msgid "Light Cyan"
-msgstr "Ciano Claro"
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-#, fuzzy
-msgid "Light Magenta"
-msgstr "Magenta Claro"
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-#, fuzzy
-msgid "Light Black"
-msgstr "Preto"
-
-#: src/main/print-escp2-data.c:811
-#, fuzzy
-msgid "Dark Yellow"
-msgstr "Amarelo"
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-#, fuzzy
-msgid "Matte Black"
-msgstr "Papel Mate"
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-#, fuzzy
-msgid "Photo Black"
-msgstr "Papel de Fotografia"
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-#, fuzzy
-msgid "Gloss Optimizer"
-msgstr "Filme Lustroso"
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-#, fuzzy
-msgid "Light Light Black"
-msgstr "Preto"
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 #, fuzzy
 msgid "Print Quality"
-msgstr "720 DPI Qualidade Máxima"
+msgstr "720 DPI Qualidade Máxima"
 
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr ""
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr ""
-
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr ""
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:214
+#: src/main/print-escp2.c:228
 #, fuzzy
 msgid "Resolution of the print"
-msgstr "Resolução e qualidade da impressão"
+msgstr "Resolução e qualidade da impressão"
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:236
+#: src/main/print-escp2.c:250
 #, fuzzy
 msgid "Ink Set"
 msgstr "Tipo de tinta"
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 #, fuzzy
 msgid "Output Order"
 msgstr "Tipo de Output:"
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 #, fuzzy
 msgid "Ink change command"
 msgstr "Comando desconhecido.\n"
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 #, fuzzy
 msgid "Alternate Alignment Choices"
 msgstr "Repetindo o processo de alinhamento.\n"
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 #, fuzzy
 msgid "Channel Names"
 msgstr "Cancelar"
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:346
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Ciano"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:347
 #, fuzzy
 msgid "Adjust the cyan map"
-msgstr "Ajustar o equilíbrio de ciano na impressão"
+msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:352
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Adjust the magenta map"
-msgstr "Ajustar o equilíbrio de magenta da impressão"
+msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:358
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Amarelo"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Adjust the yellow map"
-msgstr "Ajustar o equilíbrio de amarelo na impressão"
+msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:364
 #, fuzzy
 msgid "Blue Map"
 msgstr "Preto e Branco"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Adjust the blue map"
-msgstr "Ajustar o equilíbrio de ciano na impressão"
+msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Adjust the red map"
-msgstr "Ajustar o equilíbrio de amarelo na impressão"
+msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:447
+#: src/main/print-escp2.c:464
 #, fuzzy
 msgid "Red Density"
 msgstr "Densidade:"
 
-#: src/main/print-escp2.c:448
+#: src/main/print-escp2.c:465
 #, fuzzy
 msgid "Adjust the red density"
-msgstr "Ajustar o equilíbrio de amarelo na impressão"
+msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:455
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Blue Density"
 msgstr "Densidade:"
 
-#: src/main/print-escp2.c:456
+#: src/main/print-escp2.c:473
 #, fuzzy
 msgid "Adjust the blue density"
-msgstr "Ajustar o equilíbrio de ciano na impressão"
+msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-escp2.c:463
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Filme Lustroso"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:481
 #, fuzzy
 msgid "Adjust the gloss level"
-msgstr "Ajustar o equilíbrio de amarelo na impressão"
+msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:527
+#: src/main/print-escp2.c:544
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:528
+#: src/main/print-escp2.c:545
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Tipo de Output:"
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr ""
-
-#: src/main/print-escp2.c:1564
-#, fuzzy
-msgid "Print To Hub"
-msgstr "Imprimir para o Ficheiro?"
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Tipo de Output:"
 
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr "Standard"
+
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamanho"
 
-#: src/main/print-escp2.c:1701
+#: src/main/print-escp2.c:1829
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:1703
+#: src/main/print-escp2.c:1831
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2168
+#: src/main/print-escp2.c:2313
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
-msgstr "A impressora não suporta a cor de impressão\n"
+msgstr "A impressora não suporta a cor de impressão\n"
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1775,7 +1394,7 @@ msgstr "1200 DPI alta qualidade"
 
 #: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659
 msgid "1200 DPI highest quality"
-msgstr "1200 DPI qualidade máxima"
+msgstr "1200 DPI qualidade máxima"
 
 #: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660
 msgid "1200 DPI  Unidirectional"
@@ -1791,262 +1410,315 @@ msgstr "2400 DPI x 1200 DPI alta qualidade"
 
 #: src/main/print-lexmark.c:587
 msgid "2400 DPI x 1200 DPI highest quality"
-msgstr "2400 DPI x 1200 DPI qualidade máxima"
+msgstr "2400 DPI x 1200 DPI qualidade máxima"
 
 #: src/main/print-lexmark.c:589
 msgid "test print"
-msgstr "impressão de teste"
+msgstr "impressão de teste"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
 msgstr "Quatro Cores Standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
-msgstr "Três Cores Compósito"
+msgstr "Três Cores Compósito"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
 msgstr "Seis Cores Foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
-msgstr "Cinco Cores Foto Compósito"
+msgstr "Cinco Cores Foto Compósito"
+
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+msgid "Plain Paper"
+msgstr "Papel Normal"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
 msgstr "Filme Lustroso"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+msgid "Transparencies"
+msgstr "Transparências"
+
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 msgid "Envelopes"
 msgstr "Envelopes"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 msgid "Matte Paper"
 msgstr "Papel Mate"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
 msgstr "Papel para Impressora Jacto de Tinta"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papel de Qualidade Fotografica para Impressora Jacto de Tinta"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 msgid "Photo Paper"
 msgstr "Papel de Fotografia"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
 msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
 msgstr "Papel de Fotografia Brilhante Premium"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
 msgstr "Papel de Qualidade Fotografica Lustroso"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
 msgstr "Papel Pesado Ilford"
 
-#: src/main/print-olympus.c:265
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr "Outro"
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr "Alimentador de Folhas Automático"
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr "Manual com Pausa"
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr "Manual sem Pausa"
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 #, fuzzy
 msgid "Glossy"
 msgstr "Filme Lustroso"
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:861
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 #, fuzzy
 msgid "Matte"
 msgstr "Papel Mate"
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1331
+#: src/main/print-olympus.c:1627
 #, fuzzy
 msgid "Adjust the cyan balance"
-msgstr "Ajustar o equilíbrio de ciano na impressão"
+msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-olympus.c:1339
+#: src/main/print-olympus.c:1635
 #, fuzzy
 msgid "Adjust the magenta balance"
-msgstr "Ajustar o equilíbrio de magenta da impressão"
+msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-olympus.c:1347
+#: src/main/print-olympus.c:1643
 #, fuzzy
 msgid "Adjust the yellow balance"
-msgstr "Ajustar o equilíbrio de amarelo na impressão"
+msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-olympus.c:1354
+#: src/main/print-olympus.c:1650
 #, fuzzy
 msgid "Black Balance"
 msgstr "Preto e Branco"
 
-#: src/main/print-olympus.c:1355
+#: src/main/print-olympus.c:1651
 #, fuzzy
 msgid "Adjust the black balance"
-msgstr "Ajustar o equilíbrio de ciano na impressão"
+msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 msgid "Plain"
 msgstr "Simples"
 
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 msgid "Bond"
 msgstr "Dobrado"
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 msgid "Premium"
 msgstr "Premium"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
 msgstr "Foto Lustrosa"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 msgid "Transparency"
-msgstr "Transparência"
+msgstr "Transparência"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
-msgstr "Foto Secagem Rápida"
+msgstr "Foto Secagem Rápida"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 msgid "Quick-dry Transparency"
-msgstr "Transparência Secagem Rápida"
+msgstr "Transparência Secagem Rápida"
 
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
 msgstr "Manual"
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 msgid "Tray 1"
 msgstr "Tabuleiro 1"
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 msgid "Tray 2"
 msgstr "Tabuleiro 2"
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 msgid "Tray 3"
 msgstr "Tabuleiro 3"
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 msgid "Tray 4"
 msgstr "Tabuleiro 4"
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
-msgstr "Alimentador de Folhas Portátil"
+msgstr "Alimentador de Folhas Portátil"
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 msgid "Desktop Sheet Feeder"
-msgstr "Alimentador de Folhas de Secretária"
+msgstr "Alimentador de Folhas de Secretária"
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 msgid "Tray"
 msgstr "Tabuleiro"
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 msgid "Optional Source"
 msgstr "Fonte Alternativa"
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 msgid "Autoselect"
 msgstr "Auto Seleccionar"
 
 #: src/main/print-pcl.c:256
-msgid "600x600 DPI monochrome"
-msgstr "600x600 DPI monocromático"
+msgid "150x150 DPI"
+msgstr "150x150 DPI"
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr "300x300 DPI"
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
+msgstr "600x300 DPI"
 
 #: src/main/print-pcl.c:259
+msgid "600x600 DPI monochrome"
+msgstr "600x600 DPI monocromático"
+
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr "600x600 DPI"
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr "1200x600 DPI"
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
 msgstr "Cartuchos Cor + Preto"
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
 msgstr "Cartuchos Cor + Fotografia"
 
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr ""
-
 #: src/main/print-ps.c:97
 #, fuzzy
 msgid "PPDFile"
 msgstr "Ficheiro PPD:"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 #, fuzzy
 msgid "PPD File"
 msgstr "Ficheiro PPD?"
@@ -2055,184 +1727,302 @@ msgstr "Ficheiro PPD?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 msgid "Two Level Grayscale"
-msgstr "Escala de Cinzento de 2 Níveis"
+msgstr "Escala de Cinzento de 2 Níveis"
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 #, fuzzy
 msgid "Three Level Grayscale"
-msgstr "Escala de Cinzento de 2 Níveis"
+msgstr "Escala de Cinzento de 2 Níveis"
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
 msgstr "Quato Tons"
 
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
-msgstr "Seis Cores Compósito Realçado"
+msgstr "Seis Cores Compósito Realçado"
 
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 msgid "Seven Color Photo"
 msgstr "Foto de Sete Cores"
 
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 msgid "Seven Color Enhanced"
-msgstr "Sete Cores Realçado"
+msgstr "Sete Cores Realçado"
 
-#: src/main/escp2-channels.c:1535
+#: src/main/escp2-channels.c:1649
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Seis Cores Foto"
 
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/main/escp2-channels.c:1695
+#: src/main/escp2-channels.c:1809
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
-msgstr "Sete Cores Realçado"
+msgstr "Sete Cores Realçado"
 
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Quatro Cores Standard"
 
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Three Color Raw"
-msgstr "Três Cores Compósito"
+msgstr "Três Cores Compósito"
 
-#: src/main/escp2-channels.c:1762
+#: src/main/escp2-channels.c:1876
 #, fuzzy
 msgid "Three Color Raw Gloss"
-msgstr "Três Cores Compósito"
+msgstr "Três Cores Compósito"
 
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Quatro Cores Standard"
 
-#: src/main/escp2-channels.c:1884
+#: src/main/escp2-channels.c:2017
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Quatro Cores Standard"
 
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Seis Cores Foto"
 
-#: src/main/escp2-channels.c:1962
+#: src/main/escp2-channels.c:2109
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
-msgstr "Seis Cores Compósito Realçado"
+msgstr "Seis Cores Compósito Realçado"
 
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/main/escp2-channels.c:2024
+#: src/main/escp2-channels.c:2187
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Sete Cores Realçado"
+msgstr "Sete Cores Realçado"
 
-#: src/main/escp2-channels.c:2042
+#: src/main/escp2-channels.c:2205
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Seis Cores Foto"
 
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Seis Cores Foto"
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#, fuzzy
+msgid "Photo Black"
+msgstr "Papel de Fotografia"
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+#, fuzzy
+msgid "Matte Black"
+msgstr "Papel Mate"
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+#, fuzzy
+msgid "Light Cyan"
+msgstr "Ciano Claro"
+
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+#, fuzzy
+msgid "Light Magenta"
+msgstr "Magenta Claro"
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+#, fuzzy
+msgid "Light Black"
+msgstr "Preto"
+
+#: src/main/escp2-channels.c:2981
+#, fuzzy
+msgid "Dark Yellow"
+msgstr "Amarelo"
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#, fuzzy
+msgid "Gloss Optimizer"
+msgstr "Filme Lustroso"
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Preto"
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 msgid "Plain Paper Fast Load"
-msgstr "Papel Normal Carregação Rápida"
+msgstr "Papel Normal Carregação Rápida"
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
-msgstr "Cartão"
+msgstr "Cartão"
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 msgid "Back Light Film"
-msgstr "Película"
+msgstr "Película"
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Papel Mate"
 
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Papel ColorLife"
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Papel Mate"
 
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+msgid "Roll Feed"
+msgstr "Rolo de Alimentação"
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#, fuzzy
+msgid "Manual Feed"
+msgstr "Manual"
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+#, fuzzy
+msgid "Print to CD"
+msgstr "Imprimir para o Ficheiro?"
+
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Manual"
+
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Manual"
+
+#: src/main/escp2-papers.c:1859
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Tabuleiro"
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/escp2-papers.c:1886
+#, fuzzy
+msgid "Photo Board"
+msgstr "Papel de Fotografia"
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr ""
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr ""
+
+#: src/main/escp2-papers.c:1943
+#, fuzzy
+msgid "Cut Sheet Autoselect"
+msgstr "Auto Seleccionar"
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr ""
+
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
@@ -2240,7 +2030,7 @@ msgstr ""
 #: src/main/escp2-resolutions.c:40 src/main/escp2-resolutions.c:43
 #, fuzzy
 msgid "360 x 120 DPI Economy"
-msgstr "600x600 DPI monocromático"
+msgstr "600x600 DPI monocromático"
 
 #: src/main/escp2-resolutions.c:47 src/main/escp2-resolutions.c:50
 msgid "180 DPI Economy"
@@ -2272,144 +2062,168 @@ msgstr "600 DPI"
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:94
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 #, fuzzy
 msgid "720 DPI High Quality"
 msgstr "1200 DPI alta qualidade"
 
-#: src/main/escp2-resolutions.c:97
+#: src/main/escp2-resolutions.c:103
 #, fuzzy
 msgid "720 DPI Highest Quality"
-msgstr "1200 DPI qualidade máxima"
+msgstr "1200 DPI qualidade máxima"
 
-#: src/main/escp2-resolutions.c:100
+#: src/main/escp2-resolutions.c:106
 #, fuzzy
 msgid "720 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
-msgstr "1440 x 360 DPI Máxima Qualidade"
+msgstr "1440 x 360 DPI Máxima Qualidade"
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:129
+#: src/main/escp2-resolutions.c:135
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
-msgstr "1440 x 360 DPI Máxima Qualidade"
+msgstr "1440 x 360 DPI Máxima Qualidade"
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
+#: src/main/escp2-resolutions.c:145
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:142
-#, fuzzy
-msgid "1440 x 1440"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/escp2-resolutions.c:145
-#, fuzzy
-msgid "1440 x 1440 DPI High Quality"
-msgstr "1440 x 360 DPI Máxima Qualidade"
-
-#: src/main/escp2-resolutions.c:148
-#, fuzzy
-msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1440 x 360 DPI Máxima Qualidade"
-
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:158
+#: src/main/escp2-resolutions.c:155
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:164
-#, fuzzy
-msgid "2880 x 1440 DPI High Quality"
-msgstr "1440 x 360 DPI Máxima Qualidade"
-
-#: src/main/escp2-resolutions.c:167
-#, fuzzy
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr "1440 x 360 DPI Máxima Qualidade"
-
-#: src/main/escp2-resolutions.c:171
+#: src/main/escp2-resolutions.c:162
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 #, fuzzy
 msgid "Interleave"
 msgstr "Nome da Impressora:"
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Nome da Impressora:"
 
-#: src/main/escp2-resolutions.c:584
+#: src/main/escp2-resolutions.c:594
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Brilho:"
 
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+#, fuzzy
+msgid "High"
+msgstr "Altura"
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografia"
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+#, fuzzy
+msgid "Super Photo"
+msgstr "Stylus Photo"
+
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+#, fuzzy
+msgid "Ultra Photo"
+msgstr "Seis Cores Foto"
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr ""
+
 #: src/main/generic-options.c:46
 msgid "Text"
 msgstr ""
@@ -2484,3879 +2298,4203 @@ msgstr "Tabloide"
 msgid "Executive"
 msgstr "Executivo"
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/main/xmli18n-tmp.h:11
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Papel de Fotografia Epson 4x6"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
 msgstr "12x8"
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/main/xmli18n-tmp.h:26
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/main/xmli18n-tmp.h:32
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
 msgstr "A4"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/main/xmli18n-tmp.h:67
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr "B6 JIs"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 msgid "American foolscap"
 msgstr "Papel Ministro Americano"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 msgid "European foolscap"
 msgstr "Papel Ministro Europeu"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 msgid "Large Crown Quarto"
 msgstr "Crown Quarto Grande"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/main/xmli18n-tmp.h:109
 #, fuzzy
 msgid "ISO A4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 msgid "Large Crown Octavo"
 msgstr "Crown Octavo Grande"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 msgid "Small paperback"
 msgstr "Pequena Brochura"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 msgid "Penguin small paperback"
 msgstr "Pequena Brochura Pinguim"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 msgid "Penguin large paperback"
 msgstr "Grande Brochura Pinguim"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 msgid "Hagaki Card"
-msgstr "Cartão Hagaki"
+msgstr "Cartão Hagaki"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
-msgstr "Cartão Oufuku"
+msgstr "Cartão Oufuku"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
-msgstr "Envelope longo Japonês #3"
+msgstr "Envelope longo Japonês #3"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
-msgstr "Envelope longo Japonês #4"
+msgstr "Envelope longo Japonês #4"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 msgid "Japanese Kaku envelope #4"
-msgstr "Evelope Kaku Japonês #4"
+msgstr "Evelope Kaku Japonês #4"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr "Comercial 10"
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 msgid "A2 Invitation"
 msgstr "Convite A2"
 
-#: src/main/xmli18n-tmp.h:125
+#: src/main/xmli18n-tmp.h:126
 msgid "Monarch Envelope"
 msgstr "Envelope Monarca"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:127
+#: src/main/xmli18n-tmp.h:128
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:130
+#: src/main/xmli18n-tmp.h:131
 #, fuzzy
 msgid "Wide Postcard"
-msgstr "Cartão"
+msgstr "Cartão"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 msgid "Custom"
 msgstr "Personalizado"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
-msgstr "Papel Contínuo 89 mm"
+msgstr "Papel Contínuo 89 mm"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
-msgstr "Papel Contínuo 4 Polegadas"
+msgstr "Papel Contínuo 4 Polegadas"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
-msgstr "Papel Contínuo 5 Polegadas"
+msgstr "Papel Contínuo 5 Polegadas"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
-msgstr "Papel Contínuo 210 mm"
+msgstr "Papel Contínuo 210 mm"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
-msgstr "Papel Contínuo 13 Polegadas"
+msgstr "Papel Contínuo 13 Polegadas"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
-msgstr "Papel Contínuo 22 Polegadas"
+msgstr "Papel Contínuo 22 Polegadas"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
-msgstr "Papel Contínuo 24 Polegadas"
+msgstr "Papel Contínuo 24 Polegadas"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
-msgstr "Papel Contínuo 36 Polegadas"
+msgstr "Papel Contínuo 36 Polegadas"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
-msgstr "Papel Contínuo 44 Polegadas"
+msgstr "Papel Contínuo 44 Polegadas"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:145
+#: src/main/xmli18n-tmp.h:146
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:146
+#: src/main/xmli18n-tmp.h:147
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:147
+#: src/main/xmli18n-tmp.h:148
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/main/xmli18n-tmp.h:149
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:149
+#: src/main/xmli18n-tmp.h:150
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/main/xmli18n-tmp.h:151
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/main/xmli18n-tmp.h:152
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:152
+#: src/main/xmli18n-tmp.h:153
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/main/xmli18n-tmp.h:154
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/main/xmli18n-tmp.h:155
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
+#: src/main/xmli18n-tmp.h:156
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:156
+#: src/main/xmli18n-tmp.h:157
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:157
+#: src/main/xmli18n-tmp.h:158
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:158
+#: src/main/xmli18n-tmp.h:159
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:159
+#: src/main/xmli18n-tmp.h:160
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:160
+#: src/main/xmli18n-tmp.h:161
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:161
+#: src/main/xmli18n-tmp.h:162
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:162
+#: src/main/xmli18n-tmp.h:163
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:163
+#: src/main/xmli18n-tmp.h:164
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:164
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:173
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
-msgid "Canon iP4000"
+#: src/main/xmli18n-tmp.h:181
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:182
+msgid "Canon PIXMA iP3000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:183
+msgid "Canon PIXMA iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:184
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:185
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:186
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:187
+#, fuzzy
+msgid "Canon PIXMA iP4300"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:188
+#, fuzzy
+msgid "Canon PIXMA iP5000"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
+#, fuzzy
+msgid "Canon PIXMA iP6700"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA MP150"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:192
+#, fuzzy
+msgid "Canon PIXMA MP500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:193
+#, fuzzy
+msgid "Canon PIXMA MP700"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA MP730"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:195
+#, fuzzy
+msgid "Canon PIXMA MP750"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA MP760"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA MP770"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA MP780"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
+#, fuzzy
+msgid "Canon PIXMA MP790"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP830"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:201
+msgid "Canon PIXUS iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:202
+msgid "Canon PIXUS iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:203
+msgid "Canon i560"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:204
+msgid "Canon i850"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:205
+msgid "Canon i860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:206
+msgid "Canon i865"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C61"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C62"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:238
+#, fuzzy
+msgid "Epson Stylus C79"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C82"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:245
+#, fuzzy
+msgid "Epson Stylus C87"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "Epson Stylus Photo 1400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "Epson Stylus Photo 1410"
+msgstr "Stylus Photo 810"
+
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:314
+#, fuzzy
+msgid "Epson Stylus Photo R230"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:315
+#, fuzzy
+msgid "Epson Stylus Photo R240"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "Epson Stylus Photo R245"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:317
+#, fuzzy
+msgid "Epson Stylus Photo R260"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Epson Stylus Photo R265"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "Epson Stylus Photo R270"
+msgstr "Stylus Photo 1270"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "Epson Stylus Photo R350"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "Epson Stylus Photo R360"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "Epson Stylus Photo R380"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "Epson Stylus Photo R390"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Epson Stylus Photo RX560"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:335
+#, fuzzy
+msgid "Epson Stylus Photo RX580"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:336
+#, fuzzy
+msgid "Epson Stylus Photo RX590"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:340
+#, fuzzy
+msgid "Epson Stylus Photo RX640"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:353
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:372
+#, fuzzy
+msgid "Epson Stylus CX5000"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:373
+#, fuzzy
+msgid "Epson Stylus CX5000F"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:380
+#, fuzzy
+msgid "Epson Stylus CX6000"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX7000F"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:397
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:399
+msgid "Epson PictureMate Flash"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:400
+msgid "Epson PictureMate Pal"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:401
+msgid "Epson PictureMate Snap"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:402
+#, fuzzy
+msgid "Epson PictureMate 200"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:403
+#, fuzzy
+msgid "Epson PictureMate 210"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:404
+#, fuzzy
+msgid "Epson PictureMate 240"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:405
+#, fuzzy
+msgid "Epson PictureMate 250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson PictureMate 280"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:411
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:414
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:417
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:426
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:427
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:428
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:429
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:430
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:448
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:451
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:454
+#, fuzzy
+msgid "Epson PM A820"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:456
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:459
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:460
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:462
+#, fuzzy
+msgid "Epson PM D870"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:463
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:464
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:465
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:467
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:468
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
+#, fuzzy
+msgid "Epson PM G850"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:470
+#, fuzzy
+msgid "Epson PM G4500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:471
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:472
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:473
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:474
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:475
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:478
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:549
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:550
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:551
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:552
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definir nova Impressora"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:802
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Nome da Impressora:"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+msgid "Lexmark Optra E220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:913
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Configurar a Impressora"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:924
+msgid "Xerox WorkCentre M118"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:926
+msgid "Lexmark X73"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+msgid "Olympus P-S100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:942
+msgid "Canon CP-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:943
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:953
+msgid "Sony DPP-EX5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:957
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:960
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Inch"
 msgstr "Polegada"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
 msgstr "Definir como base das unidades de medida a polegada"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
-msgstr "Definir como base das unidades de medida o centímetro"
+msgstr "Definir como base das unidades de medida o centímetro"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Points"
 msgstr "Imprimir"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Definir como base das unidades de medida a polegada"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
-msgstr "Definir como base das unidades de medida o centímetro"
+msgstr "Definir como base das unidades de medida o centímetro"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Definir como base das unidades de medida a polegada"
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color output"
 msgstr "Ouput de cor"
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
 msgstr "Imprimir em sombras de cinzento usando tinta preta"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 #, fuzzy
 msgid "Standard Command"
 msgstr "Standard"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Custom Command"
 msgstr "Comando:"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
 msgstr "Ficheiro"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Print to a file"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 #, fuzzy
 msgid "Set Default"
-msgstr "Definir Valores Padrão"
+msgstr "Definir Valores Padrão"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Imprimir v%s"
 
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
 msgstr "Acerca"
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 msgid ""
 "Print and\n"
 "Save Settings"
 msgstr ""
 "Imprimir e\n"
-"Gravar Definições"
+"Gravar Definições"
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 msgid ""
 "Save\n"
 "Settings"
-msgstr "Gravar Definições"
+msgstr "Gravar Definições"
 
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6369,403 +6507,359 @@ msgid ""
 "If you click another button while dragging the mouse, the image will return "
 "to its original position."
 msgstr ""
-"Posição a imagem na página.\n"
-"Clique e arraste com o botão primário para a posição da imagem.\n"
-"Clique e arraste com o segundo botão para mover a imagem com maior "
-"precisão;\n"
+"Posição a imagem na página.\n"
+"Clique e arraste com o botão primário para a posição da imagem.\n"
+"Clique e arraste com o segundo botão para mover a imagem com maior "
+"precisão;\n"
 "cada unidade de movimento move a imagem um ponto (1/72\")\n"
-"Clique e arraste com o terceiro botão (o do meio) para mover a imagem em "
+"Clique e arraste com o terceiro botão (o do meio) para mover a imagem em "
 "unidades\n"
 "de tamanho da imagem.\n"
 "Mantendo pressionado a tecla shift enquanto se clica e arrasta, restringe o "
 "movimento\n"
 "ao eixo horizontal e vertical.\n"
-"Se clicar noutro botão enquanto arrasta com o rato, a imagem vai voltar à "
+"Se clicar noutro botão enquanto arrasta com o rato, a imagem vai voltar à "
 "sua\n"
-"posição original."
+"posição original."
 
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 #, fuzzy
 msgid "Paper Size"
 msgstr "Tamanho"
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
-msgstr "Dimensões:"
+msgstr "Dimensões:"
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
 msgstr "Largura:"
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 msgid "Width of the paper that you wish to print to"
 msgstr "Largura do papel para o qual deseja imprimir"
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
 msgstr "Altura"
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 msgid "Height of the paper that you wish to print to"
 msgstr "Altura do papel para o qual deseja imprimir"
 
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Tamanho"
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 #, fuzzy
 msgid "Image Position"
-msgstr "Posição"
+msgstr "Posição"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
 msgstr "Retrato"
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
 msgstr "Paisagem"
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 msgid "Upside down"
-msgstr "De cabeça para baixo"
+msgstr "De cabeça para baixo"
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
-msgstr "Paisagem de cabeça para baixo"
+msgstr "Paisagem de cabeça para baixo"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
-"Seleccione a orientação: retrato, paisagem, cabeça para baixo, ou paisagem "
-"de cabeça para baixo"
+"Seleccione a orientação: retrato, paisagem, cabeça para baixo, ou paisagem "
+"de cabeça para baixo"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 msgid "Orientation:"
-msgstr "Orientação:"
+msgstr "Orientação:"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
 msgstr "Esquerda:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
-msgstr "Distância da esquerda do papel até à imagem"
+msgstr "Distância da esquerda do papel até à imagem"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
 msgstr "Direita:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 msgid "Distance from the left of the paper to the right of the image"
-msgstr "Distência da esquerda do papel até à direita da imagem"
+msgstr "Distência da esquerda do papel até à direita da imagem"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
-msgstr "Distância da direita do papel até à imagem"
+msgstr "Distância da direita do papel até à imagem"
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
 msgstr "Topo:"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
-msgstr "Distência do topo do papel até à imagem"
+msgstr "Distência do topo do papel até à imagem"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
 msgstr "Fundo:"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
-msgstr "Distância do topo do papel até ao fundo da imagem"
+msgstr "Distância do topo do papel até ao fundo da imagem"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
-msgstr "Distância do fundo do papel até à imagem"
+msgstr "Distância do fundo do papel até à imagem"
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Center:"
 msgstr "Centro:"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horizontalmente"
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
 msgstr "Centrar a imagem horizontalmente no papel"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
 msgstr "Ambos"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image on the paper"
 msgstr "Centrar a imagem no papel"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 #, fuzzy
 msgid "Vertical"
 msgstr "Verticalmente"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Center the image vertically on the paper"
 msgstr "Centrar a imagem verticalmente no papel"
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
 msgstr "Configurar a Impressora"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Nome da Impressora:"
 
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Seleccione o seu modelo de impressora"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 msgid "Printer Model:"
 msgstr "Modelo da Impressora:"
 
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 msgid "Select your printer model"
 msgstr "Seleccione o seu modelo de impressora"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 msgid "PPD File:"
 msgstr "Ficheiro PPD:"
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Insira o ficheiro PPD correct para a sua impressora"
 
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Seleccione o ficheiro PPD correcto para a sua impressora"
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr ""
-"Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n"
+"Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n"
 "a qual deseja imprimir"
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Nome da Impressora:"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Insira o ficheiro PPD correct para a sua impressora"
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 #, fuzzy
 msgid "File to print to"
-msgstr "impressão de teste"
+msgstr "impressão de teste"
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 #, fuzzy
 msgid "Print To File"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 msgid "Define New Printer"
 msgstr "Definir nova Impressora"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 msgid "Printer Name:"
 msgstr "Nome da Impressora:"
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 msgid "Enter the name you wish to give this logical printer"
-msgstr "Insira o noma que deseja dar a esta impressora lógica"
+msgstr "Insira o noma que deseja dar a esta impressora lógica"
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Acerca do Gimp-Print "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 #, fuzzy
 msgid "Gutenprint Version "
-msgstr "Versão do Gimp-Print "
+msgstr "Versão do Gimp-Print "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
-"\n"
-"\n"
-"Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gimp-Print Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 msgid "Printer Settings"
-msgstr "Definições da Impressora"
+msgstr "Definições da Impressora"
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 msgstr ""
-"Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n"
+"Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n"
 "a qual deseja imprimir"
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 msgid "Setup Printer..."
 msgstr "Configurar Impressora..."
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
-"Escolha o modelo da impressora, ficheiro PPD, e comando que é usado para "
+"Escolha o modelo da impressora, ficheiro PPD, e comando que é usado para "
 "imprimir\n"
 "para esta impressora"
 
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 msgid "New Printer..."
 msgstr "Nova Impressora..."
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr ""
-"Definir uma nova impressora lógica. Isto pode ser usado para denominar uma "
-"colecção de definições que você deseje guardar para uso futuro"
+"Definir uma nova impressora lógica. Isto pode ser usado para denominar uma "
+"colecção de definições que você deseje guardar para uso futuro"
 
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 #, fuzzy
 msgid "Image Size"
 msgstr "Tamanho"
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 msgid "Scaling:"
 msgstr "Redimesionamento:"
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 msgid "Set the scale (size) of the image"
 msgstr "Definir a escala (tamanho) da imagem"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
-"Seleccione se a escala é medida em percentagem do tamanho de página "
-"disponível ou número de pontos por polegada na impressão"
+"Seleccione se a escala é medida em percentagem do tamanho de página "
+"disponível ou número de pontos por polegada na impressão"
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
 msgstr "Precentagem"
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 msgid "Scale the print to the size of the page"
-msgstr "Redimensionar a impressão para o tamanho da página"
+msgstr "Redimensionar a impressão para o tamanho da página"
 
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
-msgstr "Redimensionar a impressão para o número de pontos por polegada"
+msgstr "Redimensionar a impressão para o número de pontos por polegada"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 msgid "Set the width of the print"
-msgstr "Definir a largura da impressão"
+msgstr "Definir a largura da impressão"
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 msgid "Set the height of the print"
-msgstr "Definir a altura da impressão"
+msgstr "Definir a altura da impressão"
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6773,107 +6867,107 @@ msgstr ""
 "Usar Original\n"
 "Tamanho de Imagem"
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the print size to the size of the image"
-msgstr "Definir como tamanho de impressão o tamanho da imagem"
+msgstr "Definir como tamanho de impressão o tamanho da imagem"
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 msgid "Print Color Adjust"
-msgstr "Ajustamento da Cor de Impressão"
+msgstr "Ajustamento da Cor de Impressão"
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 msgid "Set Defaults"
-msgstr "Definir Valores Padrão"
+msgstr "Definir Valores Padrão"
 
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 msgid "Image preview"
-msgstr "Previsualização da Imagem"
+msgstr "Previsualização da Imagem"
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 #, fuzzy
 msgid "Output"
 msgstr "Tipo de Output:"
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 msgid "Output Type:"
 msgstr "Tipo de Output:"
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 msgid "Select the desired output type"
 msgstr "Seleccione o tipo de output desejado"
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
 msgstr "Ajustar o Output..."
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
-"Ajustar equilíbrio de cor, brilho, contraste, saturação e algoritmo de "
+"Ajustar equilíbrio de cor, brilho, contraste, saturação e algoritmo de "
 "\"dither\""
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 #, fuzzy
 msgid "Size Units:"
 msgstr "Unidades:"
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 msgid "Units:"
 msgstr "Unidades:"
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 msgid "Select the base unit of measurement for printing"
-msgstr "Seleccione a base das unidades de medida para impressão"
+msgstr "Seleccione a base das unidades de medida para impressão"
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
 msgstr ""
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
 msgstr ""
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
 msgstr ""
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 #, fuzzy
 msgid "Printer"
 msgstr "Imprimir"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Configurar a Impressora"
@@ -6923,85 +7017,96 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:133
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Printer Features"
-msgstr "Definições da Impressora"
+msgstr "Definições da Impressora"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 #, fuzzy
 msgid "Output Control"
 msgstr "Tipo de Output:"
 
-#: src/cups/genppd.c:139
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Common"
 msgstr "Comando:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:153
 #, fuzzy
 msgid "Extra 1"
 msgstr "Tabuleiro 1"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Extra 2"
 msgstr "Tabuleiro 2"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Extra 3"
 msgstr "Tabuleiro 3"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:156
 #, fuzzy
 msgid "Extra 4"
 msgstr "Tabuleiro 4"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr "Portuguese"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1465
+#: src/cups/genppd.c:1613
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1717
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1719
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1497
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1756
 msgid "Fine Adjustment"
 msgstr ""
 
 #: src/escputil/escputil.c:70
 msgid "Escputil version "
-msgstr "Versão de Escputil"
-
-#: src/escputil/escputil.c:71
-#, fuzzy
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-"Copyright (C) 2000-2001 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
+msgstr "Versão de Escputil"
 
 #: src/escputil/escputil.c:76
 #, fuzzy
@@ -7084,9 +7189,9 @@ msgid ""
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
-"Utilização: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"Utilização: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
 "                    [-P printer | -r device] [-u] [-q] [-m model]\n"
-"Realiza manutenção em impressoras EPSON Styles (R).\n"
+"Realiza manutenção em impressoras EPSON Styles (R).\n"
 "Exemplos: escputil --clean-head --printer stpex-on-third-floor\n"
 "          escputil --ink-level --new --raw-device /dev/lp0\n"
 "\n"
@@ -7112,7 +7217,7 @@ msgstr ""
 "    -l|--license       Display the license/warranty terms of this program.\n"
 "    -M|--list-models   List the available printer models.\n"
 "    -h|--help          Print this help message.\n"
-"  Opções:\n"
+"  Opções:\n"
 "    -P|--printer-name  Specify the name of the printer queue to operate on.\n"
 "                       Default is the default system printer.\n"
 "    -r|--raw-device    Specify the name of the device to write to directly\n"
@@ -7167,10 +7272,10 @@ msgid ""
 "    -C Specify the number of pattern choices for alignment\n"
 "    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
-"Utilização: escputil [OPTIONS] [COMMAND]\n"
-"Utilização: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"Utilização: escputil [OPTIONS] [COMMAND]\n"
+"Utilização: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
 "                     [-P printer | -r device] [-u] [-q] [-m model]\n"
-"Realiza manutenção em impressoras EPSON Stylus (R).\n"
+"Realiza manutenção em impressoras EPSON Stylus (R).\n"
 "Exemplos: escputil -c -P stpex-on-third-floor\n"
 "          escputil -i -u -r /dev/lp0\n"
 "\n"
@@ -7206,12 +7311,12 @@ msgstr ""
 #: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
-msgstr "Você só pode especificar uma impresoora ou dispositivo"
+msgstr "Você só pode especificar uma impresoora ou dispositivo"
 
 #: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
-msgstr "Você só pode especificar um modelo de impressora"
+msgstr "Você só pode especificar um modelo de impressora"
 
 #: src/escputil/escputil.c:369
 #, c-format
@@ -7226,7 +7331,7 @@ msgstr ""
 #: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
-msgstr "Opção desconhecida %c\n"
+msgstr "Opção desconhecida %c\n"
 
 #: src/escputil/escputil.c:389
 #, c-format
@@ -7246,17 +7351,17 @@ msgstr ""
 #: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
-msgstr "Não foi possível abrir o dispositivo %s: %s\n"
+msgstr "Não foi possível abrir o dispositivo %s: %s\n"
 
 #: src/escputil/escputil.c:482
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
-msgstr "Não é possível imprimir para impressora %s com %s\n"
+msgstr "Não é possível imprimir para impressora %s com %s\n"
 
 #: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
-msgstr "Não foi possível enviar comando para a impressora\n"
+msgstr "Não foi possível enviar comando para a impressora\n"
 
 #: src/escputil/escputil.c:568
 #, c-format
@@ -7266,22 +7371,22 @@ msgstr ""
 #: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
-msgstr "Não é possível ler a partir de %s: %s\n"
+msgstr "Não é possível ler a partir de %s: %s\n"
 
 #: src/escputil/escputil.c:747
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
-msgstr "Status da impressora requere a utilização de um dipositivo.\n"
+msgstr "Status da impressora requere a utilização de um dipositivo.\n"
 
 #: src/escputil/escputil.c:754
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
-msgstr "Não foi possível abrir %s escrita/leitura: %s\n"
+msgstr "Não foi possível abrir %s escrita/leitura: %s\n"
 
 #: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
 #, c-format
 msgid "Cannot write to %s: %s\n"
-msgstr "Não foi possível escrever para %s: %s\n"
+msgstr "Não foi possível escrever para %s: %s\n"
 
 #: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
 #: src/escputil/escputil.c:1511
@@ -7291,7 +7396,7 @@ msgid ""
 "Cannot write to %s: %s\n"
 msgstr ""
 "\n"
-"Não foi possível escrever para %s: %s\n"
+"Não foi possível escrever para %s: %s\n"
 
 #: src/escputil/escputil.c:885
 #, c-format
@@ -7301,8 +7406,8 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 "\n"
-"Não foi possível detecar o tipo de impressora.\n"
-"Por favor use a opção -m para especificar o modelo da sua impressora.\n"
+"Não foi possível detecar o tipo de impressora.\n"
+"Por favor use a opção -m para especificar o modelo da sua impressora.\n"
 
 #: src/escputil/escputil.c:983 src/escputil/escputil.c:989
 #: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
@@ -7332,7 +7437,7 @@ msgstr ""
 #: src/escputil/escputil.c:1036
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
-msgstr "Saturação:"
+msgstr "Saturação:"
 
 #: src/escputil/escputil.c:1039
 #, c-format
@@ -7484,12 +7589,12 @@ msgstr ""
 #: src/escputil/escputil.c:1355
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Obter níveis de tinta requere a utilização de um dipositivo.\n"
+msgstr "Obter níveis de tinta requere a utilização de um dipositivo.\n"
 
 #: src/escputil/escputil.c:1461
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Obter níveis de tinta requere a utilização de um dipositivo.\n"
+msgstr "Obter níveis de tinta requere a utilização de um dipositivo.\n"
 
 #: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
 #: src/escputil/escputil.c:1646
@@ -7504,17 +7609,17 @@ msgstr ""
 #: src/escputil/escputil.c:1675
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
-msgstr "Identificação da impressora requere a utilização de um dispositivo.\n"
+msgstr "Identificação da impressora requere a utilização de um dispositivo.\n"
 
 #: src/escputil/escputil.c:1693
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
-msgstr "Você só pode especificar um modelo de impressora"
+msgstr "Você só pode especificar um modelo de impressora"
 
 #: src/escputil/escputil.c:1713
 #, c-format
 msgid "Cleaning heads...\n"
-msgstr "Limpando as cabeças...\n"
+msgstr "Limpando as cabeças...\n"
 
 #: src/escputil/escputil.c:1728
 #, c-format
@@ -7560,50 +7665,50 @@ msgid ""
 "It is essential that you not turn your printer off during this procedure.\n"
 "\n"
 msgstr ""
-"Por favor leia estas intruções muito cuidadosamente antes de prosseguir.\n"
+"Por favor leia estas intruções muito cuidadosamente antes de prosseguir.\n"
 "\n"
-"Este programa permite alinhas a cabeça de impressão da sua impressora a "
+"Este programa permite alinhas a cabeça de impressão da sua impressora a "
 "jacto\n"
-"de tinta Epson Stylus. A má utilização do programa pode provocar degradação "
+"de tinta Epson Stylus. A má utilização do programa pode provocar degradação "
 "da\n"
-"qualidade de impressão, ou mesmo danificar a sua impressora. Este programa "
-"não foi revisto\n"
-"pela Seiko Epson para verificação, e não oferece qualquer tipo de garantia. "
+"qualidade de impressão, ou mesmo danificar a sua impressora. Este programa "
+"não foi revisto\n"
+"pela Seiko Epson para verificação, e não oferece qualquer tipo de garantia. "
 "O risco\n"
-"involvido na sua utilização recai totalmente sobre si.\n"
+"involvido na sua utilização recai totalmente sobre si.\n"
 "\n"
-"Este programa imprime %d padrões de teste. Cada parão parece muito "
+"Este programa imprime %d padrões de teste. Cada parão parece muito "
 "semelhante.\n"
-"O padrão consiste num série de pares de linhas verticais que sobrepõem.\n"
-"Debaixo de cada par de linhas está um número entre %d e %d.\n"
+"O padrão consiste num série de pares de linhas verticais que sobrepõem.\n"
+"Debaixo de cada par de linhas está um número entre %d e %d.\n"
 "\n"
-"Quando você inpeccionar o par de linhas, deve procurar o par de linhas\n"
-"qye está melhor alinhado, isto é, que melhor forma uma única linha vertcal.\n"
+"Quando você inpeccionar o par de linhas, deve procurar o par de linhas\n"
+"qye está melhor alinhado, isto é, que melhor forma uma única linha vertcal.\n"
 "Inpeccione os pares cuidadosamente para procurar o melhor resultado. O uso\n"
-"de uma lupa é recomendado para as inspecções mais críticas.\n"
-"Tamebém é recomendado que utilize papel de boa qualidade para o teste, para\n"
-"que as linhas fiquem bem formadas e não se espalhem pelo papel.\n"
-"Após descobrir o número que corresponde ao melhor par, coloque o papel de "
+"de uma lupa é recomendado para as inspecções mais críticas.\n"
+"Tamebém é recomendado que utilize papel de boa qualidade para o teste, para\n"
+"que as linhas fiquem bem formadas e não se espalhem pelo papel.\n"
+"Após descobrir o número que corresponde ao melhor par, coloque o papel de "
 "volta\n"
 "no alimentador de papel antes de o teclar.\n"
 "\n"
-"Cada padrão é similar, mas os últimos padrões usam pontos mais finos para "
+"Cada padrão é similar, mas os últimos padrões usam pontos mais finos para "
 "alinhamentos\n"
-"mais críticos. Deve correr todas as passagens para alinhar correctamente a "
+"mais críticos. Deve correr todas as passagens para alinhar correctamente a "
 "sua\n"
-"impressora. Após correr todas as passagens de alinhamento, os padrões de "
+"impressora. Após correr todas as passagens de alinhamento, os padrões de "
 "alinhamento\n"
-"serão imprimidos mais uma vez. Você deve verificar que o par do meio (#%d em "
-"%d) é\n"
-"o melhor de todos os padrões.\n"
+"serão imprimidos mais uma vez. Você deve verificar que o par do meio (#%d em "
+"%d) é\n"
+"o melhor de todos os padrões.\n"
 "\n"
-"Após as passagens serem imprimidas mais ima vez, vão dar-lhe a opção\n"
+"Após as passagens serem imprimidas mais ima vez, vão dar-lhe a opção\n"
 "de gravar as escolhas na impressora, repetir o processo, ou sair sem "
 "gravar.\n"
-"Sair não vai restaurar as definições anteriores, mas desligar aimpressora e\n"
+"Sair não vai restaurar as definições anteriores, mas desligar aimpressora e\n"
 "voltar a ligar vai. Se sair deve repetir o processo inteiro se desejar "
 "gravar\n"
-"os resultados. É essencial que você não desligue a impressora durante este "
+"os resultados. É essencial que você não desligue a impressora durante este "
 "procedimento.\n"
 "\n"
 
@@ -7642,50 +7747,50 @@ msgid ""
 "this procedure.\n"
 "\n"
 msgstr ""
-"Por favor leia estas intrucções muito cuidadosamente antes de prosseguir.\n"
+"Por favor leia estas intrucções muito cuidadosamente antes de prosseguir.\n"
 "\n"
-"Este programa permite alinhas a cabeça de impressão da sua impressora a "
+"Este programa permite alinhas a cabeça de impressão da sua impressora a "
 "jacto\n"
-"de tinta Epson Stylus. A má utilização do programa pode provocar degradação "
+"de tinta Epson Stylus. A má utilização do programa pode provocar degradação "
 "da\n"
-"qualidade de impressão, ou mesmo danificar a sua impressora. Este programa "
-"não foi revisto\n"
-"pela Seiko Epson para verificação, e não oferece qualquer tipo de garantia. "
+"qualidade de impressão, ou mesmo danificar a sua impressora. Este programa "
+"não foi revisto\n"
+"pela Seiko Epson para verificação, e não oferece qualquer tipo de garantia. "
 "O risco\n"
-"involvido na sua utilização recai totalmente sobre si.\n"
+"involvido na sua utilização recai totalmente sobre si.\n"
 "\n"
-"Este programa imprime um padrao que consiste num série de pares de linhas "
-"verticais que sobrepõem.\n"
-"Debaixo de cada par de linhas está um número entre %d e %d.\n"
+"Este programa imprime um padrao que consiste num série de pares de linhas "
+"verticais que sobrepõem.\n"
+"Debaixo de cada par de linhas está um número entre %d e %d.\n"
 "\n"
-"Quando você inpeccionar o par de linhas, deve procurar o par de linhas\n"
-"qye está melhor alinhado, isto é, que melhor forma uma única linha vertcal.\n"
+"Quando você inpeccionar o par de linhas, deve procurar o par de linhas\n"
+"qye está melhor alinhado, isto é, que melhor forma uma única linha vertcal.\n"
 "Inpeccione os pares cuidadosamente para procurar o melhor resultado. O uso\n"
-"de uma lupa é recomendado para as inspecções mais críticas.\n"
-"Tamebém é recomendado que utilize papel de boa qualidade para o teste, para\n"
-"que as linhas fiquem bem formadas e não se espalhem pelo papel.\n"
-"Após descobrir o número que corresponde ao melhor par, coloque o papel de "
+"de uma lupa é recomendado para as inspecções mais críticas.\n"
+"Tamebém é recomendado que utilize papel de boa qualidade para o teste, para\n"
+"que as linhas fiquem bem formadas e não se espalhem pelo papel.\n"
+"Após descobrir o número que corresponde ao melhor par, coloque o papel de "
 "volta\n"
 "no alimentador de papel antes de o teclar.\n"
 "\n"
-"Após correr todas as passagens de alinhamento, os padrões de alinhamento\n"
-"serão imprimidos mais uma vez. Você deve verificar que o par do meio (#%d em "
-"%d) é\n"
-"o melhor de todos os padrões.\n"
+"Após correr todas as passagens de alinhamento, os padrões de alinhamento\n"
+"serão imprimidos mais uma vez. Você deve verificar que o par do meio (#%d em "
+"%d) é\n"
+"o melhor de todos os padrões.\n"
 "\n"
-"Agora ser-lhe-á dada a opção de gravar as escolhas na impressora, repetir o "
+"Agora ser-lhe-á dada a opção de gravar as escolhas na impressora, repetir o "
 "processo,\n"
-"ou sair sem gravar. Sair não vai restaurar as definições anteriores, mas "
+"ou sair sem gravar. Sair não vai restaurar as definições anteriores, mas "
 "desligar a\n"
 "impressora e voltar a ligar vai. Se sair deve repetir o processo inteiro se "
 "desejar gravar\n"
-"os resultados. É essencial que você não desligue a impressora durante este "
+"os resultados. É essencial que você não desligue a impressora durante este "
 "procedimento.\n"
 
 #: src/escputil/escputil.c:1811
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
-msgstr "Não foi possível enviar o comando para a impressora, saindo.\n"
+msgstr "Não foi possível enviar o comando para a impressora, saindo.\n"
 
 #: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
 #, c-format
@@ -7704,12 +7809,12 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 "Por favor inspeccione o output final muito cuidadosamente para se assegurar\n"
-"que a sua impressora tem um alinhamento correcto. Você pode agora:\n"
+"que a sua impressora tem um alinhamento correcto. Você pode agora:\n"
 "  (s) gravar os resultados na impressora,\n"
 "  (q) sair sem gravar os resultados, ou\n"
-"  (r) repetir o processo inteiro desde o início.\n"
+"  (r) repetir o processo inteiro desde o início.\n"
 "Vai-lhe ser pedido para confirmar a sua escolha.\n"
-"O que é que pretende fazer (s, q, r)?\n"
+"O que é que pretende fazer (s, q, r)?\n"
 
 #: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
 #: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
@@ -7730,8 +7835,8 @@ msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
-"A sua impressora está alinhada, mas o alinhamento não foi gravado.\n"
-"Se deseja gravar o alinhamento, terá de repetir o processo.\n"
+"A sua impressora está alinhada, mas o alinhamento não foi gravado.\n"
+"Se deseja gravar o alinhamento, terá de repetir o processo.\n"
 
 #: src/escputil/escputil.c:1857
 #, c-format
@@ -7756,16 +7861,16 @@ msgid ""
 "Please confirm by typing 's' again that you wish to save the settings\n"
 "to your printer:\n"
 msgstr ""
-"Isto vai alterar permanentemente a configuração da sua impressora.\n"
-"AVISO: este procedimento não foi aprovado pela Seiko Epson, e pode\n"
+"Isto vai alterar permanentemente a configuração da sua impressora.\n"
+"AVISO: este procedimento não foi aprovado pela Seiko Epson, e pode\n"
 "danificar a sua impressora. Prosseguir?\n"
-"Por favor confirme, carregando em 's' outra vez, que você deseja gravar\n"
-"as configurações para a sua impressora:\n"
+"Por favor confirme, carregando em 's' outra vez, que você deseja gravar\n"
+"as configurações para a sua impressora:\n"
 
 #: src/escputil/escputil.c:1883
 #, c-format
 msgid "About to save settings..."
-msgstr "Prestes a gravar as configurações..."
+msgstr "Prestes a gravar as configurações..."
 
 #: src/escputil/escputil.c:1889
 #, c-format
@@ -7778,7 +7883,7 @@ msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
-"A suas configurações não foram gravados com sucesso.\n"
+"A suas configurações não foram gravados com sucesso.\n"
 "Vai ter de repetir o processo de alinhamento.\n"
 
 #: src/escputil/escputil.c:1894
@@ -7790,7 +7895,7 @@ msgstr "sucesso!\n"
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
-"As suas configurações do alinhamento foram gravadas para a impressora.\n"
+"As suas configurações do alinhamento foram gravadas para a impressora.\n"
 
 #: src/escputil/escputil.c:1900
 #, c-format
@@ -7800,7 +7905,7 @@ msgstr "Comando desconhecido.\n"
 #: src/escputil/escputil.c:1903
 #, c-format
 msgid "Final command was not confirmed.\n"
-msgstr "O comando final não foi confirmado.\n"
+msgstr "O comando final não foi confirmado.\n"
 
 #: src/escputil/escputil.c:1908
 #, c-format
@@ -7812,12 +7917,12 @@ msgid ""
 "Please place a sheet of paper in your printer to begin the head\n"
 "alignment procedure.\n"
 msgstr ""
-"Este procedimento assume que a sua impressora é uma Epson %s.\n"
-"Se este não é o seu modelo de impressora, por favor carregue em control-C\n"
+"Este procedimento assume que a sua impressora é uma Epson %s.\n"
+"Se este não é o seu modelo de impressora, por favor carregue em control-C\n"
 "agora e escolha o seu modelo de impressora.\n"
 "\n"
 "Por favor coloque uma folha de papel na impressora para iniciar\n"
-"o processo de alinhamento da cabeça.\n"
+"o processo de alinhamento da cabeça.\n"
 
 #: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
 #: src/escputil/escputil.c:2047
@@ -7831,8 +7936,8 @@ msgid ""
 "pattern.\n"
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
-"Por favor inspeccione a impressão, e escolha o melhor par de linhas em cada "
-"padrão.\n"
+"Por favor inspeccione a impressão, e escolha o melhor par de linhas em cada "
+"padrão.\n"
 "Insira um par, '?' para ajuda, ou 'r' para repetir o procedimento.\n"
 
 #: src/escputil/escputil.c:1993
@@ -7848,12 +7953,12 @@ msgstr "Por favor insira uma nova folha de papel.\n"
 #: src/escputil/escputil.c:2020
 #, c-format
 msgid "Number out of range!\n"
-msgstr "Número fora do intervalo|\n"
+msgstr "Número fora do intervalo|\n"
 
 #: src/escputil/escputil.c:2025
 #, c-format
 msgid "I cannot understand what you typed!\n"
-msgstr "Eu não consigo intender o que escreveu!\n"
+msgstr "Eu não consigo intender o que escreveu!\n"
 
 #: src/escputil/escputil.c:2031
 #, c-format
@@ -7878,12 +7983,12 @@ msgid ""
 "pattern %d.  If it is not, you should repeat the process to get the best\n"
 "quality printing.\n"
 msgstr ""
-"Por favor verifique que o alinhamento é correcto. Após padrão de "
+"Por favor verifique que o alinhamento é correcto. Após padrão de "
 "alinhamento\n"
-"ser impresso outra vez, por favor certifique-se qye o melhor padrão para "
+"ser impresso outra vez, por favor certifique-se qye o melhor padrão para "
 "cada linha\n"
-"é o padrão %d. Se não é, você deve repetir o processo para obter a melhor\n"
-"qualidade de impressão.\n"
+"é o padrão %d. Se não é, você deve repetir o processo para obter a melhor\n"
+"qualidade de impressão.\n"
 
 #: src/escputil/escputil.c:2088
 #, c-format
@@ -7913,7 +8018,7 @@ msgstr ""
 #: src/ghost/ijsgutenprint.c:191
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
-msgstr "Espaço de cor inválido: bps %d channels %d space %s\n"
+msgstr "Espaço de cor inválido: bps %d channels %d space %s\n"
 
 #: src/ghost/ijsgutenprint.c:199
 #, fuzzy, c-format
@@ -7924,7 +8029,7 @@ msgstr "Sem buffer de linha\n"
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
-msgstr "Não foi possível procesar parâmetro %s=%s (número esperado)\n"
+msgstr "Não foi possível procesar parâmetro %s=%s (número esperado)\n"
 
 #: src/ghost/ijsgutenprint.c:498
 #, fuzzy, c-format
@@ -7934,7 +8039,7 @@ msgstr "Impressora deve ser especificada com -sModelo\n"
 #: src/ghost/ijsgutenprint.c:500
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
-msgstr "Impressora %s não é um modelo conhecido\n"
+msgstr "Impressora %s não é um modelo conhecido\n"
 
 #: src/ghost/ijsgutenprint.c:656
 #, c-format
@@ -7944,37 +8049,37 @@ msgstr ""
 #: src/ghost/ijsgutenprint.c:700
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
-msgstr "Não é possível imprimir para impressora %s com %s\n"
+msgstr "Não é possível imprimir para impressora %s com %s\n"
 
 #: src/ghost/ijsgutenprint.c:723
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
-msgstr "Não é possível imprimir para impressora %s com %s\n"
+msgstr "Não é possível imprimir para impressora %s com %s\n"
 
 #: src/ghost/ijsgutenprint.c:795
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
-msgstr "Não é possível imprimir para impressora %s com %s\n"
+msgstr "Não é possível imprimir para impressora %s com %s\n"
 
 #: src/ghost/ijsgutenprint.c:802
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
-msgstr "Não é possível imprimir para impressora %s com %s\n"
+msgstr "Não é possível imprimir para impressora %s com %s\n"
 
 #: src/ghost/ijsgutenprint.c:809
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
-msgstr "Não é possível imprimir para impressora %s com %s\n"
+msgstr "Não é possível imprimir para impressora %s com %s\n"
 
 #: src/ghost/ijsgutenprint.c:816
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
-msgstr "Não é possível imprimir para impressora %s com %s\n"
+msgstr "Não é possível imprimir para impressora %s com %s\n"
 
 #: src/ghost/ijsgutenprint.c:830
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
-msgstr "Não é possível imprimir para impressora %s com %s\n"
+msgstr "Não é possível imprimir para impressora %s com %s\n"
 
 #: src/ghost/ijsgutenprint.c:841
 #, fuzzy, c-format
@@ -7984,7 +8089,7 @@ msgstr "Impressora desconhecida %s\n"
 #: src/ghost/ijsgutenprint.c:867
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
-msgstr "Obtenção da próxima linha falhou em %.0f\n"
+msgstr "Obtenção da próxima linha falhou em %.0f\n"
 
 #: src/ghost/ijsgutenprint.c:1308
 #, fuzzy, c-format
@@ -7994,12 +8099,12 @@ msgstr "image_init falhou %d\n"
 #: src/ghost/ijsgutenprint.c:1319
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-msgstr "Não foi possível abrir \"file descriptor\": %s\n"
+msgstr "Não foi possível abrir \"file descriptor\": %s\n"
 
 #: src/ghost/ijsgutenprint.c:1331
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-msgstr "Não foi possível abrir %s: %s\n"
+msgstr "Não foi possível abrir %s: %s\n"
 
 #: src/ghost/ijsgutenprint.c:1344
 #, fuzzy, c-format
@@ -8009,16 +8114,255 @@ msgstr "Impressora desconhecida %s\n"
 #: src/ghost/ijsgutenprint.c:1516
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-msgstr "Parâmetros inválidos; não é possível continuar|\n"
+msgstr "Parâmetros inválidos; não é possível continuar|\n"
 
 #: src/ghost/ijsgutenprint.c:1534
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
-msgstr "Obtenção da próxima linha falhou em %.0f\n"
+msgstr "Obtenção da próxima linha falhou em %.0f\n"
+
+#, fuzzy
+#~ msgid "Model Name"
+#~ msgstr "Cancelar"
+
+#, fuzzy
+#~ msgid "Cassette"
+#~ msgstr "Papel Mate"
+
+#, fuzzy
+#~ msgid " Gamma"
+#~ msgstr "Gama:"
+
+#, fuzzy
+#~ msgid " Curve"
+#~ msgstr "Preto"
+
+#, fuzzy
+#~ msgid "1440 x 1440"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI High Quality"
+#~ msgstr "1440 x 360 DPI Máxima Qualidade"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI Highest Quality"
+#~ msgstr "1440 x 360 DPI Máxima Qualidade"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI High Quality"
+#~ msgstr "1440 x 360 DPI Máxima Qualidade"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI Highest Quality"
+#~ msgstr "1440 x 360 DPI Máxima Qualidade"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "and the rest of the Gutenprint Development Team.\n"
+#~ "\n"
+#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n"
+#~ "and the rest of the Gimp-Print Development Team.\n"
+#~ "\n"
+#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
+
+#, fuzzy
+#~ msgid ""
+#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
+#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
+#~ "l'\n"
+#~ "This is free software, and you are welcome to redistribute it\n"
+#~ "under certain conditions; type 'escputil -l' for details.\n"
+#~ msgstr ""
+#~ "Copyright (C) 2000-2001 Robert Krawitz\n"
+#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
+#~ "l'\n"
+#~ "This is free software, and you are welcome to redistribute it\n"
+#~ "under certain conditions; type 'escputil -l' for details.\n"
+
+#, fuzzy
+#~ msgid "90x90 DPI"
+#~ msgstr "600 DPI"
+
+#, fuzzy
+#~ msgid "90x90 DPI DMT"
+#~ msgstr "600 DPI"
+
+#, fuzzy
+#~ msgid "180x180 DPI"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "180x180 DPI DMT"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "360x360 DPI"
+#~ msgstr "300x300 DPI"
+
+#, fuzzy
+#~ msgid "360x360 DPI DMT"
+#~ msgstr "600x600 DPI"
+
+#, fuzzy
+#~ msgid "720x360 DPI"
+#~ msgstr "720 x 360 DPI"
+
+#, fuzzy
+#~ msgid "720x360 DPI DMT"
+#~ msgstr "720 x 360 DPI MW2"
+
+#, fuzzy
+#~ msgid "720x720 DPI"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "720x720 DPI DMT"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x720 DPI"
+#~ msgstr "1440 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x720 DPI DMT"
+#~ msgstr "1440 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI DMT"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI DMT"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "150x150 DPI DMT"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "300x300 DPI DMT"
+#~ msgstr "300x300 DPI"
+
+#, fuzzy
+#~ msgid "600x300 DPI DMT"
+#~ msgstr "600x300 DPI"
+
+#, fuzzy
+#~ msgid "600x600 DPI DMT"
+#~ msgstr "600x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x600 DPI DMT"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI DMT"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI"
+#~ msgstr "2400x600 DPI"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI DMT"
+#~ msgstr "2400x600 DPI"
+
+#, fuzzy
+#~ msgid "Plain Paper PIXMA"
+#~ msgstr "Papel Normal"
+
+#~ msgid "Back Print Film"
+#~ msgstr "Filme de impressão por trás"
+
+#~ msgid "Fabric Sheets"
+#~ msgstr "Folhas de Fábrica"
+
+#~ msgid "Envelope"
+#~ msgstr "Envelope"
+
+#~ msgid "High Resolution Paper"
+#~ msgstr "Papel de Alta Resolução"
+
+#~ msgid "T-Shirt Transfers"
+#~ msgstr "Transferências para T-Shirt"
+
+#~ msgid "High Gloss Film"
+#~ msgstr "Filme Muito Lustroso"
+
+#~ msgid "Glossy Photo Paper"
+#~ msgstr "Papel de Fotografia Lustroso"
+
+#~ msgid "Glossy Photo Cards"
+#~ msgstr "Cartões de Fotografia Lustrosos"
+
+#~ msgid "Photo Paper Pro"
+#~ msgstr "Papel de Fotografia Profissional"
+
+#~ msgid "Photo CcMmYK Color"
+#~ msgstr "Cor CcMmYK de Fotografia<"
+
+#~ msgid "Photo CcMmY Color"
+#~ msgstr "Cor CcMmY de Fotografia"
+
+#~ msgid "CMYK Color"
+#~ msgstr "Cor CMYK"
+
+#~ msgid "CMY Color"
+#~ msgstr "Cor CMY"
 
 #, fuzzy
 #~ msgid "Gutenprint"
-#~ msgstr "impressão de teste"
+#~ msgstr "impressão de teste"
 
 #, fuzzy
 #~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
@@ -8322,26 +8666,26 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
 
 #, fuzzy
 #~ msgid "Printer does not support listing ink types!\n"
-#~ msgstr "A impressora não suporta a cor de impressão\n"
+#~ msgstr "A impressora não suporta a cor de impressão\n"
 
 #, fuzzy
 #~ msgid "Cannot identify printer!\n"
-#~ msgstr "Não é possivel processar o output da impressora\n"
+#~ msgstr "Não é possivel processar o output da impressora\n"
 
 #, fuzzy
 #~ msgid "Red Balance"
-#~ msgstr "Ajustar o equilíbrio de amarelo na impressão"
+#~ msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
 #, fuzzy
 #~ msgid "Gloss Balance"
-#~ msgstr "Ajustar o equilíbrio de amarelo na impressão"
+#~ msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
 #~ msgid ""
 #~ "Printer alignment must be done with a raw device or else\n"
 #~ "the -m option must be used to specify a printer.\n"
 #~ msgstr ""
 #~ "O alinhamento da impressora deve ser feiro com um dipositovo\n"
-#~ "ou então a opção -m deve ser usada para especificar a impressora.\n"
+#~ "ou então a opção -m deve ser usada para especificar a impressora.\n"
 
 #~ msgid "Attempting to detect printer model..."
 #~ msgstr "Tentado detectar o modelo da impressora..."
@@ -8351,10 +8695,10 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
 #~ "Cannot open %s read/write: %s\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Não foi possível abir %s leitura/escrita %s\n"
+#~ "Não foi possível abir %s leitura/escrita %s\n"
 
 #~ msgid "Printer model %s is not known.\n"
-#~ msgstr "O modelo de impressora %s é desconhecido.\n"
+#~ msgstr "O modelo de impressora %s é desconhecido.\n"
 
 #, fuzzy
 #~ msgid "Gimp-Print"
@@ -8363,8 +8707,8 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
 #, fuzzy
 #~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
 #~ msgstr ""
-#~ "Defina o brilho da impressão.\n"
-#~ "0 é preto sólido, 2 é branco sólido"
+#~ "Defina o brilho da impressão.\n"
+#~ "0 é preto sólido, 2 é branco sólido"
 
 #~ msgid ""
 #~ "Enter the correct command to print to your printer. Note: Please do not "
@@ -8373,7 +8717,7 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
 #~ msgstr ""
 #~ "Insira o comando correcto para imprimir para a sua impressora. Nota: Por "
 #~ "favor\n"
-#~ "não remova o `-l' ou `-oraw' da linha de comando, ou a impressão "
+#~ "não remova o `-l' ou `-oraw' da linha de comando, ou a impressão "
 #~ "provavelmente \n"
 #~ "vai falhar!"
 
@@ -8381,37 +8725,37 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
 #~ msgstr "Ficheiro PPD?"
 
 #~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: a opção `%s' é ambígua\n"
+#~ msgstr "%s: a opção `%s' é ambígua\n"
 
 #~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "'%s': a opção `--%s' não admite um argumento\n"
+#~ msgstr "'%s': a opção `--%s' não admite um argumento\n"
 
 #~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: a opção `%c%s' não admite um argumento\n"
+#~ msgstr "%s: a opção `%c%s' não admite um argumento\n"
 
 #~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: a opção `%s' requere um argumento\n"
+#~ msgstr "%s: a opção `%s' requere um argumento\n"
 
 #~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: opção não reconhecida `--%s'\n"
+#~ msgstr "%s: opção não reconhecida `--%s'\n"
 
 #~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: opcção não reconhecida `%c%s'\n"
+#~ msgstr "%s: opcção não reconhecida `%c%s'\n"
 
 #~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opção ilegal -- %c\n"
+#~ msgstr "%s: opção ilegal -- %c\n"
 
 #~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: opção inválida -- %c\n"
+#~ msgstr "%s: opção inválida -- %c\n"
 
 #~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: opção requere um argumento -- %c\n"
+#~ msgstr "%s: opção requere um argumento -- %c\n"
 
 #~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: opção `-W %s' é ambígua\n"
+#~ msgstr "%s: opção `-W %s' é ambígua\n"
 
 #~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: opção `-W %s' não permite um argumento\n"
+#~ msgstr "%s: opção `-W %s' não permite um argumento\n"
 
 #, fuzzy
 #~ msgid "Bright"
@@ -8419,11 +8763,11 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
 
 #, fuzzy
 #~ msgid "Image is too wide for the page\n"
-#~ msgstr "Redimensionar a impressão para o tamanho da página"
+#~ msgstr "Redimensionar a impressão para o tamanho da página"
 
 #, fuzzy
 #~ msgid "Full Bleed"
-#~ msgstr "Rolo de Alimentação"
+#~ msgstr "Rolo de Alimentação"
 
 #, fuzzy
 #~ msgid "traditional"
@@ -8443,7 +8787,7 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
 #~ msgstr "Optimizar o output para o tipo de imagem a ser imprimida"
 
 #~ msgid "Solid Colors"
-#~ msgstr "Cores Sólidas"
+#~ msgstr "Cores Sólidas"
 
 #~ msgid "Stylus C20sx"
 #~ msgstr "Stylus c20sx"
@@ -8507,66 +8851,66 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
 #~ "WARNING: THIS FUNCTION IS NOT YET TESTED!  It may not work, and it may\n"
 #~ "damage your printer!\n"
 #~ msgstr ""
-#~ "Por favor leia estas intrucções muito cuidadosamente antes de "
+#~ "Por favor leia estas intrucções muito cuidadosamente antes de "
 #~ "prosseguir.\n"
 #~ "\n"
-#~ "Este programa permite alinhas a cabeça de impressão da sua impressora a "
+#~ "Este programa permite alinhas a cabeça de impressão da sua impressora a "
 #~ "jacto\n"
-#~ "de tinta Epson Stylus. A má utilização do programa pode provocar "
-#~ "degradação da\n"
-#~ "qualidade de impressão, ou mesmo danificar a sua impressora. Este "
-#~ "programa não foi revisto\n"
-#~ "pela Seiko Epson para verificação, e não oferece qualquer tipo de "
+#~ "de tinta Epson Stylus. A má utilização do programa pode provocar "
+#~ "degradação da\n"
+#~ "qualidade de impressão, ou mesmo danificar a sua impressora. Este "
+#~ "programa não foi revisto\n"
+#~ "pela Seiko Epson para verificação, e não oferece qualquer tipo de "
 #~ "garantia. O risco\n"
-#~ "involvido na sua utilização recai totalmente sobre si.\n"
+#~ "involvido na sua utilização recai totalmente sobre si.\n"
 #~ "\n"
-#~ "Este programa imprime %d padrões de teste que se sobrepõem en cada folha "
+#~ "Este programa imprime %d padrões de teste que se sobrepõem en cada folha "
 #~ "de papel.\n"
-#~ "Isto é, ele imprime um padrão e depois ejecta o papel. Você deve "
+#~ "Isto é, ele imprime um padrão e depois ejecta o papel. Você deve "
 #~ "reinserir a mesma\n"
-#~ "página, e ele vai imprimir outro padrão. Cada padrão consiste num "
+#~ "página, e ele vai imprimir outro padrão. Cada padrão consiste num "
 #~ "conjunto de \n"
 #~ "escolhas numeradas entre %d e %d.\n"
 #~ "\n"
-#~ "Quando você inpeccionar os padrões, deve encontrar uma mancha com a "
+#~ "Quando você inpeccionar os padrões, deve encontrar uma mancha com a "
 #~ "textura mais suave\n"
-#~ "(menos granulada). Você deve inspeccionar as manchas muito cuidadosamente "
+#~ "(menos granulada). Você deve inspeccionar as manchas muito cuidadosamente "
 #~ "para escolher\n"
-#~ "a melhor. Nós sugerimos usar papel de qualidade fotográfica ou um papel "
+#~ "a melhor. Nós sugerimos usar papel de qualidade fotográfica ou um papel "
 #~ "similar de alta\n"
-#~ "qualidade para este teste. Se não encontrar um padrão suave, deve repetir "
+#~ "qualidade para este teste. Se não encontrar um padrão suave, deve repetir "
 #~ "o teste.\n"
 #~ "\n"
-#~ "Após inpeccionar as escolhas e escolher uma mancha, vai-lhe ser dada a "
-#~ "hipótese\n"
+#~ "Após inpeccionar as escolhas e escolher uma mancha, vai-lhe ser dada a "
+#~ "hipótese\n"
 #~ "de gravar os resultados na impressora, repetir o processo, ou sair sem "
-#~ "gravar. Sair não\n"
-#~ "vai restaurar as definições anteriores, mas desligar e voltar a ligar a "
+#~ "gravar. Sair não\n"
+#~ "vai restaurar as definições anteriores, mas desligar e voltar a ligar a "
 #~ "impressora vai.\n"
-#~ "Se você sair, deve repetir o processo inteiro se desejar gravar mais "
+#~ "Se você sair, deve repetir o processo inteiro se desejar gravar mais "
 #~ "tarde os resultados.\n"
-#~ "É essencial que você não desligue a impressora durante este "
+#~ "É essencial que você não desligue a impressora durante este "
 #~ "procedimento.\n"
 #~ "\n"
-#~ "AVISO: ESTA FUNÇÃO AINDA NÃO FOI TESTADA! Pode não funcionar, e pode "
+#~ "AVISO: ESTA FUNÇÃO AINDA NÃO FOI TESTADA! Pode não funcionar, e pode "
 #~ "danificar a\n"
 #~ "sua impressora!\n"
 
 #~ msgid "Printer %s does not require color head alignment.\n"
-#~ msgstr "A impressora %s não necessita de alinhamento das cabeças de cor.\n"
+#~ msgstr "A impressora %s não necessita de alinhamento das cabeças de cor.\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "Please inspect the print, and choose the pattern in each set.\n"
 #~ "Type a pattern number, '?' for help, or 'r' to repeat the procedure.\n"
 #~ msgstr ""
-#~ "Por favor inspeccione a impressão, e escolha o melhor par de linhas em "
-#~ "cada padrão.\n"
+#~ "Por favor inspeccione a impressão, e escolha o melhor par de linhas em "
+#~ "cada padrão.\n"
 #~ "Insira um par, '?' para ajuda, ou 'r' para repetir o procedimento.\n"
 
 #, fuzzy
 #~ msgid "Model %d out of range.\n"
-#~ msgstr "Número fora do intervalo|\n"
+#~ msgstr "Número fora do intervalo|\n"
 
 #~ msgid "Right Border:"
 #~ msgstr "Borda Direita:"
@@ -8578,7 +8922,7 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
 #~ msgstr "Tamanho"
 
 #~ msgid "Image / Output Settings"
-#~ msgstr "Imagem / Definições de Output"
+#~ msgstr "Imagem / Definições de Output"
 
 #, fuzzy
 #~ msgid "GIMP-print"
@@ -8586,13 +8930,13 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
 
 #, fuzzy
 #~ msgid "Resolutions"
-#~ msgstr "Resolução"
+#~ msgstr "Resolução"
 
 #~ msgid "Media Type:"
 #~ msgstr "Tipo de \"Media\":"
 
 #~ msgid "Type of media you're printing to"
-#~ msgstr "Tipo de \"meida\" para o qual está a imprimir"
+#~ msgstr "Tipo de \"meida\" para o qual está a imprimir"
 
 #~ msgid "Media Size:"
 #~ msgstr "Tamanho do \"Media\":"
@@ -8604,22 +8948,22 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
 #~ msgstr "Fonte do \"Media\":"
 
 #~ msgid "Source (input slot) of media you're printing to"
-#~ msgstr "Fonte do \"media\" para o qual está a imprimir"
+#~ msgstr "Fonte do \"media\" para o qual está a imprimir"
 
 #~ msgid "Ink Type:"
 #~ msgstr "Tipo de Tinta:"
 
 #~ msgid "Resolution:"
-#~ msgstr "Resolução"
+#~ msgstr "Resolução"
 
 #~ msgid "Print in black and white (no color, and no shades of gray)"
 #~ msgstr "Imprimir em preto e branco (sem cores, nem sombras de cinzento)"
 
 #~ msgid "Fastest and brightest color for text and line art"
-#~ msgstr "Mais rápido e cor mais brilhange para texto e \"line art\""
+#~ msgstr "Mais rápido e cor mais brilhange para texto e \"line art\""
 
 #~ msgid "Best for images dominated by regions of solid color"
-#~ msgstr "Ideal para imagens onde predominam regiões com cores sólidas"
+#~ msgstr "Ideal para imagens onde predominam regiões com cores sólidas"
 
 #~ msgid ""
 #~ "Slowest, but most accurate and smoothest color for continuous tone images "
@@ -8636,13 +8980,13 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
 #~ "Cannot read from %s: %s\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Não foi possível ler a partir de %s: %s\n"
+#~ "Não foi possível ler a partir de %s: %s\n"
 
 #~ msgid "%s out of range (value %f, min %f, max %f)\n"
 #~ msgstr "%s fora do intervalo (valor %f, min %f, max %f)\n"
 
 #~ msgid "%s is not a valid dither algorithm\n"
-#~ msgstr "%s não é um algoritmo de \"dither\" válido\n"
+#~ msgstr "%s não é um algoritmo de \"dither\" válido\n"
 
 #~ msgid ""
 #~ "Please re-insert the same alignment sheet in the printer when it is\n"
@@ -8659,17 +9003,17 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
 #~ "best pattern, and repeat the procedure.\n"
 #~ "Type a pattern number, or '?' for help.\n"
 #~ msgstr ""
-#~ "Inspeccione a folha de alinhamentos, e determine qual é o padrão mais\n"
-#~ "suave. Este é padrão menos granulado.\n"
-#~ "Se não conseguir encontrar uma padrão suave, por favor seleccione outro\n"
-#~ "número para melhor padrão, e repita o procedimento.\n"
-#~ "Insira um número de padrão, ou '?' para ajuda.\n"
+#~ "Inspeccione a folha de alinhamentos, e determine qual é o padrão mais\n"
+#~ "suave. Este é padrão menos granulado.\n"
+#~ "Se não conseguir encontrar uma padrão suave, por favor seleccione outro\n"
+#~ "número para melhor padrão, e repita o procedimento.\n"
+#~ "Insira um número de padrão, ou '?' para ajuda.\n"
 
 #~ msgid "The best pattern should be numbered between 1 and %d.\n"
-#~ msgstr "O melhor padrão deve estar numerado entre 1 e %d.\n"
+#~ msgstr "O melhor padrão deve estar numerado entre 1 e %d.\n"
 
 #~ msgid "Set the contrast of the print"
-#~ msgstr "Defina o contraste da impressão"
+#~ msgstr "Defina o contraste da impressão"
 
 #~ msgid "Cyan:"
 #~ msgstr "Ciano:"
@@ -8681,13 +9025,13 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
 #~ msgstr "Amarelo:"
 
 #~ msgid "Parameter %s out of range (value %f, min %f, max %f)\n"
-#~ msgstr "Parâmetro %s fora do intervalo (valor %f, min %f, max %f)\n"
+#~ msgstr "Parâmetro %s fora do intervalo (valor %f, min %f, max %f)\n"
 
 #~ msgid "Parameter %s out of range (value %d, min %d, max %d)\n"
-#~ msgstr "Parâmetro %s foram do intervalo (valor %d, min %dm max %d)\n"
+#~ msgstr "Parâmetro %s foram do intervalo (valor %d, min %dm max %d)\n"
 
 #~ msgid "Unknown option %s\n"
-#~ msgstr "Opção desconhecida %s\n"
+#~ msgstr "Opção desconhecida %s\n"
 
 #~ msgid "1440 x 360 DPI"
 #~ msgstr "1440 x 360 DPI"
@@ -8702,7 +9046,7 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
 #~ msgstr "13x19"
 
 #~ msgid "Monarch"
-#~ msgstr "Monáquico"
+#~ msgstr "Monáquico"
 
 #~ msgid "Long 3"
 #~ msgstr "Longo 3"
@@ -8714,4 +9058,4 @@ msgstr "Obtenção da próxima linha falhou em %.0f\n"
 #~ msgstr "Kaku"
 
 #~ msgid "HP Greeting Card"
-#~ msgstr "Cartão Saudações HP"
+#~ msgstr "Cartão Saudações HP"
diff --git a/po/sk.gmo b/po/sk.gmo
index f3f766b..1854830 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index 98f79c6..6c41b4c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,38 +1,38 @@
 # Slovak translation of GIMP Print
-# Slovenský preklad GIMP Print
+# Slovenský preklad GIMP Print
 # Copyright (C) 2002 Free Software Foundation, Inc.
-# Zdenko Podobný <zdpo@mailbox.sk>, 2002.
+# Zdenko Podobný <zdpo@mailbox.sk>, 2002.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: GIMP Print\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\n"
 "PO-Revision-Date: 2002-05-20 18:08+0100\n"
-"Last-Translator: Zdenko Podobný <zdpo@mailbox.sk>\n"
+"Last-Translator: Zdenko Podobný <zdpo@mailbox.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 #, fuzzy
 msgid "Default"
-msgstr "Nastavi» ¹tandardné"
+msgstr "Nastaviť štandardné"
 
 #: src/main/dither-main.c:47
 #, fuzzy
 msgid "EvenTone"
-msgstr "Obálka"
+msgstr "Obálka"
 
 #: src/main/dither-main.c:48
 #, fuzzy
 msgid "Hybrid EvenTone"
-msgstr "Obálka"
+msgstr "Obálka"
 
 #. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
 #. * names, not descriptive.
@@ -45,12 +45,12 @@ msgstr "Letter"
 #: src/main/dither-main.c:54
 #, fuzzy
 msgid "Hybrid EvenBetter"
-msgstr "Obálka"
+msgstr "Obálka"
 
 #: src/main/dither-main.c:60
 #, fuzzy
 msgid "UniTone"
-msgstr "Obálka"
+msgstr "Obálka"
 
 #: src/main/dither-main.c:61
 msgid "Hybrid UniTone"
@@ -58,23 +58,23 @@ msgstr ""
 
 #: src/main/dither-main.c:63
 msgid "Adaptive Hybrid"
-msgstr "Adaptívne hybridný"
+msgstr "Adaptívne hybridný"
 
 #: src/main/dither-main.c:64
 msgid "Ordered"
-msgstr "Postupný"
+msgstr "Postupný"
 
 #: src/main/dither-main.c:65
 msgid "Fast"
-msgstr "Rýchly"
+msgstr "Rýchly"
 
 #: src/main/dither-main.c:66
 msgid "Very Fast"
-msgstr "Veµmi rýchly"
+msgstr "Veľmi rýchly"
 
 #: src/main/dither-main.c:67
 msgid "Hybrid Floyd-Steinberg"
-msgstr "Hybridný Floyd-Steinbergov"
+msgstr "Hybridný Floyd-Steinbergov"
 
 #: src/main/dither-main.c:68
 msgid "Predithered Input"
@@ -85,18 +85,18 @@ msgstr ""
 msgid "Density"
 msgstr "Hustota:"
 
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -106,8 +106,8 @@ msgid ""
 "ink bleeds through the paper or smears; increase the density if black "
 "regions are not solid."
 msgstr ""
-"Nastavte hustotu (mno¾stvo atramentu) pre tlaè. Hustotu zní¾te, ak atrament "
-"teèie po papieri, alebo sa rozmazáva; zvý¹te hustotu, ak èierne oblasti sú "
+"Nastavte hustotu (množstvo atramentu) pre tla�. Hustotu znížte, ak atrament "
+"te�ie po papieri, alebo sa rozmazáva; zvýšte hustotu, ak �ierne oblasti sú "
 "jednoliate."
 
 #: src/main/dither-main.c:97
@@ -130,13 +130,13 @@ msgid ""
 "art.\n"
 "Hybrid Floyd-Steinberg generally produces inferior output."
 msgstr ""
-"Zvoµte algoritmus rozptylu, ktorý sa pou¾ije pri tlaèi.\n"
-"Prispôsobiteµné mie¹anie roztylu v¹obecne poskytuje najlep¹í výsledok.\n"
-"Postupný rozptyl je rýchlej¹í a výsledná kvalita je podobná ako je na "
-"fotografiách.\n"
-"Rýchly a veµmi rýchly roztyl je podstatne rýchlej¹í a dobré výsledky "
-"poskytuje pre text a èiarovú grafiku.\n"
-"Mie¹aný Floyd-Steinbergov roztyl v¹eobecne poskytuje menej kvalitný výstup."
+"Zvoľte algoritmus rozptylu, ktorý sa použije pri tla�i.\n"
+"Prispôsobiteľné miešanie roztylu všobecne poskytuje najlepší výsledok.\n"
+"Postupný rozptyl je rýchlejší a výsledná kvalita je podobná ako je na "
+"fotografiách.\n"
+"Rýchly a veľmi rýchly roztyl je podstatne rýchlejší a dobré výsledky "
+"poskytuje pre text a �iarovú grafiku.\n"
+"Miešaný Floyd-Steinbergov roztyl všeobecne poskytuje menej kvalitný výstup."
 
 #: src/main/module.c:52
 msgid "Miscellaneous (unclassified)"
@@ -155,507 +155,320 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmus rozptylu"
 
-#: src/main/print-canon.c:1382
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 #, fuzzy
-msgid "90x90 DPI"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1382
-#, fuzzy
-msgid "90x90 DPI DMT"
-msgstr "600 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1383
-#, fuzzy
-msgid "180x180 DPI DMT"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1384
-#, fuzzy
-msgid "360x360 DPI DMT"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI"
-msgstr "720 x 360 DPI"
-
-#: src/main/print-canon.c:1385
-#, fuzzy
-msgid "720x360 DPI DMT"
-msgstr "720 x 360 DPI MW2"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1386
-#, fuzzy
-msgid "720x720 DPI DMT"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI"
-msgstr "1440 x 720 DPI"
-
-#: src/main/print-canon.c:1387
-#, fuzzy
-msgid "1440x720 DPI DMT"
-msgstr "1440 x 720 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/print-canon.c:1388
-#, fuzzy
-msgid "1440x1440 DPI DMT"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1389
-#, fuzzy
-msgid "2880x2880 DPI DMT"
-msgstr "2880 x 720 DPI"
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1390
-#, fuzzy
-msgid "150x150 DPI DMT"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1391
-#, fuzzy
-msgid "300x300 DPI DMT"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1392
-#, fuzzy
-msgid "600x300 DPI DMT"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1393
-#, fuzzy
-msgid "600x600 DPI DMT"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1394
-#, fuzzy
-msgid "1200x600 DPI DMT"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1395
+msgid "Page Size"
+msgstr "Veľkosť"
+
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
 #, fuzzy
-msgid "1200x1200 DPI"
-msgstr "1200x600 DPI"
+msgid "Basic Printer Setup"
+msgstr "Nastavenie tla�iarne"
 
-#: src/main/print-canon.c:1395
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 #, fuzzy
-msgid "1200x1200 DPI DMT"
-msgstr "1200x600 DPI"
+msgid "Size of the paper being printed to"
+msgstr "Veľkosť papiera, na ktorý chcete tla�iť"
 
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI"
-msgstr "2400x600 DPI"
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
+msgid "Media Type"
+msgstr "Typ média"
 
-#: src/main/print-canon.c:1396
-#, fuzzy
-msgid "2400x2400 DPI DMT"
-msgstr "2400x600 DPI"
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
+msgid "Type of media (plain paper, photo paper, etc.)"
+msgstr ""
 
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-msgid "Plain Paper"
-msgstr "Obyèajný papier"
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
+msgid "Media Source"
+msgstr "Zdroj média"
 
-#: src/main/print-canon.c:1448
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
 #, fuzzy
-msgid "Plain Paper PIXMA"
-msgstr "Obyèajný papier"
-
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-msgid "Transparencies"
-msgstr "Priesvitná fólia"
+msgid "Source (input slot) of the media"
+msgstr "Zdroj (vstupné miesto) média, na ktoré tla�íte"
 
-#: src/main/print-canon.c:1450
-msgid "Back Print Film"
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:1451
-msgid "Fabric Sheets"
-msgstr "Normálny papier"
-
-#: src/main/print-canon.c:1452
-msgid "Envelope"
-msgstr "Obálka"
-
-#: src/main/print-canon.c:1453
-msgid "High Resolution Paper"
-msgstr "Papier s vysokým rozlí¹ením"
-
-#: src/main/print-canon.c:1454
-msgid "T-Shirt Transfers"
-msgstr "Na¾ehµovacia fólia"
-
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
-msgstr "Vysokolesklý film"
-
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
-msgstr "Lesklý foto papier"
-
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
-msgstr "Lesklé foto karty"
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr ""
 
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
-msgstr "Foto papier pro"
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
+msgstr ""
 
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
-msgstr "Iné"
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
 
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
-#, fuzzy
-msgid "Page Size"
-msgstr "Veµkos»"
-
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
-#, fuzzy
-msgid "Basic Printer Setup"
-msgstr "Nastavenie tlaèiarne"
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+msgid "CD Hub Size (Custom)"
+msgstr ""
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
 #, fuzzy
-msgid "Size of the paper being printed to"
-msgstr "Veµkos» papiera, na ktorý chcete tlaèi»"
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "Zmeniť veľkosť tla�e podľa rozmerov strany"
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
-msgid "Media Type"
-msgstr "Typ média"
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
+msgstr ""
 
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
-msgid "Type of media (plain paper, photo paper, etc.)"
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
-msgid "Media Source"
-msgstr "Zdroj média"
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr ""
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
-#, fuzzy
-msgid "Source (input slot) of the media"
-msgstr "Zdroj (vstupné miesto) média, na ktoré tlaèíte"
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
+msgstr ""
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
-msgstr "Rozlí¹enie"
+msgstr "Rozlíšenie"
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
-msgstr "Rozlí¹enie a kvalita tlaèe"
+msgstr "Rozlíšenie a kvalita tla�e"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Typ atramentu"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr ""
-
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
-msgstr "Typ atramentu tlaèiarne"
+msgstr "Typ atramentu tla�iarne"
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
-msgstr "Model tlaèiarne:"
+msgstr "Model tla�iarne:"
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
-msgstr "Obyèajný papier"
+msgstr "Oby�ajný papier"
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 #, fuzzy
 msgid "Adjust the cyan density"
-msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie azúrovej farby pre tla�"
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
-msgstr "Purpurová"
+msgstr "Purpurová"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 #, fuzzy
 msgid "Adjust the magenta density"
-msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie purpurovej farby pre tla�"
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Adjust the yellow density"
-msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie žltej farby pre tla�"
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 #, fuzzy
 msgid "Adjust the black density"
-msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie azúrovej farby pre tla�"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 #, fuzzy
 msgid "Light Cyan Transition"
-msgstr "Jasná azúrová"
-
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+msgstr "Jasná azúrová"
+
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 #, fuzzy
 msgid "Light Magenta Transition"
-msgstr "Jasná purpurová"
+msgstr "Jasná purpurová"
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 #, fuzzy
 msgid "Light Yellow Transition"
-msgstr "Jasná azúrová"
+msgstr "Jasná azúrová"
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
-msgid "Short Edge (Flip)"
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-msgid "Auto Sheet Feeder"
-msgstr "Automatický podávaè papiera"
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+msgid "Short Edge (Flip)"
+msgstr ""
 
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-msgid "Manual with Pause"
-msgstr "Manuálne s preru¹ením"
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
+msgstr ""
 
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
-msgstr "Manuálne bez preru¹enia"
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
+msgstr ""
 
-#: src/main/print-canon.c:1923
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
 #, fuzzy
-msgid "Cassette"
-msgstr "Matný papier"
+msgid "CD - Custom"
+msgstr "Vlastný"
 
-#: src/main/print-canon.c:1924
-msgid "CD tray"
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:2049
-msgid "Photo CcMmYK Color"
-msgstr "Fotografická CcMmYK farba"
-
-#: src/main/print-canon.c:2052
-msgid "Photo CcMmY Color"
-msgstr "Fotografická CcMmY farba"
-
-#: src/main/print-canon.c:2055
-msgid "CMYK Color"
-msgstr "CMYK farba"
-
-#: src/main/print-canon.c:2058
-msgid "CMY Color"
-msgstr "CMY farba"
-
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
-msgstr "Èierna"
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#, fuzzy
+msgid "Print To Hub"
+msgstr "Tla�iť do súboru?"
 
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
 msgstr "Farebne"
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
-msgstr "Èiernobielo"
+msgstr "ÄŒiernobielo"
 
 #: src/main/print-color.c:50
 msgid "High Accuracy"
@@ -664,7 +477,7 @@ msgstr ""
 #: src/main/print-color.c:51
 #, fuzzy
 msgid "Bright Colors"
-msgstr "Prispôsobenie farieb pre tlaè"
+msgstr "Prispôsobenie farieb pre tla�"
 
 #: src/main/print-color.c:52
 msgid "Correct Hue Only"
@@ -689,18 +502,18 @@ msgstr ""
 #: src/main/print-color.c:58
 #, fuzzy
 msgid "Pre-Dithered"
-msgstr "Tlaèi»"
+msgstr "Tla�iť"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
-msgstr "V odtieòoch ¹edej"
+msgstr "V odtieňoch šedej"
 
 #: src/main/print-color.c:123
 #, fuzzy
 msgid "Whitescale"
-msgstr "®ltá"
+msgstr "Žltá"
 
 #: src/main/print-color.c:125
 msgid "RGB"
@@ -723,11 +536,6 @@ msgstr ""
 msgid "Channel "
 msgstr "Storno"
 
-#: src/main/print-color.c:165
-#, fuzzy
-msgid " Gamma"
-msgstr "Gama:"
-
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
 #: src/main/print-color.c:266 src/main/print-color.c:274
@@ -767,25 +575,25 @@ msgstr ""
 #: src/main/print-color.c:192
 #, fuzzy
 msgid "Input Image Type"
-msgstr "Typ obrázku"
+msgstr "Typ obrázku"
 
 #: src/main/print-color.c:193
 #, fuzzy
 msgid "Input image type"
-msgstr "Typ obrázku"
+msgstr "Typ obrázku"
 
 #: src/main/print-color.c:200
 #, fuzzy
 msgid "Output Image Type"
-msgstr "Typ výstupu:"
+msgstr "Typ výstupu:"
 
 #: src/main/print-color.c:201
 #, fuzzy
 msgid "Output image type"
-msgstr "Typ výstupu:"
+msgstr "Typ výstupu:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
 msgstr ""
 
@@ -806,7 +614,7 @@ msgstr "Jas:"
 #: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
-msgstr "Nastavi» vý¹ku tlaèe"
+msgstr "Nastaviť výšku tla�e"
 
 #: src/main/print-color.c:232
 #, fuzzy
@@ -824,7 +632,7 @@ msgstr ""
 #: src/main/print-color.c:240
 #, fuzzy
 msgid "Advanced Image Control"
-msgstr "Typ výstupu:"
+msgstr "Typ výstupu:"
 
 #: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
@@ -840,9 +648,9 @@ msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
 msgstr ""
-"Nastavenie gamy pre tlaè. Vy¹¹ie hodnoty vyprodukujú v¹eobecne jasnej¹iu "
-"tlaè, kým ni¾¹ie hodnoty vyprodukujú tmav¹iu tlaè. Èierna a biela zostanú "
-"také isté na rozdiel od nastavovania jasu."
+"Nastavenie gamy pre tla�. Vyššie hodnoty vyprodukujú všeobecne jasnejšiu "
+"tla�, kým nižšie hodnoty vyprodukujú tmavšiu tla�. Čierna a biela zostanú "
+"také isté na rozdiel od nastavovania jasu."
 
 #: src/main/print-color.c:258
 #, fuzzy
@@ -853,60 +661,60 @@ msgstr "Gama:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
-msgstr "Azúrová"
+msgstr "Azúrová"
 
 #: src/main/print-color.c:267
 #, fuzzy
 msgid "Adjust the cyan gamma"
-msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
-
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+msgstr "Prispôsobenie vyváženie azúrovej farby pre tla�"
+
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 msgid "Magenta"
-msgstr "Purpurová"
+msgstr "Purpurová"
 
 #: src/main/print-color.c:275
 #, fuzzy
 msgid "Adjust the magenta gamma"
-msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
-
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+msgstr "Prispôsobenie vyváženie purpurovej farby pre tla�"
+
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
-msgstr "®ltá"
+msgstr "Žltá"
 
 #: src/main/print-color.c:283
 #, fuzzy
 msgid "Adjust the yellow gamma"
-msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie žltej farby pre tla�"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
 msgstr ""
@@ -914,21 +722,21 @@ msgstr ""
 #: src/main/print-color.c:291
 #, fuzzy
 msgid "Adjust the red gamma"
-msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie žltej farby pre tla�"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
 msgstr ""
 
 #: src/main/print-color.c:299
 #, fuzzy
 msgid "Adjust the green gamma"
-msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie purpurovej farby pre tla�"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
 msgstr ""
@@ -936,14 +744,26 @@ msgstr ""
 #: src/main/print-color.c:307
 #, fuzzy
 msgid "Adjust the blue gamma"
-msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie azúrovej farby pre tla�"
+
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr "ÄŒierna"
 
 #: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
-msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie azúrovej farby pre tla�"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
 msgstr ""
 
@@ -951,46 +771,46 @@ msgstr ""
 #: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
-msgstr "V odtieòoch ¹edej"
+msgstr "V odtieňoch šedej"
 
 #: src/main/print-color.c:323
 #, fuzzy
 msgid "Adjust the cyan gray balance"
-msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie azúrovej farby pre tla�"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 #, fuzzy
 msgid "Magenta Balance"
-msgstr "Purpurová"
+msgstr "Purpurová"
 
 #: src/main/print-color.c:331
 #, fuzzy
 msgid "Adjust the magenta gray balance"
-msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie purpurovej farby pre tla�"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 #, fuzzy
 msgid "Yellow Balance"
-msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie žltej farby pre tla�"
 
 #: src/main/print-color.c:339
 #, fuzzy
 msgid "Adjust the yellow gray balance"
-msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie žltej farby pre tla�"
 
 #: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
-msgstr "Sýtos»:"
+msgstr "Sýtosť:"
 
 #: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
-"Prispôsobenie sýtosti (farebného vyvá¾enia) tlaèe\n"
-"Pou¾ite nulu na vyprodukovanie výstupu v odtieòoch ¹edej s pou¾itím "
-"farebného a èierneho atramentu"
+"Prispôsobenie sýtosti (farebného vyváženia) tla�e\n"
+"Použite nulu na vyprodukovanie výstupu v odtieňoch šedej s použitím "
+"farebného a �ierneho atramentu"
 
 #: src/main/print-color.c:357
 #, fuzzy
@@ -999,12 +819,12 @@ msgstr "Typ atramentu"
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 #, fuzzy
 msgid "Advanced Output Control"
-msgstr "Typ výstupu:"
+msgstr "Typ výstupu:"
 
 #: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
@@ -1034,11 +854,6 @@ msgstr ""
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:446
-#, fuzzy
-msgid " Curve"
-msgstr "Èierna"
-
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
@@ -1046,7 +861,7 @@ msgstr "Èierna"
 #: src/main/print-color.c:513
 #, fuzzy
 msgid "Output Curves"
-msgstr "Typ výstupu:"
+msgstr "Typ výstupu:"
 
 #: src/main/print-color.c:447
 msgid "Curve for raw channel "
@@ -1064,72 +879,72 @@ msgstr "Storno"
 #: src/main/print-color.c:465
 #, fuzzy
 msgid "Magenta Curve"
-msgstr "Purpurová"
+msgstr "Purpurová"
 
 #: src/main/print-color.c:466
 #, fuzzy
 msgid "Magenta curve"
-msgstr "Purpurová"
+msgstr "Purpurová"
 
 #: src/main/print-color.c:473
 #, fuzzy
 msgid "Yellow Curve"
-msgstr "®ltá"
+msgstr "Žltá"
 
 #: src/main/print-color.c:474
 #, fuzzy
 msgid "Yellow curve"
-msgstr "®ltá"
+msgstr "Žltá"
 
 #: src/main/print-color.c:481
 #, fuzzy
 msgid "Black Curve"
-msgstr "Èierna"
+msgstr "ÄŒierna"
 
 #: src/main/print-color.c:482
 #, fuzzy
 msgid "Black curve"
-msgstr "Èierna"
+msgstr "ÄŒierna"
 
 #: src/main/print-color.c:489
 #, fuzzy
 msgid "Red Curve"
-msgstr "®ltá"
+msgstr "Žltá"
 
 #: src/main/print-color.c:490
 #, fuzzy
 msgid "Red curve"
-msgstr "®ltá"
+msgstr "Žltá"
 
 #: src/main/print-color.c:497
 #, fuzzy
 msgid "Green Curve"
-msgstr "Purpurová"
+msgstr "Purpurová"
 
 #: src/main/print-color.c:498
 #, fuzzy
 msgid "Green curve"
-msgstr "Purpurová"
+msgstr "Purpurová"
 
 #: src/main/print-color.c:505
 #, fuzzy
 msgid "Blue Curve"
-msgstr "Èierna"
+msgstr "ÄŒierna"
 
 #: src/main/print-color.c:506
 #, fuzzy
 msgid "Blue curve"
-msgstr "Èierna"
+msgstr "ÄŒierna"
 
 #: src/main/print-color.c:513
 #, fuzzy
 msgid "White Curve"
-msgstr "®ltá"
+msgstr "Žltá"
 
 #: src/main/print-color.c:514
 #, fuzzy
 msgid "White curve"
-msgstr "®ltá"
+msgstr "Žltá"
 
 #: src/main/print-color.c:521
 msgid "Hue Map"
@@ -1147,7 +962,7 @@ msgstr ""
 #: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
-msgstr "Sýtos»:"
+msgstr "Sýtosť:"
 
 #: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
@@ -1169,584 +984,388 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:516 src/main/printers.c:521
+#: src/main/printers.c:519 src/main/printers.c:524
 #, fuzzy, c-format
 msgid "`%s' is not a valid %s\n"
-msgstr "%s nie je platný parameter pre typ %s\n"
+msgstr "%s nie je platný parameter pre typ %s\n"
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr ""
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr ""
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:673
+#: src/main/printers.c:676
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
-msgstr "Neznáma tlaèiareò %s\n"
+msgstr "Neznáma tla�iareň %s\n"
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s mimo rozsahu (hodnota %d, min %d, max %d)\n"
 
-#: src/main/printers.c:755
+#: src/main/printers.c:761
 #, fuzzy
 msgid "Page size is not valid\n"
-msgstr "Veµkos» obrázka nie je platná\n"
+msgstr "Veľkosť obrázka nie je platná\n"
 
-#: src/main/printers.c:776
+#: src/main/printers.c:782
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
-msgstr "Horný okraj nemô¾e by» men¹í ako nula\n"
+msgstr "Horný okraj nemôže byť menší ako nula\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:788
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
-msgstr "¥avý okraj nemô¾e by» men¹í ako nula\n"
+msgstr "Ľavý okraj nemôže byť menší ako nula\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:794
 #, fuzzy
 msgid "Height must be greater than zero\n"
-msgstr "¥avý okraj nemô¾e by» men¹í ako nula\n"
+msgstr "Ľavý okraj nemôže byť menší ako nula\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:800
 #, fuzzy
 msgid "Width must be greater than zero\n"
-msgstr "Horný okraj nemô¾e by» men¹í ako nula\n"
+msgstr "Horný okraj nemôže byť menší ako nula\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr "©tandardný"
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-msgid "Roll Feed"
-msgstr "Kotúèový podávaè"
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-#, fuzzy
-msgid "Manual Feed"
-msgstr "Manuál"
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-#, fuzzy
-msgid "Print to CD"
-msgstr "Tlaèi» do súboru?"
-
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-#, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Manuál"
-
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-#, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Manuál"
-
-#: src/main/print-escp2-data.c:554
-#, fuzzy
-msgid "Rear Tray"
-msgstr "Zásobník"
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr ""
-
-#: src/main/print-escp2-data.c:581
-#, fuzzy
-msgid "Photo Board"
-msgstr "Fotografický papier"
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr ""
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr ""
-
-#: src/main/print-escp2-data.c:638
-#, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "Automatický výber"
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr ""
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr ""
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-#, fuzzy
-msgid "High"
-msgstr "Vý¹ka:"
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-#, fuzzy
-msgid "Photo"
-msgstr "Fotografia"
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-#, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
-
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-#, fuzzy
-msgid "Ultra Photo"
-msgstr "Fotografický ¹es»farebný"
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-#, fuzzy
-msgid "Light Cyan"
-msgstr "Jasná azúrová"
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-#, fuzzy
-msgid "Light Magenta"
-msgstr "Jasná purpurová"
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-#, fuzzy
-msgid "Light Black"
-msgstr "Èierna"
-
-#: src/main/print-escp2-data.c:811
-#, fuzzy
-msgid "Dark Yellow"
-msgstr "®ltá"
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-#, fuzzy
-msgid "Matte Black"
-msgstr "Matný papier"
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-#, fuzzy
-msgid "Photo Black"
-msgstr "Fotografický papier"
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-#, fuzzy
-msgid "Gloss Optimizer"
-msgstr "Lesklý film"
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-#, fuzzy
-msgid "Light Light Black"
-msgstr "Èierna"
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
 msgstr ""
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 #, fuzzy
 msgid "Print Quality"
-msgstr "720 DPI Najvy¹¹ia kvalita"
-
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr ""
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr ""
-
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr ""
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr ""
+msgstr "720 DPI Najvyššia kvalita"
 
-#: src/main/print-escp2.c:214
+#: src/main/print-escp2.c:228
 #, fuzzy
 msgid "Resolution of the print"
-msgstr "Rozlí¹enie a kvalita tlaèe"
+msgstr "Rozlíšenie a kvalita tla�e"
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:236
+#: src/main/print-escp2.c:250
 #, fuzzy
 msgid "Ink Set"
 msgstr "Typ atramentu"
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 #, fuzzy
 msgid "Output Order"
-msgstr "Typ výstupu:"
+msgstr "Typ výstupu:"
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 #, fuzzy
 msgid "Ink change command"
-msgstr "Neznámy príkaz.\n"
+msgstr "Neznámy príkaz.\n"
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 #, fuzzy
 msgid "Alternate Alignment Choices"
-msgstr "Opakujem proces zarovnávania.\n"
+msgstr "Opakujem proces zarovnávania.\n"
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 #, fuzzy
 msgid "Channel Names"
 msgstr "Storno"
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:346
 #, fuzzy
 msgid "Cyan Map"
-msgstr "Azúrová"
+msgstr "Azúrová"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:347
 #, fuzzy
 msgid "Adjust the cyan map"
-msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie azúrovej farby pre tla�"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:352
 #, fuzzy
 msgid "Magenta Map"
-msgstr "Purpurová"
+msgstr "Purpurová"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Adjust the magenta map"
-msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie purpurovej farby pre tla�"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:358
 #, fuzzy
 msgid "Yellow Map"
-msgstr "®ltá"
+msgstr "Žltá"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Adjust the yellow map"
-msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie žltej farby pre tla�"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:364
 #, fuzzy
 msgid "Blue Map"
-msgstr "Èiernobielo"
+msgstr "ÄŒiernobielo"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Adjust the blue map"
-msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie azúrovej farby pre tla�"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Adjust the red map"
-msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie žltej farby pre tla�"
 
-#: src/main/print-escp2.c:447
+#: src/main/print-escp2.c:464
 #, fuzzy
 msgid "Red Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:448
+#: src/main/print-escp2.c:465
 #, fuzzy
 msgid "Adjust the red density"
-msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie žltej farby pre tla�"
 
-#: src/main/print-escp2.c:455
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Blue Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:456
+#: src/main/print-escp2.c:473
 #, fuzzy
 msgid "Adjust the blue density"
-msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie azúrovej farby pre tla�"
 
-#: src/main/print-escp2.c:463
+#: src/main/print-escp2.c:480
 #, fuzzy
 msgid "Gloss Level"
-msgstr "Lesklý film"
+msgstr "Lesklý film"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:481
 #, fuzzy
 msgid "Adjust the gloss level"
-msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie žltej farby pre tla�"
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 #, fuzzy
 msgid "Light Gray Transition"
-msgstr "Jasná azúrová"
+msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 #, fuzzy
 msgid "Dark Gray Transition"
-msgstr "Jasná azúrová"
+msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:527
+#: src/main/print-escp2.c:544
 #, fuzzy
 msgid "Mid Gray Transition"
-msgstr "Jasná azúrová"
+msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:528
+#: src/main/print-escp2.c:545
 #, fuzzy
 msgid "Medium Gray Transition"
-msgstr "Jasná azúrová"
+msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 #, fuzzy
 msgid "Full Manual Control"
-msgstr "Typ výstupu:"
+msgstr "Typ výstupu:"
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr ""
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr ""
-
-#: src/main/print-escp2.c:1564
-#, fuzzy
-msgid "Print To Hub"
-msgstr "Tlaèi» do súboru?"
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
-msgstr "Typ výstupu:"
+msgstr "Typ výstupu:"
+
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr "Štandardný"
 
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 #, fuzzy
 msgid "Automatic"
-msgstr "Veµkos»"
+msgstr "Veľkosť"
 
-#: src/main/print-escp2.c:1701
+#: src/main/print-escp2.c:1829
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:1703
+#: src/main/print-escp2.c:1831
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2168
+#: src/main/print-escp2.c:2313
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
-msgstr "Tlaèiareò nepodporuje farebný výstup\n"
+msgstr "Tla�iareň nepodporuje farebný výstup\n"
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1761,7 +1380,7 @@ msgstr "600 DPI"
 
 #: src/main/print-lexmark.c:579 src/main/print-lexmark.c:655
 msgid "600 DPI high quality"
-msgstr "600 DPI Vysoká kvalita"
+msgstr "600 DPI Vysoká kvalita"
 
 #: src/main/print-lexmark.c:580 src/main/print-lexmark.c:656
 msgid "600 DPI Unidirectional"
@@ -1773,11 +1392,11 @@ msgstr "1200 DPI"
 
 #: src/main/print-lexmark.c:582 src/main/print-lexmark.c:658
 msgid "1200 DPI high quality"
-msgstr "1200 DPI Vysoká kvalita"
+msgstr "1200 DPI Vysoká kvalita"
 
 #: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659
 msgid "1200 DPI highest quality"
-msgstr "1200 DPI Najvy¹¹ia kvalita"
+msgstr "1200 DPI Najvyššia kvalita"
 
 #: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660
 msgid "1200 DPI  Unidirectional"
@@ -1789,454 +1408,625 @@ msgstr "2400 DPI x 1200 DPI"
 
 #: src/main/print-lexmark.c:586
 msgid "2400 DPI x 1200 DPI high quality"
-msgstr "2400 DPI x 1200 DPI Vysoká kvalita"
+msgstr "2400 DPI x 1200 DPI Vysoká kvalita"
 
 #: src/main/print-lexmark.c:587
 msgid "2400 DPI x 1200 DPI highest quality"
-msgstr "2400 DPI x 1200 DPI Najvy¹¹ia kvalita"
+msgstr "2400 DPI x 1200 DPI Najvyššia kvalita"
 
 #: src/main/print-lexmark.c:589
 msgid "test print"
-msgstr "Test tlaèe"
+msgstr "Test tla�e"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
-msgstr "©tandardný ¹tvorfarebný"
+msgstr "Štandardný štvorfarebný"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
-msgstr "Kompozitný trojfarebný"
+msgstr "Kompozitný trojfarebný"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
-msgstr "Fotografický ¹es»farebný"
+msgstr "Fotografický šesťfarebný"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
-msgstr "Kompozitný fotografický pä»farebný"
+msgstr "Kompozitný fotografický päťfarebný"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+msgid "Plain Paper"
+msgstr "Oby�ajný papier"
+
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
-msgstr "Lesklý film"
+msgstr "Lesklý film"
+
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+msgid "Transparencies"
+msgstr "Priesvitná fólia"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 msgid "Envelopes"
-msgstr "Obálky"
+msgstr "Obálky"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 msgid "Matte Paper"
-msgstr "Matný papier"
+msgstr "Matný papier"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
-msgstr "Papier pre atramentovú tlaèiareò"
+msgstr "Papier pre atramentovú tla�iareň"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papier s fotografickou kvalitou"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 msgid "Photo Paper"
-msgstr "Fotografický papier"
+msgstr "Fotografický papier"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
-msgstr "Lesklý foto papier Premium"
+msgstr "Lesklý foto papier Premium"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
-msgstr "Ligotavý foto papier Premium"
+msgstr "Ligotavý foto papier Premium"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
-msgstr "Lesklý fotografický papier"
+msgstr "Lesklý fotografický papier"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
-msgstr "Ilford »a¾ký papier"
+msgstr "Ilford ťažký papier"
+
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr "Iné"
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr "Automatický podáva� papiera"
 
-#: src/main/print-olympus.c:265
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr "Manuálne s prerušením"
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr "Manuálne bez prerušenia"
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 #, fuzzy
 msgid "Glossy"
-msgstr "Lesklý film"
+msgstr "Lesklý film"
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:861
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 #, fuzzy
 msgid "Matte"
-msgstr "Matný papier"
+msgstr "Matný papier"
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1331
+#: src/main/print-olympus.c:1627
 #, fuzzy
 msgid "Adjust the cyan balance"
-msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie azúrovej farby pre tla�"
 
-#: src/main/print-olympus.c:1339
+#: src/main/print-olympus.c:1635
 #, fuzzy
 msgid "Adjust the magenta balance"
-msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie purpurovej farby pre tla�"
 
-#: src/main/print-olympus.c:1347
+#: src/main/print-olympus.c:1643
 #, fuzzy
 msgid "Adjust the yellow balance"
-msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie žltej farby pre tla�"
 
-#: src/main/print-olympus.c:1354
+#: src/main/print-olympus.c:1650
 #, fuzzy
 msgid "Black Balance"
-msgstr "Èiernobielo"
+msgstr "ÄŒiernobielo"
 
-#: src/main/print-olympus.c:1355
+#: src/main/print-olympus.c:1651
 #, fuzzy
 msgid "Adjust the black balance"
-msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
+msgstr "Prispôsobenie vyváženie azúrovej farby pre tla�"
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 msgid "Plain"
-msgstr "Jednoduchá"
+msgstr "Jednoduchá"
 
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 msgid "Bond"
 msgstr "Bond"
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 msgid "Premium"
 msgstr "Premium"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
-msgstr "Lesklé foto"
+msgstr "Lesklé foto"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 msgid "Transparency"
-msgstr "Priesvitné fólie"
+msgstr "Priesvitné fólie"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
-msgstr "Rýchloschnúce foto"
+msgstr "Rýchloschnúce foto"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 msgid "Quick-dry Transparency"
-msgstr "Rýchloschnúce priesvit. fólie"
+msgstr "Rýchloschnúce priesvit. fólie"
 
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
-msgstr "Manuál"
+msgstr "Manuál"
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 msgid "Tray 1"
-msgstr "Zásobník 1"
+msgstr "Zásobník 1"
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 msgid "Tray 2"
-msgstr "Zásobník 2"
+msgstr "Zásobník 2"
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 msgid "Tray 3"
-msgstr "Zásobník 3"
+msgstr "Zásobník 3"
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 msgid "Tray 4"
-msgstr "Zásobník 4"
+msgstr "Zásobník 4"
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
-msgstr "Prenosný podávaè papiera"
+msgstr "Prenosný podáva� papiera"
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 msgid "Desktop Sheet Feeder"
-msgstr "Stolový podávaè papiera"
+msgstr "Stolový podáva� papiera"
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 msgid "Tray"
-msgstr "Zásobník"
+msgstr "Zásobník"
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 msgid "Optional Source"
-msgstr "Voliteµný zdroj"
+msgstr "Voliteľný zdroj"
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 msgid "Autoselect"
-msgstr "Automatický výber"
+msgstr "Automatický výber"
 
 #: src/main/print-pcl.c:256
+msgid "150x150 DPI"
+msgstr "150x150 DPI"
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr "300x300 DPI"
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
+msgstr "600x300 DPI"
+
+#: src/main/print-pcl.c:259
 msgid "600x600 DPI monochrome"
 msgstr "600x600 DPI monochromaticky"
 
-#: src/main/print-pcl.c:259
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr "600x600 DPI"
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr "1200x600 DPI"
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
-msgstr "Farebná + èierna kazeta"
+msgstr "Farebná + �ierna kazeta"
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
-msgstr "Farebná + Foto kazeta"
-
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr ""
+msgstr "Farebná + Foto kazeta"
 
 #: src/main/print-ps.c:97
 #, fuzzy
 msgid "PPDFile"
-msgstr "PPD súbor:"
+msgstr "PPD súbor:"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 #, fuzzy
 msgid "PPD File"
-msgstr "PPD súbor?"
+msgstr "PPD súbor?"
 
 #: src/main/print-raw.c:223
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 #, fuzzy
 msgid "Two Level Grayscale"
-msgstr "V odtieòoch ¹edej"
+msgstr "V odtieňoch šedej"
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 #, fuzzy
 msgid "Three Level Grayscale"
-msgstr "V odtieòoch ¹edej"
+msgstr "V odtieňoch šedej"
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
-msgstr "Kompozitný roz¹írený ¹es»farebný"
+msgstr "Kompozitný rozšírený šesťfarebný"
 
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 #, fuzzy
 msgid "Seven Color Photo"
-msgstr "Fotografický ¹es»farebný"
+msgstr "Fotografický šesťfarebný"
 
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 msgid "Seven Color Enhanced"
-msgstr "Roz¹írený sedemfarebný"
+msgstr "Rozšírený sedemfarebný"
 
-#: src/main/escp2-channels.c:1535
+#: src/main/escp2-channels.c:1649
 #, fuzzy
 msgid "Eight Color Photo"
-msgstr "Fotografický ¹es»farebný"
+msgstr "Fotografický šesťfarebný"
 
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 #, fuzzy
 msgid "One Color Raw"
-msgstr "Fotografický ¹es»farebný"
+msgstr "Fotografický šesťfarebný"
 
-#: src/main/escp2-channels.c:1695
+#: src/main/escp2-channels.c:1809
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
-msgstr "Roz¹írený sedemfarebný"
+msgstr "Rozšírený sedemfarebný"
 
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 #, fuzzy
 msgid "Two Color Raw"
-msgstr "©tandardný ¹tvorfarebný"
+msgstr "Štandardný štvorfarebný"
 
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 #, fuzzy
 msgid "Three Color Raw"
-msgstr "Kompozitný trojfarebný"
+msgstr "Kompozitný trojfarebný"
 
-#: src/main/escp2-channels.c:1762
+#: src/main/escp2-channels.c:1876
 #, fuzzy
 msgid "Three Color Raw Gloss"
-msgstr "Kompozitný trojfarebný"
+msgstr "Kompozitný trojfarebný"
 
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 #, fuzzy
 msgid "Four Color Raw"
-msgstr "©tandardný ¹tvorfarebný"
+msgstr "Štandardný štvorfarebný"
 
-#: src/main/escp2-channels.c:1884
+#: src/main/escp2-channels.c:2017
 #, fuzzy
 msgid "Four Color Raw Gloss"
-msgstr "©tandardný ¹tvorfarebný"
+msgstr "Štandardný štvorfarebný"
 
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 #, fuzzy
 msgid "Five Color Raw"
-msgstr "Fotografický ¹es»farebný"
+msgstr "Fotografický šesťfarebný"
 
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 #, fuzzy
 msgid "Six Color Raw"
-msgstr "Fotografický ¹es»farebný"
+msgstr "Fotografický šesťfarebný"
 
-#: src/main/escp2-channels.c:1962
+#: src/main/escp2-channels.c:2109
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
-msgstr "Kompozitný roz¹írený ¹es»farebný"
+msgstr "Kompozitný rozšírený šesťfarebný"
 
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 #, fuzzy
 msgid "Seven Color Raw"
-msgstr "Fotografický ¹es»farebný"
+msgstr "Fotografický šesťfarebný"
 
-#: src/main/escp2-channels.c:2024
+#: src/main/escp2-channels.c:2187
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
-msgstr "Roz¹írený sedemfarebný"
+msgstr "Rozšírený sedemfarebný"
 
-#: src/main/escp2-channels.c:2042
+#: src/main/escp2-channels.c:2205
 #, fuzzy
 msgid "Eight Color Raw"
-msgstr "Fotografický ¹es»farebný"
-
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+msgstr "Fotografický šesťfarebný"
+
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 #, fuzzy
 msgid "UltraChrome Photo Black"
-msgstr "Fotografický ¹es»farebný"
+msgstr "Fotografický šesťfarebný"
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+#, fuzzy
+msgid "Photo Black"
+msgstr "Fotografický papier"
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+#, fuzzy
+msgid "Matte Black"
+msgstr "Matný papier"
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+#, fuzzy
+msgid "Light Cyan"
+msgstr "Jasná azúrová"
+
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+#, fuzzy
+msgid "Light Magenta"
+msgstr "Jasná purpurová"
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+#, fuzzy
+msgid "Light Black"
+msgstr "ÄŒierna"
+
+#: src/main/escp2-channels.c:2981
+#, fuzzy
+msgid "Dark Yellow"
+msgstr "Žltá"
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+#, fuzzy
+msgid "Gloss Optimizer"
+msgstr "Lesklý film"
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+#, fuzzy
+msgid "Light Light Black"
+msgstr "ÄŒierna"
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 msgid "Plain Paper Fast Load"
-msgstr "Obyèajný papier rýchle nasadenie"
+msgstr "Oby�ajný papier rýchle nasadenie"
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
-msgstr "Pohµadnica"
+msgstr "Pohľadnica"
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 #, fuzzy
 msgid "Matte Paper Heavyweight"
-msgstr "Matný papier"
+msgstr "Matný papier"
 
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
-msgstr "Lesklý foto papier Premium"
+msgstr "Lesklý foto papier Premium"
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 #, fuzzy
 msgid "ColorLife Paper"
-msgstr "Obyèajný papier"
+msgstr "Oby�ajný papier"
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 #, fuzzy
 msgid "Archival Matte Paper"
-msgstr "Matný papier"
+msgstr "Matný papier"
 
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+msgid "Roll Feed"
+msgstr "Kotú�ový podáva�"
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+#, fuzzy
+msgid "Manual Feed"
+msgstr "Manuál"
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+#, fuzzy
+msgid "Print to CD"
+msgstr "Tla�iť do súboru?"
+
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Manuál"
+
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Manuál"
+
+#: src/main/escp2-papers.c:1859
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Zásobník"
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/escp2-papers.c:1886
+#, fuzzy
+msgid "Photo Board"
+msgstr "Fotografický papier"
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr ""
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr ""
+
+#: src/main/escp2-papers.c:1943
+#, fuzzy
+msgid "Cut Sheet Autoselect"
+msgstr "Automatický výber"
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr ""
+
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
@@ -2263,7 +2053,7 @@ msgstr "600x600 DPI"
 #: src/main/escp2-resolutions.c:68
 #, fuzzy
 msgid "360 DPI High Quality"
-msgstr "1440 x 360 DPI Vysoká kvalita"
+msgstr "1440 x 360 DPI Vysoká kvalita"
 
 #: src/main/escp2-resolutions.c:71 src/main/escp2-resolutions.c:74
 #: src/main/escp2-resolutions.c:77
@@ -2276,144 +2066,168 @@ msgstr "600 DPI"
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:94
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 #, fuzzy
 msgid "720 DPI High Quality"
-msgstr "1200 DPI Vysoká kvalita"
+msgstr "1200 DPI Vysoká kvalita"
 
-#: src/main/escp2-resolutions.c:97
+#: src/main/escp2-resolutions.c:103
 #, fuzzy
 msgid "720 DPI Highest Quality"
-msgstr "1200 DPI Najvy¹¹ia kvalita"
+msgstr "1200 DPI Najvyššia kvalita"
 
-#: src/main/escp2-resolutions.c:100
+#: src/main/escp2-resolutions.c:106
 #, fuzzy
 msgid "720 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:116
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
-msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
+msgstr "1440 x 360 DPI Najvyššia kvalita"
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:129
+#: src/main/escp2-resolutions.c:135
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
-msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
+msgstr "1440 x 360 DPI Najvyššia kvalita"
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
+#: src/main/escp2-resolutions.c:145
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:142
-#, fuzzy
-msgid "1440 x 1440"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/escp2-resolutions.c:145
-#, fuzzy
-msgid "1440 x 1440 DPI High Quality"
-msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
-
-#: src/main/escp2-resolutions.c:148
-#, fuzzy
-msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
-
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:158
+#: src/main/escp2-resolutions.c:155
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:164
-#, fuzzy
-msgid "2880 x 1440 DPI High Quality"
-msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
-
-#: src/main/escp2-resolutions.c:167
-#, fuzzy
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
-
-#: src/main/escp2-resolutions.c:171
+#: src/main/escp2-resolutions.c:162
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 #, fuzzy
 msgid "Interleave"
-msgstr "Názov tlaèiarne:"
+msgstr "Názov tla�iarne:"
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 #, fuzzy
 msgid "Interleave 2"
-msgstr "Názov tlaèiarne:"
+msgstr "Názov tla�iarne:"
 
-#: src/main/escp2-resolutions.c:584
+#: src/main/escp2-resolutions.c:594
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jas:"
 
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+#, fuzzy
+msgid "High"
+msgstr "Výška:"
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografia"
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+#, fuzzy
+msgid "Super Photo"
+msgstr "Stylus Photo"
+
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+#, fuzzy
+msgid "Ultra Photo"
+msgstr "Fotografický šesťfarebný"
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr ""
+
 #: src/main/generic-options.c:46
 msgid "Text"
 msgstr ""
@@ -2433,12 +2247,12 @@ msgstr "Fotografia"
 
 #: src/main/generic-options.c:50
 msgid "Line Art"
-msgstr "Èiarová grafika"
+msgstr "Čiarová grafika"
 
 #: src/main/generic-options.c:55
 #, fuzzy
 msgid "Page"
-msgstr "Veµkos»"
+msgstr "Veľkosť"
 
 #: src/main/generic-options.c:56
 msgid "Job"
@@ -2447,12 +2261,12 @@ msgstr ""
 #: src/main/generic-options.c:68
 #, fuzzy
 msgid "Image Type"
-msgstr "Typ obrázku:"
+msgstr "Typ obrázku:"
 
 #: src/main/generic-options.c:69
 #, fuzzy
 msgid "Type of image being printed"
-msgstr "Typ atramentu tlaèiarne"
+msgstr "Typ atramentu tla�iarne"
 
 #: src/main/generic-options.c:74 src/main/generic-options.c:80
 msgid "Job Mode"
@@ -2465,12 +2279,12 @@ msgstr ""
 #: src/main/generic-options.c:80
 #, fuzzy
 msgid "Page Number"
-msgstr "Veµkos»"
+msgstr "Veľkosť"
 
 #: src/main/generic-options.c:81
 #, fuzzy
 msgid "Page number"
-msgstr "Veµkos»"
+msgstr "Veľkosť"
 
 #: src/main/xmli18n-tmp.h:1
 msgid "Letter"
@@ -2488,3882 +2302,4206 @@ msgstr "Tabloid"
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/main/xmli18n-tmp.h:11
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 Foto papier"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/main/xmli18n-tmp.h:26
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/main/xmli18n-tmp.h:32
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
 msgstr "A4"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/main/xmli18n-tmp.h:67
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 msgid "American foolscap"
-msgstr "Americké rozmery"
+msgstr "Americké rozmery"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 msgid "European foolscap"
-msgstr "Európske rozmery"
+msgstr "Európske rozmery"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/main/xmli18n-tmp.h:109
 #, fuzzy
 msgid "ISO A4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 msgid "Small paperback"
 msgstr "Small paperback"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 msgid "Penguin small paperback"
 msgstr "Penguin small paperback"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 msgid "Penguin large paperback"
 msgstr "Penguin large paperback"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 msgid "Hagaki Card"
 msgstr "Hagaki karta"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
 msgstr "Oufuku karta"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
-msgstr "Japonská dlhá obálka #3"
+msgstr "Japonská dlhá obálka #3"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
-msgstr "Japonská dlhá obálka #4"
+msgstr "Japonská dlhá obálka #4"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 msgid "Japanese Kaku envelope #4"
-msgstr "Japonská Kaku obálka #4"
+msgstr "Japonská Kaku obálka #4"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 msgid "A2 Invitation"
-msgstr "A2 pozvánka"
+msgstr "A2 pozvánka"
 
-#: src/main/xmli18n-tmp.h:125
+#: src/main/xmli18n-tmp.h:126
 #, fuzzy
 msgid "Monarch Envelope"
-msgstr "Obálka"
+msgstr "Obálka"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:127
+#: src/main/xmli18n-tmp.h:128
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:130
+#: src/main/xmli18n-tmp.h:131
 #, fuzzy
 msgid "Wide Postcard"
-msgstr "Pohµadnica"
+msgstr "Pohľadnica"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 msgid "Custom"
-msgstr "Vlastný"
+msgstr "Vlastný"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
 msgstr "89 mm rolka papiera"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
-msgstr "4 palcová rolka papiera"
+msgstr "4 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
-msgstr "5 palcová rolka papiera"
+msgstr "5 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
 msgstr "210 mm rolka papiera"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
-msgstr "13 palcová rolka papiera"
+msgstr "13 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
-msgstr "22 palcová rolka papiera"
+msgstr "22 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
-msgstr "24 palcová rolka papiera"
+msgstr "24 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
-msgstr "36 palcová rolka papiera"
+msgstr "36 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
-msgstr "44 palcová rolka papiera"
+msgstr "44 palcová rolka papiera"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:145
+#: src/main/xmli18n-tmp.h:146
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:146
+#: src/main/xmli18n-tmp.h:147
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:147
+#: src/main/xmli18n-tmp.h:148
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:148
+#: src/main/xmli18n-tmp.h:149
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:149
+#: src/main/xmli18n-tmp.h:150
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:150
+#: src/main/xmli18n-tmp.h:151
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:151
+#: src/main/xmli18n-tmp.h:152
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:152
+#: src/main/xmli18n-tmp.h:153
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:153
+#: src/main/xmli18n-tmp.h:154
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:154
+#: src/main/xmli18n-tmp.h:155
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:155
+#: src/main/xmli18n-tmp.h:156
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:156
+#: src/main/xmli18n-tmp.h:157
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:157
+#: src/main/xmli18n-tmp.h:158
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:158
+#: src/main/xmli18n-tmp.h:159
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:159
+#: src/main/xmli18n-tmp.h:160
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:160
+#: src/main/xmli18n-tmp.h:161
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:161
+#: src/main/xmli18n-tmp.h:162
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:162
+#: src/main/xmli18n-tmp.h:163
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:163
+#: src/main/xmli18n-tmp.h:164
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:164
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon S100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon S200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:173
 msgid "Canon S300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:180
-msgid "Canon iP4000"
+#: src/main/xmli18n-tmp.h:181
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:182
+msgid "Canon PIXMA iP3000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:183
+msgid "Canon PIXMA iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:184
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:185
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:186
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:187
+#, fuzzy
+msgid "Canon PIXMA iP4300"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:188
+#, fuzzy
+msgid "Canon PIXMA iP5000"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:189
+msgid "Canon PIXMA iP5200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:190
+#, fuzzy
+msgid "Canon PIXMA iP6700"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA MP150"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:192
+#, fuzzy
+msgid "Canon PIXMA MP500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:193
+#, fuzzy
+msgid "Canon PIXMA MP700"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA MP730"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:195
+#, fuzzy
+msgid "Canon PIXMA MP750"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA MP760"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA MP770"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA MP780"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
+#, fuzzy
+msgid "Canon PIXMA MP790"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP830"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:201
+msgid "Canon PIXUS iP3100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:202
+msgid "Canon PIXUS iP4100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:203
+msgid "Canon i560"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:204
+msgid "Canon i850"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:205
+msgid "Canon i860"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:206
+msgid "Canon i865"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:238
+#, fuzzy
+msgid "Epson Stylus C79"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:245
+#, fuzzy
+msgid "Epson Stylus C87"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "Epson Stylus Photo 1400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "Epson Stylus Photo 1410"
+msgstr "Stylus Photo 810"
+
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:314
+#, fuzzy
+msgid "Epson Stylus Photo R230"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:315
+#, fuzzy
+msgid "Epson Stylus Photo R240"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "Epson Stylus Photo R245"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:317
+#, fuzzy
+msgid "Epson Stylus Photo R260"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Epson Stylus Photo R265"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "Epson Stylus Photo R270"
+msgstr "Stylus Photo 1270"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "Epson Stylus Photo R350"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "Epson Stylus Photo R360"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "Epson Stylus Photo R380"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "Epson Stylus Photo R390"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Epson Stylus Photo RX560"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:335
+#, fuzzy
+msgid "Epson Stylus Photo RX580"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:336
+#, fuzzy
+msgid "Epson Stylus Photo RX590"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:340
+#, fuzzy
+msgid "Epson Stylus Photo RX640"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:353
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:372
+#, fuzzy
+msgid "Epson Stylus CX5000"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:373
+#, fuzzy
+msgid "Epson Stylus CX5000F"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:380
+#, fuzzy
+msgid "Epson Stylus CX6000"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX7000F"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:397
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:399
+msgid "Epson PictureMate Flash"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:400
+msgid "Epson PictureMate Pal"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:401
+msgid "Epson PictureMate Snap"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:402
+#, fuzzy
+msgid "Epson PictureMate 200"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:403
+#, fuzzy
+msgid "Epson PictureMate 210"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:404
+#, fuzzy
+msgid "Epson PictureMate 240"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:405
+#, fuzzy
+msgid "Epson PictureMate 250"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson PictureMate 280"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:411
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:414
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:417
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:426
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:427
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:428
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:429
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:430
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:448
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:451
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:454
+#, fuzzy
+msgid "Epson PM A820"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:456
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:459
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:460
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:462
+#, fuzzy
+msgid "Epson PM D870"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:463
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:464
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:465
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:467
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:468
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
+#, fuzzy
+msgid "Epson PM G850"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:470
+#, fuzzy
+msgid "Epson PM G4500"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:471
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:472
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:473
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:474
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:475
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:478
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:549
 #, fuzzy
 msgid "Generic PCL 4 Printer"
-msgstr "Definovanie novej tlaèiarne"
+msgstr "Definovanie novej tla�iarne"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:550
 #, fuzzy
 msgid "Generic PCL 5 Printer"
-msgstr "Definovanie novej tlaèiarne"
+msgstr "Definovanie novej tla�iarne"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:551
 #, fuzzy
 msgid "Generic PCL 5c Printer"
-msgstr "Definovanie novej tlaèiarne"
+msgstr "Definovanie novej tla�iarne"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:552
 #, fuzzy
 msgid "Generic PCL 5e Printer"
-msgstr "Definovanie novej tlaèiarne"
+msgstr "Definovanie novej tla�iarne"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:802
 #, fuzzy
 msgid "HP e-printer e20"
-msgstr "Názov tlaèiarne:"
+msgstr "Názov tla�iarne:"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+msgid "Lexmark Optra E220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:913
 #, fuzzy
 msgid "Star LaserPrinter 8"
-msgstr "Nastavi» tlaèiareò"
+msgstr "Nastaviť tla�iareň"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:924
+msgid "Xerox WorkCentre M118"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:926
+msgid "Lexmark X73"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+msgid "Olympus P-S100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:942
+msgid "Canon CP-10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:943
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:953
+msgid "Sony DPP-EX5"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:957
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:960
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Inch"
 msgstr "palce"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
-msgstr "Nastavi» palce ako základnú mernú jednotku"
+msgstr "Nastaviť palce ako základnú mernú jednotku"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
-msgstr "Nastavi» centimetre ako základnú mernú jednotku"
+msgstr "Nastaviť centimetre ako základnú mernú jednotku"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Points"
-msgstr "Tlaèi»"
+msgstr "Tla�iť"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "Nastavi» palce ako základnú mernú jednotku"
+msgstr "Nastaviť palce ako základnú mernú jednotku"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
-msgstr "Nastavi» centimetre ako základnú mernú jednotku"
+msgstr "Nastaviť centimetre ako základnú mernú jednotku"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "Nastavi» palce ako základnú mernú jednotku"
+msgstr "Nastaviť palce ako základnú mernú jednotku"
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color output"
-msgstr "Farebný výstup"
+msgstr "Farebný výstup"
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
-msgstr "Tlaèi» v odtieòoch ¹edej s pou¾itím èiernej farby"
+msgstr "Tla�iť v odtieňoch šedej s použitím �iernej farby"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 #, fuzzy
 msgid "Standard Command"
-msgstr "©tandardný"
+msgstr "Štandardný"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 #, fuzzy
 msgid "Custom Command"
-msgstr "Príkaz:"
+msgstr "Príkaz:"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
-msgstr "Súbor"
+msgstr "Súbor"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 #, fuzzy
 msgid "Print to a file"
-msgstr "Tlaèi» do súboru?"
+msgstr "Tla�iť do súboru?"
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 #, fuzzy
 msgid "Set Default"
-msgstr "Nastavi» ¹tandardné"
+msgstr "Nastaviť štandardné"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
 msgstr "Storno"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, c-format
 msgid "%s -- Print v%s"
-msgstr "%s -- Tlaè v%s"
+msgstr "%s -- Tla� v%s"
 
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
 msgstr "O programe"
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 msgid ""
 "Print and\n"
 "Save Settings"
 msgstr ""
-"Ulo¾i» nastavenia\n"
-"a vytlaèi»"
+"Uložiť nastavenia\n"
+"a vytla�iť"
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 msgid ""
 "Save\n"
 "Settings"
 msgstr ""
-"Ulo¾i»\n"
+"Uložiť\n"
 "nastavenia"
 
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
-msgstr "Tlaèi»"
+msgstr "Tla�iť"
 
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
-msgstr "Náhµad"
+msgstr "Náhľad"
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6376,513 +6514,468 @@ msgid ""
 "If you click another button while dragging the mouse, the image will return "
 "to its original position."
 msgstr ""
-"Pozícia obrázku na strane.\n"
-"Kliknite a potiahnite primárne tlaèítko na pozíciu obrázku.\n"
-"Kliknite a potiahnite sekundárne tlaèítko pohybu obrázku s jemnej¹ou "
-"presnos»ou; ka¾dá jednotka pohybu posunie obrázok o jeden bod (1/72\")\n"
-"Kliknite a potiahnite so stredným tlaèítkom na pohyb v jednotkách veµkosti "
-"obrázku.\n"
-"Ak pri klikaní a »ahaní podr¾íte klávesu Shift obmedzíte pohyb obrázku iba "
-"na vodorovný a zvislý pohyb.\n"
-"Ak poèas »ahania obrázku my¹ou kliknete iným tlaèítkom, obrázok sa vráti na "
-"pôvodnú pozíciu."
+"Pozícia obrázku na strane.\n"
+"Kliknite a potiahnite primárne tla�ítko na pozíciu obrázku.\n"
+"Kliknite a potiahnite sekundárne tla�ítko pohybu obrázku s jemnejšou "
+"presnosťou; každá jednotka pohybu posunie obrázok o jeden bod (1/72\")\n"
+"Kliknite a potiahnite so stredným tla�ítkom na pohyb v jednotkách veľkosti "
+"obrázku.\n"
+"Ak pri klikaní a ťahaní podržíte klávesu Shift obmedzíte pohyb obrázku iba "
+"na vodorovný a zvislý pohyb.\n"
+"Ak po�as ťahania obrázku myšou kliknete iným tla�ítkom, obrázok sa vráti na "
+"pôvodnú pozíciu."
 
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 #, fuzzy
 msgid "Paper Size"
-msgstr "Veµkos»"
+msgstr "Veľkosť"
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
 msgstr "Rozmery:"
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
-msgstr "©írka:"
+msgstr "Šírka:"
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 msgid "Width of the paper that you wish to print to"
-msgstr "©írka papiera, na ktorý chcete tlaèi»"
+msgstr "Šírka papiera, na ktorý chcete tla�iť"
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
-msgstr "Vý¹ka:"
+msgstr "Výška:"
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 msgid "Height of the paper that you wish to print to"
-msgstr "Vý¹ka papiera, na ktorý chcete tlaèi»"
+msgstr "Výška papiera, na ktorý chcete tla�iť"
 
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 #, fuzzy
 msgid "Automatic Paper Size"
-msgstr "Veµkos»"
+msgstr "Veľkosť"
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 #, fuzzy
 msgid "Image Position"
-msgstr "Pozícia"
+msgstr "Pozícia"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
 msgstr "Automaticky"
 
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
-msgstr "Na vý¹ku"
+msgstr "Na výšku"
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
-msgstr "Na ¹írku"
+msgstr "Na šírku"
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 msgid "Upside down"
 msgstr "Hore nohami"
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
-msgstr "Na ¹írku"
+msgstr "Na šírku"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
-"Zvoµte orientáciu: na vý¹ku, na ¹írku, hore nohami, na ¹írku hore nohami "
+"Zvoľte orientáciu: na výšku, na šírku, hore nohami, na šírku hore nohami "
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 msgid "Orientation:"
-msgstr "Orientácia:"
+msgstr "Orientácia:"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
-msgstr "¥avý:"
+msgstr "Ľavý:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
-msgstr "Vzdialenos» od µavého okraja papiera k obrázku"
+msgstr "Vzdialenosť od ľavého okraja papiera k obrázku"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
-msgstr "Pravý:"
+msgstr "Pravý:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 msgid "Distance from the left of the paper to the right of the image"
-msgstr "Vzdialenos» od µavého okraja papiera k pravému okraju obrázku"
+msgstr "Vzdialenosť od ľavého okraja papiera k pravému okraju obrázku"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
-msgstr "Vzdialenos» od pravého okraja papiera k obrázku"
+msgstr "Vzdialenosť od pravého okraja papiera k obrázku"
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
-msgstr "Horný:"
+msgstr "Horný:"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
-msgstr "Vzdialenos» od horného okraja papiera k obrázku"
+msgstr "Vzdialenosť od horného okraja papiera k obrázku"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
-msgstr "Dolný:"
+msgstr "Dolný:"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
-msgstr "Vzdialenos» od horného okraja papiera k dolnému okraju obrázku"
+msgstr "Vzdialenosť od horného okraja papiera k dolnému okraju obrázku"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
-msgstr "Vzdialenos» od dolného okraja papiera k obrázku"
+msgstr "Vzdialenosť od dolného okraja papiera k obrázku"
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Center:"
 msgstr "Centrovanie:"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 #, fuzzy
 msgid "Horizontal"
 msgstr "Vodorovne"
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
-msgstr "Vycentrova» vodorovne obrázok na papieri"
+msgstr "Vycentrovať vodorovne obrázok na papieri"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
 msgstr "Oboje"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image on the paper"
-msgstr "Vycentrova» obrázok na papieri"
+msgstr "Vycentrovať obrázok na papieri"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 #, fuzzy
 msgid "Vertical"
 msgstr "Zvislo"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Center the image vertically on the paper"
-msgstr "Vycentrova» obrázok zvisle na papieri"
+msgstr "Vycentrovať obrázok zvisle na papieri"
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
-msgstr "Nastavi» tlaèiareò"
+msgstr "Nastaviť tla�iareň"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 #, fuzzy
 msgid "Printer Make:"
-msgstr "Názov tlaèiarne:"
+msgstr "Názov tla�iarne:"
 
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 #, fuzzy
 msgid "Select the make of your printer"
-msgstr "Vyberte model va¹ej tlaèiarne"
+msgstr "Vyberte model vašej tla�iarne"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 msgid "Printer Model:"
-msgstr "Model tlaèiarne:"
+msgstr "Model tla�iarne:"
 
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 msgid "Select your printer model"
-msgstr "Vyberte model va¹ej tlaèiarne"
+msgstr "Vyberte model vašej tla�iarne"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 msgid "PPD File:"
-msgstr "PPD súbor:"
+msgstr "PPD súbor:"
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
-msgstr "Vlo¾te správny PPD názov súboru pre va¹u tlaèiareò"
+msgstr "Vložte správny PPD názov súboru pre vašu tla�iareň"
 
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
-msgstr "Prechádza»"
+msgstr "Prechádzať"
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
-msgstr "Zvoµte správny PPD názov súboru pre va¹u tlaèiareò"
+msgstr "Zvoľte správny PPD názov súboru pre vašu tla�iareň"
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr ""
-"Zvoµte si názov tlaèiarne (nie typ alebo model tlaèiarne), na ktorej chcete "
-"tlaèi»"
+"Zvoľte si názov tla�iarne (nie typ alebo model tla�iarne), na ktorej chcete "
+"tla�iť"
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 #, fuzzy
 msgid "Printer Queue:"
-msgstr "Názov tlaèiarne:"
+msgstr "Názov tla�iarne:"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
-msgstr "Vlo¾te správny PPD názov súboru pre va¹u tlaèiareò"
+msgstr "Vložte správny PPD názov súboru pre vašu tla�iareň"
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 #, fuzzy
 msgid "File to print to"
-msgstr "Test tlaèe"
+msgstr "Test tla�e"
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 #, fuzzy
 msgid "Print To File"
-msgstr "Tlaèi» do súboru?"
+msgstr "Tla�iť do súboru?"
 
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 msgid "Define New Printer"
-msgstr "Definovanie novej tlaèiarne"
+msgstr "Definovanie novej tla�iarne"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 msgid "Printer Name:"
-msgstr "Názov tlaèiarne:"
+msgstr "Názov tla�iarne:"
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 msgid "Enter the name you wish to give this logical printer"
-msgstr "Vlo¾te oznaèenie, ktoré chcete da» tejto logickej tlaèiarni"
+msgstr "Vložte ozna�enie, ktoré chcete dať tejto logickej tla�iarni"
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "O Gimp-Print "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Verzia Gimp-Print"
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
-"\n"
-"\n"
-"Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n"
-"a zvy¹ok vývojového tímu  Gimp-Print.\n"
-"\n"
-"Nav¹tívte prosím webovskú stánku http://gimp-print.sourceforge.net.\n"
-"\n"
-"Tento program je slobodný softvér; mô¾ete ho nedistribuova» a/alebo meni»\n"
-"v súlade so V¹eobecnou verejnou licenciou GNU publikovanou\n"
-"vo Free Software Foundation; èi u¾ verzie 2 alebo\n"
-"(podµa va¹ej voµby) akoukoµvek nov¹ou.\n"
-"\n"
-"Tento program je ¹írený v nádeji, ¾e bude u¾itoèný, av¹ak\n"
-"BEZ AKEJKO¥VEK ZÁRUKY; neposkytujú sa ani odvodené záruky\n"
-"PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL.\n"
-"Ïal¹ie podrobnosti hµadajte vo V¹eobecnej verejnej licencii GNU.\n"
-"\n"
-"S týmto programom by ste mali získa» kópiu V¹eobecnej verejnej\n"
-"licencie GNU; ak tomu tak nie je, napí¹te do Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
-"MA 02111-1307, USA.\n"
-
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 msgid "Printer Settings"
-msgstr "Nastavenie tlaèiarne"
+msgstr "Nastavenie tla�iarne"
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 msgstr ""
-"Zvoµte si názov tlaèiarne (nie typ alebo model tlaèiarne), na ktorej chcete "
-"tlaèi»"
+"Zvoľte si názov tla�iarne (nie typ alebo model tla�iarne), na ktorej chcete "
+"tla�iť"
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 msgid "Setup Printer..."
-msgstr "Nastavenie tlaèiarne..."
+msgstr "Nastavenie tla�iarne..."
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
-"Voµba model tlaèiarne, PPD súboru a príkaz, ktorý sa pou¾íva pre tlaè na "
-"tejto tlaèiarni"
+"Voľba model tla�iarne, PPD súboru a príkaz, ktorý sa používa pre tla� na "
+"tejto tla�iarni"
 
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 msgid "New Printer..."
-msgstr "Nová tlaèiareò..."
+msgstr "Nová tla�iareň..."
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr ""
-"Definovanie novej logickej tlaèiarne. Toto mô¾e by» pou¾ité na pomenovanie "
-"zbierky nastavení, ktoré si prajete zapamäta» a v budúcnosti pou¾íva»."
+"Definovanie novej logickej tla�iarne. Toto môže byť použité na pomenovanie "
+"zbierky nastavení, ktoré si prajete zapamätať a v budúcnosti používať."
 
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 #, fuzzy
 msgid "Image Size"
-msgstr "Veµkos»"
+msgstr "Veľkosť"
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 msgid "Scaling:"
 msgstr "Zmena:"
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 msgid "Set the scale (size) of the image"
-msgstr "Nastavi» zväè¹enie (veµkos») obrázku"
+msgstr "Nastaviť zvä�šenie (veľkosť) obrázku"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
-"Zvoµte, èi zmena veµkosti bude vyjadrená ako percento dostupnej veµkosti "
-"stránky, alebo ako èíslo výstupného DPI"
+"Zvoľte, �i zmena veľkosti bude vyjadrená ako percento dostupnej veľkosti "
+"stránky, alebo ako �íslo výstupného DPI"
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
-msgstr "Percentá"
+msgstr "Percentá"
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 msgid "Scale the print to the size of the page"
-msgstr "Zmeni» veµkos» tlaèe podµa rozmerov strany"
+msgstr "Zmeniť veľkosť tla�e podľa rozmerov strany"
 
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
-msgstr "Zmeni» veµkos» tlaèe podµa poètu bodov na palec"
+msgstr "Zmeniť veľkosť tla�e podľa po�tu bodov na palec"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 msgid "Set the width of the print"
-msgstr "Nastavi» ¹írku tlaèe"
+msgstr "Nastaviť šírku tla�e"
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 msgid "Set the height of the print"
-msgstr "Nastavi» vý¹ku tlaèe"
+msgstr "Nastaviť výšku tla�e"
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
-"Pou¾i» pôvodnú\n"
-"veµkos» obrázka"
+"Použiť pôvodnú\n"
+"veľkosť obrázka"
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the print size to the size of the image"
-msgstr "Nastavenie veµkosti tlaèe na veµkos» obrázku"
+msgstr "Nastavenie veľkosti tla�e na veľkosť obrázku"
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 msgid "Print Color Adjust"
-msgstr "Prispôsobenie farieb pre tlaè"
+msgstr "Prispôsobenie farieb pre tla�"
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 msgid "Set Defaults"
-msgstr "Nastavi» ¹tandardné"
+msgstr "Nastaviť štandardné"
 
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
-msgstr "Zatvori»"
+msgstr "Zatvoriť"
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 msgid "Image preview"
-msgstr "Náhµad obrázku"
+msgstr "Náhľad obrázku"
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 #, fuzzy
 msgid "Output"
-msgstr "Typ výstupu:"
+msgstr "Typ výstupu:"
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 msgid "Output Type:"
-msgstr "Typ výstupu:"
+msgstr "Typ výstupu:"
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 msgid "Select the desired output type"
-msgstr "Zvoµte vytú¾ený typ výstupu"
+msgstr "Zvoľte vytúžený typ výstupu"
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
-msgstr "Prispôsobi» výstup..."
+msgstr "Prispôsobiť výstup..."
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
-"Nastavenie farebného vyvá¾enia, kontrastu, sýtosti a algoritmu rozptylu"
+"Nastavenie farebného vyváženia, kontrastu, sýtosti a algoritmu rozptylu"
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 #, fuzzy
 msgid "Size Units:"
 msgstr "Jednotky:"
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 msgid "Units:"
 msgstr "Jednotky:"
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 msgid "Select the base unit of measurement for printing"
-msgstr "Zvoli» základnú mernú jednotku pre tlaè"
+msgstr "Zvoliť základnú mernú jednotku pre tla�"
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
 msgstr ""
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
 msgstr ""
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
 msgstr ""
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 #, fuzzy
 msgid "Printer"
-msgstr "Tlaèi»"
+msgstr "Tla�iť"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 #, fuzzy
 msgid "(Default Printer)"
-msgstr "Nastavi» tlaèiareò"
+msgstr "Nastaviť tla�iareň"
 
 #: src/gutenprintui2/curve.c:130
 #, fuzzy
 msgid "Curve type"
-msgstr "Èierna"
+msgstr "ÄŒierna"
 
 #: src/gutenprintui2/curve.c:131
 msgid "Is this curve linear, spline interpolated, or free-form"
@@ -6924,66 +7017,90 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:133
+#: src/cups/genppd.c:146
 #, fuzzy
 msgid "Printer Features"
-msgstr "Nastavenie tlaèiarne"
+msgstr "Nastavenie tla�iarne"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 #, fuzzy
 msgid "Output Control"
-msgstr "Typ výstupu:"
+msgstr "Typ výstupu:"
 
-#: src/cups/genppd.c:139
+#: src/cups/genppd.c:152
 #, fuzzy
 msgid "Common"
-msgstr "Príkaz:"
+msgstr "Príkaz:"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:153
 #, fuzzy
 msgid "Extra 1"
-msgstr "Zásobník 1"
+msgstr "Zásobník 1"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Extra 2"
-msgstr "Zásobník 2"
+msgstr "Zásobník 2"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Extra 3"
-msgstr "Zásobník 3"
+msgstr "Zásobník 3"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:156
 #, fuzzy
 msgid "Extra 4"
-msgstr "Zásobník 4"
+msgstr "Zásobník 4"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr "Slovak"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1465
+#: src/cups/genppd.c:1613
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1717
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1719
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1497
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1756
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -6991,20 +7108,6 @@ msgstr ""
 msgid "Escputil version "
 msgstr "Verzia Escputil "
 
-#: src/escputil/escputil.c:71
-#, fuzzy
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-", Copyright (C) 2000-2001 Robert Krawitz\n"
-"Escputil prichádza bez AKÝCHKO¥VEK GARANCIÍ; detaily získate po napísaní "
-"'escputil -l'\n"
-"Toto je slobodný softvér a jeho redistribúcia je za istých podmienok\n"
-"vítaná; viac informácií získate po napísaní 'escputil -l'.\n"
-
 #: src/escputil/escputil.c:76
 #, fuzzy
 msgid ""
@@ -7026,21 +7129,21 @@ msgid ""
 msgstr ""
 "Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
-"Toto je iba orientaèný preklad licencie, ktorá platí v originálnom anglickom "
-"znení.\n"
+"Toto je iba orienta�ný preklad licencie, ktorá platí v originálnom anglickom "
+"znení.\n"
 "\n"
-"Tento program je voµne ¹íriteµný; mô¾ete ho redistribuova» a meni»\n"
-"v súlade so V¹eobecnou verejnou licenciou GNU publikovanou\n"
-"vo Free Software Foundation; buï licenciou verzie 2 alebo\n"
-"(podµa va¹ej voµby) akoukoµvek nov¹ou.\n"
+"Tento program je voľne šíriteľný; môžete ho redistribuovať a meniť\n"
+"v súlade so Všeobecnou verejnou licenciou GNU publikovanou\n"
+"vo Free Software Foundation; bu� licenciou verzie 2 alebo\n"
+"(podľa vašej voľby) akoukoľvek novšou.\n"
 "\n"
-"Tento program je ¹írený v nádeji, ¾e bude u¾itoèný, av¹ak\n"
-"BEZ AKEJKO¥VEK ZÁRUKY; neposkytujú sa ani odvodené záruky\n"
-"PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL.\n"
-"Ïal¹ie podrobnosti hµadajte vo V¹eobecnej verejnej licencii GNU.\n"
+"Tento program je šírený v nádeji, že bude užito�ný, avšak\n"
+"BEZ AKEJKOĽVEK Z�RUKY; neposkytujú sa ani odvodené záruky\n"
+"PREDAJNOSTI alebo VHODNOSTI PRE URČIT� ÚČEL.\n"
+"Ďalšie podrobnosti hľadajte vo Všeobecnej verejnej licencii GNU.\n"
 "\n"
-"S týmto programom by ste mali získa» kópiu V¹eobecnej verejnej\n"
-"licencie GNU; ak tomu tak nie je, napí¹te do Free Software\n"
+"S týmto programom by ste mali získať kópiu Všeobecnej verejnej\n"
+"licencie GNU; ak tomu tak nie je, napíšte do Free Software\n"
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
 "MA 02111-1307, USA.\n"
 
@@ -7090,51 +7193,51 @@ msgid ""
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
-"Pou¾itie: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                [-P tlaèiareò | -r zariadenie] [-u] [-q] [-m model]\n"
-"Vykoná údr¾bu tlaèiarní EPSON Stylus (R).\n"
-"Príklad: escputil --clean-head --printer stpex-na-druhom-poschodí\n"
+"Použitie: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                [-P tla�iareň | -r zariadenie] [-u] [-q] [-m model]\n"
+"Vykoná údržbu tla�iarní EPSON Stylus (R).\n"
+"Príklad: escputil --clean-head --printer stpex-na-druhom-poschodí\n"
 "         escputil --ink-level --new --raw-device /dev/lp0\n"
 "\n"
-"  Príkazy:\n"
-"    -c|--clean-head    Èistí tlaèovú hlavu.\n"
-"    -n|--nozzle-check  Vytlaèí testovaciu vzorku na otvory.\n"
-"                       ©pinavé alebo upchaté otvory budú zobrazené ako "
+"  Príkazy:\n"
+"    -c|--clean-head    Čistí tla�ovú hlavu.\n"
+"    -n|--nozzle-check  Vytla�í testovaciu vzorku na otvory.\n"
+"                       Špinavé alebo upchaté otvory budú zobrazené ako "
 "medzery\n"
-"                       vo vzorke. Ak uvidíte nejaké medzery, mali by ste\n"
-"                       oèisti» tlaèovú hlavu.\n"
-"    -a|--align-head    Zarovnanie tlaèovej hlavy.  UPOZORNENIE: Nesprávne\n"
-"                       pou¾itie tohoto nástroja bude ma» za následok nízku\n"
-"                       kvalitu tlaèe a/alebo po¹kodenie tlaèiarne.\n"
+"                       vo vzorke. Ak uvidíte nejaké medzery, mali by ste\n"
+"                       o�istiť tla�ovú hlavu.\n"
+"    -a|--align-head    Zarovnanie tla�ovej hlavy.  UPOZORNENIE: Nesprávne\n"
+"                       použitie tohoto nástroja bude mať za následok nízku\n"
+"                       kvalitu tla�e a/alebo poškodenie tla�iarne.\n"
 "    -o|--align-color   Zarovnanie farebnej hlavy ( iba pre Stylus Color 480 "
 "a\n"
-"                       580 UPOZORNENIE: Nesprávne pou¾itie tohoto nástroja "
+"                       580 UPOZORNENIE: Nesprávne použitie tohoto nástroja "
 "bude\n"
-"                       ma» za následok nízku kvalitu tlaèe a/alebo "
-"po¹kodenie\n"
-" \t\t\ttlaèiarne.\n"
-"    -s|--status        Informácie o stave tlaèiarne.\n"
-"    -i|--ink-level     Získanie o informácie o úrovni atramentu z "
-"tlaèiarne.\n"
-"\t\t\tToto vy¾aduje prístup èítanie/zápis na základné\n"
-"                       zariadenie tlaèiarne.\n"
-"    -d|--identify      Po¾iadavka na tlaèiareò o informácie o modely.\n"
-"                       Toto vy¾aduje prístup èítanie/zápis na základné\n"
-"                       zariadenie tlaèiarne.\n"
-"    -l|--license       Zobrazenie licencie/podmienok záruky tohoto "
+"                       mať za následok nízku kvalitu tla�e a/alebo "
+"poškodenie\n"
+" \t\t\ttla�iarne.\n"
+"    -s|--status        Informácie o stave tla�iarne.\n"
+"    -i|--ink-level     Získanie o informácie o úrovni atramentu z "
+"tla�iarne.\n"
+"\t\t\tToto vyžaduje prístup �ítanie/zápis na základné\n"
+"                       zariadenie tla�iarne.\n"
+"    -d|--identify      Požiadavka na tla�iareň o informácie o modely.\n"
+"                       Toto vyžaduje prístup �ítanie/zápis na základné\n"
+"                       zariadenie tla�iarne.\n"
+"    -l|--license       Zobrazenie licencie/podmienok záruky tohoto "
 "programu.\n"
-"    -M|--list-models   Zoznam dostupných modelov tlaèiarní.\n"
-"    -h|--help          Zobrazí tieto informácie.\n"
+"    -M|--list-models   Zoznam dostupných modelov tla�iarní.\n"
+"    -h|--help          Zobrazí tieto informácie.\n"
 "\n"
-"  Voµby:\n"
-"    -P|--printer-name  Urèenie názvu tlaèiarne, s ktorou sa bude pracova».\n"
-"                       ©tandardne sa pou¾ije systémová tlaèiareò.\n"
-"    -r|--raw-device    Urèenie názvu zariadenia pre priamy zápis, ne¾ by sa\n"
-"                       mal pou¾i» tlaèový front.\n"
-"    -u|--new           Tlaèiareò je nová tlaèiareò (Stylus Color 740 alebo\n"
-"                       nov¹ia).\n"
-"    -q|--quiet         zakázanie nápisu.\n"
-"    -m|--model         Urèenie presného modelu tlaèiarne pre zarovnanie "
+"  Voľby:\n"
+"    -P|--printer-name  Ur�enie názvu tla�iarne, s ktorou sa bude pracovať.\n"
+"                       Štandardne sa použije systémová tla�iareň.\n"
+"    -r|--raw-device    Ur�enie názvu zariadenia pre priamy zápis, než by sa\n"
+"                       mal použiť tla�ový front.\n"
+"    -u|--new           Tla�iareň je nová tla�iareň (Stylus Color 740 alebo\n"
+"                       novšia).\n"
+"    -q|--quiet         zakázanie nápisu.\n"
+"    -m|--model         Ur�enie presného modelu tla�iarne pre zarovnanie "
 "hlavy.\n"
 
 #: src/escputil/escputil.c:161
@@ -7181,52 +7284,52 @@ msgid ""
 "    -C Specify the number of pattern choices for alignment\n"
 "    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
-"Pou¾itie: escputil [VO¥BA] [PRÍKAZ]\n"
-"Pou¾itie: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                [-P tlaèiareò | -r zariadenie] [-u] [-q] [-m model]\n"
-"Vykoná údr¾bu na tlaèiarni EPSON Stylus (R).\n"
-"Príklady: escputil -c -P stpex-na-druhom-poschodí\n"
+"Použitie: escputil [VOĽBA] [PR�KAZ]\n"
+"Použitie: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                [-P tla�iareň | -r zariadenie] [-u] [-q] [-m model]\n"
+"Vykoná údržbu na tla�iarni EPSON Stylus (R).\n"
+"Príklady: escputil -c -P stpex-na-druhom-poschodí\n"
 "          escputil -i -u -r /dev/lp0\n"
 "\n"
-"  Príkazy:\n"
-"    -c Èistí tlaèovú hlavu.\n"
-"    -n Vytlaèí testovaciu vzorku na otvory.\n"
-"          ©pinavé alebo upchaté otvory budú zobrazené ako medzery\n"
-"          vo vzorke. Ak uvidíte nejaké medzery, mali by ste oèisti»\n"
-"          tlaèovú hlavu.\n"
-"    -a Zarovnanie tlaèovej hlavy.  UPOZORNENIE: Nesprávne pou¾itie\n"
-"          tohoto nástroja bude ma» za následok nízku kvalitu tlaèe\n"
-"          a/alebo po¹kodenie tlaèiarne.\n"
+"  Príkazy:\n"
+"    -c Čistí tla�ovú hlavu.\n"
+"    -n Vytla�í testovaciu vzorku na otvory.\n"
+"          Špinavé alebo upchaté otvory budú zobrazené ako medzery\n"
+"          vo vzorke. Ak uvidíte nejaké medzery, mali by ste o�istiť\n"
+"          tla�ovú hlavu.\n"
+"    -a Zarovnanie tla�ovej hlavy.  UPOZORNENIE: Nesprávne použitie\n"
+"          tohoto nástroja bude mať za následok nízku kvalitu tla�e\n"
+"          a/alebo poškodenie tla�iarne.\n"
 "    -o Zarovnanie farebnej hlavy ( iba pre Stylus Color 480 a 580\n"
-"          UPOZORNENIE: Nesprávne pou¾itie tohoto nástroja bude ma»\n"
-"          za následok nízku kvalitu tlaèe a/alebo po¹kodenie tlaèiarne.\n"
-"    -s Informácie o stave tlaèiarne.\n"
-"    -i Získanie o informácie o úrovni atramentu z tlaèiarne. Toto vy¾aduje\n"
-"          prístup na èítanie/zápis na základné zariadenie tlaèiarne.\n"
-"    -d Po¾iadavka na tlaèiareò o informácie o modely. Toto vy¾aduje prístup\n"
-"          èítanie/zápis na základné zariadenie tlaèiarne.\n"
-"    -l Zobrazenie licencie/podmienok záruky tohoto programu.\n"
-"    -M Zoznam dostupných modelov tlaèiarní.\n"
-"    -h Zobrazí tieto informácie.\n"
+"          UPOZORNENIE: Nesprávne použitie tohoto nástroja bude mať\n"
+"          za následok nízku kvalitu tla�e a/alebo poškodenie tla�iarne.\n"
+"    -s Informácie o stave tla�iarne.\n"
+"    -i Získanie o informácie o úrovni atramentu z tla�iarne. Toto vyžaduje\n"
+"          prístup na �ítanie/zápis na základné zariadenie tla�iarne.\n"
+"    -d Požiadavka na tla�iareň o informácie o modely. Toto vyžaduje prístup\n"
+"          �ítanie/zápis na základné zariadenie tla�iarne.\n"
+"    -l Zobrazenie licencie/podmienok záruky tohoto programu.\n"
+"    -M Zoznam dostupných modelov tla�iarní.\n"
+"    -h Zobrazí tieto informácie.\n"
 "\n"
-"  Voµby:\n"
-"    -P Urèenie názvu tlaèiarne, s ktorou sa bude pracova».\n"
-"          ¹tandardne sa pou¾ije systémová tlaèiareò.\n"
-"    -r Urèenie názvu zariadenia pre priamy zápis, ne¾ by sa\n"
-"          mal pou¾i» tlaèový front.\n"
-"    -u Tlaèiareò je nová tlaèiareò (Stylus Color 740 alebo nov¹ia).\n"
-"    -q zakázanie nápisu.\n"
-"    -m Urèenie presného modelu tlaèiarne pre zarovnanie hlavy.\n"
+"  Voľby:\n"
+"    -P Ur�enie názvu tla�iarne, s ktorou sa bude pracovať.\n"
+"          štandardne sa použije systémová tla�iareň.\n"
+"    -r Ur�enie názvu zariadenia pre priamy zápis, než by sa\n"
+"          mal použiť tla�ový front.\n"
+"    -u Tla�iareň je nová tla�iareň (Stylus Color 740 alebo novšia).\n"
+"    -q zakázanie nápisu.\n"
+"    -m Ur�enie presného modelu tla�iarne pre zarovnanie hlavy.\n"
 
 #: src/escputil/escputil.c:329 src/escputil/escputil.c:337
 #, c-format
 msgid "You may only specify one printer or raw device."
-msgstr "Mô¾ete ¹pecifikova» len jednu tlaèiareò alebo prvotné zariadenie."
+msgstr "Môžete špecifikovať len jednu tla�iareň alebo prvotné zariadenie."
 
 #: src/escputil/escputil.c:345
 #, c-format
 msgid "You may only specify one printer model."
-msgstr "Je mo¾né zvoli» len jeden model tlaèiarne."
+msgstr "Je možné zvoliť len jeden model tla�iarne."
 
 #: src/escputil/escputil.c:369
 #, c-format
@@ -7241,7 +7344,7 @@ msgstr ""
 #: src/escputil/escputil.c:381
 #, c-format
 msgid "Unknown option %c\n"
-msgstr "Neznáme nastavenie %c\n"
+msgstr "Neznáme nastavenie %c\n"
 
 #: src/escputil/escputil.c:389
 #, c-format
@@ -7261,17 +7364,17 @@ msgstr ""
 #: src/escputil/escputil.c:459
 #, c-format
 msgid "Cannot open device %s: %s\n"
-msgstr "Nie je mo¾né otvori» zariadenie %s: %s\n"
+msgstr "Nie je možné otvoriť zariadenie %s: %s\n"
 
 #: src/escputil/escputil.c:482
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
-msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
+msgstr "Na tla�iarni %s s %s nie je možné tla�iť \n"
 
 #: src/escputil/escputil.c:498 src/escputil/escputil.c:508
 #, c-format
 msgid "Unable to send command to printer\n"
-msgstr "Nie je mo¾né posla» príkaz na tlaèiareò\n"
+msgstr "Nie je možné poslať príkaz na tla�iareň\n"
 
 #: src/escputil/escputil.c:568
 #, c-format
@@ -7281,22 +7384,22 @@ msgstr ""
 #: src/escputil/escputil.c:573
 #, c-format
 msgid "Cannot read from %s: %s\n"
-msgstr "Nie je mo¾né èíta» z %s: %s\n"
+msgstr "Nie je možné �ítať z %s: %s\n"
 
 #: src/escputil/escputil.c:747
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
-msgstr "Stav tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n"
+msgstr "Stav tla�iarne vyžaduje používanie základného zariadenia.\n"
 
 #: src/escputil/escputil.c:754
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
-msgstr "Nie je mo¾né otvori» %s pre èítanie/zápis: %s\n"
+msgstr "Nie je možné otvoriť %s pre �ítanie/zápis: %s\n"
 
 #: src/escputil/escputil.c:797 src/escputil/escputil.c:1418
 #, c-format
 msgid "Cannot write to %s: %s\n"
-msgstr "Nie je mo¾né zapisova» do %s: %s\n"
+msgstr "Nie je možné zapisovať do %s: %s\n"
 
 #: src/escputil/escputil.c:843 src/escputil/escputil.c:1383
 #: src/escputil/escputil.c:1511
@@ -7306,7 +7409,7 @@ msgid ""
 "Cannot write to %s: %s\n"
 msgstr ""
 "\n"
-"Nie je mo¾né zapisova» do %s: %s\n"
+"Nie je možné zapisovať do %s: %s\n"
 
 #: src/escputil/escputil.c:885
 #, c-format
@@ -7316,8 +7419,8 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 "\n"
-"Nie je mo¾né zisti» typ tlaèiarne.\n"
-"Pou¾ite prosím -m na urèenie modelu va¹ej tlaèiarne.\n"
+"Nie je možné zistiť typ tla�iarne.\n"
+"Použite prosím -m na ur�enie modelu vašej tla�iarne.\n"
 
 #: src/escputil/escputil.c:983 src/escputil/escputil.c:989
 #: src/escputil/escputil.c:990 src/escputil/escputil.c:1006
@@ -7347,7 +7450,7 @@ msgstr ""
 #: src/escputil/escputil.c:1036
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
-msgstr "Sýtos»:"
+msgstr "Sýtosť:"
 
 #: src/escputil/escputil.c:1039
 #, c-format
@@ -7463,13 +7566,13 @@ msgstr ""
 #: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
 #: src/escputil/escputil.c:1646
 msgid "Ink color"
-msgstr "Farebný atrament"
+msgstr "Farebný atrament"
 
 #: src/escputil/escputil.c:1216 src/escputil/escputil.c:1246
 #: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
 #: src/escputil/escputil.c:1646
 msgid "Percent remaining"
-msgstr "Zostávajúce percentá"
+msgstr "Zostávajúce percentá"
 
 #: src/escputil/escputil.c:1291 src/escputil/escputil.c:1294
 #: src/escputil/escputil.c:1297 src/escputil/escputil.c:1300
@@ -7499,12 +7602,12 @@ msgstr ""
 #: src/escputil/escputil.c:1355
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Získanie úrovne atramentu vy¾aduje pou¾itie základného zariadenia.\n"
+msgstr "Získanie úrovne atramentu vyžaduje použitie základného zariadenia.\n"
 
 #: src/escputil/escputil.c:1461
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Získanie úrovne atramentu vy¾aduje pou¾itie základného zariadenia.\n"
+msgstr "Získanie úrovne atramentu vyžaduje použitie základného zariadenia.\n"
 
 #: src/escputil/escputil.c:1602 src/escputil/escputil.c:1626
 #: src/escputil/escputil.c:1646
@@ -7519,22 +7622,22 @@ msgstr ""
 #: src/escputil/escputil.c:1675
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
-msgstr "Identifikácia tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n"
+msgstr "Identifikácia tla�iarne vyžaduje používanie základného zariadenia.\n"
 
 #: src/escputil/escputil.c:1693
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
-msgstr "Je mo¾né zvoli» len jeden model tlaèiarne."
+msgstr "Je možné zvoliť len jeden model tla�iarne."
 
 #: src/escputil/escputil.c:1713
 #, c-format
 msgid "Cleaning heads...\n"
-msgstr "Èistenie hláv...\n"
+msgstr "Čistenie hláv...\n"
 
 #: src/escputil/escputil.c:1728
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
-msgstr "Spú¹»am kontrolu trysiek, uistite sa, ¾e v tlaèiarni je papier.\n"
+msgstr "Spúšťam kontrolu trysiek, uistite sa, že v tla�iarni je papier.\n"
 
 #: src/escputil/escputil.c:1732
 #, c-format
@@ -7574,41 +7677,41 @@ msgid ""
 "It is essential that you not turn your printer off during this procedure.\n"
 "\n"
 msgstr ""
-"Prosím, veµmi pozorne si preèítajte tieto in¹trukcie skôr, ako bude "
-"pokraèova».\n"
+"Prosím, veľmi pozorne si pre�ítajte tieto inštrukcie skôr, ako bude "
+"pokra�ovať.\n"
 "\n"
-"Tento nástroj vám umo¾ní zarovna» tlaèovú hlavu atramentovej tlaèiarne\n"
-"Epson Stylus. Jeho nesprávne pou¾itie mô¾e spôsobi» zní¾enie kvality tlaèe\n"
-"a mô¾e po¹kodi» samotnú tlaèiareò. Tento nástroj nebol otestovaný\n"
-"spoloènos»ou Seiko Epson a je ponúknutý bez akejkoµvek záruky. Celé\n"
-"riziko za pou¾itie toho nástroja le¾í na vás.\n"
+"Tento nástroj vám umožní zarovnať tla�ovú hlavu atramentovej tla�iarne\n"
+"Epson Stylus. Jeho nesprávne použitie môže spôsobiť zníženie kvality tla�e\n"
+"a môže poškodiť samotnú tla�iareň. Tento nástroj nebol otestovaný\n"
+"spolo�nosťou Seiko Epson a je ponúknutý bez akejkoľvek záruky. Celé\n"
+"riziko za použitie toho nástroja leží na vás.\n"
 "\n"
-"Bude vytlaèených %d testovacích vzoriek. V¹etky vzorky sú veµmi podobné.\n"
-"Vzorky obsahujú série zvislých èiar, ktoré sa budú prekrýva» Pod ka¾dým "
-"párom je èíslo\n"
+"Bude vytla�ených %d testovacích vzoriek. Všetky vzorky sú veľmi podobné.\n"
+"Vzorky obsahujú série zvislých �iar, ktoré sa budú prekrývať Pod každým "
+"párom je �íslo\n"
 "od %d do %d.\n"
 "\n"
-"Keï si prezriete páry èiar, mali by ste vybra» taký pár èiar, ktorý je "
-"najlep¹ie\n"
-"zarovnaný. Veµmi pozorne si ich prezrite. Pre najkritickej¹ie rozhodovanie\n"
-"pou¾ite lupu alebo zväè¹ovacie sklíèko. Tie¾ vám odporúèame pou¾i» na tento\n"
-"test vysokokvalitný papier, aby sa èiary nerozpíjali na papieri, ale mali\n"
-"správny tvar. Pred napísaním èísla najlep¹ieho páru èiar, vlo¾te stanu spä»\n"
-"do tlaèiarne.\n"
+"Ke� si prezriete páry �iar, mali by ste vybrať taký pár �iar, ktorý je "
+"najlepšie\n"
+"zarovnaný. Veľmi pozorne si ich prezrite. Pre najkritickejšie rozhodovanie\n"
+"použite lupu alebo zvä�šovacie sklí�ko. Tiež vám odporú�ame použiť na tento\n"
+"test vysokokvalitný papier, aby sa �iary nerozpíjali na papieri, ale mali\n"
+"správny tvar. Pred napísaním �ísla najlepšieho páru �iar, vložte stanu späť\n"
+"do tla�iarne.\n"
 "\n"
-"Ka¾dá vzorka je podobná, ale posledné vzorky pou¾ívajú jemnej¹ie bodky\n"
-"pre kritickej¹ie zarovnanie. Musíte prejs» v¹etkými fázami zarovnávania,\n"
-"aby va¹a tlaèiareò bola správne zarovnaná.  Po absolvovaní v¹etkých fáz\n"
-"bude zarovnávacia vzorka vytlaèená e¹te raz. Mali by ste zisti», ¾e vzorka\n"
-"v strede (#%d z %d) je najlep¹ia zo v¹etkých,\n"
+"Každá vzorka je podobná, ale posledné vzorky používajú jemnejšie bodky\n"
+"pre kritickejšie zarovnanie. Musíte prejsť všetkými fázami zarovnávania,\n"
+"aby vaša tla�iareň bola správne zarovnaná.  Po absolvovaní všetkých fáz\n"
+"bude zarovnávacia vzorka vytla�ená ešte raz. Mali by ste zistiť, že vzorka\n"
+"v strede (#%d z %d) je najlepšia zo všetkých,\n"
 "\n"
-"Po vytlaèení ïal¹ej vzorky vám bude ponúknutá mo¾nos» (s) - ulo¾i» výsledky\n"
-"do tlaèiarne, (r) - zopakova» proces, alebo (q) - ukonèi» bez ulo¾enia.\n"
-"Ukonèenie neobnoví pôvodné nastavenie, ale vypnutie a následné zapnutie\n"
-"tlaèiarne áno. Pokiaµ ukonèíte bez ulo¾enia, budete musie» zopakova» celý\n"
-"proces opä», ak budete chcie» svoje výsledky ulo¾i». Je dôle¾ité, aby ste "
-"poèas\n"
-"toho procesu nevypli tlaèiareò\n"
+"Po vytla�ení �alšej vzorky vám bude ponúknutá možnosť (s) - uložiť výsledky\n"
+"do tla�iarne, (r) - zopakovať proces, alebo (q) - ukon�iť bez uloženia.\n"
+"Ukon�enie neobnoví pôvodné nastavenie, ale vypnutie a následné zapnutie\n"
+"tla�iarne áno. Pokiaľ ukon�íte bez uloženia, budete musieť zopakovať celý\n"
+"proces opäť, ak budete chcieť svoje výsledky uložiť. Je dôležité, aby ste "
+"po�as\n"
+"toho procesu nevypli tla�iareň\n"
 "\n"
 
 #: src/escputil/escputil.c:1767
@@ -7646,45 +7749,45 @@ msgid ""
 "this procedure.\n"
 "\n"
 msgstr ""
-"Prosím, veµmi pozorne si preèítajte tieto in¹trukcie skôr, ako bude "
-"pokraèova».\n"
+"Prosím, veľmi pozorne si pre�ítajte tieto inštrukcie skôr, ako bude "
+"pokra�ovať.\n"
 "\n"
-"Tento nástroj vám umo¾ní zarovna» tlaèovú hlavu atramentovej tlaèiarne Epson "
+"Tento nástroj vám umožní zarovnať tla�ovú hlavu atramentovej tla�iarne Epson "
 "Stylus.\n"
-"Jeho nesprávne pou¾itie mô¾e spôsobi» zní¾enie kvality tlaèe a mô¾e "
-"po¹kodi»\n"
-"samotnú tlaèiareò. Tento nástroj nebol otestovaný spoloènos»ou Seiko Epson\n"
-"a je ponúknutý bez akejkoµvek záruky. Celé riziko za pou¾itie toho nástroja\n"
-"le¾í na vás.\n"
+"Jeho nesprávne použitie môže spôsobiť zníženie kvality tla�e a môže "
+"poškodiť\n"
+"samotnú tla�iareň. Tento nástroj nebol otestovaný spolo�nosťou Seiko Epson\n"
+"a je ponúknutý bez akejkoľvek záruky. Celé riziko za použitie toho nástroja\n"
+"leží na vás.\n"
 "\n"
-"Bude vytlaèená testovacia vzorka, ktorá bude obsahova» sériu párov zvislých\n"
-"èiar, ktoré **overlap. Pod ka¾dým párom èiar je èíslo od %d do %d.\n"
+"Bude vytla�ená testovacia vzorka, ktorá bude obsahovať sériu párov zvislých\n"
+"�iar, ktoré **overlap. Pod každým párom �iar je �íslo od %d do %d.\n"
 "\n"
-"Keï si prezriete vzorky, mali by ste vybra» taký pár èiar, ktorý je "
-"najlep¹ie\n"
-"zarovnaný. Veµmi pozorne si ich prezrite. Pre najkritickej¹ie rozhodovanie\n"
-"pou¾ite lupu alebo zväè¹ovacie sklíèko. Tie¾ vám odporúèame pou¾i» na tento\n"
-"test vysokokvalitný papier, aby sa èiary nerozpíjali na papieri, ale mali\n"
-"správny tvar. Pred napísaním èísla najlep¹ieho páru èiar, vlo¾te stanu spä»\n"
-"do tlaèiarne.\n"
+"Ke� si prezriete vzorky, mali by ste vybrať taký pár �iar, ktorý je "
+"najlepšie\n"
+"zarovnaný. Veľmi pozorne si ich prezrite. Pre najkritickejšie rozhodovanie\n"
+"použite lupu alebo zvä�šovacie sklí�ko. Tiež vám odporú�ame použiť na tento\n"
+"test vysokokvalitný papier, aby sa �iary nerozpíjali na papieri, ale mali\n"
+"správny tvar. Pred napísaním �ísla najlepšieho páru �iar, vložte stanu späť\n"
+"do tla�iarne.\n"
 "\n"
-"Zarovnávacia vzorka bude vytlaèená e¹te raz. V tomto prípade by najlep¹ím\n"
-"párom (#%d z %d) mal by» ten uprostred. Potom vám bude ponúknutá mo¾nos»\n"
-"(s) - ulo¾i» výsledky do tlaèiarne, (r) - zopakova» proces, alebo (q) - "
-"ukonèi»\n"
-"bez ulo¾enia.  Ukonèenie neobnoví pôvodné nastavenie, ale vypnutie a "
-"následné\n"
-"zapnutie tlaèiarne áno.\n"
-"Pokiaµ ukonèíte bez ulo¾enia, budete musie» zopakova» celý proces opä», ak\n"
-"budete chcie» svoje výsledky ulo¾i». Je dôle¾ité, aby ste poèas toho "
+"Zarovnávacia vzorka bude vytla�ená ešte raz. V tomto prípade by najlepším\n"
+"párom (#%d z %d) mal byť ten uprostred. Potom vám bude ponúknutá možnosť\n"
+"(s) - uložiť výsledky do tla�iarne, (r) - zopakovať proces, alebo (q) - "
+"ukon�iť\n"
+"bez uloženia.  Ukon�enie neobnoví pôvodné nastavenie, ale vypnutie a "
+"následné\n"
+"zapnutie tla�iarne áno.\n"
+"Pokiaľ ukon�íte bez uloženia, budete musieť zopakovať celý proces opäť, ak\n"
+"budete chcieť svoje výsledky uložiť. Je dôležité, aby ste po�as toho "
 "procesu \n"
-"nevypli tlaèiareò\n"
+"nevypli tla�iareň\n"
 "\n"
 
 #: src/escputil/escputil.c:1811
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
-msgstr "Nie je mo¾né odosla» príkaz pre tlaèiareò, koniec.\n"
+msgstr "Nie je možné odoslať príkaz pre tla�iareň, koniec.\n"
 
 #: src/escputil/escputil.c:1825 src/escputil/escputil.c:1990
 #, c-format
@@ -7702,13 +7805,13 @@ msgid ""
 "You will then be asked to confirm your choice.\n"
 "What do you want to do (s, q, r)?\n"
 msgstr ""
-"Preskúmajte výsledok tlaèe veµmi pozorne a uistite sa,\n"
-"¾e va¹a tlaèiareò má správne zarovnanie. Teraz mô¾ete:\n"
-"  (s) ulo¾i» výsledok do tlaèiarne,\n"
-"  (q) ukonèi» bez ulo¾enia výsledku, alebo\n"
-"  (r) zopakova» celý proces od zaèiatku.\n"
-"Potom bude po¾iadaný potvrdi» va¹u voµbu.\n"
-"Èo chcete spravi»? (s,q,r)?\n"
+"Preskúmajte výsledok tla�e veľmi pozorne a uistite sa,\n"
+"že vaša tla�iareň má správne zarovnanie. Teraz môžete:\n"
+"  (s) uložiť výsledok do tla�iarne,\n"
+"  (q) ukon�iť bez uloženia výsledku, alebo\n"
+"  (r) zopakovať celý proces od za�iatku.\n"
+"Potom bude požiadaný potvrdiť vašu voľbu.\n"
+"Čo chcete spraviť? (s,q,r)?\n"
 
 #: src/escputil/escputil.c:1836 src/escputil/escputil.c:1845
 #: src/escputil/escputil.c:1860 src/escputil/escputil.c:1878
@@ -7721,7 +7824,7 @@ msgstr "> "
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
-"Potvrïte prosím opätovným stlaèením 'q', ¾e si ¾eláte ukonèi» bez ulo¾enia:\n"
+"Potvr�te prosím opätovným stla�ením 'q', že si želáte ukon�iť bez uloženia:\n"
 
 #: src/escputil/escputil.c:1850
 #, c-format
@@ -7729,8 +7832,8 @@ msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
-"V poriadku, va¹a tlaèiareò je  zarovnaná, ale zarovnanie nebolo ulo¾ené.\n"
-"Ak si ¾eláte ulo¾i» zarovnanie, musíte tento proces zopakova».\n"
+"V poriadku, vaša tla�iareň je  zarovnaná, ale zarovnanie nebolo uložené.\n"
+"Ak si želáte uložiť zarovnanie, musíte tento proces zopakovať.\n"
 
 #: src/escputil/escputil.c:1857
 #, c-format
@@ -7738,13 +7841,13 @@ msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
-"Opätovným stlaèení 'r' potvrïte, ¾e si prajete zopakova» proces "
-"zarovnávania:\n"
+"Opätovným stla�ení 'r' potvr�te, že si prajete zopakovať proces "
+"zarovnávania:\n"
 
 #: src/escputil/escputil.c:1865
 #, c-format
 msgid "Repeating the alignment process.\n"
-msgstr "Opakujem proces zarovnávania.\n"
+msgstr "Opakujem proces zarovnávania.\n"
 
 #: src/escputil/escputil.c:1871
 #, c-format
@@ -7755,11 +7858,11 @@ msgid ""
 "Please confirm by typing 's' again that you wish to save the settings\n"
 "to your printer:\n"
 msgstr ""
-"Toto natrvalo zmení nastavenie va¹ej tlaèiarne.\n"
-"VAROVANIE: táto procedúra nebola odsúhlasená spoloènos»ou Seiko Epson\n"
-"a mô¾e po¹kodi» va¹u tlaèiareò. Pokraèova»?\n"
-"Potvrïte opätovným stlaèením 's', ¾e si prajete ulo¾i» nastavenie\n"
-"va¹ej tlaèiarne:\n"
+"Toto natrvalo zmení nastavenie vašej tla�iarne.\n"
+"VAROVANIE: táto procedúra nebola odsúhlasená spolo�nosťou Seiko Epson\n"
+"a môže poškodiť vašu tla�iareň. Pokra�ovať?\n"
+"Potvr�te opätovným stla�ením 's', že si prajete uložiť nastavenie\n"
+"vašej tla�iarne:\n"
 
 #: src/escputil/escputil.c:1883
 #, c-format
@@ -7777,28 +7880,28 @@ msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
-"Va¹e nastavenie sa nepodarilo úspe¹ne ulo¾i». Musíte zopakova»\n"
-"procedúru zarovnávania.\n"
+"Vaše nastavenie sa nepodarilo úspešne uložiť. Musíte zopakovať\n"
+"procedúru zarovnávania.\n"
 
 #: src/escputil/escputil.c:1894
 #, c-format
 msgid "succeeded!\n"
-msgstr "úspe¹ne!\n"
+msgstr "úspešne!\n"
 
 #: src/escputil/escputil.c:1895
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
-msgstr "Va¹e nastavenia zarovnávania boli ulo¾ené do tlaèiarne.\n"
+msgstr "Vaše nastavenia zarovnávania boli uložené do tla�iarne.\n"
 
 #: src/escputil/escputil.c:1900
 #, c-format
 msgid "Unrecognized command.\n"
-msgstr "Neznámy príkaz.\n"
+msgstr "Neznámy príkaz.\n"
 
 #: src/escputil/escputil.c:1903
 #, c-format
 msgid "Final command was not confirmed.\n"
-msgstr "Závereèný príkaz nebol potvrdený.\n"
+msgstr "Závere�ný príkaz nebol potvrdený.\n"
 
 #: src/escputil/escputil.c:1908
 #, c-format
@@ -7810,17 +7913,17 @@ msgid ""
 "Please place a sheet of paper in your printer to begin the head\n"
 "alignment procedure.\n"
 msgstr ""
-"Táto procedúra prepokladá, ¾e va¹a tlaèiareò je Epson %s.\n"
-"Ak toto nie je model va¹ej tlaèiarne, stlaète teraz prosím control-C\n"
-"a zvoµte vá¹ súèasný model tlaèiarne.\n"
+"Táto procedúra prepokladá, že vaša tla�iareň je Epson %s.\n"
+"Ak toto nie je model vašej tla�iarne, stla�te teraz prosím control-C\n"
+"a zvoľte váš sú�asný model tla�iarne.\n"
 "\n"
-"Vlo¾te prosím hárok papiera do va¹ej tlaèiarne, aby sa mohla zaèa»\n"
-"procedúra zarovnávania hlavy.\n"
+"Vložte prosím hárok papiera do vašej tla�iarne, aby sa mohla za�ať\n"
+"procedúra zarovnávania hlavy.\n"
 
 #: src/escputil/escputil.c:1973 src/escputil/escputil.c:2004
 #: src/escputil/escputil.c:2047
 msgid "Press enter to continue > "
-msgstr "Pre pokraèovanie stlaète enter > "
+msgstr "Pre pokra�ovanie stla�te enter > "
 
 #: src/escputil/escputil.c:1980
 #, c-format
@@ -7829,8 +7932,8 @@ msgid ""
 "pattern.\n"
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
-"Preskúmajte pozorne výtlaèok a zvoµte najlep¹í pár èiar v ka¾dej vzorke.\n"
-"Stlaète èíslo páru, '?' pre pomoc alebo 'r' pre zopakovanie procedúry.\n"
+"Preskúmajte pozorne výtla�ok a zvoľte najlepší pár �iar v každej vzorke.\n"
+"Stla�te �íslo páru, '?' pre pomoc alebo 'r' pre zopakovanie procedúry.\n"
 
 #: src/escputil/escputil.c:1993
 #, c-format
@@ -7840,32 +7943,32 @@ msgstr "Prechod #%d"
 #: src/escputil/escputil.c:2001 src/escputil/escputil.c:2046
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
-msgstr "Vlo¾te prosím nový hárok papiera.\n"
+msgstr "Vložte prosím nový hárok papiera.\n"
 
 #: src/escputil/escputil.c:2020
 #, c-format
 msgid "Number out of range!\n"
-msgstr "Èíslo je mimo rozsahu!\n"
+msgstr "Číslo je mimo rozsahu!\n"
 
 #: src/escputil/escputil.c:2025
 #, c-format
 msgid "I cannot understand what you typed!\n"
-msgstr "Nedoká¾em pochopi», èo ste napísali!\n"
+msgstr "Nedokážem pochopiť, �o ste napísali!\n"
 
 #: src/escputil/escputil.c:2031
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "Najlep¹í pár èiar by mal ma» èíslo z rozpätia 1 a %d.\n"
+msgstr "Najlepší pár �iar by mal mať �íslo z rozpätia 1 a %d.\n"
 
 #: src/escputil/escputil.c:2038
 #, c-format
 msgid "Attempting to set alignment..."
-msgstr "Pokú¹am sa nastavi» zarovnávanie..."
+msgstr "Pokúšam sa nastaviť zarovnávanie..."
 
 #: src/escputil/escputil.c:2041
 #, c-format
 msgid "succeeded.\n"
-msgstr "úspe¹né.\n"
+msgstr "úspešné.\n"
 
 #: src/escputil/escputil.c:2042
 #, c-format
@@ -7875,10 +7978,10 @@ msgid ""
 "pattern %d.  If it is not, you should repeat the process to get the best\n"
 "quality printing.\n"
 msgstr ""
-"Prekontrolujte prosím, èi je zarovnávanie správne. Potom, èo bude vzorka\n"
-"opä» vytlaèená, uistite sa, èi najlep¹ia vzorka pre ka¾dý riadok je vzorka %"
-"d. Ak nie je, mali by ste zopakova» tento proces, aby ste dostali najlep¹ie "
-"výsledky pri tlaèi.\n"
+"Prekontrolujte prosím, �i je zarovnávanie správne. Potom, �o bude vzorka\n"
+"opäť vytla�ená, uistite sa, �i najlepšia vzorka pre každý riadok je vzorka %"
+"d. Ak nie je, mali by ste zopakovať tento proces, aby ste dostali najlepšie "
+"výsledky pri tla�i.\n"
 
 #: src/escputil/escputil.c:2088
 #, c-format
@@ -7887,11 +7990,11 @@ msgstr "Chyba na vstupe\n"
 
 #: src/gimp/print-image-gimp.c:225 src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
-msgstr "Tlaèím..."
+msgstr "Tla�ím..."
 
 #: src/gimp/print.c:133
 msgid "<Image>/File/Print..."
-msgstr "<Image>/Súbor/Tlaè..."
+msgstr "<Image>/Súbor/Tla�..."
 
 #: src/ghost/ijsgutenprint.c:98
 #, c-format
@@ -7908,28 +8011,28 @@ msgstr ""
 #: src/ghost/ijsgutenprint.c:191
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
-msgstr "Zlý farebný priestor: bps %d kanály %d priestor %s\n"
+msgstr "Zlý farebný priestor: bps %d kanály %d priestor %s\n"
 
 #: src/ghost/ijsgutenprint.c:199
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: No row buffer\n"
-msgstr "Neexistuje riadkový bufer\n"
+msgstr "Neexistuje riadkový bufer\n"
 
 #: src/ghost/ijsgutenprint.c:226 src/ghost/ijsgutenprint.c:246
 #, fuzzy, c-format
 msgid ""
 "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
-msgstr "Nie je mo¾né analyzova» parameter %s=%s (oèakáva sa èíslo)\n"
+msgstr "Nie je možné analyzovať parameter %s=%s (o�akáva sa �íslo)\n"
 
 #: src/ghost/ijsgutenprint.c:498
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
-msgstr "Tlaèiareò musí by» urèené pomocou -sModel\n"
+msgstr "Tla�iareň musí byť ur�ené pomocou -sModel\n"
 
 #: src/ghost/ijsgutenprint.c:500
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
-msgstr "Tlaèiareò %s nie je známy model\n"
+msgstr "Tla�iareň %s nie je známy model\n"
 
 #: src/ghost/ijsgutenprint.c:656
 #, c-format
@@ -7939,47 +8042,47 @@ msgstr ""
 #: src/ghost/ijsgutenprint.c:700
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
-msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
+msgstr "Na tla�iarni %s s %s nie je možné tla�iť \n"
 
 #: src/ghost/ijsgutenprint.c:723
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
-msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
+msgstr "Na tla�iarni %s s %s nie je možné tla�iť \n"
 
 #: src/ghost/ijsgutenprint.c:795
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
-msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
+msgstr "Na tla�iarni %s s %s nie je možné tla�iť \n"
 
 #: src/ghost/ijsgutenprint.c:802
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
-msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
+msgstr "Na tla�iarni %s s %s nie je možné tla�iť \n"
 
 #: src/ghost/ijsgutenprint.c:809
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
-msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
+msgstr "Na tla�iarni %s s %s nie je možné tla�iť \n"
 
 #: src/ghost/ijsgutenprint.c:816
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
-msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
+msgstr "Na tla�iarni %s s %s nie je možné tla�iť \n"
 
 #: src/ghost/ijsgutenprint.c:830
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
-msgstr "Na tlaèiarni %s s %s nie je mo¾né tlaèi» \n"
+msgstr "Na tla�iarni %s s %s nie je možné tla�iť \n"
 
 #: src/ghost/ijsgutenprint.c:841
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
-msgstr "Neznáma tlaèiareò %s\n"
+msgstr "Neznáma tla�iareň %s\n"
 
 #: src/ghost/ijsgutenprint.c:867
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: bad key code %d\n"
-msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
+msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 
 #: src/ghost/ijsgutenprint.c:1308
 #, fuzzy, c-format
@@ -7989,35 +8092,272 @@ msgstr "image_init zlyhalo %d\n"
 #: src/ghost/ijsgutenprint.c:1319
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-msgstr "Nepodarilo sa otvori» popis súboru: %s\n"
+msgstr "Nepodarilo sa otvoriť popis súboru: %s\n"
 
 #: src/ghost/ijsgutenprint.c:1331
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-msgstr "Nie je mo¾né otvori» %s: %s\n"
+msgstr "Nie je možné otvoriť %s: %s\n"
 
 #: src/ghost/ijsgutenprint.c:1344
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
-msgstr "Neznáma tlaèiareò %s\n"
+msgstr "Neznáma tla�iareň %s\n"
 
 #: src/ghost/ijsgutenprint.c:1516
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-msgstr "Zlé parametre; nie je mo¾né pokraèova»!\n"
+msgstr "Zlé parametre; nie je možné pokra�ovať!\n"
 
 #: src/ghost/ijsgutenprint.c:1534
 #, fuzzy, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
-msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
+msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
+
+#, fuzzy
+#~ msgid "Model Name"
+#~ msgstr "Storno"
+
+#, fuzzy
+#~ msgid "Cassette"
+#~ msgstr "Matný papier"
+
+#, fuzzy
+#~ msgid " Gamma"
+#~ msgstr "Gama:"
+
+#, fuzzy
+#~ msgid " Curve"
+#~ msgstr "ÄŒierna"
+
+#, fuzzy
+#~ msgid "1440 x 1440"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI High Quality"
+#~ msgstr "1440 x 360 DPI Najvyššia kvalita"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI Highest Quality"
+#~ msgstr "1440 x 360 DPI Najvyššia kvalita"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI High Quality"
+#~ msgstr "1440 x 360 DPI Najvyššia kvalita"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI Highest Quality"
+#~ msgstr "1440 x 360 DPI Najvyššia kvalita"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "and the rest of the Gutenprint Development Team.\n"
+#~ "\n"
+#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n"
+#~ "a zvyšok vývojového tímu  Gimp-Print.\n"
+#~ "\n"
+#~ "Navštívte prosím webovskú stánku http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "Tento program je slobodný softvér; môžete ho nedistribuovať a/alebo "
+#~ "meniť\n"
+#~ "v súlade so Všeobecnou verejnou licenciou GNU publikovanou\n"
+#~ "vo Free Software Foundation; �i už verzie 2 alebo\n"
+#~ "(podľa vašej voľby) akoukoľvek novšou.\n"
+#~ "\n"
+#~ "Tento program je šírený v nádeji, že bude užito�ný, avšak\n"
+#~ "BEZ AKEJKOĽVEK Z�RUKY; neposkytujú sa ani odvodené záruky\n"
+#~ "PREDAJNOSTI alebo VHODNOSTI PRE URČIT� ÚČEL.\n"
+#~ "Ďalšie podrobnosti hľadajte vo Všeobecnej verejnej licencii GNU.\n"
+#~ "\n"
+#~ "S týmto programom by ste mali získať kópiu Všeobecnej verejnej\n"
+#~ "licencie GNU; ak tomu tak nie je, napíšte do Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
+#~ "MA 02111-1307, USA.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
+#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
+#~ "l'\n"
+#~ "This is free software, and you are welcome to redistribute it\n"
+#~ "under certain conditions; type 'escputil -l' for details.\n"
+#~ msgstr ""
+#~ ", Copyright (C) 2000-2001 Robert Krawitz\n"
+#~ "Escputil prichádza bez AK�CHKOĽVEK GARANCI�; detaily získate po napísaní "
+#~ "'escputil -l'\n"
+#~ "Toto je slobodný softvér a jeho redistribúcia je za istých podmienok\n"
+#~ "vítaná; viac informácií získate po napísaní 'escputil -l'.\n"
+
+#, fuzzy
+#~ msgid "90x90 DPI"
+#~ msgstr "600 DPI"
+
+#, fuzzy
+#~ msgid "90x90 DPI DMT"
+#~ msgstr "600 DPI"
+
+#, fuzzy
+#~ msgid "180x180 DPI"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "180x180 DPI DMT"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "360x360 DPI"
+#~ msgstr "300x300 DPI"
+
+#, fuzzy
+#~ msgid "360x360 DPI DMT"
+#~ msgstr "600x600 DPI"
+
+#, fuzzy
+#~ msgid "720x360 DPI"
+#~ msgstr "720 x 360 DPI"
+
+#, fuzzy
+#~ msgid "720x360 DPI DMT"
+#~ msgstr "720 x 360 DPI MW2"
+
+#, fuzzy
+#~ msgid "720x720 DPI"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "720x720 DPI DMT"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x720 DPI"
+#~ msgstr "1440 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x720 DPI DMT"
+#~ msgstr "1440 x 720 DPI"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440x1440 DPI DMT"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "2880x2880 DPI DMT"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
+#~ msgid "150x150 DPI DMT"
+#~ msgstr "150x150 DPI"
+
+#, fuzzy
+#~ msgid "300x300 DPI DMT"
+#~ msgstr "300x300 DPI"
+
+#, fuzzy
+#~ msgid "600x300 DPI DMT"
+#~ msgstr "600x300 DPI"
+
+#, fuzzy
+#~ msgid "600x600 DPI DMT"
+#~ msgstr "600x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x600 DPI DMT"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "1200x1200 DPI DMT"
+#~ msgstr "1200x600 DPI"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI"
+#~ msgstr "2400x600 DPI"
+
+#, fuzzy
+#~ msgid "2400x2400 DPI DMT"
+#~ msgstr "2400x600 DPI"
+
+#, fuzzy
+#~ msgid "Plain Paper PIXMA"
+#~ msgstr "Oby�ajný papier"
+
+#~ msgid "Fabric Sheets"
+#~ msgstr "Normálny papier"
+
+#~ msgid "Envelope"
+#~ msgstr "Obálka"
+
+#~ msgid "High Resolution Paper"
+#~ msgstr "Papier s vysokým rozlíšením"
+
+#~ msgid "T-Shirt Transfers"
+#~ msgstr "Nažehľovacia fólia"
+
+#~ msgid "High Gloss Film"
+#~ msgstr "Vysokolesklý film"
+
+#~ msgid "Glossy Photo Paper"
+#~ msgstr "Lesklý foto papier"
+
+#~ msgid "Glossy Photo Cards"
+#~ msgstr "Lesklé foto karty"
+
+#~ msgid "Photo Paper Pro"
+#~ msgstr "Foto papier pro"
+
+#~ msgid "Photo CcMmYK Color"
+#~ msgstr "Fotografická CcMmYK farba"
+
+#~ msgid "Photo CcMmY Color"
+#~ msgstr "Fotografická CcMmY farba"
+
+#~ msgid "CMYK Color"
+#~ msgstr "CMYK farba"
+
+#~ msgid "CMY Color"
+#~ msgstr "CMY farba"
 
 #, fuzzy
 #~ msgid "Gutenprint"
-#~ msgstr "Test tlaèe"
+#~ msgstr "Test tla�e"
 
 #, fuzzy
 #~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-#~ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
+#~ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 
 #, fuzzy
 #~ msgid "EPSON Stylus C50"
@@ -8317,39 +8657,39 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 
 #, fuzzy
 #~ msgid "Printer does not support listing ink types!\n"
-#~ msgstr "Tlaèiareò nepodporuje farebný výstup\n"
+#~ msgstr "Tla�iareň nepodporuje farebný výstup\n"
 
 #, fuzzy
 #~ msgid "Cannot identify printer!\n"
-#~ msgstr "Nie je mo¾né analyzova» výstup z tlaèiarne\n"
+#~ msgstr "Nie je možné analyzovať výstup z tla�iarne\n"
 
 #, fuzzy
 #~ msgid "Red Balance"
-#~ msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+#~ msgstr "Prispôsobenie vyváženie žltej farby pre tla�"
 
 #, fuzzy
 #~ msgid "Gloss Balance"
-#~ msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
+#~ msgstr "Prispôsobenie vyváženie žltej farby pre tla�"
 
 #~ msgid ""
 #~ "Printer alignment must be done with a raw device or else\n"
 #~ "the -m option must be used to specify a printer.\n"
 #~ msgstr ""
-#~ "Zarovnanie tlaèiarne musí by» vykonané so základného zariadením alebo\n"
-#~ "pomocou voµby -m musíte urèi» tlaèiareò.\n"
+#~ "Zarovnanie tla�iarne musí byť vykonané so základného zariadením alebo\n"
+#~ "pomocou voľby -m musíte ur�iť tla�iareň.\n"
 
 #~ msgid "Attempting to detect printer model..."
-#~ msgstr "Pokú¹am sa zisti» model tlaèiarne..."
+#~ msgstr "Pokúšam sa zistiť model tla�iarne..."
 
 #~ msgid ""
 #~ "\n"
 #~ "Cannot open %s read/write: %s\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Nie je mo¾né otvori» %s pre èítanie/zápis: %s\n"
+#~ "Nie je možné otvoriť %s pre �ítanie/zápis: %s\n"
 
 #~ msgid "Printer model %s is not known.\n"
-#~ msgstr "Neznámy typ tlaèiarne %s.\n"
+#~ msgstr "Neznámy typ tla�iarne %s.\n"
 
 #, fuzzy
 #~ msgid "Gimp-Print"
@@ -8358,53 +8698,53 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 #, fuzzy
 #~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
 #~ msgstr ""
-#~ "Nastavenie jasu tlaèe.\n"
-#~ "0 je jednoliatu èiernu, 2 pre jednoliatu bielu"
+#~ "Nastavenie jasu tla�e.\n"
+#~ "0 je jednoliatu �iernu, 2 pre jednoliatu bielu"
 
 #~ msgid ""
 #~ "Enter the correct command to print to your printer. Note: Please do not "
 #~ "remove the `-l' or `-oraw' from the command string, or printing will "
 #~ "probably fail!"
 #~ msgstr ""
-#~ "Vlo¾te správny príkaz pre tlaè na va¹ej tlaèiarni. Poznámka: Neodstráòte "
-#~ "prosím z re»azca pre tlaè prepínaèe `-l' alebo `-oraw', lebo tlaè "
-#~ "pravdepodobne nebude úspe¹ná!"
+#~ "Vložte správny príkaz pre tla� na vašej tla�iarni. Poznámka: Neodstráňte "
+#~ "prosím z reťazca pre tla� prepína�e `-l' alebo `-oraw', lebo tla� "
+#~ "pravdepodobne nebude úspešná!"
 
 #~ msgid "PPD File?"
-#~ msgstr "PPD súbor?"
+#~ msgstr "PPD súbor?"
 
 #~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: voµba `%s' je viacznaèná\n"
+#~ msgstr "%s: voľba `%s' je viaczna�ná\n"
 
 #~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: voµba `--%s' nedovoµuje pou¾i» argument\n"
+#~ msgstr "%s: voľba `--%s' nedovoľuje použiť argument\n"
 
 #~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: voµba `%c%s' nedovoµuje pou¾i» argument\n"
+#~ msgstr "%s: voľba `%c%s' nedovoľuje použiť argument\n"
 
 #~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: voµba `%s' vy¾aduje argument\n"
+#~ msgstr "%s: voľba `%s' vyžaduje argument\n"
 
 #~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: neznáma voµba `--%s'\n"
+#~ msgstr "%s: neznáma voľba `--%s'\n"
 
 #~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: neznáma voµba `%c%s'\n"
+#~ msgstr "%s: neznáma voľba `%c%s'\n"
 
 #~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: neplatná voµba -- %c\n"
+#~ msgstr "%s: neplatná voľba -- %c\n"
 
 #~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: neplatná voµba -- %c\n"
+#~ msgstr "%s: neplatná voľba -- %c\n"
 
 #~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: voµba vy¾aduje argument -- %c\n"
+#~ msgstr "%s: voľba vyžaduje argument -- %c\n"
 
 #~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: voµba `-W %s` je viacznaèná\n"
+#~ msgstr "%s: voľba `-W %s` je viaczna�ná\n"
 
 #~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: voµba `-W %s' nedovoµuje pou¾i» argument\n"
+#~ msgstr "%s: voľba `-W %s' nedovoľuje použiť argument\n"
 
 #, fuzzy
 #~ msgid "Bright"
@@ -8412,11 +8752,11 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 
 #, fuzzy
 #~ msgid "Image is too wide for the page\n"
-#~ msgstr "Zmeni» veµkos» tlaèe podµa rozmerov strany"
+#~ msgstr "Zmeniť veľkosť tla�e podľa rozmerov strany"
 
 #, fuzzy
 #~ msgid "Full Bleed"
-#~ msgstr "Kotúèový podávaè"
+#~ msgstr "Kotú�ový podáva�"
 
 #, fuzzy
 #~ msgid "traditional"
@@ -8433,7 +8773,7 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 
 #, fuzzy
 #~ msgid "Optimize the settings for the type of image to be printed"
-#~ msgstr "Optimalizova» výstup podµa typu tlaèeného obrázku"
+#~ msgstr "Optimalizovať výstup podľa typu tla�eného obrázku"
 
 #~ msgid "Solid Colors"
 #~ msgstr "Jednoliate farby"
@@ -8504,122 +8844,122 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 #~ "WARNING: THIS FUNCTION IS NOT YET TESTED!  It may not work, and it may\n"
 #~ "damage your printer!\n"
 #~ msgstr ""
-#~ "Prosím, veµmi pozorne si preèítajte tieto in¹trukcie pred tým, ako bude "
-#~ "pokraèova».\n"
+#~ "Prosím, veľmi pozorne si pre�ítajte tieto inštrukcie pred tým, ako bude "
+#~ "pokra�ovať.\n"
 #~ "\n"
-#~ "Tento nástroj vám pomô¾e so zarovnávaním tlaèovej hlavy pre farebnú tlaè "
-#~ "atramentovej tlaèiarne Epson Stylus.\n"
-#~ "Jeho nesprávne pou¾itie mô¾e spôsobi» zní¾enie kvality tlaèe a mô¾e "
-#~ "po¹kodi»\n"
-#~ "samotnú tlaèiareò. Tento nástroj nebol odobrený spoloènos»ou Seiko Epson\n"
-#~ "a je ponúknutý bez akejkoµvek záruky. Celé riziko za pou¾itie toho "
-#~ "nástroja\n"
-#~ "le¾í na vás.\n"
+#~ "Tento nástroj vám pomôže so zarovnávaním tla�ovej hlavy pre farebnú tla� "
+#~ "atramentovej tla�iarne Epson Stylus.\n"
+#~ "Jeho nesprávne použitie môže spôsobiť zníženie kvality tla�e a môže "
+#~ "poškodiť\n"
+#~ "samotnú tla�iareň. Tento nástroj nebol odobrený spolo�nosťou Seiko Epson\n"
+#~ "a je ponúknutý bez akejkoľvek záruky. Celé riziko za použitie toho "
+#~ "nástroja\n"
+#~ "leží na vás.\n"
 #~ "\n"
-#~ "Nástroj vytlaèí %d pretlaè testovacích vzoriek na jeden kúsok papiera.\n"
-#~ "Najprv sa vytlaèí jedna vzorka a papier bude vysunutý. Potom musíte ten "
-#~ "istý\n"
-#~ "papier vlo¾i» do tlaèiarne, aby sa naò vytlaèila ïal¹ia vzorka. Ka¾dá "
+#~ "Nástroj vytla�í %d pretla� testovacích vzoriek na jeden kúsok papiera.\n"
+#~ "Najprv sa vytla�í jedna vzorka a papier bude vysunutý. Potom musíte ten "
+#~ "istý\n"
+#~ "papier vložiť do tla�iarne, aby sa naň vytla�ila �alšia vzorka. Každá "
 #~ "vzorka\n"
-#~ "obsahuje sadu mo¾ností oèíslovaných od %d do %d.\n"
+#~ "obsahuje sadu možností o�íslovaných od %d do %d.\n"
 #~ "\n"
-#~ "Keï si prezriete vzorky, mali by ste nájs» tú s najhlad¹ou textúrou "
+#~ "Ke� si prezriete vzorky, mali by ste nájsť tú s najhladšou textúrou "
 #~ "(najmenej\n"
-#~ "''zrnitou''). Mali by ste ich veµmi pozorne prezrie» a  vybra» tú "
-#~ "najlep¹iu.\n"
-#~ "Odporúèame vám pou¾i» papier pre tlaè vo foto kvalite alebo podobne "
-#~ "vysokokvalitný\n"
-#~ "typ papiera. Pokiaµ nenájdete hladkú vzorku, mali by ste test zopakova».\n"
+#~ "''zrnitou''). Mali by ste ich veľmi pozorne prezrieť a  vybrať tú "
+#~ "najlepšiu.\n"
+#~ "Odporú�ame vám použiť papier pre tla� vo foto kvalite alebo podobne "
+#~ "vysokokvalitný\n"
+#~ "typ papiera. Pokiaľ nenájdete hladkú vzorku, mali by ste test zopakovať.\n"
 #~ "\n"
-#~ "Po preskúmaní mo¾ností a výbere pásky, vám budú ponúknuté tieto "
-#~ "mo¾nosti:\n"
-#~ "(s) - ulo¾i» výsledky do tlaèiarne, (r) - zopakova» proces, alebo (q) - "
-#~ "ukonèi»\n"
-#~ "bez ulo¾enia.  Ukonèenie neobnoví pôvodné nastavenie, ale vypnutie a "
-#~ "následné\n"
-#~ "zapnutie tlaèiarne áno.. Pokiaµ ukonèíte bez ulo¾enia, budete musie» "
-#~ "zopakova»\n"
-#~ "celý proces opä», ak budete chcie» svoje výsledky ulo¾i».\n"
-#~ "Je dôle¾ité, aby ste poèas toho procesu nevypli tlaèiareò\n"
+#~ "Po preskúmaní možností a výbere pásky, vám budú ponúknuté tieto "
+#~ "možnosti:\n"
+#~ "(s) - uložiť výsledky do tla�iarne, (r) - zopakovať proces, alebo (q) - "
+#~ "ukon�iť\n"
+#~ "bez uloženia.  Ukon�enie neobnoví pôvodné nastavenie, ale vypnutie a "
+#~ "následné\n"
+#~ "zapnutie tla�iarne áno.. Pokiaľ ukon�íte bez uloženia, budete musieť "
+#~ "zopakovať\n"
+#~ "celý proces opäť, ak budete chcieť svoje výsledky uložiť.\n"
+#~ "Je dôležité, aby ste po�as toho procesu nevypli tla�iareň\n"
 #~ "\n"
-#~ "VAROVANIE: TÁTO FUNKCIA NIE JE E©TE OTESTOVANÁ!  Mo¾no nebude fungova» a "
-#~ "mo¾no\n"
-#~ "vám po¹kodí tlaèiareò!\n"
+#~ "VAROVANIE: T�TO FUNKCIA NIE JE EŠTE OTESTOVAN�!  Možno nebude fungovať a "
+#~ "možno\n"
+#~ "vám poškodí tla�iareň!\n"
 
 #~ msgid "Printer %s does not require color head alignment.\n"
-#~ msgstr "Tlaèiareò %s nevy¾aduje zarovnanie farebnej hlavy.\n"
+#~ msgstr "Tla�iareň %s nevyžaduje zarovnanie farebnej hlavy.\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "Please inspect the print, and choose the pattern in each set.\n"
 #~ "Type a pattern number, '?' for help, or 'r' to repeat the procedure.\n"
 #~ msgstr ""
-#~ "Preskúmajte pozorne výtlaèok a zvoµte najlep¹í pár èiar v ka¾dej vzorke.\n"
-#~ "Stlaète èíslo páru, '?' pre pomoc alebo 'r' pre zopakovanie procedúry.\n"
+#~ "Preskúmajte pozorne výtla�ok a zvoľte najlepší pár �iar v každej vzorke.\n"
+#~ "Stla�te �íslo páru, '?' pre pomoc alebo 'r' pre zopakovanie procedúry.\n"
 
 #, fuzzy
 #~ msgid "Model %d out of range.\n"
-#~ msgstr "Èíslo je mimo rozsahu!\n"
+#~ msgstr "Číslo je mimo rozsahu!\n"
 
 #~ msgid "Right Border:"
-#~ msgstr "Pravý okraj:"
+#~ msgstr "Pravý okraj:"
 
 #~ msgid "Bottom Border:"
-#~ msgstr "Dolný okraj:"
+#~ msgstr "Dolný okraj:"
 
 #~ msgid "Size"
-#~ msgstr "Veµkos»"
+#~ msgstr "Veľkosť"
 
 #~ msgid "Image / Output Settings"
-#~ msgstr "Obrázok / Výstupné nastavenia"
+#~ msgstr "Obrázok / Výstupné nastavenia"
 
 #, fuzzy
 #~ msgid "GIMP-print"
-#~ msgstr "Tlaèi»"
+#~ msgstr "Tla�iť"
 
 #, fuzzy
 #~ msgid "Resolutions"
-#~ msgstr "Rozlí¹enie"
+#~ msgstr "Rozlíšenie"
 
 #~ msgid "Media Type:"
-#~ msgstr "Typ média:"
+#~ msgstr "Typ média:"
 
 #~ msgid "Type of media you're printing to"
-#~ msgstr "Typ média na ktorý bude tlaèené"
+#~ msgstr "Typ média na ktorý bude tla�ené"
 
 #~ msgid "Media Size:"
-#~ msgstr "Veµkos» média:"
+#~ msgstr "Veľkosť média:"
 
 #~ msgid "Size of paper that you wish to print to"
-#~ msgstr "Veµkos» papiera, na ktorý chcete tlaèi»"
+#~ msgstr "Veľkosť papiera, na ktorý chcete tla�iť"
 
 #~ msgid "Media Source:"
-#~ msgstr "Zdroj média:"
+#~ msgstr "Zdroj média:"
 
 #~ msgid "Source (input slot) of media you're printing to"
-#~ msgstr "Zdroj (vstupné miesto) média, na ktoré tlaèíte"
+#~ msgstr "Zdroj (vstupné miesto) média, na ktoré tla�íte"
 
 #~ msgid "Ink Type:"
 #~ msgstr "Typ atramentu:"
 
 #~ msgid "Resolution:"
-#~ msgstr "Rozlí¹enie:"
+#~ msgstr "Rozlíšenie:"
 
 #~ msgid "Print in black and white (no color, and no shades of gray)"
-#~ msgstr "Tlaèi» èiernou a bielou (bez farieb a bez odtieòov ¹edej)"
+#~ msgstr "Tla�iť �iernou a bielou (bez farieb a bez odtieňov šedej)"
 
 #~ msgid "Fastest and brightest color for text and line art"
-#~ msgstr "Najrýchlej¹ie a jasnej¹ie farby pre text a èiarovú grafiku"
+#~ msgstr "Najrýchlejšie a jasnejšie farby pre text a �iarovú grafiku"
 
 #~ msgid "Best for images dominated by regions of solid color"
-#~ msgstr "Najlep¹ie pre obrázky s dominatnými oblas»ami jednej farby"
+#~ msgstr "Najlepšie pre obrázky s dominatnými oblasťami jednej farby"
 
 #~ msgid ""
 #~ "Slowest, but most accurate and smoothest color for continuous tone images "
 #~ "and photographs"
 #~ msgstr ""
-#~ "Najpomal¹ie, ale najpresnej¹ie a najhlad¹ie farby pre plynulé odtiene "
-#~ "obrázkov a fotografií"
+#~ "Najpomalšie, ale najpresnejšie a najhladšie farby pre plynulé odtiene "
+#~ "obrázkov a fotografií"
 
 #~ msgid "Dither Algorithm:"
 #~ msgstr "Algoritmus rozptylu:"
@@ -8629,20 +8969,20 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 #~ "Cannot read from %s: %s\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Nie je mo¾né èíta» z %s: %s\n"
+#~ "Nie je možné �ítať z %s: %s\n"
 
 #~ msgid "%s out of range (value %f, min %f, max %f)\n"
 #~ msgstr "%s mimo rozsahu (hodnota %f, min %f, max %f)\n"
 
 #~ msgid "%s is not a valid dither algorithm\n"
-#~ msgstr "%s nie je platný algoritmus rozptylu\n"
+#~ msgstr "%s nie je platný algoritmus rozptylu\n"
 
 #~ msgid ""
 #~ "Please re-insert the same alignment sheet in the printer when it is\n"
 #~ "finished printing.\n"
 #~ msgstr ""
-#~ "Opätovne vlo¾te prosím ten istý hárok papiera na zarovnanie\n"
-#~ "do tlaèiarne po dokonèení tlaèenia.\n"
+#~ "Opätovne vložte prosím ten istý hárok papiera na zarovnanie\n"
+#~ "do tla�iarne po dokon�ení tla�enia.\n"
 
 #~ msgid ""
 #~ "Inspect the alignment sheet, and determine which pattern is the "
@@ -8652,26 +8992,26 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 #~ "best pattern, and repeat the procedure.\n"
 #~ "Type a pattern number, or '?' for help.\n"
 #~ msgstr ""
-#~ "Preskúmajte zarovnanie papiera a urèite, ktorá vzorka je najhlad¹ia.\n"
-#~ "Táto vzorka má najmenej ``zrniek''.\n"
-#~ "Ak nemô¾ete nájs» hladkú vzorku, zvoµte prosím èíslo najlep¹ej vzorky\n"
-#~ "a zopakujte túto procedúru.\n"
-#~ "Vlo¾te èíslo vzorky, alebo '?' pre pomoc.\n"
+#~ "Preskúmajte zarovnanie papiera a ur�ite, ktorá vzorka je najhladšia.\n"
+#~ "Táto vzorka má najmenej ``zrniek''.\n"
+#~ "Ak nemôžete nájsť hladkú vzorku, zvoľte prosím �íslo najlepšej vzorky\n"
+#~ "a zopakujte túto procedúru.\n"
+#~ "Vložte �íslo vzorky, alebo '?' pre pomoc.\n"
 
 #~ msgid "The best pattern should be numbered between 1 and %d.\n"
-#~ msgstr "Najlep¹ia vzorka by mala ma» èíslo od 1 po %d.\n"
+#~ msgstr "Najlepšia vzorka by mala mať �íslo od 1 po %d.\n"
 
 #~ msgid "Set the contrast of the print"
-#~ msgstr "Nastavi» kontrast tlaèe"
+#~ msgstr "Nastaviť kontrast tla�e"
 
 #~ msgid "Cyan:"
-#~ msgstr "Azúrová:"
+#~ msgstr "Azúrová:"
 
 #~ msgid "Magenta:"
-#~ msgstr "Purpurová:"
+#~ msgstr "Purpurová:"
 
 #~ msgid "Yellow:"
-#~ msgstr "®ltá:"
+#~ msgstr "Žltá:"
 
 #~ msgid "Parameter %s out of range (value %f, min %f, max %f)\n"
 #~ msgstr "Parameter %s je mimo rozsahu (hodnota %f, min %f, max %f)\n"
@@ -8680,7 +9020,7 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 #~ msgstr "Parameter %s je mimo rozsahu (hodnota %d, min %d, max %d)\n"
 
 #~ msgid "Unknown option %s\n"
-#~ msgstr "Neznáme nastavenie %s\n"
+#~ msgstr "Neznáme nastavenie %s\n"
 
 #~ msgid "1440 x 360 DPI"
 #~ msgstr "1440 x 360 DPI"
@@ -8689,7 +9029,7 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 #~ msgstr "1440 x 360 DPI Jednosmerne"
 
 #~ msgid "1440 x 360 DPI High Quality Uni"
-#~ msgstr "1440 x 360 DPI Vysoká kvalita jed."
+#~ msgstr "1440 x 360 DPI Vysoká kvalita jed."
 
 #~ msgid "13x19"
 #~ msgstr "13x19"
@@ -8707,4 +9047,4 @@ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
 #~ msgstr "Kaku"
 
 #~ msgid "HP Greeting Card"
-#~ msgstr "HP pohµadnica"
+#~ msgstr "HP pohľadnica"
diff --git a/po/sv.gmo b/po/sv.gmo
index 25c0700..c0279ec 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 8feb98e..1c5825b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,13 +3,13 @@
 # Daniel Nylander <po@danielnylander.se>, 2006.
 # Christian Rose <menthos@menthos.com>, 2001, 2002.
 #
-# $Id: sv.po,v 1.82 2006/05/29 00:07:55 rlk Exp $
+# $Id: sv.po,v 1.83.4.2 2007/05/13 17:09:40 rlk Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint 5.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\n"
 "PO-Revision-Date: 2006-05-23 23:04+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -20,7 +20,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 msgid "Default"
 msgstr "Standard"
 
@@ -79,18 +79,18 @@ msgstr ""
 msgid "Density"
 msgstr "Densitet"
 
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -149,472 +149,311 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Färgutjämningsalgoritm"
 
-#: src/main/print-canon.c:1382
-msgid "90x90 DPI"
-msgstr "90×90 DPI"
-
-#: src/main/print-canon.c:1382
-msgid "90x90 DPI DMT"
-msgstr "90×90 DPI DMT"
-
-#: src/main/print-canon.c:1383
-msgid "180x180 DPI"
-msgstr "180×180 DPI"
-
-#: src/main/print-canon.c:1383
-msgid "180x180 DPI DMT"
-msgstr "180×180 DPI DMT"
-
-#: src/main/print-canon.c:1384
-msgid "360x360 DPI"
-msgstr "360×360 DPI"
-
-#: src/main/print-canon.c:1384
-msgid "360x360 DPI DMT"
-msgstr "360×360 DPI DMT"
-
-#: src/main/print-canon.c:1385
-msgid "720x360 DPI"
-msgstr "720×360 DPI"
-
-#: src/main/print-canon.c:1385
-msgid "720x360 DPI DMT"
-msgstr "720×360 DPI DMT"
-
-#: src/main/print-canon.c:1386
-msgid "720x720 DPI"
-msgstr "720×720 DPI"
-
-#: src/main/print-canon.c:1386
-msgid "720x720 DPI DMT"
-msgstr "720×720 DPI DMT"
-
-#: src/main/print-canon.c:1387
-msgid "1440x720 DPI"
-msgstr "1440×720 DPI"
-
-#: src/main/print-canon.c:1387
-msgid "1440x720 DPI DMT"
-msgstr "1440×720 DPI DMT"
-
-#: src/main/print-canon.c:1388
-msgid "1440x1440 DPI"
-msgstr "1440×1440 DPI"
-
-#: src/main/print-canon.c:1388
-msgid "1440x1440 DPI DMT"
-msgstr "1440×1440 DPI DMT"
-
-#: src/main/print-canon.c:1389
-msgid "2880x2880 DPI"
-msgstr "2880×2880 DPI"
-
-#: src/main/print-canon.c:1389
-msgid "2880x2880 DPI DMT"
-msgstr "2880×2880 DPI DMT"
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr "150×150 DPI"
-
-#: src/main/print-canon.c:1390
-msgid "150x150 DPI DMT"
-msgstr "150×150 DPI DMT"
-
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
-msgstr "300×300 DPI"
-
-#: src/main/print-canon.c:1391
-msgid "300x300 DPI DMT"
-msgstr "300×300 DPI DMT"
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr "600×300 DPI"
-
-#: src/main/print-canon.c:1392
-msgid "600x300 DPI DMT"
-msgstr "600×300 DPI DMT"
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr "600×600 DPI"
-
-#: src/main/print-canon.c:1393
-msgid "600x600 DPI DMT"
-msgstr "600×600 DPI DMT"
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr "1200×600 DPI"
-
-#: src/main/print-canon.c:1394
-msgid "1200x600 DPI DMT"
-msgstr "1200×600 DPI DMT"
-
-#: src/main/print-canon.c:1395
-msgid "1200x1200 DPI"
-msgstr "1200×1200 DPI"
-
-#: src/main/print-canon.c:1395
-msgid "1200x1200 DPI DMT"
-msgstr "1200×1200 DPI DMT"
-
-#: src/main/print-canon.c:1396
-msgid "2400x2400 DPI"
-msgstr "2400×2400 DPI"
-
-#: src/main/print-canon.c:1396
-msgid "2400x2400 DPI DMT"
-msgstr "2400×2400 DPI DMT"
-
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-msgid "Plain Paper"
-msgstr "Vanligt papper"
-
-#: src/main/print-canon.c:1448
-msgid "Plain Paper PIXMA"
-msgstr "Vanligt papper PIXMA"
-
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-msgid "Transparencies"
-msgstr "Genomskinligheter"
-
-#: src/main/print-canon.c:1450
-msgid "Back Print Film"
-msgstr "Bakutskriftsfilm"
-
-#: src/main/print-canon.c:1451
-msgid "Fabric Sheets"
-msgstr "Tygark"
-
-#: src/main/print-canon.c:1452
-msgid "Envelope"
-msgstr "Kuvert"
-
-#: src/main/print-canon.c:1453
-msgid "High Resolution Paper"
-msgstr "Högupplösningspapper"
-
-#: src/main/print-canon.c:1454
-msgid "T-Shirt Transfers"
-msgstr "T-shirttryck"
-
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
-msgstr "Högglansig film"
-
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
-msgstr "Glansigt fotopapper"
-
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
-msgstr "Glansiga fotokort"
-
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
-msgstr "Professionellt fotopapper"
-
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
-msgstr "Annat"
-
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 msgid "Page Size"
 msgstr "Pappersstorlek"
 
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
 msgid "Basic Printer Setup"
 msgstr "Grundläggande skrivarinställningar"
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 msgid "Size of the paper being printed to"
 msgstr "Storlek på pappret som du vill skriva ut till"
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
 msgid "Media Type"
 msgstr "Mediatyp"
 
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Typ av media (vanligt papper, fotopapper, etc.)"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
 msgid "Media Source"
 msgstr "Mediakälla"
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Källa (inmatningsfack) med media som du skriver ut till"
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
+msgstr ""
+
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr ""
+
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
+msgstr ""
+
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
+
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+msgid "CD Hub Size (Custom)"
+msgstr ""
+
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#, fuzzy
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "Skala utskriften till storleken på sidan"
+
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
+msgstr "Avancerad skrivarkonfiguration"
+
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr ""
+
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
 msgstr "Upplösning"
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
 msgstr "Upplösning och kvalitet på utskriften"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Bläcktyp"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr "Avancerad skrivarkonfiguration"
-
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Typ av bläck i skrivaren"
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr "Bläckkanaler"
 
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr "Avancerad skrivarfunktionalitet"
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Utskriftsläge"
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Kärnparameter"
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr "Dubbelsidad utskrift"
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Justera magentabalansen på utskriften"
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 #, fuzzy
 msgid "Black Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 #, fuzzy
 msgid "Light Cyan Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr "Avancerad bläckjustering"
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 #, fuzzy
 msgid "Light Magenta Transition"
 msgstr "Ljus magenta"
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
 msgstr "Av"
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
+msgstr "LÃ¥ng kant (Standard)"
+
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
 msgid "Short Edge (Flip)"
 msgstr "Kort kant (Vänd)"
 
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-msgid "Auto Sheet Feeder"
-msgstr "Automatisk arkmatare"
-
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-msgid "Manual with Pause"
-msgstr "Manuell med paus"
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
+msgstr "CD - 5 tum"
 
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
-msgstr "Manuell utan paus"
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
+msgstr "CD - 3 tum"
 
-#: src/main/print-canon.c:1923
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
 #, fuzzy
-msgid "Cassette"
-msgstr "Matte-papper"
+msgid "CD - Custom"
+msgstr "Anpassat"
 
-#: src/main/print-canon.c:1924
-msgid "CD tray"
-msgstr "Cd-lucka"
-
-#: src/main/print-canon.c:2049
-msgid "Photo CcMmYK Color"
-msgstr "CcMmYK-fotofärg"
-
-#: src/main/print-canon.c:2052
-msgid "Photo CcMmY Color"
-msgstr "CcMmY-fotofärg"
-
-#: src/main/print-canon.c:2055
-msgid "CMYK Color"
-msgstr "CMYK-färg"
-
-#: src/main/print-canon.c:2058
-msgid "CMY Color"
-msgstr "CMY-färg"
-
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
-msgstr "Svart"
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
+msgstr "Normal"
+
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+#, fuzzy
+msgid "Print To Hub"
+msgstr "Skriv ut till fil?"
 
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
 msgstr "Färg"
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Svart och vitt"
@@ -652,9 +491,9 @@ msgstr "RÃ¥"
 msgid "Pre-Dithered"
 msgstr "Skriv ut"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
 msgstr "Gråtoner"
 
@@ -682,10 +521,6 @@ msgstr "KCMY"
 msgid "Channel "
 msgstr "Kanal "
 
-#: src/main/print-color.c:165
-msgid " Gamma"
-msgstr " Gamma"
-
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
 #: src/main/print-color.c:266 src/main/print-color.c:274
@@ -742,7 +577,7 @@ msgid "Output image type"
 msgstr "Utdatatyp:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
 msgstr "RÃ¥kanaler"
 
@@ -807,13 +642,13 @@ msgstr "Gamma:"
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
@@ -823,13 +658,13 @@ msgstr "Cyan"
 msgid "Adjust the cyan gamma"
 msgstr "Justera cyangamma"
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 msgid "Magenta"
@@ -839,13 +674,13 @@ msgstr "Magenta"
 msgid "Adjust the magenta gamma"
 msgstr "Justera magentagamma"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
@@ -855,9 +690,9 @@ msgstr "Gul"
 msgid "Adjust the yellow gamma"
 msgstr "Justera gulgamma"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
 msgstr "Röd"
@@ -866,8 +701,8 @@ msgstr "Röd"
 msgid "Adjust the red gamma"
 msgstr "Justera rödgamma"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
 msgstr "Grön"
 
@@ -875,9 +710,9 @@ msgstr "Grön"
 msgid "Adjust the green gamma"
 msgstr "Justera gröngamma"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
 msgstr "Blå"
@@ -886,11 +721,23 @@ msgstr "Blå"
 msgid "Adjust the blue gamma"
 msgstr "Justera blågamma"
 
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr "Svart"
+
 #: src/main/print-color.c:315
 msgid "Adjust the black gamma"
 msgstr "Justera svartgamma"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
 msgstr "Cyanbalans"
 
@@ -903,7 +750,7 @@ msgstr "Gråbalans"
 msgid "Adjust the cyan gray balance"
 msgstr "Justera cyan-gråbalansen"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 msgid "Magenta Balance"
 msgstr "Magentabalans"
 
@@ -911,7 +758,7 @@ msgstr "Magentabalans"
 msgid "Adjust the magenta gray balance"
 msgstr "Justera magenta-gråbalansen"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 msgid "Yellow Balance"
 msgstr "Gulbalans"
 
@@ -938,9 +785,9 @@ msgstr "Bläckgräns"
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Utdatatyp:"
@@ -973,10 +820,6 @@ msgstr ""
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:446
-msgid " Curve"
-msgstr " Kurva"
-
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
@@ -1091,83 +934,83 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr "Värde måste ställas in för %s\n"
 
-#: src/main/printers.c:516 src/main/printers.c:521
+#: src/main/printers.c:519 src/main/printers.c:524
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr "\"%s\" är inte en giltig %s\n"
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr "%s måste vara mellan %f och %f (är %f)\n"
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr "%s måste vara mellan %d och %d (är %d)\n"
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr ""
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:673
+#: src/main/printers.c:676
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr "Okänd typparameter %s (%d)\n"
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr "%s är utanför intervallet (värde %d, min %d, max %d)\n"
 
-#: src/main/printers.c:755
+#: src/main/printers.c:761
 msgid "Page size is not valid\n"
 msgstr "Pappersstorleken är inte giltig\n"
 
-#: src/main/printers.c:776
+#: src/main/printers.c:782
 #, fuzzy, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "Övre marginalen får inte vara negativ\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:788
 #, fuzzy, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "Vänstermarginalen får inte vara negativ\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:794
 #, fuzzy
 msgid "Height must be greater than zero\n"
 msgstr "Vänstermarginalen får inte vara negativ\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:800
 #, fuzzy
 msgid "Width must be greater than zero\n"
 msgstr "Övre marginalen får inte vara negativ\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
@@ -1176,7 +1019,7 @@ msgstr ""
 "Bilden är för bred för sidan: vänstermarginalen är %d, bredd %d, högerkanten "
 "är %d\n"
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
@@ -1185,464 +1028,279 @@ msgstr ""
 "Bilden är för lång för sidan: övre marginal är %d, höjd %d, nedre kanten är %"
 "d\n"
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-msgid "Roll Feed"
-msgstr "Rullmatning"
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-msgid "Manual Feed"
-msgstr "Manuell matning"
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-msgid "Print to CD"
-msgstr "Skriv ut till cd"
-
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-#, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "Manuell matning"
-
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-#, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "Manuell matning"
-
-#: src/main/print-escp2-data.c:554
-#, fuzzy
-msgid "Rear Tray"
-msgstr "Fack"
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr ""
-
-#: src/main/print-escp2-data.c:581
-#, fuzzy
-msgid "Photo Board"
-msgstr "Fotosvart"
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr ""
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr ""
-
-#: src/main/print-escp2-data.c:638
-#, fuzzy
-msgid "Cut Sheet Autoselect"
-msgstr "Välj automatiskt"
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr ""
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr "Snabb ekonomi"
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr "Ekonomi"
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr "Utdrag"
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-msgid "High"
-msgstr "Hög"
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-msgid "Photo"
-msgstr "Foto"
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-#, fuzzy
-msgid "Super Photo"
-msgstr "Stylus Photo"
-
-# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-#, fuzzy
-msgid "Ultra Photo"
-msgstr "Sexfärgs foto"
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr "Bästa"
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-msgid "Light Cyan"
-msgstr "Ljus cyan"
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-msgid "Light Magenta"
-msgstr "Ljus magenta"
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-msgid "Light Black"
-msgstr "Ljus svart"
-
-#: src/main/print-escp2-data.c:811
-msgid "Dark Yellow"
-msgstr "Mörk gul"
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-msgid "Matte Black"
-msgstr "Matt svart"
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-msgid "Photo Black"
-msgstr "Fotosvart"
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-msgid "Gloss Optimizer"
-msgstr "Glansoptimerare"
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-msgid "Light Light Black"
-msgstr "Ljus-ljus svart"
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
 msgstr "Automatiskt utskriftsläge"
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
 msgstr "Automatiskt utskriftsläge"
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Utskriftskvalitet"
 
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr ""
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr ""
-
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr ""
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:214
+#: src/main/print-escp2.c:228
 msgid "Resolution of the print"
 msgstr "Upplösning på utskriften"
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
 msgstr "Förbättrat glansig"
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
 msgstr "Lägg till glansförbättring"
 
-#: src/main/print-escp2.c:236
+#: src/main/print-escp2.c:250
 #, fuzzy
 msgid "Ink Set"
 msgstr "Bläcktyp"
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
 msgstr ""
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 #, fuzzy
 msgid "Output Order"
 msgstr "Utdatatyp:"
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
 msgstr "Justeringsval"
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 #, fuzzy
 msgid "Ink change command"
 msgstr "Okänt kommando.\n"
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 msgid "Alternate Alignment Choices"
 msgstr "Alternativa justeringsval"
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 msgid "Channel Names"
 msgstr "Kanalnamn"
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:346
 msgid "Cyan Map"
 msgstr "Cyankarta"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:347
 msgid "Adjust the cyan map"
 msgstr "Justera cyankartan"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:352
 msgid "Magenta Map"
 msgstr "Magentakarta"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:353
 msgid "Adjust the magenta map"
 msgstr "Justera magentakartan"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:358
 msgid "Yellow Map"
 msgstr "Gulkarta"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:359
 msgid "Adjust the yellow map"
 msgstr "Justera gulkartan"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:364
 msgid "Blue Map"
 msgstr "Blåkarta"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:365
 msgid "Adjust the blue map"
 msgstr "Justera blåkartan"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
 msgstr "Rödkarta"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:371
 msgid "Adjust the red map"
 msgstr "Justera rödkartan"
 
-#: src/main/print-escp2.c:447
+#: src/main/print-escp2.c:464
 #, fuzzy
 msgid "Red Density"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:448
+#: src/main/print-escp2.c:465
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-escp2.c:455
+#: src/main/print-escp2.c:472
 #, fuzzy
 msgid "Blue Density"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:456
+#: src/main/print-escp2.c:473
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-escp2.c:463
+#: src/main/print-escp2.c:480
 msgid "Gloss Level"
 msgstr "Glansnivå"
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:481
 msgid "Adjust the gloss level"
 msgstr "Justera glansnivån"
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:527
+#: src/main/print-escp2.c:544
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:528
+#: src/main/print-escp2.c:545
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr "CD - 5 tum"
-
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr "CD - 3 tum"
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr "Normal"
-
-#: src/main/print-escp2.c:1564
-#, fuzzy
-msgid "Print To Hub"
-msgstr "Skriv ut till fil?"
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr "Standard"
+
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/main/print-escp2.c:1701
+#: src/main/print-escp2.c:1829
 msgid "Bidirectional"
 msgstr "Dubbelriktad"
 
-#: src/main/print-escp2.c:1703
+#: src/main/print-escp2.c:1831
 msgid "Unidirectional"
 msgstr "Enkelriktad"
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
 msgstr "Undvik närmaste granne"
 
-#: src/main/print-escp2.c:2168
+#: src/main/print-escp2.c:2313
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Skrivaren stöder inte färgutskrift\n"
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr "Utskriftsflaggor inte validerade; kan inte skriva ut.\n"
@@ -1697,250 +1355,303 @@ msgstr "testutskrift"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
 msgstr "Fyrfärgs standard"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
 msgstr "Trefärgers sammansatt"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
 msgstr "Sexfärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
 msgstr "Femfärgsfoto sammansatt"
 
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+msgid "Plain Paper"
+msgstr "Vanligt papper"
+
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
 msgstr "Glansig film"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+msgid "Transparencies"
+msgstr "Genomskinligheter"
+
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 msgid "Envelopes"
 msgstr "Kuvert"
 
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 msgid "Matte Paper"
 msgstr "Matte-papper"
 
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
 msgstr "Bläckstrålepapper"
 
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
 msgstr "Bläckstrålepapper med fotokvalitet"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 msgid "Photo Paper"
 msgstr "Fotopapper"
 
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
 msgstr "Premiumglansigt fotopapper"
 
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
 msgstr "Fotopapper med premiumlyster"
 
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
 msgstr "Glansigt papper med fotokvalitet"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
 msgstr "Tungt Ilford-papper"
 
-#: src/main/print-olympus.c:265
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr "Annat"
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr "Automatisk arkmatare"
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr "Manuell med paus"
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr "Manuell utan paus"
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
 msgstr "Inget"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 msgid "Glossy"
 msgstr "Glansig"
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
 msgstr "Textur"
 
-#: src/main/print-olympus.c:861
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 msgid "Matte"
 msgstr "Matt"
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
 msgstr "Laminatmönster"
 
-#: src/main/print-olympus.c:1331
+#: src/main/print-olympus.c:1627
 msgid "Adjust the cyan balance"
 msgstr "Justera cyanbalansen"
 
-#: src/main/print-olympus.c:1339
+#: src/main/print-olympus.c:1635
 msgid "Adjust the magenta balance"
 msgstr "Justera magentabalansen"
 
-#: src/main/print-olympus.c:1347
+#: src/main/print-olympus.c:1643
 msgid "Adjust the yellow balance"
 msgstr "Justera gulbalansen"
 
-#: src/main/print-olympus.c:1354
+#: src/main/print-olympus.c:1650
 msgid "Black Balance"
 msgstr "Svartbalans"
 
-#: src/main/print-olympus.c:1355
+#: src/main/print-olympus.c:1651
 msgid "Adjust the black balance"
 msgstr "Justera svartbalansen"
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 msgid "Plain"
 msgstr "Vanlig"
 
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 msgid "Bond"
 msgstr "Band"
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 msgid "Premium"
 msgstr "Premium"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
 msgstr "Glansigt foto"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 msgid "Transparency"
 msgstr "Genomskinligt"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
 msgstr "Snabbtorkande foto"
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 msgid "Quick-dry Transparency"
 msgstr "Snabbtorkande genomskinligt"
 
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
 msgstr "Manuell"
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 msgid "Tray 1"
 msgstr "Fack 1"
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 msgid "Tray 2"
 msgstr "Fack 2"
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 msgid "Tray 3"
 msgstr "Fack 3"
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 msgid "Tray 4"
 msgstr "Fack 4"
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
 msgstr "Portabel arkmatare"
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 msgid "Desktop Sheet Feeder"
 msgstr "Skrivbordsarkmatare"
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 msgid "Tray"
 msgstr "Fack"
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 msgid "Optional Source"
 msgstr "Valfri källa"
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 msgid "Autoselect"
 msgstr "Välj automatiskt"
 
 #: src/main/print-pcl.c:256
+msgid "150x150 DPI"
+msgstr "150×150 DPI"
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr "300×300 DPI"
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
+msgstr "600×300 DPI"
+
+#: src/main/print-pcl.c:259
 msgid "600x600 DPI monochrome"
 msgstr "600×600 DPI enfärgad"
 
-#: src/main/print-pcl.c:259
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr "600×600 DPI"
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr "1200×600 DPI"
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
 msgstr "Färgpatroner + svarta patroner"
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
 msgstr "Färgpatroner + fotopatroner"
 
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr "LÃ¥ng kant (Standard)"
-
 #: src/main/print-ps.c:97
 msgid "PPDFile"
 msgstr "PPD-fil"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 msgid "PPD File"
 msgstr "PPD-fil"
 
@@ -1948,184 +1659,292 @@ msgstr "PPD-fil"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 msgid "Two Level Grayscale"
 msgstr "Tvånivås gråton"
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 msgid "Three Level Grayscale"
 msgstr "Trenivåers gråton"
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
 msgstr "Quadtone"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
 msgstr "Sexfärgs förbättrad sammansatt"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 msgid "Seven Color Photo"
 msgstr "Sjufärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 msgid "Seven Color Enhanced"
 msgstr "Sjufärgs förbättrad"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1535
+#: src/main/escp2-channels.c:1649
 msgid "Eight Color Photo"
 msgstr "Åttafärgers foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 msgid "One Color Raw"
 msgstr "Enfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1695
+#: src/main/escp2-channels.c:1809
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Enfärgers rå förbättrad glansig"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 msgid "Two Color Raw"
 msgstr "Tvåfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 msgid "Three Color Raw"
 msgstr "Trefärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1762
+#: src/main/escp2-channels.c:1876
 msgid "Three Color Raw Gloss"
 msgstr "Trefärgers rå glansig"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 msgid "Four Color Raw"
 msgstr "Fyrfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1884
+#: src/main/escp2-channels.c:2017
 msgid "Four Color Raw Gloss"
 msgstr "Fyrfärgers rå glansig"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 msgid "Five Color Raw"
 msgstr "Femfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 msgid "Six Color Raw"
 msgstr "Sexfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1962
+#: src/main/escp2-channels.c:2109
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Sexfärgers förbättrad glansig rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 msgid "Seven Color Raw"
 msgstr "Sjufärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2024
+#: src/main/escp2-channels.c:2187
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sjufärgers förbättrad glansig rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2042
+#: src/main/escp2-channels.c:2205
 msgid "Eight Color Raw"
 msgstr "Åttafärgers rå"
 
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
 msgstr ""
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Sexfärgs foto"
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+msgid "Photo Black"
+msgstr "Fotosvart"
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+msgid "Matte Black"
+msgstr "Matt svart"
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+msgid "Light Cyan"
+msgstr "Ljus cyan"
+
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+msgid "Light Magenta"
+msgstr "Ljus magenta"
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+msgid "Light Black"
+msgstr "Ljus svart"
+
+#: src/main/escp2-channels.c:2981
+msgid "Dark Yellow"
+msgstr "Mörk gul"
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+msgid "Gloss Optimizer"
+msgstr "Glansoptimerare"
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+msgid "Light Light Black"
+msgstr "Ljus-ljus svart"
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 msgid "Plain Paper Fast Load"
 msgstr "Snabbladdning av vanligt papper"
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Vykort"
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 msgid "Back Light Film"
 msgstr "Bakljusfilm"
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 msgid "Matte Paper Heavyweight"
 msgstr "Matt tungt papper"
 
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium halvglansigt fotopapper"
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 msgid "ColorLife Paper"
 msgstr "ColorLife-papper"
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matte-papper"
 
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+msgid "Roll Feed"
+msgstr "Rullmatning"
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+msgid "Manual Feed"
+msgstr "Manuell matning"
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+msgid "Print to CD"
+msgstr "Skriv ut till cd"
+
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "Manuell matning"
+
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "Manuell matning"
+
+#: src/main/escp2-papers.c:1859
+#, fuzzy
+msgid "Rear Tray"
+msgstr "Fack"
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/escp2-papers.c:1886
+#, fuzzy
+msgid "Photo Board"
+msgstr "Fotosvart"
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr ""
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr ""
+
+#: src/main/escp2-papers.c:1943
+#, fuzzy
+msgid "Cut Sheet Autoselect"
+msgstr "Välj automatiskt"
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr ""
+
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
 msgstr "360 × 90 DPI snabb ekonomi"
@@ -2159,129 +1978,152 @@ msgstr "360 DPI"
 msgid "720 x 360 DPI"
 msgstr "720 × 360 DPI"
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 × 360 DPI"
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/main/escp2-resolutions.c:94
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 msgid "720 DPI High Quality"
 msgstr "720 DPI hög kvalitet"
 
-#: src/main/escp2-resolutions.c:97
+#: src/main/escp2-resolutions.c:103
 msgid "720 DPI Highest Quality"
 msgstr "720 DPI högsta kvalitet"
 
-#: src/main/escp2-resolutions.c:100
+#: src/main/escp2-resolutions.c:106
 msgid "720 x 720 DPI"
 msgstr "720 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 msgid "1440 x 720 DPI"
 msgstr "1440 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:116
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 × 720 DPI högsta kvalitet"
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 msgid "1440 x 720 DPI Transposed"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 msgid "2880 x 720 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:129
+#: src/main/escp2-resolutions.c:135
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 × 720 DPI högsta kvalitet"
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
+#: src/main/escp2-resolutions.c:145
 msgid "1440 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:142
-#, fuzzy
-msgid "1440 x 1440"
-msgstr "1440 × 1440 DPI"
-
-#: src/main/escp2-resolutions.c:145
-#, fuzzy
-msgid "1440 x 1440 DPI High Quality"
-msgstr "1440 × 720 DPI högsta kvalitet"
-
-#: src/main/escp2-resolutions.c:148
-#, fuzzy
-msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1440 × 720 DPI högsta kvalitet"
-
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 msgid "2880 x 1440 DPI"
 msgstr "2880 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:158
+#: src/main/escp2-resolutions.c:155
 msgid "2880 x 1440 DPI Transposed"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:164
-#, fuzzy
-msgid "2880 x 1440 DPI High Quality"
-msgstr "2880 × 720 DPI högsta kvalitet"
-
-#: src/main/escp2-resolutions.c:167
-#, fuzzy
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr "2880 × 720 DPI högsta kvalitet"
-
-#: src/main/escp2-resolutions.c:171
+#: src/main/escp2-resolutions.c:162
 msgid "5760 x 1440 DPI"
 msgstr "5760 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 msgid "2880 x 2880 DPI"
 msgstr "2880 × 2880 DPI"
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 msgid "5760 x 2880 DPI"
 msgstr "5760 × 2880 DPI"
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
 msgstr "PÃ¥"
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 #, fuzzy
 msgid "Interleave"
 msgstr "Skrivarnamn:"
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
 msgstr "Full överlappning"
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Skrivarnamn:"
 
-#: src/main/escp2-resolutions.c:584
+#: src/main/escp2-resolutions.c:594
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Ljusstyrka:"
 
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr "Snabb ekonomi"
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr "Ekonomi"
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr "Utdrag"
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+msgid "High"
+msgstr "Hög"
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+msgid "Photo"
+msgstr "Foto"
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+#, fuzzy
+msgid "Super Photo"
+msgstr "Stylus Photo"
+
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+#, fuzzy
+msgid "Ultra Photo"
+msgstr "Sexfärgs foto"
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr "Bästa"
+
 #: src/main/generic-options.c:46
 msgid "Text"
 msgstr "Text"
@@ -2350,3654 +2192,4002 @@ msgstr "Tabloid"
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
 msgstr "3×5"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
 msgstr "4×6"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/main/xmli18n-tmp.h:11
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 fotopapper"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
 msgstr "5×7"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
 msgstr "5×8"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
 msgstr "6×8"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
 msgstr "8×10"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
 msgstr "12×18"
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
 msgstr "Super B 13×19"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
 msgstr "8×12"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
 msgstr "11×14"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
 msgstr "16×20"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
 msgstr "16×24"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
 msgstr "20×24"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
 msgstr "20×30"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/main/xmli18n-tmp.h:26
 msgid "22x30"
 msgstr "22×30"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
 msgstr "24×30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
 msgstr "30×40"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/main/xmli18n-tmp.h:32
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
 msgstr "A4"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/main/xmli18n-tmp.h:67
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 msgid "American foolscap"
 msgstr "Amerikansk folio"
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 msgid "European foolscap"
 msgstr "Europeisk folio"
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 msgid "Large Crown Quarto"
 msgstr "Large crown quarto"
 
 # får plats
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 msgid "Demy Quarto"
 msgstr "Demy quarto"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 msgid "Royal Quarto"
 msgstr "Royal quarto"
 
-#: src/main/xmli18n-tmp.h:108
+#: src/main/xmli18n-tmp.h:109
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 msgid "Crown Octavo"
 msgstr "Crown octavo"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 msgid "Large Crown Octavo"
 msgstr "Large crown octavo"
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 msgid "Demy Octavo"
 msgstr "Demy octavo"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 msgid "Royal Octavo"
 msgstr "Royal octavo"
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
 msgstr "ISO A5"
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 msgid "Small paperback"
 msgstr "Liten pocket"
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 msgid "Penguin small paperback"
 msgstr "Liten pingvinpocket"
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 msgid "Penguin large paperback"
 msgstr "Stor pingvinpocket"
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 msgid "Hagaki Card"
 msgstr "Hagaki-kort"
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
 msgstr "Oufuku-kort"
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
 msgstr "Japanskt långt kuvert 3"
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
 msgstr "Japanskt långt kuvert 4"
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanskt Kaku-kuvert 4"
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 msgid "A2 Invitation"
 msgstr "A2-inbjudan"
 
-#: src/main/xmli18n-tmp.h:125
+#: src/main/xmli18n-tmp.h:126
 msgid "Monarch Envelope"
 msgstr "Monarkkuvert"
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/main/xmli18n-tmp.h:128
 msgid "4x7"
 msgstr "4x7"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
 msgstr "Kort"
 
-#: src/main/xmli18n-tmp.h:130
+#: src/main/xmli18n-tmp.h:131
 msgid "Wide Postcard"
 msgstr "Brett vykort"
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 msgid "Custom"
 msgstr "Anpassat"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
 msgstr "89 mm rullpapper"
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
 msgstr "4 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
 msgstr "5 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
 msgstr "210 mm rullpapper"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
 msgstr "13 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
 msgstr "22 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
 msgstr "24 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
 msgstr "36 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
 msgstr "44 tum rullpapper"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 1"
 msgstr "PostScript nivå 1"
 
-#: src/main/xmli18n-tmp.h:145
+#: src/main/xmli18n-tmp.h:146
 msgid "PostScript Level 2"
 msgstr "PostScript nivå 2"
 
-#: src/main/xmli18n-tmp.h:146
+#: src/main/xmli18n-tmp.h:147
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/main/xmli18n-tmp.h:148
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/main/xmli18n-tmp.h:148
+#: src/main/xmli18n-tmp.h:149
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/main/xmli18n-tmp.h:150
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/main/xmli18n-tmp.h:150
+#: src/main/xmli18n-tmp.h:151
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/main/xmli18n-tmp.h:151
+#: src/main/xmli18n-tmp.h:152
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/main/xmli18n-tmp.h:153
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/main/xmli18n-tmp.h:153
+#: src/main/xmli18n-tmp.h:154
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/main/xmli18n-tmp.h:154
+#: src/main/xmli18n-tmp.h:155
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/main/xmli18n-tmp.h:155
+#: src/main/xmli18n-tmp.h:156
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/main/xmli18n-tmp.h:156
+#: src/main/xmli18n-tmp.h:157
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/main/xmli18n-tmp.h:158
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/main/xmli18n-tmp.h:159
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/main/xmli18n-tmp.h:160
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/main/xmli18n-tmp.h:161
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/main/xmli18n-tmp.h:162
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/main/xmli18n-tmp.h:163
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/main/xmli18n-tmp.h:164
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:170
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:171
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:172
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:173
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:176
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:177
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:178
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:180
-msgid "Canon iP4000"
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:182
+#, fuzzy
+msgid "Canon PIXMA iP3000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:183
+#, fuzzy
+msgid "Canon PIXMA iP3100"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "Canon PIXMA iP4000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:185
+#, fuzzy
+msgid "Canon PIXMA iP4100"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:186
+#, fuzzy
+msgid "Canon PIXMA iP4200"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:187
+#, fuzzy
+msgid "Canon PIXMA iP4300"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:188
+#, fuzzy
+msgid "Canon PIXMA iP5000"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "Canon PIXMA iP5200"
+msgstr "Canon CP-200"
+
+#: src/main/xmli18n-tmp.h:190
+#, fuzzy
+msgid "Canon PIXMA iP6700"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA MP150"
+msgstr "Canon CP-300"
+
+#: src/main/xmli18n-tmp.h:192
+#, fuzzy
+msgid "Canon PIXMA MP500"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:193
+#, fuzzy
+msgid "Canon PIXMA MP700"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA MP730"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:195
+#, fuzzy
+msgid "Canon PIXMA MP750"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA MP760"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA MP770"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA MP780"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:199
+#, fuzzy
+msgid "Canon PIXMA MP790"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP830"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXUS iP3100"
+msgstr "Canon S100"
+
+#: src/main/xmli18n-tmp.h:202
+#, fuzzy
+msgid "Canon PIXUS iP4100"
+msgstr "Canon iP4000"
+
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon i560"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:204
+#, fuzzy
+msgid "Canon i850"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon i860"
+msgstr "Canon S600"
+
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon BJC-85"
+
+#: src/main/xmli18n-tmp.h:207
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:208
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:209
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:210
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:211
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:212
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:213
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:214
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:215
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:216
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:217
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:218
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:219
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:220
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:221
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:222
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:223
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:224
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:225
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:226
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:227
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:228
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:229
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:230
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:231
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:232
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:233
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:234
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:235
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:236
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:237
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:238
+#, fuzzy
+msgid "Epson Stylus C79"
+msgstr "Epson Stylus C70"
+
+#: src/main/xmli18n-tmp.h:239
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:240
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:241
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:242
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:243
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:244
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:245
+#, fuzzy
+msgid "Epson Stylus C87"
+msgstr "Epson Stylus C48"
+
+#: src/main/xmli18n-tmp.h:246
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:247
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:248
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:249
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:250
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:251
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:252
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:253
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:254
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:255
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:256
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:257
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:258
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:259
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:260
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:261
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:262
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:263
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:264
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:265
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:266
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:267
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:268
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:269
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:270
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:271
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:272
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:273
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:274
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:275
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:276
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:277
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:278
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:279
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:280
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:281
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:282
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:283
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:284
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:285
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:286
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:287
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:288
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:289
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:290
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:291
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:292
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:293
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:294
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:295
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:296
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:297
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:298
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:299
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:300
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:301
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:302
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:303
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:304
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:305
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "Epson Stylus Photo 1400"
+msgstr "Epson Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "Epson Stylus Photo 1410"
+msgstr "Epson Stylus Photo 810"
+
+#: src/main/xmli18n-tmp.h:308
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:309
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:310
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:311
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:312
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:313
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:314
+#, fuzzy
+msgid "Epson Stylus Photo R230"
+msgstr "Epson Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:315
+#, fuzzy
+msgid "Epson Stylus Photo R240"
+msgstr "Epson Stylus Photo R2400"
+
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "Epson Stylus Photo R245"
+msgstr "Epson Stylus Photo RX425"
+
+#: src/main/xmli18n-tmp.h:317
+#, fuzzy
+msgid "Epson Stylus Photo R260"
+msgstr "Epson Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Epson Stylus Photo R265"
+msgstr "Epson Stylus Photo RX425"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "Epson Stylus Photo R270"
+msgstr "Epson Stylus Photo 1270"
+
+#: src/main/xmli18n-tmp.h:320
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:321
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:322
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:323
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "Epson Stylus Photo R350"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "Epson Stylus Photo R360"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "Epson Stylus Photo R380"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "Epson Stylus Photo R390"
+msgstr "Epson Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:329
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:330
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:331
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:332
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:333
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Epson Stylus Photo RX560"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:335
+#, fuzzy
+msgid "Epson Stylus Photo RX580"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:336
+#, fuzzy
+msgid "Epson Stylus Photo RX590"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:337
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:338
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:339
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:340
+#, fuzzy
+msgid "Epson Stylus Photo RX640"
+msgstr "Epson Stylus Photo RX400"
+
+#: src/main/xmli18n-tmp.h:341
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:342
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:343
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:344
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:345
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:346
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:347
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:348
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:349
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:350
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:351
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:352
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:353
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:354
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:355
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:356
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:357
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:358
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:359
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:360
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:361
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:362
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:363
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:364
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:365
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:366
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:367
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:368
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:369
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:370
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:371
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:372
+#, fuzzy
+msgid "Epson Stylus CX5000"
+msgstr "Epson Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:373
+#, fuzzy
+msgid "Epson Stylus CX5000F"
+msgstr "Epson Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:374
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:375
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:376
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:377
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:378
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:379
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:380
+#, fuzzy
+msgid "Epson Stylus CX6000"
+msgstr "Epson Stylus CX3600"
+
+#: src/main/xmli18n-tmp.h:381
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:382
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:383
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:384
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX7000F"
+msgstr "Epson Stylus CX3700"
+
+#: src/main/xmli18n-tmp.h:386
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:387
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:388
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:389
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:390
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:391
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:392
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:393
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:394
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:395
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:396
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:397
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:399
+#, fuzzy
+msgid "Epson PictureMate Flash"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:400
+#, fuzzy
+msgid "Epson PictureMate Pal"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:401
+#, fuzzy
+msgid "Epson PictureMate Snap"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:402
+#, fuzzy
+msgid "Epson PictureMate 200"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:403
+#, fuzzy
+msgid "Epson PictureMate 210"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:404
+#, fuzzy
+msgid "Epson PictureMate 240"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:405
+#, fuzzy
+msgid "Epson PictureMate 250"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson PictureMate 280"
+msgstr "Epson PictureMate"
+
+#: src/main/xmli18n-tmp.h:407
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:411
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:413
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:414
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:415
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:416
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:417
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:418
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:419
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:420
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:421
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:422
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:423
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:424
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:425
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:426
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:427
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:428
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:429
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:430
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:431
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:432
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:433
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:434
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:435
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:436
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:437
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:438
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:439
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:440
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:441
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:442
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:443
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:444
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:445
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:446
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:447
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:448
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:449
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:450
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:451
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:454
+#, fuzzy
+msgid "Epson PM A820"
+msgstr "Epson PM A890"
+
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:456
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:459
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:460
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:462
+#, fuzzy
+msgid "Epson PM D870"
+msgstr "Epson PM 870C"
+
+#: src/main/xmli18n-tmp.h:463
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:464
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:465
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:467
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:468
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
+#, fuzzy
+msgid "Epson PM G850"
+msgstr "Epson PM G800"
+
+#: src/main/xmli18n-tmp.h:470
+#, fuzzy
+msgid "Epson PM G4500"
+msgstr "Epson PM G700"
+
+#: src/main/xmli18n-tmp.h:471
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:472
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:473
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:474
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:475
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:476
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:478
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:549
 msgid "Generic PCL 4 Printer"
 msgstr "Allmän PCL 4-skrivare"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:550
 msgid "Generic PCL 5 Printer"
 msgstr "Allmän PCL 5-skivare"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:551
 msgid "Generic PCL 5c Printer"
 msgstr "Allmän PCL 5c-skivare"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:552
 msgid "Generic PCL 5e Printer"
 msgstr "Allmän PCL 5e-skivare"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Allmän PCL 6/PCL XL-skrivare"
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:802
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+#, fuzzy
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Optra E"
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
 msgstr "Okidata OL400"
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
 msgstr "Okidata OL400e"
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
 msgstr "Okidata OL410e"
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
 msgstr "Okidata OL600e"
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
 msgstr "Okidata OL800"
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:913
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:924
+#, fuzzy
+msgid "Xerox WorkCentre M118"
+msgstr "Xerox Document Centre 400"
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:926
+#, fuzzy
+msgid "Lexmark X73"
+msgstr "Lexmark Z43"
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+#, fuzzy
+msgid "Olympus P-S100"
+msgstr "Olympus P-10"
+
+#: src/main/xmli18n-tmp.h:942
+#, fuzzy
+msgid "Canon CP-10"
+msgstr "Canon CP-100"
+
+#: src/main/xmli18n-tmp.h:943
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:953
+#, fuzzy
+msgid "Sony DPP-EX5"
+msgstr "Sony UP-DR150"
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+#, fuzzy
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DR150"
+
+#: src/main/xmli18n-tmp.h:957
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:960
+#, fuzzy
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm Printpix-CX-400"
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
 msgstr "RÃ… DATA 16-bitar"
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
 msgstr "RÃ… DATA 8-bitar"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Inch"
 msgstr "Tum"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
 msgstr "Ställ in grundenheten till tum"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Ställ in grundenheten till centimeter"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Points"
 msgstr "Punkter"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Ställ in grundenheten för mått till punkter (1/72\")"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
 msgstr "mm"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Ställ in grundenheten för mått till millimeter"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
 msgstr "Pica"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Ställ in grundenheten för mått till pica (1/12\")"
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color output"
 msgstr "Färgutdata"
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
 msgstr "Skriv ut i gråtoner genom att använda svart bläck"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Standard Command"
 msgstr "Standard kommando"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
 msgstr "Använd standardkommando för utskrift"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Custom Command"
 msgstr "Anpassat kommando"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
 msgstr "Använd anpassat kommando för utskrift"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
 msgstr "Fil"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Print to a file"
 msgstr "Skriv ut till en fil"
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
 msgstr "Redigera kurva..."
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 msgid "Set Default"
 msgstr "Ställ in standard"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
 msgstr "Återställ föregående"
 
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Utskrift v%s"
 
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
 msgstr "Om"
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6005,7 +6195,7 @@ msgstr ""
 "Skriv ut och\n"
 "spara inställningar"
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 msgid ""
 "Save\n"
 "Settings"
@@ -6013,15 +6203,15 @@ msgstr ""
 "Spara\n"
 "inställningar"
 
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
 msgstr "Förhandsgranskning"
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6045,192 +6235,193 @@ msgstr ""
 "Om du klickar någon annan knapp under tiden du drar med musen kommer bilden "
 "att återgå till sin ursprungliga position."
 
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 msgid "Paper Size"
 msgstr "Pappersstorlek"
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
 msgstr "Visa alla pappersstorlekar"
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
 msgstr "Dimensioner:"
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
 msgstr "Bredd:"
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 msgid "Width of the paper that you wish to print to"
 msgstr "Bredd på pappret som du vill skriva ut till"
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
 msgstr "Höjd:"
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 msgid "Height of the paper that you wish to print to"
 msgstr "Höjd på pappret som du vill skriva ut till"
 
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 msgid "Automatic Paper Size"
 msgstr "Automatisk pappersstorlek"
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
 msgstr "Antal kopior"
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr "Välj antalet kopior att skriva ut; ett värde mellan 1 och 100"
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 msgid "Image Position"
 msgstr "Bildposition"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
 msgstr "Automatisk"
 
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
 msgstr "Stående"
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
 msgstr "Liggande"
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 msgid "Upside down"
 msgstr "Uppochner"
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
 msgstr "Liggande uppochner"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 "Välj orientering: stående, liggande, uppochner eller liggande uppochner"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 msgid "Orientation:"
 msgstr "Orientering:"
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
 msgstr "Vänster:"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
 msgstr "Avstånd från vänsterkanten på pappret till bilden"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
 msgstr "Höger:"
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Avstånd från vänsterkanten på pappret till högerkanten på bilden"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
 msgstr "Avstånd från högerkanten på pappret till bilden"
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
 msgstr "Övre kant:"
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
 msgstr "Avstånd från överkanten på pappret till bilden"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
 msgstr "Nedre kant:"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Avstånd från överkanten på pappret till nederkanten på bilden"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Avstånd från nederkanten på pappret till bilden"
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Center:"
 msgstr "Centrera:"
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Horizontal"
 msgstr "Horisontal"
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
 msgstr "Centrera bilden horisontellt på pappret"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
 msgstr "BÃ¥de och"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image on the paper"
 msgstr "Centrera bilden på pappret"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Center the image vertically on the paper"
 msgstr "Centrera bilden vertikalt på pappret"
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
 msgstr "Konfigurera skrivare"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 msgid "Printer Make:"
 msgstr "Skrivarmärke:"
 
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 msgid "Select the make of your printer"
 msgstr "Välj märke på din skrivare"
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 msgid "Printer Model:"
 msgstr "Skrivarmodell:"
 
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 msgid "Select your printer model"
 msgstr "Välj modell på din skrivare"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 msgid "PPD File:"
 msgstr "PPD-fil:"
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Ange rätt PPD-filnamn för din skrivare"
 
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
 msgstr "Bläddra"
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Välj rätt PPD-filnamn för din skrivare"
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
@@ -6238,114 +6429,52 @@ msgstr ""
 "Välj namnet på utskriftskön (inte skrivarens typ eller modell) som du vill "
 "skriva ut på"
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 msgid "Printer Queue:"
 msgstr "Skrivarkö:"
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 msgid "Enter the correct command to print to your printer. "
 msgstr "Ange korrekt kommando för att skriva ut på din skrivare. "
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
 msgstr "Ange filen att skriva till. "
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 msgid "File to print to"
 msgstr "Fil att skriva ut till"
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 msgid "Print To File"
 msgstr "Skriv ut till fil"
 
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 msgid "Define New Printer"
 msgstr "Ange ny skrivare"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 msgid "Printer Name:"
 msgstr "Skrivarnamn:"
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Ange det namn som du vill ge denna logiska skrivare"
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 msgid "About Gutenprint "
 msgstr "Om Gutenprint "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 msgid "Gutenprint Version "
 msgstr "Gutenprint version "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
-"\n"
-"\n"
-"Copyright © 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"och resten av utvecklingsteamet bakom Gimp-Print.\n"
-"\n"
-"Besök vår webbsida på http://gimp-print.sourceforge.net.\n"
-"\n"
-"Följande text är en informell översättning som enbart tillhandahålls i\n"
-"informativt syfte. För alla juridiska tolkningar gäller den engelska\n"
-"originaltexten, som är bifogad nedan.\n"
-"\n"
-"Detta program är fri programvara. Du kan distribuera det och/eller\n"
-"modifiera det under villkoren i GNU General Public License, publicerad\n"
-"av Free Software Foundation, antingen version 2 eller (om du så vill)\n"
-"någon senare version.\n"
-"\n"
-"Detta program distribueras i hopp om att det ska vara användbart, men\n"
-"UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om\n"
-"SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General\n"
-"Public License för ytterligare information.\n"
-"\n"
-"Du bör ha fått en kopia av GNU General Public License tillsammans med\n"
-"detta program. Om inte, skriv till Free Software Foundation, In.,\n"
-"59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 msgid "Printer Settings"
 msgstr "Skrivarinställningar"
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -6353,11 +6482,11 @@ msgstr ""
 "Välj namnet på skrivaren (inte skrivarens typ eller modell) som du vill "
 "skriva ut till"
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 msgid "Setup Printer..."
 msgstr "Konfigurera skrivare..."
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -6365,11 +6494,11 @@ msgstr ""
 "Välj den skrivarmodell, PPD-fil och kommando som används för att skriva ut "
 "till denna skrivare"
 
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 msgid "New Printer..."
 msgstr "Ny skrivare..."
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -6377,23 +6506,23 @@ msgstr ""
 "Ange en ny logisk skrivare. Detta kan användas för att namnge en samling "
 "inställningar som du vill komma ihåg för framtida användning."
 
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 msgid "Image Size"
 msgstr "Bildstorlek"
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 msgid "Scaling:"
 msgstr "Skalning:"
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 msgid "Set the scale (size) of the image"
 msgstr "Ändra skalningen (storleken) på bilden"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
 msgstr "Skala efter:"
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -6401,31 +6530,31 @@ msgstr ""
 "Välj huruvida skalning mäts i procent av tillgänglig sidstorlek eller antal "
 "utdatapunkter per tum"
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
 msgstr "Procent"
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 msgid "Scale the print to the size of the page"
 msgstr "Skala utskriften till storleken på sidan"
 
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid "PPI"
 msgstr "Punkter per tum"
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
 msgstr "Skala utskriften till antalet punkter per tum"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 msgid "Set the width of the print"
 msgstr "Ställ in bredden på utskriften"
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 msgid "Set the height of the print"
 msgstr "Ställ in bredden på utskriften"
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6433,102 +6562,102 @@ msgstr ""
 "Använd\n"
 "originalbildstorlek"
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the print size to the size of the image"
 msgstr "Ställ in storleken på utskriften till storleken på sidan"
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 msgid "Print Color Adjust"
 msgstr "Justera utskriftsfärg"
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 msgid "Set Defaults"
 msgstr "Ställ in standardvärden"
 
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
 msgstr "Stäng"
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 msgid "Image preview"
 msgstr "Förhandsgranskning av bild"
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 msgid "Output"
 msgstr "Utdata"
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 msgid "Output Type:"
 msgstr "Utdatatyp:"
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 msgid "Select the desired output type"
 msgstr "Välj önskad typ av utdata"
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
 msgstr "Justera utdata..."
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Justera färgbalans, ljusstyrka, kontrast, mättnad och färgutjämningsalgoritm"
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 msgid "Size Units:"
 msgstr "Storleksenheter:"
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 msgid " "
 msgstr " "
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 msgid "Units:"
 msgstr "Enheter:"
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 msgid "Select the base unit of measurement for printing"
 msgstr "Välj grundenheten för utskrift"
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
 msgstr "System V lp"
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
 msgstr "CUPS"
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
 msgstr "Berkeley lpd (/etc/lpc)"
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
 msgstr "Berkeley lpd (/usr/bsd/lpc)"
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
 msgstr "Berkeley lpd (/usr/etc/lpc"
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
 msgstr "Berkeley lpd (/usr/libexec/lpc)"
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 msgid "Printer"
 msgstr "Skrivare"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 msgid "(Default Printer)"
 msgstr "(Standardskrivare)"
 
@@ -6576,35 +6705,35 @@ msgstr "Maximalt möjligt värde för Y"
 msgid "_Gamma value"
 msgstr "_Gammavärde"
 
-#: src/cups/genppd.c:133
+#: src/cups/genppd.c:146
 msgid "Printer Features"
 msgstr "Skrivarfunktioner"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:139
+#: src/cups/genppd.c:152
 msgid "Common"
 msgstr "Vanlig"
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:153
 msgid "Extra 1"
 msgstr "Extra 1"
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:154
 msgid "Extra 2"
 msgstr "Extra 2"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:155
 msgid "Extra 3"
 msgstr "Extra 3"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:156
 msgid "Extra 4"
 msgstr "Extra 4"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
 msgstr "Extra 5"
 
@@ -6613,24 +6742,50 @@ msgstr "Extra 5"
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr "Swedish"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1465
+#: src/cups/genppd.c:1613
+#, fuzzy
+msgid "2-Sided Printing"
+msgstr "Dubbelsidad utskrift"
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1717
 msgid "No"
 msgstr "Nej"
 
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1719
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cups/genppd.c:1497
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#, fuzzy
+msgid "Value"
+msgstr "Blå"
+
+#: src/cups/genppd.c:1756
 msgid "Fine Adjustment"
 msgstr "Finjustering"
 
@@ -6638,19 +6793,6 @@ msgstr "Finjustering"
 msgid "Escputil version "
 msgstr "Escputil version "
 
-#: src/escputil/escputil.c:71
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-", Copyright © 2000-2006 Robert Krawitz\n"
-"Escputil kommer UTAN NÅGON SOM HELST GARANTI; skriv in \"escputil -l\" för\n"
-"mer information. Detta är fri programvara, och du är välkommen att\n"
-"vidaredistribuera det under vissa villkor; skriv in \"escputil -l\" för mer\n"
-"information.\n"
-
 #: src/escputil/escputil.c:76
 msgid ""
 "Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
@@ -7681,6 +7823,246 @@ msgstr "FEL: ijsgutenprint: Felaktiga parametrar; kan inte fortsätta!\n"
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "FEL: ijsgutenprint: Hämtning av nästa rad misslyckades vid %.0f\n"
 
+#, fuzzy
+#~ msgid "Model Name"
+#~ msgstr "Kanalnamn"
+
+#, fuzzy
+#~ msgid "Canon MULTIPASS MP500"
+#~ msgstr "Canon S500"
+
+#, fuzzy
+#~ msgid "Canon MULTIPASS MP760"
+#~ msgstr "Canon LBP-1760"
+
+#, fuzzy
+#~ msgid "Cassette"
+#~ msgstr "Matte-papper"
+
+#~ msgid "CD tray"
+#~ msgstr "Cd-lucka"
+
+#~ msgid " Gamma"
+#~ msgstr " Gamma"
+
+#~ msgid " Curve"
+#~ msgstr " Kurva"
+
+#, fuzzy
+#~ msgid "1440 x 1440"
+#~ msgstr "1440 × 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI High Quality"
+#~ msgstr "1440 × 720 DPI högsta kvalitet"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI Highest Quality"
+#~ msgstr "1440 × 720 DPI högsta kvalitet"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI High Quality"
+#~ msgstr "2880 × 720 DPI högsta kvalitet"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI Highest Quality"
+#~ msgstr "2880 × 720 DPI högsta kvalitet"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "and the rest of the Gutenprint Development Team.\n"
+#~ "\n"
+#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright © 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "och resten av utvecklingsteamet bakom Gimp-Print.\n"
+#~ "\n"
+#~ "Besök vår webbsida på http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "Följande text är en informell översättning som enbart tillhandahålls i\n"
+#~ "informativt syfte. För alla juridiska tolkningar gäller den engelska\n"
+#~ "originaltexten, som är bifogad nedan.\n"
+#~ "\n"
+#~ "Detta program är fri programvara. Du kan distribuera det och/eller\n"
+#~ "modifiera det under villkoren i GNU General Public License, publicerad\n"
+#~ "av Free Software Foundation, antingen version 2 eller (om du så vill)\n"
+#~ "någon senare version.\n"
+#~ "\n"
+#~ "Detta program distribueras i hopp om att det ska vara användbart, men\n"
+#~ "UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om\n"
+#~ "SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General\n"
+#~ "Public License för ytterligare information.\n"
+#~ "\n"
+#~ "Du bör ha fått en kopia av GNU General Public License tillsammans med\n"
+#~ "detta program. Om inte, skriv till Free Software Foundation, In.,\n"
+#~ "59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
+
+#~ msgid ""
+#~ ", Copyright (C) 2000-2006 Robert Krawitz\n"
+#~ "Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -"
+#~ "l'\n"
+#~ "This is free software, and you are welcome to redistribute it\n"
+#~ "under certain conditions; type 'escputil -l' for details.\n"
+#~ msgstr ""
+#~ ", Copyright © 2000-2006 Robert Krawitz\n"
+#~ "Escputil kommer UTAN NÃ…GON SOM HELST GARANTI; skriv in \"escputil -l\" "
+#~ "för\n"
+#~ "mer information. Detta är fri programvara, och du är välkommen att\n"
+#~ "vidaredistribuera det under vissa villkor; skriv in \"escputil -l\" för "
+#~ "mer\n"
+#~ "information.\n"
+
+#~ msgid "90x90 DPI"
+#~ msgstr "90×90 DPI"
+
+#~ msgid "90x90 DPI DMT"
+#~ msgstr "90×90 DPI DMT"
+
+#~ msgid "180x180 DPI"
+#~ msgstr "180×180 DPI"
+
+#~ msgid "180x180 DPI DMT"
+#~ msgstr "180×180 DPI DMT"
+
+#~ msgid "360x360 DPI"
+#~ msgstr "360×360 DPI"
+
+#~ msgid "360x360 DPI DMT"
+#~ msgstr "360×360 DPI DMT"
+
+#~ msgid "720x360 DPI"
+#~ msgstr "720×360 DPI"
+
+#~ msgid "720x360 DPI DMT"
+#~ msgstr "720×360 DPI DMT"
+
+#~ msgid "720x720 DPI"
+#~ msgstr "720×720 DPI"
+
+#~ msgid "720x720 DPI DMT"
+#~ msgstr "720×720 DPI DMT"
+
+#~ msgid "1440x720 DPI"
+#~ msgstr "1440×720 DPI"
+
+#~ msgid "1440x720 DPI DMT"
+#~ msgstr "1440×720 DPI DMT"
+
+#~ msgid "1440x1440 DPI"
+#~ msgstr "1440×1440 DPI"
+
+#~ msgid "1440x1440 DPI DMT"
+#~ msgstr "1440×1440 DPI DMT"
+
+#~ msgid "2880x2880 DPI"
+#~ msgstr "2880×2880 DPI"
+
+#~ msgid "2880x2880 DPI DMT"
+#~ msgstr "2880×2880 DPI DMT"
+
+#~ msgid "150x150 DPI DMT"
+#~ msgstr "150×150 DPI DMT"
+
+#~ msgid "300x300 DPI DMT"
+#~ msgstr "300×300 DPI DMT"
+
+#~ msgid "600x300 DPI DMT"
+#~ msgstr "600×300 DPI DMT"
+
+#~ msgid "600x600 DPI DMT"
+#~ msgstr "600×600 DPI DMT"
+
+#~ msgid "1200x600 DPI DMT"
+#~ msgstr "1200×600 DPI DMT"
+
+#~ msgid "1200x1200 DPI"
+#~ msgstr "1200×1200 DPI"
+
+#~ msgid "1200x1200 DPI DMT"
+#~ msgstr "1200×1200 DPI DMT"
+
+#~ msgid "2400x2400 DPI"
+#~ msgstr "2400×2400 DPI"
+
+#~ msgid "2400x2400 DPI DMT"
+#~ msgstr "2400×2400 DPI DMT"
+
+#~ msgid "Plain Paper PIXMA"
+#~ msgstr "Vanligt papper PIXMA"
+
+#~ msgid "Back Print Film"
+#~ msgstr "Bakutskriftsfilm"
+
+#~ msgid "Fabric Sheets"
+#~ msgstr "Tygark"
+
+#~ msgid "Envelope"
+#~ msgstr "Kuvert"
+
+#~ msgid "High Resolution Paper"
+#~ msgstr "Högupplösningspapper"
+
+#~ msgid "T-Shirt Transfers"
+#~ msgstr "T-shirttryck"
+
+#~ msgid "High Gloss Film"
+#~ msgstr "Högglansig film"
+
+#~ msgid "Glossy Photo Paper"
+#~ msgstr "Glansigt fotopapper"
+
+#~ msgid "Glossy Photo Cards"
+#~ msgstr "Glansiga fotokort"
+
+#~ msgid "Photo Paper Pro"
+#~ msgstr "Professionellt fotopapper"
+
+#~ msgid "Photo CcMmYK Color"
+#~ msgstr "CcMmYK-fotofärg"
+
+#~ msgid "Photo CcMmY Color"
+#~ msgstr "CcMmY-fotofärg"
+
+#~ msgid "CMYK Color"
+#~ msgstr "CMYK-färg"
+
+#~ msgid "CMY Color"
+#~ msgstr "CMY-färg"
+
 #~ msgid "Gutenprint"
 #~ msgstr "Gutenprint"
 
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 080a958..a5bc981 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 631644b..a1c6b66 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint 5.0.0-b5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 16:42-0400\n"
+"POT-Creation-Date: 2007-06-17 11:45-0400\n"
 "PO-Revision-Date: 2006-05-28 10:06-0400\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -17,7 +17,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1737
 msgid "Default"
 msgstr "�設"
 
@@ -76,18 +76,18 @@ msgstr ""
 msgid "Density"
 msgstr "密度"
 
-#: src/main/dither-main.c:88 src/main/print-canon.c:1534
-#: src/main/print-canon.c:1542 src/main/print-canon.c:1550
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:415
-#: src/main/print-escp2.c:423 src/main/print-escp2.c:431
-#: src/main/print-escp2.c:439 src/main/print-escp2.c:447
-#: src/main/print-escp2.c:455 src/main/print-escp2.c:463
+#: src/main/dither-main.c:88 src/main/print-canon.c:293
+#: src/main/print-canon.c:301 src/main/print-canon.c:309
+#: src/main/print-canon.c:317 src/main/print-escp2.c:432
+#: src/main/print-escp2.c:440 src/main/print-escp2.c:448
+#: src/main/print-escp2.c:456 src/main/print-escp2.c:464
+#: src/main/print-escp2.c:472 src/main/print-escp2.c:480
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
-#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
-#: src/main/print-pcl.c:1258 src/main/print-pcl.c:1266
-#: src/main/print-pcl.c:1274 src/main/print-pcl.c:1282
+#: src/main/print-olympus.c:1626 src/main/print-olympus.c:1634
+#: src/main/print-olympus.c:1642 src/main/print-olympus.c:1650
+#: src/main/print-pcl.c:1261 src/main/print-pcl.c:1269
+#: src/main/print-pcl.c:1277 src/main/print-pcl.c:1285
 msgid "Output Level Adjustment"
 msgstr ""
 
@@ -142,465 +142,298 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "擬色�算方�"
 
-#: src/main/print-canon.c:1382
-msgid "90x90 DPI"
-msgstr "90x90 DPI"
-
-#: src/main/print-canon.c:1382
-msgid "90x90 DPI DMT"
-msgstr "90x90 DPI DMT"
-
-#: src/main/print-canon.c:1383
-msgid "180x180 DPI"
-msgstr "180x180 DPI"
-
-#: src/main/print-canon.c:1383
-msgid "180x180 DPI DMT"
-msgstr "180x180 DPI DMT"
-
-#: src/main/print-canon.c:1384
-msgid "360x360 DPI"
-msgstr "360x360 DPI"
-
-#: src/main/print-canon.c:1384
-msgid "360x360 DPI DMT"
-msgstr "360x360 DPI DMT"
-
-#: src/main/print-canon.c:1385
-msgid "720x360 DPI"
-msgstr "720x360 DPI"
-
-#: src/main/print-canon.c:1385
-msgid "720x360 DPI DMT"
-msgstr "720x360 DPI DMT"
-
-#: src/main/print-canon.c:1386
-msgid "720x720 DPI"
-msgstr "720x720 DPI"
-
-#: src/main/print-canon.c:1386
-msgid "720x720 DPI DMT"
-msgstr "720x720 DPI DMT"
-
-#: src/main/print-canon.c:1387
-msgid "1440x720 DPI"
-msgstr "1440x720 DPI"
-
-#: src/main/print-canon.c:1387
-msgid "1440x720 DPI DMT"
-msgstr "1440x720 DPI DMT"
-
-#: src/main/print-canon.c:1388
-msgid "1440x1440 DPI"
-msgstr "1440x1440 DPI"
-
-#: src/main/print-canon.c:1388
-msgid "1440x1440 DPI DMT"
-msgstr "1440x1440 DPI DMT"
-
-#: src/main/print-canon.c:1389
-msgid "2880x2880 DPI"
-msgstr "2880x2880 DPI"
-
-#: src/main/print-canon.c:1389
-msgid "2880x2880 DPI DMT"
-msgstr "2880x2880 DPI DMT"
-
-#: src/main/print-canon.c:1390 src/main/print-pcl.c:253
-msgid "150x150 DPI"
-msgstr "150x150 DPI"
-
-#: src/main/print-canon.c:1390
-msgid "150x150 DPI DMT"
-msgstr "150x150 DPI DMT"
-
-#: src/main/print-canon.c:1391 src/main/print-pcl.c:254
-msgid "300x300 DPI"
-msgstr "300x300 DPI"
-
-#: src/main/print-canon.c:1391
-msgid "300x300 DPI DMT"
-msgstr "300x300 DPI DMT"
-
-#: src/main/print-canon.c:1392 src/main/print-pcl.c:255
-msgid "600x300 DPI"
-msgstr "600x300 DPI"
-
-#: src/main/print-canon.c:1392
-msgid "600x300 DPI DMT"
-msgstr "600x300 DPI DMT"
-
-#: src/main/print-canon.c:1393 src/main/print-pcl.c:257
-msgid "600x600 DPI"
-msgstr "600x600 DPI"
-
-#: src/main/print-canon.c:1393
-msgid "600x600 DPI DMT"
-msgstr "600x600 DPI DMT"
-
-#: src/main/print-canon.c:1394 src/main/print-pcl.c:258
-msgid "1200x600 DPI"
-msgstr "1200x600 DPI"
-
-#: src/main/print-canon.c:1394
-msgid "1200x600 DPI DMT"
-msgstr "1200x600 DPI DMT"
-
-#: src/main/print-canon.c:1395
-msgid "1200x1200 DPI"
-msgstr "1200x1200 DPI"
-
-#: src/main/print-canon.c:1395
-msgid "1200x1200 DPI DMT"
-msgstr "1200x1200 DPI DMT"
-
-#: src/main/print-canon.c:1396
-msgid "2400x2400 DPI"
-msgstr "2400x2400 DPI"
-
-#: src/main/print-canon.c:1396
-msgid "2400x2400 DPI DMT"
-msgstr "2400x2400 DPI DMT"
-
-#: src/main/print-canon.c:1447 src/main/print-lexmark.c:856
-#: src/main/escp2-papers.c:1160 src/main/escp2-papers.c:1204
-#: src/main/escp2-papers.c:1248 src/main/escp2-papers.c:1296
-#: src/main/escp2-papers.c:1344 src/main/escp2-papers.c:1388
-msgid "Plain Paper"
-msgstr "普通紙張"
-
-#: src/main/print-canon.c:1448
-#, fuzzy
-msgid "Plain Paper PIXMA"
-msgstr "普通紙張"
-
-#: src/main/print-canon.c:1449 src/main/print-lexmark.c:864
-#: src/main/escp2-papers.c:1168 src/main/escp2-papers.c:1212
-#: src/main/escp2-papers.c:1256 src/main/escp2-papers.c:1304
-#: src/main/escp2-papers.c:1352 src/main/escp2-papers.c:1396
-msgid "Transparencies"
-msgstr "�明膠片"
-
-#: src/main/print-canon.c:1450
-msgid "Back Print Film"
-msgstr ""
-
-#: src/main/print-canon.c:1451
-msgid "Fabric Sheets"
-msgstr ""
-
-#: src/main/print-canon.c:1452
-msgid "Envelope"
-msgstr "ä¿¡å°�"
-
-# (Abel) from Canon
-#: src/main/print-canon.c:1453
-msgid "High Resolution Paper"
-msgstr "高解�度彩色專用紙"
-
-# (Abel) from www.easyoffice.com.tw
-#: src/main/print-canon.c:1454
-msgid "T-Shirt Transfers"
-msgstr "T�轉�紙"
-
-# (Abel) from Canon
-#: src/main/print-canon.c:1455
-msgid "High Gloss Film"
-msgstr "影�寫真光澤膠片"
-
-# (Abel) from Canon
-#: src/main/print-canon.c:1456
-msgid "Glossy Photo Paper"
-msgstr "影�寫真光澤紙"
-
-#: src/main/print-canon.c:1457
-msgid "Glossy Photo Cards"
-msgstr ""
-
-# (Abel) from Canon
-#: src/main/print-canon.c:1458
-msgid "Photo Paper Pro"
-msgstr "專業級相紙"
-
-#: src/main/print-canon.c:1459 src/main/print-lexmark.c:904
-#: src/main/escp2-papers.c:1196 src/main/escp2-papers.c:1240
-#: src/main/escp2-papers.c:1288 src/main/escp2-papers.c:1336
-#: src/main/escp2-papers.c:1380 src/main/escp2-papers.c:1428
-#: src/main/escp2-papers.c:1438
-msgid "Other"
-msgstr "其它"
-
-#: src/main/print-canon.c:1469 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
-#: src/main/print-pcl.c:1193 src/main/print-ps.c:67
+#: src/main/print-canon.c:198 src/main/print-escp2.c:179
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1561
+#: src/main/print-pcl.c:1196 src/main/print-ps.c:67
 msgid "Page Size"
 msgstr "��尺寸"
 
-#: src/main/print-canon.c:1469 src/main/print-canon.c:1475
-#: src/main/print-canon.c:1481 src/main/print-canon.c:1487
-#: src/main/print-canon.c:1511 src/main/print-escp2.c:177
-#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
-#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
-#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
-#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
-#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
-#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
-#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
-#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1193 src/main/print-pcl.c:1199
-#: src/main/print-pcl.c:1205 src/main/print-pcl.c:1211
-#: src/main/print-pcl.c:1235 src/main/print-ps.c:67 src/main/print-ps.c:73
-#: src/main/print-ps.c:79 src/main/print-ps.c:85 src/main/print-ps.c:97
+#: src/main/print-canon.c:198 src/main/print-canon.c:204
+#: src/main/print-canon.c:210 src/main/print-canon.c:216
+#: src/main/print-canon.c:222 src/main/print-canon.c:228
+#: src/main/print-canon.c:246 src/main/print-canon.c:270
+#: src/main/print-escp2.c:179 src/main/print-escp2.c:185
+#: src/main/print-escp2.c:191 src/main/print-escp2.c:197
+#: src/main/print-escp2.c:203 src/main/print-escp2.c:209
+#: src/main/print-escp2.c:227 src/main/print-escp2.c:244
+#: src/main/print-escp2.c:250 src/main/print-escp2.c:262
+#: src/main/print-escp2.c:280 src/main/print-lexmark.c:266
+#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1561
+#: src/main/print-olympus.c:1567 src/main/print-olympus.c:1573
+#: src/main/print-olympus.c:1579 src/main/print-pcl.c:1196
+#: src/main/print-pcl.c:1202 src/main/print-pcl.c:1208
+#: src/main/print-pcl.c:1214 src/main/print-pcl.c:1238 src/main/print-ps.c:67
+#: src/main/print-ps.c:73 src/main/print-ps.c:79 src/main/print-ps.c:85
+#: src/main/print-ps.c:97
 msgid "Basic Printer Setup"
 msgstr "基本�表機設定"
 
-#: src/main/print-canon.c:1470 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
-#: src/main/print-pcl.c:1194 src/main/print-ps.c:68
+#: src/main/print-canon.c:199 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1562
+#: src/main/print-pcl.c:1197 src/main/print-ps.c:68
 msgid "Size of the paper being printed to"
 msgstr "列�時使用的紙張尺寸"
 
-#: src/main/print-canon.c:1475 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
-#: src/main/print-pcl.c:1199 src/main/print-ps.c:73 src/cups/genppd.c:1238
+#: src/main/print-canon.c:204 src/main/print-escp2.c:185
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1567
+#: src/main/print-pcl.c:1202 src/main/print-ps.c:73 src/cups/genppd.c:1410
 msgid "Media Type"
 msgstr "紙張類別"
 
-#: src/main/print-canon.c:1476 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
-#: src/main/print-pcl.c:1200 src/main/print-ps.c:74
+#: src/main/print-canon.c:205 src/main/print-escp2.c:186
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1568
+#: src/main/print-pcl.c:1203 src/main/print-ps.c:74
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "紙張的類別 (普通紙�相紙等等)"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
-#: src/main/print-pcl.c:1205 src/main/print-ps.c:79 src/cups/genppd.c:1262
+#: src/main/print-canon.c:210 src/main/print-escp2.c:191
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1573
+#: src/main/print-pcl.c:1208 src/main/print-ps.c:79 src/cups/genppd.c:1435
 msgid "Media Source"
 msgstr "紙張來�"
 
-#: src/main/print-canon.c:1482 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
-#: src/main/print-pcl.c:1206 src/main/print-ps.c:80
+#: src/main/print-canon.c:211 src/main/print-escp2.c:192
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1574
+#: src/main/print-pcl.c:1209 src/main/print-ps.c:80
 msgid "Source (input slot) of the media"
 msgstr "�紙匣或者紙張的來�"
 
-#: src/main/print-canon.c:1487 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
-#: src/main/print-pcl.c:1211 src/main/print-ps.c:85 src/cups/genppd.c:1322
+#: src/main/print-canon.c:216 src/main/print-escp2.c:197
+msgid "CD Hub Size"
+msgstr ""
+
+#: src/main/print-canon.c:217 src/main/print-escp2.c:198
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr ""
+
+#: src/main/print-canon.c:222 src/main/print-escp2.c:203
+msgid "CD Size (Custom)"
+msgstr ""
+
+#: src/main/print-canon.c:223 src/main/print-escp2.c:204
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
+
+#: src/main/print-canon.c:228 src/main/print-escp2.c:209
+msgid "CD Hub Size (Custom)"
+msgstr ""
+
+#: src/main/print-canon.c:229 src/main/print-escp2.c:210
+#, fuzzy
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "指定列�時的影�尺寸為��尺寸的�個百分比"
+
+#: src/main/print-canon.c:234 src/main/print-escp2.c:215
+msgid "CD Horizontal Fine Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:234 src/main/print-canon.c:240
+#: src/main/print-canon.c:252 src/main/print-escp2.c:215
+#: src/main/print-escp2.c:221 src/main/print-escp2.c:238
+#: src/main/print-escp2.c:274 src/main/print-lexmark.c:290
+#: src/main/print-olympus.c:1585 src/main/print-olympus.c:1591
+#: src/main/print-olympus.c:1597 src/main/print-pcl.c:1220
+#: src/main/print-ps.c:91 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
+msgstr "進階�表機設定"
+
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-escp2.c:216 src/main/print-escp2.c:222
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr ""
+
+#: src/main/print-canon.c:240 src/main/print-escp2.c:221
+msgid "CD Vertical Fine Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:246 src/main/print-escp2.c:227
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1579
+#: src/main/print-pcl.c:1214 src/main/print-ps.c:85 src/cups/genppd.c:1504
 msgid "Resolution"
 msgstr "解�度"
 
-#: src/main/print-canon.c:1488 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1212
+#: src/main/print-canon.c:247 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1580 src/main/print-pcl.c:1215
 #: src/main/print-ps.c:86
 msgid "Resolution and quality of the print"
 msgstr "列�時的解�度��質"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
-#: src/main/print-pcl.c:1217 src/main/print-ps.c:91 src/main/print-raw.c:80
+#: src/main/print-canon.c:252 src/main/print-escp2.c:238
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1585
+#: src/main/print-pcl.c:1220 src/main/print-ps.c:91 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "墨水類別"
 
-#: src/main/print-canon.c:1493 src/main/print-escp2.c:201
-#: src/main/print-escp2.c:207 src/main/print-escp2.c:224
-#: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
-#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1217
-#: src/main/print-ps.c:91 src/main/print-raw.c:80
-msgid "Advanced Printer Setup"
-msgstr "進階�表機設定"
-
-#: src/main/print-canon.c:1494 src/main/print-escp2.c:225
-#: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1218
+#: src/main/print-canon.c:253 src/main/print-escp2.c:239
+#: src/main/print-escp2.c:251 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1586 src/main/print-pcl.c:1221
 #: src/main/print-ps.c:92 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "�表機墨水的類型"
 
-#: src/main/print-canon.c:1499 src/main/print-canon.c:1500
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:309
+#: src/main/print-canon.c:258 src/main/print-canon.c:259
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:323
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
-#: src/main/print-pcl.c:1223 src/main/print-pcl.c:1224
+#: src/main/print-pcl.c:1226 src/main/print-pcl.c:1227
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1499 src/main/print-escp2.c:127
-#: src/main/print-escp2.c:134 src/main/print-escp2.c:141
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:278
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:290
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:302
-#: src/main/print-escp2.c:308 src/main/print-escp2.c:314
-#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1223
+#: src/main/print-canon.c:258 src/main/print-escp2.c:129
+#: src/main/print-escp2.c:136 src/main/print-escp2.c:143
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:292
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:304
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:316
+#: src/main/print-escp2.c:322 src/main/print-escp2.c:328
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1226
 msgid "Advanced Printer Functionality"
 msgstr "進階�表機功能"
 
-#: src/main/print-canon.c:1505 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
-#: src/main/print-pcl.c:1229 src/main/print-ps.c:103 src/main/print-raw.c:86
+#: src/main/print-canon.c:264 src/main/print-escp2.c:334
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1603
+#: src/main/print-pcl.c:1232 src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "列�模�"
 
-#: src/main/print-canon.c:1505 src/main/print-color.c:184
+#: src/main/print-canon.c:264 src/main/print-color.c:184
 #: src/main/print-color.c:192 src/main/print-color.c:200
-#: src/main/print-color.c:208 src/main/print-escp2.c:320
-#: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1229
+#: src/main/print-color.c:208 src/main/print-escp2.c:334
+#: src/main/print-escp2.c:340 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1603 src/main/print-pcl.c:1232
 #: src/main/print-ps.c:103 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr ""
 
-#: src/main/print-canon.c:1506 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
-#: src/main/print-pcl.c:1230 src/main/print-ps.c:104 src/main/print-raw.c:87
+#: src/main/print-canon.c:265 src/main/print-escp2.c:335
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1604
+#: src/main/print-pcl.c:1233 src/main/print-ps.c:104 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1511 src/main/print-pcl.c:1235
+#: src/main/print-canon.c:270 src/main/print-pcl.c:1238
 msgid "Double-Sided Printing"
 msgstr "雙�列�"
 
-#: src/main/print-canon.c:1512 src/main/print-pcl.c:1236
+#: src/main/print-canon.c:271 src/main/print-pcl.c:1239
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:1534 src/main/print-escp2.c:415
-#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1258
+#: src/main/print-canon.c:293 src/main/print-escp2.c:432
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1261
 msgid "Cyan Density"
 msgstr "氰�色密度"
 
-#: src/main/print-canon.c:1535 src/main/print-escp2.c:416
-#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1259
+#: src/main/print-canon.c:294 src/main/print-escp2.c:433
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1262
 msgid "Adjust the cyan density"
 msgstr "調整氰�色色彩密度"
 
-#: src/main/print-canon.c:1542 src/main/print-escp2.c:423
-#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1266
+#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1269
 msgid "Magenta Density"
 msgstr "洋紅色密度"
 
-#: src/main/print-canon.c:1543 src/main/print-escp2.c:424
-#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1267
+#: src/main/print-canon.c:302 src/main/print-escp2.c:441
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1270
 msgid "Adjust the magenta density"
 msgstr "調整洋紅色色彩密度"
 
-#: src/main/print-canon.c:1550 src/main/print-escp2.c:431
-#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1274
+#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1277
 msgid "Yellow Density"
 msgstr "黃色密度"
 
-#: src/main/print-canon.c:1551 src/main/print-escp2.c:432
-#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1275
+#: src/main/print-canon.c:310 src/main/print-escp2.c:449
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1278
 msgid "Adjust the yellow density"
 msgstr "調整黃色色彩密度"
 
-#: src/main/print-canon.c:1558 src/main/print-escp2.c:439
-#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1282
+#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1285
 msgid "Black Density"
 msgstr "黑色密度"
 
-#: src/main/print-canon.c:1559 src/main/print-escp2.c:440
-#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1283
+#: src/main/print-canon.c:318 src/main/print-escp2.c:457
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1286
 msgid "Adjust the black density"
 msgstr "調整黑色色彩密度"
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1567
-#: src/main/print-escp2.c:471 src/main/print-escp2.c:472
+#: src/main/print-canon.c:325 src/main/print-canon.c:326
+#: src/main/print-escp2.c:488 src/main/print-escp2.c:489
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1291
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1294
 msgid "Light Cyan Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1566 src/main/print-canon.c:1574
-#: src/main/print-canon.c:1582 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
+#: src/main/print-canon.c:325 src/main/print-canon.c:333
+#: src/main/print-canon.c:341 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:544 src/main/print-escp2.c:552
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
-#: src/main/print-pcl.c:1290 src/main/print-pcl.c:1298
+#: src/main/print-pcl.c:1293 src/main/print-pcl.c:1301
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1574 src/main/print-canon.c:1575
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:480
+#: src/main/print-canon.c:333 src/main/print-canon.c:334
+#: src/main/print-escp2.c:496 src/main/print-escp2.c:497
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
-#: src/main/print-pcl.c:1298 src/main/print-pcl.c:1299
+#: src/main/print-pcl.c:1301 src/main/print-pcl.c:1302
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1582 src/main/print-canon.c:1583
+#: src/main/print-canon.c:341 src/main/print-canon.c:342
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1604 src/main/print-pcl.c:1479
-#: src/main/escp2-resolutions.c:547 src/main/escp2-resolutions.c:555
-#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:578
+#: src/main/print-canon.c:361 src/main/print-pcl.c:1482
+#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:565
+#: src/main/escp2-resolutions.c:576 src/main/escp2-resolutions.c:588
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:1606 src/main/print-pcl.c:1481
-msgid "Short Edge (Flip)"
+#: src/main/print-canon.c:362 src/main/print-pcl.c:1483
+msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:1920 src/main/print-lexmark.c:1113
-msgid "Auto Sheet Feeder"
-msgstr "自動�紙匣"
-
-#: src/main/print-canon.c:1921 src/main/print-lexmark.c:1114
-msgid "Manual with Pause"
+#: src/main/print-canon.c:363 src/main/print-pcl.c:1484
+msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:1922 src/main/print-lexmark.c:1115
-msgid "Manual without Pause"
-msgstr ""
+#: src/main/print-canon.c:588 src/main/print-escp2.c:1633
+#: src/main/xmli18n-tmp.h:6
+msgid "CD - 5 inch"
+msgstr "5 �光碟"
 
-#: src/main/print-canon.c:1923
-msgid "Cassette"
-msgstr ""
+#: src/main/print-canon.c:590 src/main/print-escp2.c:1635
+#: src/main/xmli18n-tmp.h:7
+msgid "CD - 3 inch"
+msgstr "3 �光碟"
 
-#: src/main/print-canon.c:1924
-msgid "CD tray"
-msgstr ""
+#: src/main/print-canon.c:592 src/main/print-escp2.c:1637
+#: src/main/xmli18n-tmp.h:8
+#, fuzzy
+msgid "CD - Custom"
+msgstr "自�"
 
-#: src/main/print-canon.c:2049
-msgid "Photo CcMmYK Color"
+#: src/main/print-canon.c:615 src/main/print-escp2.c:1662
+msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:2052
-msgid "Photo CcMmY Color"
+#: src/main/print-canon.c:617 src/main/print-escp2.c:1664
+msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-canon.c:2055
-msgid "CMYK Color"
-msgstr "CMYK 色系"
-
-#: src/main/print-canon.c:2058
-msgid "CMY Color"
-msgstr "CMY 色系"
-
-#: src/main/print-canon.c:2061 src/main/print-color.c:314
-#: src/main/print-escp2-data.c:738 src/main/print-escp2-data.c:751
-#: src/main/print-escp2-data.c:761 src/main/print-escp2-data.c:768
-#: src/main/print-escp2-data.c:780 src/main/print-escp2-data.c:792
-#: src/main/print-escp2-data.c:805 src/main/print-escp2-data.c:818
-#: src/main/print-escp2-data.c:824 src/main/print-escp2-data.c:848
-#: src/main/print-escp2-data.c:861 src/main/print-lexmark.c:613
-#: src/gutenprintui/panel.c:2143 src/gutenprintui2/panel.c:2144
-#: src/escputil/escputil.c:981 src/escputil/escputil.c:1002
-#: src/escputil/escputil.c:1206
-msgid "Black"
-msgstr "黑"
-
-#: src/main/print-canon.c:2106 src/main/print-escp2.c:1868
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1562
-#: src/main/print-pcl.c:1773 src/main/print-ps.c:170 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/main/print-canon.c:732 src/main/print-escp2.c:1996
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:1858
+#: src/main/print-pcl.c:1776 src/main/print-ps.c:170 src/main/print-raw.c:135
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color"
 msgstr "彩色"
 
-#: src/main/print-canon.c:2108 src/main/print-escp2.c:1870
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1775
+#: src/main/print-canon.c:734 src/main/print-escp2.c:1998
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1778
 #: src/main/print-ps.c:172 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "黑白"
@@ -637,9 +470,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr ""
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:820
-#: src/main/escp2-channels.c:833 src/main/escp2-channels.c:847
-#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
+#: src/main/print-color.c:121 src/main/escp2-channels.c:878
+#: src/main/escp2-channels.c:891 src/main/escp2-channels.c:905
+#: src/gutenprintui/panel.c:289 src/gutenprintui2/panel.c:289
 msgid "Grayscale"
 msgstr "�階"
 
@@ -667,10 +500,6 @@ msgstr "KCMY"
 msgid "Channel "
 msgstr ""
 
-#: src/main/print-color.c:165
-msgid " Gamma"
-msgstr " Gamma"
-
 #: src/main/print-color.c:165 src/main/print-color.c:216
 #: src/main/print-color.c:248 src/main/print-color.c:258
 #: src/main/print-color.c:266 src/main/print-color.c:274
@@ -723,7 +552,7 @@ msgid "Output image type"
 msgstr "輸出影�類型"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:326
+#: src/main/print-escp2.c:340
 msgid "Raw Channels"
 msgstr ""
 
@@ -784,13 +613,13 @@ msgstr ""
 msgid "Gamma value assumed by application"
 msgstr "程�使用的 Gamma 值"
 
-#: src/main/print-color.c:266 src/main/print-escp2-data.c:739
-#: src/main/print-escp2-data.c:748 src/main/print-escp2-data.c:758
-#: src/main/print-escp2-data.c:769 src/main/print-escp2-data.c:781
-#: src/main/print-escp2-data.c:793 src/main/print-escp2-data.c:806
-#: src/main/print-escp2-data.c:819 src/main/print-escp2-data.c:833
-#: src/main/print-escp2-data.c:847 src/main/print-escp2-data.c:862
-#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
+#: src/main/print-color.c:266 src/main/escp2-channels.c:2909
+#: src/main/escp2-channels.c:2918 src/main/escp2-channels.c:2928
+#: src/main/escp2-channels.c:2939 src/main/escp2-channels.c:2951
+#: src/main/escp2-channels.c:2963 src/main/escp2-channels.c:2976
+#: src/main/escp2-channels.c:2989 src/main/escp2-channels.c:3003
+#: src/main/escp2-channels.c:3017 src/main/escp2-channels.c:3032
+#: src/gutenprintui/panel.c:2140 src/gutenprintui2/panel.c:2141
 #: src/escputil/escputil.c:984 src/escputil/escputil.c:1003
 #: src/escputil/escputil.c:1207
 msgid "Cyan"
@@ -800,13 +629,13 @@ msgstr "æ°°è—�"
 msgid "Adjust the cyan gamma"
 msgstr "調整氰�色 gamma 值"
 
-#: src/main/print-color.c:274 src/main/print-escp2-data.c:740
-#: src/main/print-escp2-data.c:750 src/main/print-escp2-data.c:759
-#: src/main/print-escp2-data.c:770 src/main/print-escp2-data.c:783
-#: src/main/print-escp2-data.c:794 src/main/print-escp2-data.c:807
-#: src/main/print-escp2-data.c:820 src/main/print-escp2-data.c:832
-#: src/main/print-escp2-data.c:846 src/main/print-escp2-data.c:863
-#: src/gutenprintui/panel.c:2129 src/gutenprintui2/panel.c:2130
+#: src/main/print-color.c:274 src/main/escp2-channels.c:2910
+#: src/main/escp2-channels.c:2920 src/main/escp2-channels.c:2929
+#: src/main/escp2-channels.c:2940 src/main/escp2-channels.c:2953
+#: src/main/escp2-channels.c:2964 src/main/escp2-channels.c:2977
+#: src/main/escp2-channels.c:2990 src/main/escp2-channels.c:3002
+#: src/main/escp2-channels.c:3016 src/main/escp2-channels.c:3033
+#: src/gutenprintui/panel.c:2147 src/gutenprintui2/panel.c:2148
 #: src/escputil/escputil.c:985 src/escputil/escputil.c:1004
 #: src/escputil/escputil.c:1208
 msgid "Magenta"
@@ -816,13 +645,13 @@ msgstr "æ´‹ç´…"
 msgid "Adjust the magenta gamma"
 msgstr "調整洋紅色 gamma 值"
 
-#: src/main/print-color.c:282 src/main/print-escp2-data.c:741
-#: src/main/print-escp2-data.c:749 src/main/print-escp2-data.c:760
-#: src/main/print-escp2-data.c:771 src/main/print-escp2-data.c:785
-#: src/main/print-escp2-data.c:795 src/main/print-escp2-data.c:808
-#: src/main/print-escp2-data.c:821 src/main/print-escp2-data.c:831
-#: src/main/print-escp2-data.c:845 src/main/print-escp2-data.c:864
-#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
+#: src/main/print-color.c:282 src/main/escp2-channels.c:2911
+#: src/main/escp2-channels.c:2919 src/main/escp2-channels.c:2930
+#: src/main/escp2-channels.c:2941 src/main/escp2-channels.c:2955
+#: src/main/escp2-channels.c:2965 src/main/escp2-channels.c:2978
+#: src/main/escp2-channels.c:2991 src/main/escp2-channels.c:3001
+#: src/main/escp2-channels.c:3015 src/main/escp2-channels.c:3034
+#: src/gutenprintui/panel.c:2154 src/gutenprintui2/panel.c:2155
 #: src/escputil/escputil.c:986 src/escputil/escputil.c:1005
 #: src/escputil/escputil.c:1209
 msgid "Yellow"
@@ -832,9 +661,9 @@ msgstr "黃"
 msgid "Adjust the yellow gamma"
 msgstr "調整黃色 gamma 值"
 
-#: src/main/print-color.c:290 src/main/print-escp2-data.c:836
-#: src/main/print-escp2-data.c:849 src/gutenprintui/panel.c:2150
-#: src/gutenprintui2/panel.c:2151 src/escputil/escputil.c:993
+#: src/main/print-color.c:290 src/main/escp2-channels.c:3006
+#: src/main/escp2-channels.c:3019 src/gutenprintui/panel.c:2168
+#: src/gutenprintui2/panel.c:2169 src/escputil/escputil.c:993
 #: src/escputil/escputil.c:1011
 msgid "Red"
 msgstr "ç´…"
@@ -843,8 +672,8 @@ msgstr "ç´…"
 msgid "Adjust the red gamma"
 msgstr "調整紅色 gamma 值"
 
-#: src/main/print-color.c:298 src/gutenprintui/panel.c:2157
-#: src/gutenprintui2/panel.c:2158
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2175
+#: src/gutenprintui2/panel.c:2176
 msgid "Green"
 msgstr "綠"
 
@@ -852,9 +681,9 @@ msgstr "綠"
 msgid "Adjust the green gamma"
 msgstr "調整綠色 gamma 值"
 
-#: src/main/print-color.c:306 src/main/print-escp2-data.c:837
-#: src/main/print-escp2-data.c:850 src/gutenprintui/panel.c:2164
-#: src/gutenprintui2/panel.c:2165 src/escputil/escputil.c:994
+#: src/main/print-color.c:306 src/main/escp2-channels.c:3007
+#: src/main/escp2-channels.c:3020 src/gutenprintui/panel.c:2182
+#: src/gutenprintui2/panel.c:2183 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1012
 msgid "Blue"
 msgstr "è—�"
@@ -863,11 +692,23 @@ msgstr "è—�"
 msgid "Adjust the blue gamma"
 msgstr "調整�色 gamma 值"
 
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/main/escp2-channels.c:2908 src/main/escp2-channels.c:2921
+#: src/main/escp2-channels.c:2931 src/main/escp2-channels.c:2938
+#: src/main/escp2-channels.c:2950 src/main/escp2-channels.c:2962
+#: src/main/escp2-channels.c:2975 src/main/escp2-channels.c:2988
+#: src/main/escp2-channels.c:2994 src/main/escp2-channels.c:3018
+#: src/main/escp2-channels.c:3031 src/gutenprintui/panel.c:2161
+#: src/gutenprintui2/panel.c:2162 src/escputil/escputil.c:981
+#: src/escputil/escputil.c:1002 src/escputil/escputil.c:1206
+msgid "Black"
+msgstr "黑"
+
 #: src/main/print-color.c:315
 msgid "Adjust the black gamma"
 msgstr "調整黑色 gamma 值"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1330
+#: src/main/print-color.c:322 src/main/print-olympus.c:1626
 msgid "Cyan Balance"
 msgstr "氰�色平衡"
 
@@ -880,7 +721,7 @@ msgstr ""
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1338
+#: src/main/print-color.c:330 src/main/print-olympus.c:1634
 msgid "Magenta Balance"
 msgstr "洋紅色平衡"
 
@@ -888,7 +729,7 @@ msgstr "洋紅色平衡"
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1346
+#: src/main/print-color.c:338 src/main/print-olympus.c:1642
 msgid "Yellow Balance"
 msgstr "黃色平衡"
 
@@ -914,9 +755,9 @@ msgstr ""
 
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
-#: src/main/print-color.c:545 src/main/print-escp2.c:332
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
+#: src/main/print-color.c:545 src/main/print-escp2.c:346
+#: src/main/print-escp2.c:352 src/main/print-escp2.c:358
+#: src/main/print-escp2.c:364 src/main/print-escp2.c:370
 msgid "Advanced Output Control"
 msgstr ""
 
@@ -948,10 +789,6 @@ msgstr ""
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:446
-msgid " Curve"
-msgstr ""
-
 #: src/main/print-color.c:447 src/main/print-color.c:457
 #: src/main/print-color.c:465 src/main/print-color.c:473
 #: src/main/print-color.c:481 src/main/print-color.c:489
@@ -1065,533 +902,354 @@ msgstr ""
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1668
+#: src/main/print-color.c:1670
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
-#: src/main/printers.c:503
+#: src/main/printers.c:506
 #, c-format
 msgid "Value must be set for %s\n"
 msgstr ""
 
-#: src/main/printers.c:516 src/main/printers.c:521
+#: src/main/printers.c:519 src/main/printers.c:524
 #, c-format
 msgid "`%s' is not a valid %s\n"
 msgstr ""
 
-#: src/main/printers.c:540
+#: src/main/printers.c:543
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
 msgstr "%s 必須在 %f 和 %f 之間 (實際上是 %f)\n"
 
-#: src/main/printers.c:562 src/main/printers.c:586
+#: src/main/printers.c:565 src/main/printers.c:589
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
 msgstr "%s 必須在 %d 和 %d 之間 (實際上是 %d)\n"
 
-#: src/main/printers.c:617
+#: src/main/printers.c:620
 #, c-format
 msgid "%s bounds must be between %f and %f\n"
 msgstr "%s 必須在 %f 和 %f 之間\n"
 
-#: src/main/printers.c:625
+#: src/main/printers.c:628
 #, c-format
 msgid "%s wrap mode must be %s\n"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "no wrap"
 msgstr ""
 
-#: src/main/printers.c:629
+#: src/main/printers.c:632
 msgid "wrap around"
 msgstr ""
 
-#: src/main/printers.c:673
+#: src/main/printers.c:676
 #, c-format
 msgid "Unknown type parameter %s (%d)\n"
 msgstr ""
 
-#: src/main/printers.c:686 src/main/printers.c:697
+#: src/main/printers.c:689 src/main/printers.c:700
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
 msgstr ""
 
-#: src/main/printers.c:755
+#: src/main/printers.c:761
 msgid "Page size is not valid\n"
 msgstr "��尺寸無效\n"
 
-#: src/main/printers.c:776
+#: src/main/printers.c:782
 #, c-format
 msgid "Top margin must not be less than %d\n"
 msgstr "頂部邊框寬度必須�少於 %d\n"
 
-#: src/main/printers.c:782
+#: src/main/printers.c:788
 #, c-format
 msgid "Left margin must not be less than %d\n"
 msgstr "左邊邊框寬度必須�少於 %d\n"
 
-#: src/main/printers.c:788
+#: src/main/printers.c:794
 msgid "Height must be greater than zero\n"
 msgstr "高度必須大於零\n"
 
-#: src/main/printers.c:794
+#: src/main/printers.c:800
 msgid "Width must be greater than zero\n"
 msgstr "寬度必須大於零\n"
 
-#: src/main/printers.c:800
+#: src/main/printers.c:806
 #, c-format
 msgid ""
 "Image is too wide for the page: left margin is %d, width %d, right edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/printers.c:807
+#: src/main/printers.c:813
 #, c-format
 msgid ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:311 src/main/print-escp2-data.c:335
-#: src/main/print-escp2-data.c:368 src/main/print-escp2-data.c:419
-#: src/main/print-escp2-data.c:461 src/main/print-escp2-data.c:503
-#: src/main/print-escp2-data.c:596 src/main/print-escp2-data.c:690
-#: src/main/print-escp2-data.c:705 src/main/print-escp2-data.c:718
-#: src/main/print-escp2.c:1628 src/main/print-escp2.c:1720
-#: src/main/print-escp2.c:1732 src/main/print-pcl.c:227
-#: src/main/escp2-channels.c:2482 src/main/generic-options.c:36
-#: src/gutenprintui/panel.c:2583 src/gutenprintui2/panel.c:2609
-msgid "Standard"
-msgstr "標準"
-
-#: src/main/print-escp2-data.c:320 src/main/print-escp2-data.c:446
-#: src/main/print-escp2-data.c:488 src/main/print-escp2-data.c:530
-#: src/main/print-escp2-data.c:605
-msgid "Roll Feed"
-msgstr ""
-
-#: src/main/print-escp2-data.c:344 src/main/print-escp2-data.c:395
-msgid "Roll Feed (cut each page)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:353 src/main/print-escp2-data.c:404
-msgid "Roll Feed (do not cut)"
-msgstr ""
-
-#: src/main/print-escp2-data.c:377 src/main/print-escp2-data.c:428
-msgid "Manual Feed"
-msgstr "人手�紙"
-
-#: src/main/print-escp2-data.c:386 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:539 src/main/print-escp2-data.c:572
-msgid "Print to CD"
-msgstr "列�至光碟"
-
-#: src/main/print-escp2-data.c:470 src/main/print-escp2-data.c:512
-#, fuzzy
-msgid "Manual Sheet Guide"
-msgstr "人手�紙"
-
-#: src/main/print-escp2-data.c:479 src/main/print-escp2-data.c:521
-#, fuzzy
-msgid "Manual Feed (Front)"
-msgstr "人手�紙"
-
-#: src/main/print-escp2-data.c:554
-msgid "Rear Tray"
-msgstr ""
-
-#: src/main/print-escp2-data.c:563
-msgid "Front Tray"
-msgstr ""
-
-#: src/main/print-escp2-data.c:581
-#, fuzzy
-msgid "Photo Board"
-msgstr "相紙"
-
-#: src/main/print-escp2-data.c:620
-msgid "Cut Sheet Bin 1"
-msgstr ""
-
-#: src/main/print-escp2-data.c:629
-msgid "Cut Sheet Bin 2"
-msgstr ""
-
-#: src/main/print-escp2-data.c:638
-msgid "Cut Sheet Autoselect"
-msgstr ""
-
-#: src/main/print-escp2-data.c:647
-msgid "Manual Selection"
-msgstr ""
-
-#: src/main/print-escp2-data.c:687 src/main/print-escp2-data.c:702
-#: src/main/generic-options.c:33
-msgid "Fast Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:688 src/main/print-escp2-data.c:703
-#: src/main/generic-options.c:34
-msgid "Economy"
-msgstr ""
-
-#: src/main/print-escp2-data.c:689 src/main/print-escp2-data.c:704
-#: src/main/print-escp2-data.c:717 src/main/generic-options.c:35
-msgid "Draft"
-msgstr ""
-
-#: src/main/print-escp2-data.c:691 src/main/print-escp2-data.c:706
-#: src/main/print-escp2-data.c:720 src/main/generic-options.c:37
-msgid "High"
-msgstr ""
-
-#: src/main/print-escp2-data.c:692 src/main/print-escp2-data.c:707
-#: src/main/print-escp2-data.c:719 src/main/generic-options.c:38
-msgid "Photo"
-msgstr "相片"
-
-#: src/main/print-escp2-data.c:693 src/main/print-escp2-data.c:708
-#: src/main/print-escp2-data.c:721 src/main/generic-options.c:39
-msgid "Super Photo"
-msgstr ""
-
-#: src/main/print-escp2-data.c:694 src/main/print-escp2-data.c:709
-#: src/main/print-escp2-data.c:722 src/main/generic-options.c:40
-msgid "Ultra Photo"
-msgstr ""
-
-#: src/main/print-escp2-data.c:695 src/main/print-escp2-data.c:710
-#: src/main/print-escp2-data.c:723 src/main/generic-options.c:41
-msgid "Best"
-msgstr ""
-
-#: src/main/print-escp2-data.c:772 src/main/print-escp2-data.c:782
-#: src/main/print-escp2-data.c:796 src/main/print-escp2-data.c:809
-#: src/main/print-escp2-data.c:822 src/main/print-escp2-data.c:859
-#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
-msgid "Light Cyan"
-msgstr ""
-
-#: src/main/print-escp2-data.c:773 src/main/print-escp2-data.c:784
-#: src/main/print-escp2-data.c:797 src/main/print-escp2-data.c:810
-#: src/main/print-escp2-data.c:823 src/main/print-escp2-data.c:858
-#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
-msgid "Light Magenta"
-msgstr ""
-
-#: src/main/print-escp2-data.c:798 src/main/print-escp2-data.c:860
-#: src/escputil/escputil.c:991
-msgid "Light Black"
-msgstr ""
-
-#: src/main/print-escp2-data.c:811
-msgid "Dark Yellow"
-msgstr ""
-
-#: src/main/print-escp2-data.c:834 src/main/escp2-channels.c:2439
-#: src/main/escp2-channels.c:2455 src/escputil/escputil.c:992
-msgid "Matte Black"
-msgstr ""
-
-#: src/main/print-escp2-data.c:835 src/main/escp2-channels.c:2435
-#: src/main/escp2-channels.c:2473 src/escputil/escputil.c:982
-msgid "Photo Black"
-msgstr ""
-
-#: src/main/print-escp2-data.c:838 src/escputil/escputil.c:995
-msgid "Gloss Optimizer"
-msgstr ""
-
-#: src/main/print-escp2-data.c:857 src/escputil/escputil.c:996
-msgid "Light Light Black"
-msgstr ""
-
-#: src/main/print-escp2.c:159
+#: src/main/print-escp2.c:161
 msgid "Automatic Printing Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:159 src/main/print-escp2.c:171
+#: src/main/print-escp2.c:161 src/main/print-escp2.c:173
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:160
+#: src/main/print-escp2.c:162
 msgid "Automatic printing mode"
 msgstr "自動列�模�"
 
-#: src/main/print-escp2.c:171 src/main/print-escp2.c:172
+#: src/main/print-escp2.c:173 src/main/print-escp2.c:174
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "列��質"
 
-#: src/main/print-escp2.c:195
-msgid "CD Hub Size"
-msgstr ""
-
-#: src/main/print-escp2.c:196
-msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr ""
-
-#: src/main/print-escp2.c:201
-msgid "CD Horizontal Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:202 src/main/print-escp2.c:208
-msgid "Fine adjustment to horizontal position for CD printing"
-msgstr ""
-
-#: src/main/print-escp2.c:207
-msgid "CD Vertical Fine Adjustment"
-msgstr ""
-
-#: src/main/print-escp2.c:214
+#: src/main/print-escp2.c:228
 msgid "Resolution of the print"
 msgstr "列�時的解�度"
 
-#: src/main/print-escp2.c:230
+#: src/main/print-escp2.c:244
 msgid "Enhanced Gloss"
 msgstr ""
 
-#: src/main/print-escp2.c:231
+#: src/main/print-escp2.c:245
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:236
+#: src/main/print-escp2.c:250
 msgid "Ink Set"
 msgstr ""
 
-#: src/main/print-escp2.c:242
+#: src/main/print-escp2.c:256
 msgid "Printing Direction"
 msgstr "列�方�"
 
-#: src/main/print-escp2.c:242 src/main/print-escp2.c:254
+#: src/main/print-escp2.c:256 src/main/print-escp2.c:268
 msgid "Advanced Output Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:243
+#: src/main/print-escp2.c:257
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
+#: src/main/print-escp2.c:262 src/main/print-olympus.c:1597
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
+#: src/main/print-escp2.c:263 src/main/print-olympus.c:1598
 msgid "Print without borders"
 msgstr ""
 
-#: src/main/print-escp2.c:254
+#: src/main/print-escp2.c:268
 msgid "Interleave Method"
 msgstr ""
 
-#: src/main/print-escp2.c:255
+#: src/main/print-escp2.c:269
 msgid "Interleave pattern to use"
 msgstr ""
 
-#: src/main/print-escp2.c:260
+#: src/main/print-escp2.c:274
 msgid "Adjust dot size as necessary"
 msgstr ""
 
-#: src/main/print-escp2.c:261
+#: src/main/print-escp2.c:275
 msgid "Adjust dot size as necessary to achieve desired density"
 msgstr ""
 
-#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/main/print-escp2.c:280 src/main/print-escp2.c:281
 msgid "Output Order"
 msgstr ""
 
-#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+#: src/main/print-escp2.c:286 src/main/print-escp2.c:287
 msgid "Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+#: src/main/print-escp2.c:292 src/main/print-escp2.c:293
 msgid "Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+#: src/main/print-escp2.c:298 src/main/print-escp2.c:299
 msgid "Ink change command"
 msgstr ""
 
-#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+#: src/main/print-escp2.c:304 src/main/print-escp2.c:305
 msgid "Alternate Alignment Passes"
 msgstr ""
 
-#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
-#: src/main/print-escp2.c:303
+#: src/main/print-escp2.c:310 src/main/print-escp2.c:311
+#: src/main/print-escp2.c:317
 msgid "Alternate Alignment Choices"
 msgstr ""
 
-#: src/main/print-escp2.c:302
+#: src/main/print-escp2.c:316
 msgid "Supports Packet Mode"
 msgstr ""
 
-#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-escp2.c:328 src/main/print-escp2.c:329
 msgid "Channel Names"
 msgstr ""
 
-#: src/main/print-escp2.c:327
+#: src/main/print-escp2.c:341
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:346
 msgid "Cyan Map"
 msgstr ""
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:347
 msgid "Adjust the cyan map"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:352
 msgid "Magenta Map"
 msgstr ""
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:353
 msgid "Adjust the magenta map"
 msgstr ""
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:358
 msgid "Yellow Map"
 msgstr ""
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:359
 msgid "Adjust the yellow map"
 msgstr ""
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:364
 msgid "Blue Map"
 msgstr ""
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:365
 msgid "Adjust the blue map"
 msgstr ""
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:370
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:371
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:447
+#: src/main/print-escp2.c:464
 msgid "Red Density"
 msgstr "紅色密度"
 
-#: src/main/print-escp2.c:448
+#: src/main/print-escp2.c:465
 msgid "Adjust the red density"
 msgstr "調整紅色色彩密度"
 
-#: src/main/print-escp2.c:455
+#: src/main/print-escp2.c:472
 msgid "Blue Density"
 msgstr "�色密度"
 
-#: src/main/print-escp2.c:456
+#: src/main/print-escp2.c:473
 msgid "Adjust the blue density"
 msgstr "調整�色色彩密度"
 
-#: src/main/print-escp2.c:463
+#: src/main/print-escp2.c:480
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:464
+#: src/main/print-escp2.c:481
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:487 src/main/print-escp2.c:488
+#: src/main/print-escp2.c:504 src/main/print-escp2.c:505
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:495 src/main/print-escp2.c:496
-#: src/main/print-escp2.c:503 src/main/print-escp2.c:504
+#: src/main/print-escp2.c:512 src/main/print-escp2.c:513
+#: src/main/print-escp2.c:520 src/main/print-escp2.c:521
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:512
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:528 src/main/print-escp2.c:529
+#: src/main/print-escp2.c:552 src/main/print-escp2.c:553
 msgid "Light Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:519 src/main/print-escp2.c:520
+#: src/main/print-escp2.c:536 src/main/print-escp2.c:537
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:527
+#: src/main/print-escp2.c:544
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:528
+#: src/main/print-escp2.c:545
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:1525
+#: src/main/print-escp2.c:1620
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1527
+#: src/main/print-escp2.c:1622
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1538 src/main/xmli18n-tmp.h:6
-msgid "CD - 5 inch"
-msgstr "5 �光碟"
-
-#: src/main/print-escp2.c:1540 src/main/xmli18n-tmp.h:7
-msgid "CD - 3 inch"
-msgstr "3 �光碟"
-
-#: src/main/print-escp2.c:1562
-msgid "Normal"
-msgstr ""
-
-#: src/main/print-escp2.c:1564
-msgid "Print To Hub"
-msgstr ""
-
-#: src/main/print-escp2.c:1589 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1717 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1699 src/cups/genppd.c:1331
+#: src/main/print-escp2.c:1756 src/main/print-escp2.c:1848
+#: src/main/print-escp2.c:1860 src/main/print-pcl.c:230
+#: src/main/escp2-channels.c:2675 src/main/escp2-papers.c:1616
+#: src/main/escp2-papers.c:1640 src/main/escp2-papers.c:1673
+#: src/main/escp2-papers.c:1724 src/main/escp2-papers.c:1766
+#: src/main/escp2-papers.c:1808 src/main/escp2-papers.c:1901
+#: src/main/escp2-resolutions.c:640 src/main/escp2-resolutions.c:655
+#: src/main/escp2-resolutions.c:668 src/main/generic-options.c:36
+#: src/gutenprintui/panel.c:2601 src/gutenprintui2/panel.c:2627
+msgid "Standard"
+msgstr "標準"
+
+#: src/main/print-escp2.c:1827 src/cups/genppd.c:1537
 msgid "Automatic"
 msgstr "自動"
 
-#: src/main/print-escp2.c:1701
+#: src/main/print-escp2.c:1829
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1703
+#: src/main/print-escp2.c:1831
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1734
+#: src/main/print-escp2.c:1862
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1736
+#: src/main/print-escp2.c:1864
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1738
+#: src/main/print-escp2.c:1866
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1740
+#: src/main/print-escp2.c:1868
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1742
+#: src/main/print-escp2.c:1870
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2168
+#: src/main/print-escp2.c:2313
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:3141 src/main/print-olympus.c:1774
+#: src/main/print-escp2.c:3360 src/main/print-olympus.c:2310
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1645,255 +1303,308 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:1151 src/main/escp2-channels.c:1165
-#: src/main/escp2-channels.c:1179 src/main/escp2-channels.c:1193
-#: src/main/escp2-channels.c:1217 src/main/escp2-channels.c:1231
-#: src/main/escp2-channels.c:1245 src/main/escp2-channels.c:1259
-#: src/main/escp2-channels.c:1273 src/main/escp2-channels.c:1287
+#: src/main/escp2-channels.c:1223 src/main/escp2-channels.c:1237
+#: src/main/escp2-channels.c:1251 src/main/escp2-channels.c:1265
+#: src/main/escp2-channels.c:1289 src/main/escp2-channels.c:1303
+#: src/main/escp2-channels.c:1317 src/main/escp2-channels.c:1331
+#: src/main/escp2-channels.c:1345 src/main/escp2-channels.c:1359
+#: src/main/escp2-channels.c:1373
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:1015 src/main/escp2-channels.c:1029
-#: src/main/escp2-channels.c:1043 src/main/escp2-channels.c:1057
-#: src/main/escp2-channels.c:1071 src/main/escp2-channels.c:1085
-#: src/main/escp2-channels.c:1109 src/main/escp2-channels.c:1115
-#: src/main/escp2-channels.c:1129
+#: src/main/escp2-channels.c:1073 src/main/escp2-channels.c:1087
+#: src/main/escp2-channels.c:1101 src/main/escp2-channels.c:1115
+#: src/main/escp2-channels.c:1129 src/main/escp2-channels.c:1143
+#: src/main/escp2-channels.c:1167 src/main/escp2-channels.c:1173
+#: src/main/escp2-channels.c:1187 src/main/escp2-channels.c:1201
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1361 src/main/escp2-channels.c:1375
-#: src/main/escp2-channels.c:1389 src/main/escp2-channels.c:1615
-#: src/main/escp2-channels.c:1630 src/main/escp2-channels.c:1645
-#: src/main/escp2-channels.c:1662
+#: src/main/escp2-channels.c:1461 src/main/escp2-channels.c:1475
+#: src/main/escp2-channels.c:1489 src/main/escp2-channels.c:1503
+#: src/main/escp2-channels.c:1729 src/main/escp2-channels.c:1744
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1776
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1310 src/main/escp2-channels.c:1324
-#: src/main/escp2-channels.c:1338 src/main/escp2-channels.c:1559
-#: src/main/escp2-channels.c:1574 src/main/escp2-channels.c:1591
+#: src/main/escp2-channels.c:1396 src/main/escp2-channels.c:1410
+#: src/main/escp2-channels.c:1424 src/main/escp2-channels.c:1438
+#: src/main/escp2-channels.c:1673 src/main/escp2-channels.c:1688
+#: src/main/escp2-channels.c:1705
 msgid "Five Color Photo Composite"
 msgstr ""
 
+#: src/main/print-lexmark.c:856 src/main/escp2-papers.c:1251
+#: src/main/escp2-papers.c:1295 src/main/escp2-papers.c:1339
+#: src/main/escp2-papers.c:1387 src/main/escp2-papers.c:1435
+#: src/main/escp2-papers.c:1479
+msgid "Plain Paper"
+msgstr "普通紙張"
+
 # (Abel) from Epson
-#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1166
-#: src/main/escp2-papers.c:1210 src/main/escp2-papers.c:1254
-#: src/main/escp2-papers.c:1302 src/main/escp2-papers.c:1350
-#: src/main/escp2-papers.c:1394
+#: src/main/print-lexmark.c:860 src/main/escp2-papers.c:1257
+#: src/main/escp2-papers.c:1301 src/main/escp2-papers.c:1345
+#: src/main/escp2-papers.c:1393 src/main/escp2-papers.c:1441
+#: src/main/escp2-papers.c:1485
 msgid "Glossy Film"
 msgstr "光�膠片"
 
-#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1170
-#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
-#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
-#: src/main/escp2-papers.c:1398
+#: src/main/print-lexmark.c:864 src/main/escp2-papers.c:1259
+#: src/main/escp2-papers.c:1303 src/main/escp2-papers.c:1347
+#: src/main/escp2-papers.c:1395 src/main/escp2-papers.c:1443
+#: src/main/escp2-papers.c:1487
+msgid "Transparencies"
+msgstr "�明膠片"
+
+#: src/main/print-lexmark.c:868 src/main/escp2-papers.c:1261
+#: src/main/escp2-papers.c:1305 src/main/escp2-papers.c:1349
+#: src/main/escp2-papers.c:1397 src/main/escp2-papers.c:1445
+#: src/main/escp2-papers.c:1489
 msgid "Envelopes"
 msgstr "ä¿¡å°�"
 
 # (Abel) from fuji, epson
-#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1174
-#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
-#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
-#: src/main/escp2-papers.c:1402
+#: src/main/print-lexmark.c:872 src/main/escp2-papers.c:1265
+#: src/main/escp2-papers.c:1309 src/main/escp2-papers.c:1353
+#: src/main/escp2-papers.c:1401 src/main/escp2-papers.c:1449
+#: src/main/escp2-papers.c:1493
 msgid "Matte Paper"
 msgstr "雪�銅版紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1178
-#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
-#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
-#: src/main/escp2-papers.c:1406
+#: src/main/print-lexmark.c:876 src/main/escp2-papers.c:1269
+#: src/main/escp2-papers.c:1313 src/main/escp2-papers.c:1357
+#: src/main/escp2-papers.c:1405 src/main/escp2-papers.c:1453
+#: src/main/escp2-papers.c:1497
 msgid "Inkjet Paper"
 msgstr "噴墨專用紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1180
-#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1268
-#: src/main/escp2-papers.c:1316 src/main/escp2-papers.c:1364
-#: src/main/escp2-papers.c:1408
+#: src/main/print-lexmark.c:880 src/main/escp2-papers.c:1271
+#: src/main/escp2-papers.c:1315 src/main/escp2-papers.c:1359
+#: src/main/escp2-papers.c:1407 src/main/escp2-papers.c:1455
+#: src/main/escp2-papers.c:1499
 msgid "Photo Quality Inkjet Paper"
 msgstr "優質噴墨專用紙"
 
-#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1182
-#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1270
-#: src/main/escp2-papers.c:1318 src/main/escp2-papers.c:1366
-#: src/main/escp2-papers.c:1410
+#: src/main/print-lexmark.c:884 src/main/escp2-papers.c:1273
+#: src/main/escp2-papers.c:1317 src/main/escp2-papers.c:1361
+#: src/main/escp2-papers.c:1409 src/main/escp2-papers.c:1457
+#: src/main/escp2-papers.c:1501
 msgid "Photo Paper"
 msgstr "相紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1184
-#: src/main/escp2-papers.c:1228 src/main/escp2-papers.c:1272
-#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1368
-#: src/main/escp2-papers.c:1412 src/main/escp2-papers.c:1436
+#: src/main/print-lexmark.c:888 src/main/escp2-papers.c:1275
+#: src/main/escp2-papers.c:1319 src/main/escp2-papers.c:1363
+#: src/main/escp2-papers.c:1411 src/main/escp2-papers.c:1459
+#: src/main/escp2-papers.c:1503 src/main/escp2-papers.c:1527
 msgid "Premium Glossy Photo Paper"
 msgstr "頂級光�相紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1188
-#: src/main/escp2-papers.c:1232 src/main/escp2-papers.c:1276
-#: src/main/escp2-papers.c:1324 src/main/escp2-papers.c:1372
-#: src/main/escp2-papers.c:1416
+#: src/main/print-lexmark.c:892 src/main/escp2-papers.c:1279
+#: src/main/escp2-papers.c:1323 src/main/escp2-papers.c:1367
+#: src/main/escp2-papers.c:1415 src/main/escp2-papers.c:1463
+#: src/main/escp2-papers.c:1507
 msgid "Premium Luster Photo Paper"
 msgstr "精�光�相紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1190
-#: src/main/escp2-papers.c:1234 src/main/escp2-papers.c:1282
-#: src/main/escp2-papers.c:1330 src/main/escp2-papers.c:1374
-#: src/main/escp2-papers.c:1422
+#: src/main/print-lexmark.c:896 src/main/escp2-papers.c:1281
+#: src/main/escp2-papers.c:1325 src/main/escp2-papers.c:1373
+#: src/main/escp2-papers.c:1421 src/main/escp2-papers.c:1465
+#: src/main/escp2-papers.c:1513
 msgid "Photo Quality Glossy Paper"
 msgstr "光�紙"
 
-#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1192
-#: src/main/escp2-papers.c:1236 src/main/escp2-papers.c:1284
-#: src/main/escp2-papers.c:1332 src/main/escp2-papers.c:1376
-#: src/main/escp2-papers.c:1424
+#: src/main/print-lexmark.c:900 src/main/escp2-papers.c:1283
+#: src/main/escp2-papers.c:1327 src/main/escp2-papers.c:1375
+#: src/main/escp2-papers.c:1423 src/main/escp2-papers.c:1467
+#: src/main/escp2-papers.c:1515
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-olympus.c:265
+#: src/main/print-lexmark.c:904 src/main/escp2-papers.c:1287
+#: src/main/escp2-papers.c:1331 src/main/escp2-papers.c:1379
+#: src/main/escp2-papers.c:1427 src/main/escp2-papers.c:1471
+#: src/main/escp2-papers.c:1519 src/main/escp2-papers.c:1529
+msgid "Other"
+msgstr "其它"
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr "自動�紙匣"
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr ""
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr ""
+
+#: src/main/print-olympus.c:276
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:266 src/cups/genppd.c:1448 src/cups/genppd.c:1463
-#: src/cups/genppd.c:1514
+#: src/main/print-olympus.c:277 src/cups/genppd.c:1691 src/cups/genppd.c:1714
+#: src/cups/genppd.c:1781
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:922 src/main/print-olympus.c:980
+#: src/main/print-olympus.c:1080
 msgid "Glossy"
 msgstr "光�"
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:923 src/main/print-olympus.c:981
+#: src/main/print-olympus.c:1081
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:861
+#: src/main/print-olympus.c:982 src/main/print-olympus.c:1082
 msgid "Matte"
 msgstr ""
 
-#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
+#: src/main/print-olympus.c:1591 src/main/print-olympus.c:1592
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1331
+#: src/main/print-olympus.c:1627
 msgid "Adjust the cyan balance"
 msgstr "調整氰�色色彩平衡"
 
-#: src/main/print-olympus.c:1339
+#: src/main/print-olympus.c:1635
 msgid "Adjust the magenta balance"
 msgstr "調整洋紅色色彩平衡"
 
-#: src/main/print-olympus.c:1347
+#: src/main/print-olympus.c:1643
 msgid "Adjust the yellow balance"
 msgstr "調整黃色色彩平衡"
 
-#: src/main/print-olympus.c:1354
+#: src/main/print-olympus.c:1650
 msgid "Black Balance"
 msgstr "黑色平衡"
 
-#: src/main/print-olympus.c:1355
+#: src/main/print-olympus.c:1651
 msgid "Adjust the black balance"
 msgstr "調整黑色色彩平衡"
 
-#: src/main/print-pcl.c:182
+#: src/main/print-pcl.c:185
 msgid "Plain"
 msgstr ""
 
-#: src/main/print-pcl.c:183
+#: src/main/print-pcl.c:186
 msgid "Bond"
 msgstr ""
 
-#: src/main/print-pcl.c:184
+#: src/main/print-pcl.c:187
 msgid "Premium"
 msgstr "é ‚ç´š"
 
-#: src/main/print-pcl.c:185
+#: src/main/print-pcl.c:188
 msgid "Glossy Photo"
 msgstr "光�相紙"
 
-#: src/main/print-pcl.c:186
+#: src/main/print-pcl.c:189
 msgid "Transparency"
 msgstr "�明度"
 
-#: src/main/print-pcl.c:187
+#: src/main/print-pcl.c:190
 msgid "Quick-dry Photo"
 msgstr ""
 
-#: src/main/print-pcl.c:188
+#: src/main/print-pcl.c:191
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:228 src/main/xmli18n-tmp.h:15
+#: src/main/print-pcl.c:231 src/main/xmli18n-tmp.h:16
 msgid "Manual"
 msgstr "自�"
 
-#: src/main/print-pcl.c:230
+#: src/main/print-pcl.c:233
 msgid "Tray 1"
 msgstr ""
 
-#: src/main/print-pcl.c:231 src/main/print-pcl.c:237
+#: src/main/print-pcl.c:234 src/main/print-pcl.c:240
 msgid "Tray 2"
 msgstr ""
 
-#: src/main/print-pcl.c:232
+#: src/main/print-pcl.c:235
 msgid "Tray 3"
 msgstr ""
 
-#: src/main/print-pcl.c:233
+#: src/main/print-pcl.c:236
 msgid "Tray 4"
 msgstr ""
 
-#: src/main/print-pcl.c:234
+#: src/main/print-pcl.c:237
 msgid "Portable Sheet Feeder"
 msgstr ""
 
-#: src/main/print-pcl.c:235
+#: src/main/print-pcl.c:238
 msgid "Desktop Sheet Feeder"
 msgstr ""
 
-#: src/main/print-pcl.c:236
+#: src/main/print-pcl.c:239
 msgid "Tray"
 msgstr ""
 
-#: src/main/print-pcl.c:238
+#: src/main/print-pcl.c:241
 msgid "Optional Source"
 msgstr ""
 
-#: src/main/print-pcl.c:239
+#: src/main/print-pcl.c:242
 msgid "Autoselect"
 msgstr "自動�擇"
 
 #: src/main/print-pcl.c:256
+msgid "150x150 DPI"
+msgstr "150x150 DPI"
+
+#: src/main/print-pcl.c:257
+msgid "300x300 DPI"
+msgstr "300x300 DPI"
+
+#: src/main/print-pcl.c:258
+msgid "600x300 DPI"
+msgstr "600x300 DPI"
+
+#: src/main/print-pcl.c:259
 msgid "600x600 DPI monochrome"
 msgstr "600x600 DPI 單色"
 
-#: src/main/print-pcl.c:259
+#: src/main/print-pcl.c:260
+msgid "600x600 DPI"
+msgstr "600x600 DPI"
+
+#: src/main/print-pcl.c:261
+msgid "1200x600 DPI"
+msgstr "1200x600 DPI"
+
+#: src/main/print-pcl.c:262
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1467
+#: src/main/print-pcl.c:1470
 msgid "Color + Black Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1468
+#: src/main/print-pcl.c:1471
 msgid "Color + Photo Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1480
-msgid "Long Edge (Standard)"
-msgstr ""
-
 #: src/main/print-ps.c:97
 #, fuzzy
 msgid "PPDFile"
 msgstr "PPD 檔"
 
-#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1749
-#: src/gutenprintui2/panel.c:1749
+#: src/main/print-ps.c:98 src/gutenprintui/panel.c:1767
+#: src/gutenprintui2/panel.c:1767
 msgid "PPD File"
 msgstr "PPD 檔"
 
@@ -1901,167 +1612,273 @@ msgstr "PPD 檔"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:869 src/main/escp2-channels.c:882
+#: src/main/escp2-channels.c:927 src/main/escp2-channels.c:940
 msgid "Two Level Grayscale"
 msgstr ""
 
-#: src/main/escp2-channels.c:904 src/main/escp2-channels.c:917
+#: src/main/escp2-channels.c:962 src/main/escp2-channels.c:975
 #, fuzzy
 msgid "Three Level Grayscale"
 msgstr "�階"
 
-#: src/main/escp2-channels.c:939 src/main/escp2-channels.c:952
-#: src/main/escp2-channels.c:965 src/main/escp2-channels.c:978
-#: src/main/escp2-channels.c:991 src/main/escp2-channels.c:2218
-#: src/main/escp2-channels.c:2241 src/main/escp2-channels.c:2261
-#: src/main/escp2-channels.c:2281 src/main/escp2-channels.c:2301
+#: src/main/escp2-channels.c:997 src/main/escp2-channels.c:1010
+#: src/main/escp2-channels.c:1023 src/main/escp2-channels.c:1036
+#: src/main/escp2-channels.c:1049 src/main/escp2-channels.c:2395
+#: src/main/escp2-channels.c:2418 src/main/escp2-channels.c:2438
+#: src/main/escp2-channels.c:2458 src/main/escp2-channels.c:2478
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1411 src/main/escp2-channels.c:1425
+#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1539
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1448 src/main/escp2-channels.c:1462
-#: src/main/escp2-channels.c:1476 src/main/escp2-channels.c:1512
+#: src/main/escp2-channels.c:1562 src/main/escp2-channels.c:1576
+#: src/main/escp2-channels.c:1590 src/main/escp2-channels.c:1626
 msgid "Seven Color Photo"
 msgstr ""
 
-#: src/main/escp2-channels.c:1498
+#: src/main/escp2-channels.c:1612
 msgid "Seven Color Enhanced"
 msgstr ""
 
-#: src/main/escp2-channels.c:1535
+#: src/main/escp2-channels.c:1649
 msgid "Eight Color Photo"
 msgstr ""
 
-#: src/main/escp2-channels.c:1683 src/main/escp2-channels.c:1689
+#: src/main/escp2-channels.c:1797 src/main/escp2-channels.c:1803
 msgid "One Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1695
+#: src/main/escp2-channels.c:1809
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1720
+#: src/main/escp2-channels.c:1822 src/main/escp2-channels.c:1834
 msgid "Two Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1734 src/main/escp2-channels.c:1748
-#: src/main/escp2-channels.c:1775 src/main/escp2-channels.c:1788
-#: src/main/escp2-channels.c:1801 src/main/escp2-channels.c:1815
-#: src/main/escp2-channels.c:1829
+#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1862
+#: src/main/escp2-channels.c:1889 src/main/escp2-channels.c:1902
+#: src/main/escp2-channels.c:1915 src/main/escp2-channels.c:1929
+#: src/main/escp2-channels.c:1943 src/main/escp2-channels.c:1956
 msgid "Three Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1762
+#: src/main/escp2-channels.c:1876
 msgid "Three Color Raw Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1836 src/main/escp2-channels.c:1842
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1854
-#: src/main/escp2-channels.c:1860 src/main/escp2-channels.c:1866
-#: src/main/escp2-channels.c:1872 src/main/escp2-channels.c:1878
+#: src/main/escp2-channels.c:1963 src/main/escp2-channels.c:1969
+#: src/main/escp2-channels.c:1975 src/main/escp2-channels.c:1981
+#: src/main/escp2-channels.c:1987 src/main/escp2-channels.c:1993
+#: src/main/escp2-channels.c:1999 src/main/escp2-channels.c:2005
+#: src/main/escp2-channels.c:2011
 msgid "Four Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1884
+#: src/main/escp2-channels.c:2017
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1913
+#: src/main/escp2-channels.c:2032 src/main/escp2-channels.c:2046
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1929 src/main/escp2-channels.c:1935
-#: src/main/escp2-channels.c:1941 src/main/escp2-channels.c:1956
+#: src/main/escp2-channels.c:2060 src/main/escp2-channels.c:2076
+#: src/main/escp2-channels.c:2082 src/main/escp2-channels.c:2088
+#: src/main/escp2-channels.c:2103 src/main/escp2-channels.c:2124
 msgid "Six Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1962
+#: src/main/escp2-channels.c:2109
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1977 src/main/escp2-channels.c:1992
-#: src/main/escp2-channels.c:2007
+#: src/main/escp2-channels.c:2140 src/main/escp2-channels.c:2155
+#: src/main/escp2-channels.c:2170
 msgid "Seven Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2024
+#: src/main/escp2-channels.c:2187
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2042
+#: src/main/escp2-channels.c:2205
 msgid "Eight Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:2197 src/main/escp2-channels.c:2210
-#: src/main/escp2-channels.c:2230 src/main/escp2-channels.c:2233
-#: src/main/escp2-channels.c:2253 src/main/escp2-channels.c:2273
-#: src/main/escp2-channels.c:2293 src/main/escp2-channels.c:2313
-#: src/main/escp2-channels.c:2329 src/main/escp2-channels.c:2331
-#: src/main/escp2-channels.c:2333 src/main/escp2-channels.c:2335
-#: src/main/escp2-channels.c:2351 src/main/escp2-channels.c:2371
+#: src/main/escp2-channels.c:2372 src/main/escp2-channels.c:2385
+#: src/main/escp2-channels.c:2387 src/main/escp2-channels.c:2407
+#: src/main/escp2-channels.c:2410 src/main/escp2-channels.c:2430
+#: src/main/escp2-channels.c:2450 src/main/escp2-channels.c:2470
+#: src/main/escp2-channels.c:2490 src/main/escp2-channels.c:2506
+#: src/main/escp2-channels.c:2508 src/main/escp2-channels.c:2510
+#: src/main/escp2-channels.c:2512 src/main/escp2-channels.c:2528
+#: src/main/escp2-channels.c:2544 src/main/escp2-channels.c:2564
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2391 src/main/escp2-channels.c:2416
+#: src/main/escp2-channels.c:2584 src/main/escp2-channels.c:2609
 msgid "UltraChrome Photo Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2395 src/main/escp2-channels.c:2420
+#: src/main/escp2-channels.c:2588 src/main/escp2-channels.c:2613
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
-#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
-#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
+#: src/main/escp2-channels.c:2628 src/main/escp2-channels.c:2666
+#: src/main/escp2-channels.c:3005 src/escputil/escputil.c:982
+msgid "Photo Black"
+msgstr ""
+
+#: src/main/escp2-channels.c:2632 src/main/escp2-channels.c:2648
+#: src/main/escp2-channels.c:3004 src/escputil/escputil.c:992
+msgid "Matte Black"
+msgstr ""
+
+#: src/main/escp2-channels.c:2942 src/main/escp2-channels.c:2952
+#: src/main/escp2-channels.c:2966 src/main/escp2-channels.c:2979
+#: src/main/escp2-channels.c:2992 src/main/escp2-channels.c:3029
+#: src/escputil/escputil.c:987 src/escputil/escputil.c:1210
+msgid "Light Cyan"
+msgstr ""
+
+#: src/main/escp2-channels.c:2943 src/main/escp2-channels.c:2954
+#: src/main/escp2-channels.c:2967 src/main/escp2-channels.c:2980
+#: src/main/escp2-channels.c:2993 src/main/escp2-channels.c:3028
+#: src/escputil/escputil.c:988 src/escputil/escputil.c:1211
+msgid "Light Magenta"
+msgstr ""
+
+#: src/main/escp2-channels.c:2968 src/main/escp2-channels.c:3030
+#: src/escputil/escputil.c:991
+msgid "Light Black"
+msgstr ""
+
+#: src/main/escp2-channels.c:2981
+msgid "Dark Yellow"
+msgstr ""
+
+#: src/main/escp2-channels.c:3008 src/escputil/escputil.c:995
+msgid "Gloss Optimizer"
+msgstr ""
+
+#: src/main/escp2-channels.c:3027 src/escputil/escputil.c:996
+msgid "Light Light Black"
+msgstr ""
+
+#: src/main/escp2-papers.c:1253 src/main/escp2-papers.c:1297
+#: src/main/escp2-papers.c:1341 src/main/escp2-papers.c:1389
+#: src/main/escp2-papers.c:1437 src/main/escp2-papers.c:1481
 msgid "Plain Paper Fast Load"
 msgstr ""
 
-#: src/main/escp2-papers.c:1164 src/main/escp2-papers.c:1208
-#: src/main/escp2-papers.c:1252 src/main/escp2-papers.c:1300
-#: src/main/escp2-papers.c:1348 src/main/escp2-papers.c:1392
+#: src/main/escp2-papers.c:1255 src/main/escp2-papers.c:1299
+#: src/main/escp2-papers.c:1343 src/main/escp2-papers.c:1391
+#: src/main/escp2-papers.c:1439 src/main/escp2-papers.c:1483
 #: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "明信片"
 
-#: src/main/escp2-papers.c:1172 src/main/escp2-papers.c:1216
-#: src/main/escp2-papers.c:1260 src/main/escp2-papers.c:1308
-#: src/main/escp2-papers.c:1356 src/main/escp2-papers.c:1400
+#: src/main/escp2-papers.c:1263 src/main/escp2-papers.c:1307
+#: src/main/escp2-papers.c:1351 src/main/escp2-papers.c:1399
+#: src/main/escp2-papers.c:1447 src/main/escp2-papers.c:1491
 msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
-#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
-#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
+#: src/main/escp2-papers.c:1267 src/main/escp2-papers.c:1311
+#: src/main/escp2-papers.c:1355 src/main/escp2-papers.c:1403
+#: src/main/escp2-papers.c:1451 src/main/escp2-papers.c:1495
 msgid "Matte Paper Heavyweight"
 msgstr ""
 
 # (Abel) from Epson
-#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
-#: src/main/escp2-papers.c:1274 src/main/escp2-papers.c:1322
-#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1414
+#: src/main/escp2-papers.c:1277 src/main/escp2-papers.c:1321
+#: src/main/escp2-papers.c:1365 src/main/escp2-papers.c:1413
+#: src/main/escp2-papers.c:1461 src/main/escp2-papers.c:1505
 msgid "Premium Semigloss Photo Paper"
 msgstr "頂級柔光相紙"
 
-#: src/main/escp2-papers.c:1194 src/main/escp2-papers.c:1238
-#: src/main/escp2-papers.c:1286 src/main/escp2-papers.c:1334
-#: src/main/escp2-papers.c:1378 src/main/escp2-papers.c:1426
+#: src/main/escp2-papers.c:1285 src/main/escp2-papers.c:1329
+#: src/main/escp2-papers.c:1377 src/main/escp2-papers.c:1425
+#: src/main/escp2-papers.c:1469 src/main/escp2-papers.c:1517
 msgid "ColorLife Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
-#: src/main/escp2-papers.c:1418
+#: src/main/escp2-papers.c:1369 src/main/escp2-papers.c:1417
+#: src/main/escp2-papers.c:1509
 msgid "Archival Matte Paper"
 msgstr ""
 
 # (Abel) from Epson
-#: src/main/escp2-papers.c:1280 src/main/escp2-papers.c:1328
-#: src/main/escp2-papers.c:1420
+#: src/main/escp2-papers.c:1371 src/main/escp2-papers.c:1419
+#: src/main/escp2-papers.c:1511
 msgid "Watercolor Paper - Radiant White"
 msgstr "水彩紙-亮白色"
 
+#: src/main/escp2-papers.c:1625 src/main/escp2-papers.c:1751
+#: src/main/escp2-papers.c:1793 src/main/escp2-papers.c:1835
+#: src/main/escp2-papers.c:1910
+msgid "Roll Feed"
+msgstr ""
+
+#: src/main/escp2-papers.c:1649 src/main/escp2-papers.c:1700
+msgid "Roll Feed (cut each page)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1658 src/main/escp2-papers.c:1709
+msgid "Roll Feed (do not cut)"
+msgstr ""
+
+#: src/main/escp2-papers.c:1682 src/main/escp2-papers.c:1733
+msgid "Manual Feed"
+msgstr "人手�紙"
+
+#: src/main/escp2-papers.c:1691 src/main/escp2-papers.c:1742
+#: src/main/escp2-papers.c:1844 src/main/escp2-papers.c:1877
+msgid "Print to CD"
+msgstr "列�至光碟"
+
+#: src/main/escp2-papers.c:1775 src/main/escp2-papers.c:1817
+#, fuzzy
+msgid "Manual Sheet Guide"
+msgstr "人手�紙"
+
+#: src/main/escp2-papers.c:1784 src/main/escp2-papers.c:1826
+#, fuzzy
+msgid "Manual Feed (Front)"
+msgstr "人手�紙"
+
+#: src/main/escp2-papers.c:1859
+msgid "Rear Tray"
+msgstr ""
+
+#: src/main/escp2-papers.c:1868
+msgid "Front Tray"
+msgstr ""
+
+#: src/main/escp2-papers.c:1886
+#, fuzzy
+msgid "Photo Board"
+msgstr "相紙"
+
+#: src/main/escp2-papers.c:1925
+msgid "Cut Sheet Bin 1"
+msgstr ""
+
+#: src/main/escp2-papers.c:1934
+msgid "Cut Sheet Bin 2"
+msgstr ""
+
+#: src/main/escp2-papers.c:1943
+msgid "Cut Sheet Autoselect"
+msgstr ""
+
+#: src/main/escp2-papers.c:1952
+msgid "Manual Selection"
+msgstr ""
+
 #: src/main/escp2-resolutions.c:33 src/main/escp2-resolutions.c:36
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
@@ -2095,131 +1912,151 @@ msgstr "360 DPI"
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/escp2-resolutions.c:88 src/main/escp2-resolutions.c:91
+#: src/main/escp2-resolutions.c:87
+#, fuzzy
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 DPI"
+
+#: src/main/escp2-resolutions.c:91 src/main/escp2-resolutions.c:94
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/main/escp2-resolutions.c:94
+#: src/main/escp2-resolutions.c:97 src/main/escp2-resolutions.c:100
 msgid "720 DPI High Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:97
+#: src/main/escp2-resolutions.c:103
 msgid "720 DPI Highest Quality"
 msgstr "720 DPI 最高�質"
 
-#: src/main/escp2-resolutions.c:100
+#: src/main/escp2-resolutions.c:106
 #, fuzzy
 msgid "720 x 720 DPI"
 msgstr "720x720 DPI"
 
-#: src/main/escp2-resolutions.c:104 src/main/escp2-resolutions.c:107
-#: src/main/escp2-resolutions.c:119
+#: src/main/escp2-resolutions.c:110 src/main/escp2-resolutions.c:113
+#: src/main/escp2-resolutions.c:125
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:110
+#: src/main/escp2-resolutions.c:116
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 720 DPI 最高�質"
 
-#: src/main/escp2-resolutions.c:113 src/main/escp2-resolutions.c:116
+#: src/main/escp2-resolutions.c:119 src/main/escp2-resolutions.c:122
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:123 src/main/escp2-resolutions.c:126
+#: src/main/escp2-resolutions.c:129 src/main/escp2-resolutions.c:132
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:129
+#: src/main/escp2-resolutions.c:135
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 DPI 最高�質"
 
-#: src/main/escp2-resolutions.c:133 src/main/escp2-resolutions.c:136
-#: src/main/escp2-resolutions.c:139
+#: src/main/escp2-resolutions.c:139 src/main/escp2-resolutions.c:142
+#: src/main/escp2-resolutions.c:145
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:142
-#, fuzzy
-msgid "1440 x 1440"
-msgstr "1440 x 1440 DPI"
-
-#: src/main/escp2-resolutions.c:145
-#, fuzzy
-msgid "1440 x 1440 DPI High Quality"
-msgstr "2880 x 720 DPI 最高�質"
-
-#: src/main/escp2-resolutions.c:148
-#, fuzzy
-msgid "1440 x 1440 DPI Highest Quality"
-msgstr "1440 x 720 DPI 最高�質"
-
-#: src/main/escp2-resolutions.c:152 src/main/escp2-resolutions.c:155
-#: src/main/escp2-resolutions.c:161
+#: src/main/escp2-resolutions.c:149 src/main/escp2-resolutions.c:152
+#: src/main/escp2-resolutions.c:158
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:158
+#: src/main/escp2-resolutions.c:155
 #, fuzzy
 msgid "2880 x 1440 DPI Transposed"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:164
-#, fuzzy
-msgid "2880 x 1440 DPI High Quality"
-msgstr "2880 x 720 DPI 最高�質"
-
-#: src/main/escp2-resolutions.c:167
-#, fuzzy
-msgid "2880 x 1440 DPI Highest Quality"
-msgstr "2880 x 720 DPI 最高�質"
-
-#: src/main/escp2-resolutions.c:171
+#: src/main/escp2-resolutions.c:162
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:175 src/main/escp2-resolutions.c:178
+#: src/main/escp2-resolutions.c:166 src/main/escp2-resolutions.c:169
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:182 src/main/escp2-resolutions.c:185
+#: src/main/escp2-resolutions.c:173 src/main/escp2-resolutions.c:176
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:548
+#: src/main/escp2-resolutions.c:558
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:556 src/main/escp2-resolutions.c:567
-#: src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:566 src/main/escp2-resolutions.c:577
+#: src/main/escp2-resolutions.c:589
 msgid "Interleave"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:557 src/main/escp2-resolutions.c:568
-#: src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:567 src/main/escp2-resolutions.c:578
+#: src/main/escp2-resolutions.c:590
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:558 src/main/escp2-resolutions.c:569
-#: src/main/escp2-resolutions.c:581
+#: src/main/escp2-resolutions.c:568 src/main/escp2-resolutions.c:579
+#: src/main/escp2-resolutions.c:591
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:559 src/main/escp2-resolutions.c:570
-#: src/main/escp2-resolutions.c:582
+#: src/main/escp2-resolutions.c:569 src/main/escp2-resolutions.c:580
+#: src/main/escp2-resolutions.c:592
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:571 src/main/escp2-resolutions.c:583
+#: src/main/escp2-resolutions.c:581 src/main/escp2-resolutions.c:593
 msgid "Interleave 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:584
+#: src/main/escp2-resolutions.c:594
 msgid "Eight Pass"
 msgstr ""
 
+#: src/main/escp2-resolutions.c:637 src/main/escp2-resolutions.c:652
+#: src/main/generic-options.c:33
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:638 src/main/escp2-resolutions.c:653
+#: src/main/generic-options.c:34
+msgid "Economy"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:639 src/main/escp2-resolutions.c:654
+#: src/main/escp2-resolutions.c:667 src/main/generic-options.c:35
+msgid "Draft"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:641 src/main/escp2-resolutions.c:656
+#: src/main/escp2-resolutions.c:670 src/main/generic-options.c:37
+msgid "High"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:642 src/main/escp2-resolutions.c:657
+#: src/main/escp2-resolutions.c:669 src/main/generic-options.c:38
+msgid "Photo"
+msgstr "相片"
+
+#: src/main/escp2-resolutions.c:643 src/main/escp2-resolutions.c:658
+#: src/main/escp2-resolutions.c:671 src/main/generic-options.c:39
+msgid "Super Photo"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:644 src/main/escp2-resolutions.c:659
+#: src/main/escp2-resolutions.c:672 src/main/generic-options.c:40
+msgid "Ultra Photo"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:645 src/main/escp2-resolutions.c:660
+#: src/main/escp2-resolutions.c:673 src/main/generic-options.c:41
+msgid "Best"
+msgstr ""
+
 #: src/main/generic-options.c:46
 msgid "Text"
 msgstr ""
@@ -2288,4142 +2125,4485 @@ msgstr "Tabloid"
 msgid "Executive"
 msgstr "Executive"
 
-#: src/main/xmli18n-tmp.h:8
+#: src/main/xmli18n-tmp.h:9
 msgid "3x5"
 msgstr "3x5"
 
-#: src/main/xmli18n-tmp.h:9
+#: src/main/xmli18n-tmp.h:10
 msgid "4x6"
 msgstr "4x6"
 
-#: src/main/xmli18n-tmp.h:10
+#: src/main/xmli18n-tmp.h:11
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 相紙"
 
-#: src/main/xmli18n-tmp.h:11
+#: src/main/xmli18n-tmp.h:12
 msgid "5x7"
 msgstr "5x7"
 
-#: src/main/xmli18n-tmp.h:12
+#: src/main/xmli18n-tmp.h:13
 msgid "5x8"
 msgstr "5x8"
 
-#: src/main/xmli18n-tmp.h:13
+#: src/main/xmli18n-tmp.h:14
 msgid "6x8"
 msgstr "6x8"
 
-#: src/main/xmli18n-tmp.h:14
+#: src/main/xmli18n-tmp.h:15
 msgid "8x10"
 msgstr "8x10"
 
-#: src/main/xmli18n-tmp.h:16
+#: src/main/xmli18n-tmp.h:17
 msgid "12x18"
 msgstr "12x18"
 
-#: src/main/xmli18n-tmp.h:17
+#: src/main/xmli18n-tmp.h:18
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/main/xmli18n-tmp.h:18
+#: src/main/xmli18n-tmp.h:19
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17x22"
 
-#: src/main/xmli18n-tmp.h:19
+#: src/main/xmli18n-tmp.h:20
 msgid "8x12"
 msgstr "8x12"
 
-#: src/main/xmli18n-tmp.h:20
+#: src/main/xmli18n-tmp.h:21
 msgid "11x14"
 msgstr "11x14"
 
-#: src/main/xmli18n-tmp.h:21
+#: src/main/xmli18n-tmp.h:22
 msgid "16x20"
 msgstr "16x20"
 
-#: src/main/xmli18n-tmp.h:22
+#: src/main/xmli18n-tmp.h:23
 msgid "16x24"
 msgstr "16x24"
 
-#: src/main/xmli18n-tmp.h:23
+#: src/main/xmli18n-tmp.h:24
 msgid "20x24"
 msgstr "20x24"
 
-#: src/main/xmli18n-tmp.h:24
+#: src/main/xmli18n-tmp.h:25
 msgid "20x30"
 msgstr "20x30"
 
-#: src/main/xmli18n-tmp.h:25
+#: src/main/xmli18n-tmp.h:26
 msgid "22x30"
 msgstr "22x30"
 
-#: src/main/xmli18n-tmp.h:26
+#: src/main/xmli18n-tmp.h:27
 msgid "24x30"
 msgstr "24x30"
 
-#: src/main/xmli18n-tmp.h:27
+#: src/main/xmli18n-tmp.h:28
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/main/xmli18n-tmp.h:28
+#: src/main/xmli18n-tmp.h:29
 msgid "30x40"
 msgstr "30x40"
 
-#: src/main/xmli18n-tmp.h:29
+#: src/main/xmli18n-tmp.h:30
 msgid "4A"
 msgstr "4A"
 
-#: src/main/xmli18n-tmp.h:30
+#: src/main/xmli18n-tmp.h:31
 msgid "2A"
 msgstr "2A"
 
-#: src/main/xmli18n-tmp.h:31
+#: src/main/xmli18n-tmp.h:32
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/main/xmli18n-tmp.h:32
+#: src/main/xmli18n-tmp.h:33
 msgid "A0"
 msgstr "A0"
 
-#: src/main/xmli18n-tmp.h:33
+#: src/main/xmli18n-tmp.h:34
 msgid "A1"
 msgstr "A1"
 
-#: src/main/xmli18n-tmp.h:34
+#: src/main/xmli18n-tmp.h:35
 msgid "A2"
 msgstr "A2"
 
-#: src/main/xmli18n-tmp.h:35
+#: src/main/xmli18n-tmp.h:36
 msgid "A3"
 msgstr "A3"
 
-#: src/main/xmli18n-tmp.h:36
+#: src/main/xmli18n-tmp.h:37
 msgid "A4"
 msgstr "A4"
 
-#: src/main/xmli18n-tmp.h:37
+#: src/main/xmli18n-tmp.h:38
 msgid "A5"
 msgstr "A5"
 
-#: src/main/xmli18n-tmp.h:38
+#: src/main/xmli18n-tmp.h:39
 msgid "A6"
 msgstr "A6"
 
-#: src/main/xmli18n-tmp.h:39
+#: src/main/xmli18n-tmp.h:40
 msgid "A7"
 msgstr "A7"
 
-#: src/main/xmli18n-tmp.h:40
+#: src/main/xmli18n-tmp.h:41
 msgid "A8"
 msgstr "A8"
 
-#: src/main/xmli18n-tmp.h:41
+#: src/main/xmli18n-tmp.h:42
 msgid "A9"
 msgstr "A9"
 
-#: src/main/xmli18n-tmp.h:42
+#: src/main/xmli18n-tmp.h:43
 msgid "A10"
 msgstr "A10"
 
-#: src/main/xmli18n-tmp.h:43
+#: src/main/xmli18n-tmp.h:44
 msgid "RA0"
 msgstr "RA0"
 
-#: src/main/xmli18n-tmp.h:44
+#: src/main/xmli18n-tmp.h:45
 msgid "RA1"
 msgstr "RA1"
 
-#: src/main/xmli18n-tmp.h:45
+#: src/main/xmli18n-tmp.h:46
 msgid "RA2"
 msgstr "RA2"
 
-#: src/main/xmli18n-tmp.h:46
+#: src/main/xmli18n-tmp.h:47
 msgid "RA3"
 msgstr "RA3"
 
-#: src/main/xmli18n-tmp.h:47
+#: src/main/xmli18n-tmp.h:48
 msgid "RA4"
 msgstr "RA4"
 
-#: src/main/xmli18n-tmp.h:48
+#: src/main/xmli18n-tmp.h:49
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/main/xmli18n-tmp.h:49
+#: src/main/xmli18n-tmp.h:50
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/main/xmli18n-tmp.h:50
+#: src/main/xmli18n-tmp.h:51
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/main/xmli18n-tmp.h:51
+#: src/main/xmli18n-tmp.h:52
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/main/xmli18n-tmp.h:52
+#: src/main/xmli18n-tmp.h:53
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/main/xmli18n-tmp.h:53
+#: src/main/xmli18n-tmp.h:54
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/main/xmli18n-tmp.h:54
+#: src/main/xmli18n-tmp.h:55
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/main/xmli18n-tmp.h:55
+#: src/main/xmli18n-tmp.h:56
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/main/xmli18n-tmp.h:56
+#: src/main/xmli18n-tmp.h:57
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/main/xmli18n-tmp.h:57
+#: src/main/xmli18n-tmp.h:58
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/main/xmli18n-tmp.h:58
+#: src/main/xmli18n-tmp.h:59
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/main/xmli18n-tmp.h:59
+#: src/main/xmli18n-tmp.h:60
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/main/xmli18n-tmp.h:60
+#: src/main/xmli18n-tmp.h:61
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/main/xmli18n-tmp.h:61
+#: src/main/xmli18n-tmp.h:62
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/main/xmli18n-tmp.h:62
+#: src/main/xmli18n-tmp.h:63
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/main/xmli18n-tmp.h:63
+#: src/main/xmli18n-tmp.h:64
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/main/xmli18n-tmp.h:64
+#: src/main/xmli18n-tmp.h:65
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/main/xmli18n-tmp.h:65
+#: src/main/xmli18n-tmp.h:66
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/main/xmli18n-tmp.h:66
+#: src/main/xmli18n-tmp.h:67
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/main/xmli18n-tmp.h:67
+#: src/main/xmli18n-tmp.h:68
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/main/xmli18n-tmp.h:68
+#: src/main/xmli18n-tmp.h:69
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/main/xmli18n-tmp.h:69
+#: src/main/xmli18n-tmp.h:70
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/main/xmli18n-tmp.h:70
+#: src/main/xmli18n-tmp.h:71
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/main/xmli18n-tmp.h:71
+#: src/main/xmli18n-tmp.h:72
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/main/xmli18n-tmp.h:72
+#: src/main/xmli18n-tmp.h:73
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/main/xmli18n-tmp.h:73
+#: src/main/xmli18n-tmp.h:74
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/main/xmli18n-tmp.h:74
+#: src/main/xmli18n-tmp.h:75
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/main/xmli18n-tmp.h:75
+#: src/main/xmli18n-tmp.h:76
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/main/xmli18n-tmp.h:76
+#: src/main/xmli18n-tmp.h:77
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/main/xmli18n-tmp.h:77
+#: src/main/xmli18n-tmp.h:78
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/main/xmli18n-tmp.h:78
+#: src/main/xmli18n-tmp.h:79
 msgid "C0"
 msgstr "C0"
 
-#: src/main/xmli18n-tmp.h:79
+#: src/main/xmli18n-tmp.h:80
 msgid "C1"
 msgstr "C1"
 
-#: src/main/xmli18n-tmp.h:80
+#: src/main/xmli18n-tmp.h:81
 msgid "C2"
 msgstr "C2"
 
-#: src/main/xmli18n-tmp.h:81
+#: src/main/xmli18n-tmp.h:82
 msgid "C3"
 msgstr "C3"
 
-#: src/main/xmli18n-tmp.h:82
+#: src/main/xmli18n-tmp.h:83
 msgid "C4"
 msgstr "C4"
 
-#: src/main/xmli18n-tmp.h:83
+#: src/main/xmli18n-tmp.h:84
 msgid "C5"
 msgstr "C5"
 
-#: src/main/xmli18n-tmp.h:84
+#: src/main/xmli18n-tmp.h:85
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/main/xmli18n-tmp.h:85
+#: src/main/xmli18n-tmp.h:86
 msgid "C6"
 msgstr "C6"
 
-#: src/main/xmli18n-tmp.h:86
+#: src/main/xmli18n-tmp.h:87
 msgid "DL"
 msgstr "DL"
 
-#: src/main/xmli18n-tmp.h:87
+#: src/main/xmli18n-tmp.h:88
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/main/xmli18n-tmp.h:88
+#: src/main/xmli18n-tmp.h:89
 msgid "C7"
 msgstr "C7"
 
-#: src/main/xmli18n-tmp.h:89
+#: src/main/xmli18n-tmp.h:90
 msgid "C8"
 msgstr "C8"
 
-#: src/main/xmli18n-tmp.h:90
+#: src/main/xmli18n-tmp.h:91
 msgid "C9"
 msgstr "C9"
 
-#: src/main/xmli18n-tmp.h:91
+#: src/main/xmli18n-tmp.h:92
 msgid "C10"
 msgstr "C10"
 
-#: src/main/xmli18n-tmp.h:92
+#: src/main/xmli18n-tmp.h:93
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/main/xmli18n-tmp.h:93
+#: src/main/xmli18n-tmp.h:94
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:94
+#: src/main/xmli18n-tmp.h:95
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/main/xmli18n-tmp.h:95
+#: src/main/xmli18n-tmp.h:96
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:96
+#: src/main/xmli18n-tmp.h:97
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/main/xmli18n-tmp.h:97
+#: src/main/xmli18n-tmp.h:98
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:98
+#: src/main/xmli18n-tmp.h:99
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/main/xmli18n-tmp.h:99
+#: src/main/xmli18n-tmp.h:100
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:100
+#: src/main/xmli18n-tmp.h:101
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/main/xmli18n-tmp.h:101
+#: src/main/xmli18n-tmp.h:102
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:102
+#: src/main/xmli18n-tmp.h:103
 msgid "American foolscap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:103
+#: src/main/xmli18n-tmp.h:104
 msgid "European foolscap"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:104
+#: src/main/xmli18n-tmp.h:105
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:105
+#: src/main/xmli18n-tmp.h:106
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:106
+#: src/main/xmli18n-tmp.h:107
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/main/xmli18n-tmp.h:107
+#: src/main/xmli18n-tmp.h:108
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:108
+#: src/main/xmli18n-tmp.h:109
 msgid "ISO A4"
 msgstr "ISO A4"
 
-#: src/main/xmli18n-tmp.h:109
+#: src/main/xmli18n-tmp.h:110
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/main/xmli18n-tmp.h:110
+#: src/main/xmli18n-tmp.h:111
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:111
+#: src/main/xmli18n-tmp.h:112
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/main/xmli18n-tmp.h:112
+#: src/main/xmli18n-tmp.h:113
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:113
+#: src/main/xmli18n-tmp.h:114
 msgid "ISO A5"
 msgstr "ISO A5"
 
-#: src/main/xmli18n-tmp.h:114
+#: src/main/xmli18n-tmp.h:115
 msgid "Small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:115
+#: src/main/xmli18n-tmp.h:116
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:116
+#: src/main/xmli18n-tmp.h:117
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:117
+#: src/main/xmli18n-tmp.h:118
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:118
+#: src/main/xmli18n-tmp.h:119
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:119
+#: src/main/xmli18n-tmp.h:120
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:120
+#: src/main/xmli18n-tmp.h:121
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:121
+#: src/main/xmli18n-tmp.h:122
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:122
+#: src/main/xmli18n-tmp.h:123
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:123
+#: src/main/xmli18n-tmp.h:124
 msgid "Commercial 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:124
+#: src/main/xmli18n-tmp.h:125
 msgid "A2 Invitation"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:125
+#: src/main/xmli18n-tmp.h:126
 msgid "Monarch Envelope"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:126
+#: src/main/xmli18n-tmp.h:127
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/main/xmli18n-tmp.h:127
+#: src/main/xmli18n-tmp.h:128
 msgid "4x7"
 msgstr "4x7"
 
-#: src/main/xmli18n-tmp.h:128
+#: src/main/xmli18n-tmp.h:129
 msgid "CP_L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:129
+#: src/main/xmli18n-tmp.h:130
 msgid "Card"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:130
+#: src/main/xmli18n-tmp.h:131
 msgid "Wide Postcard"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:131
+#: src/main/xmli18n-tmp.h:132
 msgid "Chilean Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:132
+#: src/main/xmli18n-tmp.h:133
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:133
+#: src/main/xmli18n-tmp.h:134
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:134
+#: src/main/xmli18n-tmp.h:135
 msgid "Custom"
 msgstr "自�"
 
-#: src/main/xmli18n-tmp.h:135
+#: src/main/xmli18n-tmp.h:136
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:136
+#: src/main/xmli18n-tmp.h:137
 msgid "4 Inch Roll Paper"
 msgstr "4 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:137
+#: src/main/xmli18n-tmp.h:138
 msgid "5 Inch Roll Paper"
 msgstr "5 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:138
+#: src/main/xmli18n-tmp.h:139
 msgid "210 mm Roll Paper"
 msgstr "210 毫米滾筒紙"
 
-#: src/main/xmli18n-tmp.h:139
+#: src/main/xmli18n-tmp.h:140
 msgid "13 Inch Roll Paper"
 msgstr "13 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:140
+#: src/main/xmli18n-tmp.h:141
 msgid "22 Inch Roll Paper"
 msgstr "22 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:141
+#: src/main/xmli18n-tmp.h:142
 msgid "24 Inch Roll Paper"
 msgstr "24 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:142
+#: src/main/xmli18n-tmp.h:143
 msgid "36 Inch Roll Paper"
 msgstr "36 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:143
+#: src/main/xmli18n-tmp.h:144
 msgid "44 Inch Roll Paper"
 msgstr "44 �滾筒紙"
 
-#: src/main/xmli18n-tmp.h:144
+#: src/main/xmli18n-tmp.h:145
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:145
+#: src/main/xmli18n-tmp.h:146
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:146
+#: src/main/xmli18n-tmp.h:147
 #, fuzzy
 msgid "Canon BJ-30"
 msgstr "Canon BJC 30"
 
-#: src/main/xmli18n-tmp.h:147
+#: src/main/xmli18n-tmp.h:148
 #, fuzzy
 msgid "Canon BJC-50"
 msgstr "Canon BJC 50"
 
-#: src/main/xmli18n-tmp.h:148
+#: src/main/xmli18n-tmp.h:149
 #, fuzzy
 msgid "Canon BJC-55"
 msgstr "Canon BJC 55"
 
-#: src/main/xmli18n-tmp.h:149
+#: src/main/xmli18n-tmp.h:150
 #, fuzzy
 msgid "Canon BJC-80"
 msgstr "Canon BJC 80"
 
-#: src/main/xmli18n-tmp.h:150
+#: src/main/xmli18n-tmp.h:151
 #, fuzzy
 msgid "Canon BJC-85"
 msgstr "Canon BJC 85"
 
-#: src/main/xmli18n-tmp.h:151
+#: src/main/xmli18n-tmp.h:152
 #, fuzzy
 msgid "Canon BJC-210"
 msgstr "Canon BJC 210"
 
-#: src/main/xmli18n-tmp.h:152
+#: src/main/xmli18n-tmp.h:153
 #, fuzzy
 msgid "Canon BJC-240"
 msgstr "Canon BJC 240"
 
-#: src/main/xmli18n-tmp.h:153
+#: src/main/xmli18n-tmp.h:154
 #, fuzzy
 msgid "Canon BJC-250"
 msgstr "Canon BJC 250"
 
-#: src/main/xmli18n-tmp.h:154
+#: src/main/xmli18n-tmp.h:155
 #, fuzzy
 msgid "Canon BJC-1000"
 msgstr "Canon BJC 1000"
 
-#: src/main/xmli18n-tmp.h:155
+#: src/main/xmli18n-tmp.h:156
 #, fuzzy
 msgid "Canon BJC-2000"
 msgstr "Canon BJC 2000"
 
-#: src/main/xmli18n-tmp.h:156
+#: src/main/xmli18n-tmp.h:157
 #, fuzzy
 msgid "Canon BJC-2010"
 msgstr "Canon BJC 210"
 
-#: src/main/xmli18n-tmp.h:157
+#: src/main/xmli18n-tmp.h:158
 #, fuzzy
 msgid "Canon BJC-2100"
 msgstr "Canon BJC 210"
 
-#: src/main/xmli18n-tmp.h:158
+#: src/main/xmli18n-tmp.h:159
 #, fuzzy
 msgid "Canon BJC-2110"
 msgstr "Canon BJC 210"
 
-#: src/main/xmli18n-tmp.h:159
+#: src/main/xmli18n-tmp.h:160
 #, fuzzy
 msgid "Canon BJC-3000"
 msgstr "Canon BJC 3000"
 
-#: src/main/xmli18n-tmp.h:160
+#: src/main/xmli18n-tmp.h:161
 #, fuzzy
 msgid "Canon BJC-4000"
 msgstr "Canon BJC 7000"
 
-#: src/main/xmli18n-tmp.h:161
+#: src/main/xmli18n-tmp.h:162
 #, fuzzy
 msgid "Canon BJC-4300"
 msgstr "Canon BJC 4300"
 
-#: src/main/xmli18n-tmp.h:162
+#: src/main/xmli18n-tmp.h:163
 #, fuzzy
 msgid "Canon BJC-4400"
 msgstr "Canon BJC 4300"
 
-#: src/main/xmli18n-tmp.h:163
+#: src/main/xmli18n-tmp.h:164
 #, fuzzy
 msgid "Canon BJC-6000"
 msgstr "Canon BJC 6000"
 
-#: src/main/xmli18n-tmp.h:164
+#: src/main/xmli18n-tmp.h:165
 #, fuzzy
 msgid "Canon BJC-6100"
 msgstr "Canon BJC 6100"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 #, fuzzy
 msgid "Canon BJC-6200"
 msgstr "Canon BJC 6200"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 #, fuzzy
 msgid "Canon BJC-6500"
 msgstr "Canon BJC 6500"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 #, fuzzy
 msgid "Canon BJC-7000"
 msgstr "Canon BJC 7000"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
 #, fuzzy
 msgid "Canon BJC-7100"
 msgstr "Canon BJC 7100"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:170
 #, fuzzy
 msgid "Canon BJC-8200"
 msgstr "Canon BJC 8200"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:171
 #, fuzzy
 msgid "Canon S100"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:172
 #, fuzzy
 msgid "Canon S200"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:173
 #, fuzzy
 msgid "Canon S300"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:174
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:175
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:176
 #, fuzzy
 msgid "Canon S500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:177
 #, fuzzy
 msgid "Canon S600"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:178
 #, fuzzy
 msgid "Canon S630"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:179
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:180
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:181
 #, fuzzy
-msgid "Canon iP4000"
+msgid "Canon PIXMA iP2000"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:182
+#, fuzzy
+msgid "Canon PIXMA iP3000"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:183
+#, fuzzy
+msgid "Canon PIXMA iP3100"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "Canon PIXMA iP4000"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:185
+#, fuzzy
+msgid "Canon PIXMA iP4100"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:186
+#, fuzzy
+msgid "Canon PIXMA iP4200"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:187
+#, fuzzy
+msgid "Canon PIXMA iP4300"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:188
+#, fuzzy
+msgid "Canon PIXMA iP5000"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "Canon PIXMA iP5200"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:190
+#, fuzzy
+msgid "Canon PIXMA iP6700"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:191
+#, fuzzy
+msgid "Canon PIXMA MP150"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:192
+#, fuzzy
+msgid "Canon PIXMA MP500"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:193
+#, fuzzy
+msgid "Canon PIXMA MP700"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:194
+#, fuzzy
+msgid "Canon PIXMA MP730"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:195
+#, fuzzy
+msgid "Canon PIXMA MP750"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:196
+#, fuzzy
+msgid "Canon PIXMA MP760"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:197
+#, fuzzy
+msgid "Canon PIXMA MP770"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "Canon PIXMA MP780"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:199
+#, fuzzy
+msgid "Canon PIXMA MP790"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:200
+#, fuzzy
+msgid "Canon PIXMA MP830"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:201
+#, fuzzy
+msgid "Canon PIXUS iP3100"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:202
+#, fuzzy
+msgid "Canon PIXUS iP4100"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:203
+#, fuzzy
+msgid "Canon i560"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:204
+#, fuzzy
+msgid "Canon i850"
+msgstr "Canon S450"
+
+#: src/main/xmli18n-tmp.h:205
+#, fuzzy
+msgid "Canon i860"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon BJC 85"
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "EPSON Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "EPSON Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "EPSON Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "EPSON Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "EPSON Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "EPSON Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "EPSON Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "EPSON Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "EPSON Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "EPSON Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "EPSON Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "EPSON Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "EPSON Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "EPSON Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "EPSON Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "EPSON Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "EPSON Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "EPSON Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "EPSON Stylus C45"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "EPSON Stylus C46"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "EPSON Stylus C45"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "EPSON Stylus C50"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "EPSON Stylus C60"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "EPSON Stylus C61"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "EPSON Stylus C62"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "EPSON Stylus C63"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "EPSON Stylus C64"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "EPSON Stylus C65"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "EPSON Stylus C66"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "EPSON Stylus C46"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "EPSON Stylus C70"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:238
+#, fuzzy
+msgid "Epson Stylus C79"
+msgstr "EPSON Stylus C70"
+
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "EPSON Stylus C80"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "EPSON Stylus C82"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "EPSON Stylus C83"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "EPSON Stylus C84"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "EPSON Stylus C85"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "EPSON Stylus C86"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:245
+#, fuzzy
+msgid "Epson Stylus C87"
+msgstr "EPSON Stylus C45"
+
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "EPSON Stylus C80"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "EPSON Stylus Color"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "EPSON Stylus Color"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "EPSON Stylus Color"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "EPSON Stylus Color"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "EPSON Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "EPSON Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "EPSON Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "EPSON Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "EPSON Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "EPSON Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "EPSON Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "EPSON Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "EPSON Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "EPSON Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "EPSON Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "EPSON Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "EPSON Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "EPSON Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "EPSON Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "EPSON Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:267
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "EPSON Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "EPSON Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "EPSON Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:270
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "EPSON Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:271
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "EPSON Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "EPSON Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "EPSON Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "EPSON Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "EPSON Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "EPSON Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "EPSON Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "EPSON Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "EPSON Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "EPSON Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:281
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "EPSON Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "EPSON Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "EPSON Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:284
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "EPSON Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "EPSON Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "EPSON Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "EPSON Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "EPSON Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "EPSON Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "EPSON Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "EPSON Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "EPSON Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "EPSON Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "EPSON Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "EPSON Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "EPSON Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "EPSON Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "EPSON Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "EPSON Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "EPSON Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "EPSON Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:302
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "EPSON Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:303
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "EPSON Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:304
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "EPSON Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:305
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "EPSON Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:306
+#, fuzzy
+msgid "Epson Stylus Photo 1400"
+msgstr "EPSON Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "Epson Stylus Photo 1410"
+msgstr "EPSON Stylus Photo 810"
+
+#: src/main/xmli18n-tmp.h:308
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "EPSON Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "EPSON Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "EPSON Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "EPSON Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:313
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "EPSON Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:314
+#, fuzzy
+msgid "Epson Stylus Photo R230"
+msgstr "EPSON Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:315
+#, fuzzy
+msgid "Epson Stylus Photo R240"
+msgstr "EPSON Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:316
+#, fuzzy
+msgid "Epson Stylus Photo R245"
+msgstr "EPSON Stylus Photo RX425"
+
+#: src/main/xmli18n-tmp.h:317
+#, fuzzy
+msgid "Epson Stylus Photo R260"
+msgstr "EPSON Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "Epson Stylus Photo R265"
+msgstr "EPSON Stylus Photo RX425"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "Epson Stylus Photo R270"
+msgstr "EPSON Stylus Photo 1270"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "EPSON Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:322
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:323
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "Epson Stylus Photo R350"
+msgstr "EPSON Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "Epson Stylus Photo R360"
+msgstr "EPSON Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "Epson Stylus Photo R380"
+msgstr "EPSON Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "Epson Stylus Photo R390"
+msgstr "EPSON Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:328
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:329
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "EPSON Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:330
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:331
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "EPSON Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:332
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:333
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "EPSON Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:334
+#, fuzzy
+msgid "Epson Stylus Photo RX560"
+msgstr "EPSON Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:335
+#, fuzzy
+msgid "Epson Stylus Photo RX580"
+msgstr "EPSON Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:336
+#, fuzzy
+msgid "Epson Stylus Photo RX590"
+msgstr "EPSON Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:337
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "EPSON Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:338
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "EPSON Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:339
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "EPSON Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:340
+#, fuzzy
+msgid "Epson Stylus Photo RX640"
+msgstr "EPSON Stylus Photo RX400"
+
+#: src/main/xmli18n-tmp.h:341
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:342
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "EPSON Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:343
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "EPSON Stylus Photo R1800"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:344
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:345
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "EPSON Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:346
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "EPSON Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:347
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:348
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "EPSON Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:349
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "EPSON Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:350
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "EPSON Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:351
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "EPSON Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:352
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "EPSON Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:353
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "EPSON Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:354
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "EPSON Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:355
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "EPSON Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:356
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:357
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:358
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:359
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "EPSON Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:360
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "EPSON Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:361
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "EPSON Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:362
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "EPSON Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:363
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:364
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "EPSON Stylus C85"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:365
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:366
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:367
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:368
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:369
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:372
+#, fuzzy
+msgid "Epson Stylus CX5000"
+msgstr "EPSON Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:373
+#, fuzzy
+msgid "Epson Stylus CX5000F"
+msgstr "EPSON Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "EPSON Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "EPSON Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "EPSON Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "EPSON Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "EPSON Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:380
+#, fuzzy
+msgid "Epson Stylus CX6000"
+msgstr "EPSON Stylus CX3600"
+
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "EPSON Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:382
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "EPSON Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:383
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "EPSON Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:384
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "EPSON Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:385
+#, fuzzy
+msgid "Epson Stylus CX7000F"
+msgstr "EPSON Stylus CX8300"
+
+#: src/main/xmli18n-tmp.h:386
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "EPSON Stylus C70"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:387
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:388
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "EPSON Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:389
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:390
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "EPSON Stylus C46"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:391
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "EPSON Stylus C80"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:392
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:393
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "EPSON Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:394
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:395
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "EPSON Stylus C50"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:396
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:397
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:398
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:399
+msgid "Epson PictureMate Flash"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:400
+msgid "Epson PictureMate Pal"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:401
+msgid "Epson PictureMate Snap"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:402
+#, fuzzy
+msgid "Epson PictureMate 200"
+msgstr "EPSON PM-2000C"
+
+#: src/main/xmli18n-tmp.h:403
+#, fuzzy
+msgid "Epson PictureMate 210"
+msgstr "EPSON PM-G720"
+
+#: src/main/xmli18n-tmp.h:404
+#, fuzzy
+msgid "Epson PictureMate 240"
+msgstr "EPSON PM-740C"
+
+#: src/main/xmli18n-tmp.h:405
+#, fuzzy
+msgid "Epson PictureMate 250"
+msgstr "EPSON PM-750C"
+
+#: src/main/xmli18n-tmp.h:406
+#, fuzzy
+msgid "Epson PictureMate 280"
+msgstr "EPSON PM-780C"
+
+#: src/main/xmli18n-tmp.h:407
 #, fuzzy
 msgid "Epson CL 700"
 msgstr "Canon BJC 7000"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:408
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:409
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:410
 msgid "Epson E 100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:411
 msgid "Epson E 150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:412
 msgid "Epson E 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:413
 #, fuzzy
 msgid "Epson EM 900C"
 msgstr "EPSON EM-900C"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:414
 #, fuzzy
 msgid "Epson EM 930C"
 msgstr "EPSON EM-930C"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:415
 #, fuzzy
 msgid "Epson MC 2000"
 msgstr "Canon BJC 2000"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:416
 #, fuzzy
 msgid "Epson MC 5000"
 msgstr "EPSON MC-5000"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:417
 #, fuzzy
 msgid "Epson MC 7000"
 msgstr "Canon BJC 7000"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:418
 #, fuzzy
 msgid "Epson MC 9000"
 msgstr "EPSON MC-9000"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:419
 #, fuzzy
 msgid "Epson MC 10000"
 msgstr "Canon BJC 1000"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:420
 #, fuzzy
 msgid "Epson MJ 930C"
 msgstr "EPSON MJ-930C"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:421
 #, fuzzy
 msgid "Epson MJ 5100C"
 msgstr "EPSON MJ-5100C"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:422
 #, fuzzy
 msgid "Epson MJ 6000C"
 msgstr "Canon BJC 6000"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:423
 #, fuzzy
 msgid "Epson MJ 8000C"
 msgstr "EPSON MJ-8000C"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:424
 #, fuzzy
 msgid "Epson PM 700C"
 msgstr "EPSON PM-700C"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:425
 #, fuzzy
 msgid "Epson PM 730C"
 msgstr "EPSON PM-730C"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:426
 #, fuzzy
 msgid "Epson PM 740C"
 msgstr "EPSON PM-740C"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:427
 #, fuzzy
 msgid "Epson PM 750C"
 msgstr "EPSON PM-750C"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:428
 #, fuzzy
 msgid "Epson PM 760C"
 msgstr "EPSON PM-760C"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:429
 #, fuzzy
 msgid "Epson PM 770C"
 msgstr "EPSON PM-770C"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:430
 #, fuzzy
 msgid "Epson PM 780C"
 msgstr "EPSON PM-780C"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:431
 #, fuzzy
 msgid "Epson PM 790PT"
 msgstr "EPSON PM-790PT"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:432
 #, fuzzy
 msgid "Epson PM 800C"
 msgstr "EPSON PM-800C"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:433
 #, fuzzy
 msgid "Epson PM 850PT"
 msgstr "EPSON PM-850PT"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:434
 #, fuzzy
 msgid "Epson PM 870C"
 msgstr "EPSON PM-870C"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:435
 #, fuzzy
 msgid "Epson PM 880C"
 msgstr "EPSON PM-880C"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:436
 #, fuzzy
 msgid "Epson PM 930C"
 msgstr "EPSON PM-930C"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:437
 #, fuzzy
 msgid "Epson PM 940C"
 msgstr "EPSON PM-940C"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:438
 #, fuzzy
 msgid "Epson PM 950C"
 msgstr "EPSON PM-950C"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:439
 #, fuzzy
 msgid "Epson PM 970C"
 msgstr "EPSON PM-970C"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:440
 #, fuzzy
 msgid "Epson PM 980C"
 msgstr "EPSON PM-980C"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:441
 #, fuzzy
 msgid "Epson PM 2000C"
 msgstr "EPSON PM-2000C"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:442
 #, fuzzy
 msgid "Epson PM 2200C"
 msgstr "EPSON PM-2200C"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:443
 #, fuzzy
 msgid "Epson PM 3000C"
 msgstr "EPSON PM-3000C"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:444
 #, fuzzy
 msgid "Epson PM 3300C"
 msgstr "EPSON PM-3300C"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:445
 #, fuzzy
 msgid "Epson PM 3500C"
 msgstr "EPSON PM-3500C"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:446
 #, fuzzy
 msgid "Epson PM 3700C"
 msgstr "EPSON PM-3700C"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:447
 #, fuzzy
 msgid "Epson PM 4000PX"
 msgstr "EPSON PM-4000PX"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:448
 #, fuzzy
 msgid "Epson PM 5000C"
 msgstr "EPSON PM-5000C"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:449
 #, fuzzy
 msgid "Epson PM 7000C"
 msgstr "EPSON PM-7000C"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:450
 #, fuzzy
 msgid "Epson PM 9000C"
 msgstr "EPSON PM-9000C"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:451
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "EPSON PM-10000"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:452
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:453
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:454
+#, fuzzy
+msgid "Epson PM A820"
+msgstr "EPSON PM-G820"
+
+#: src/main/xmli18n-tmp.h:455
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:456
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "EPSON PM-9000C"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:457
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:458
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:459
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "EPSON PM-D750"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:460
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "EPSON PM-D770"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:461
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:462
+#, fuzzy
+msgid "Epson PM D870"
+msgstr "EPSON PM-870C"
+
+#: src/main/xmli18n-tmp.h:463
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "EPSON PM-D1000"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:464
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "EPSON PM-G700"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:465
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "EPSON PM-G720"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:466
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:467
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "EPSON PM-G800"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:468
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "EPSON PM-G820"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:469
+#, fuzzy
+msgid "Epson PM G850"
+msgstr "EPSON PM-G800"
+
+#: src/main/xmli18n-tmp.h:470
+#, fuzzy
+msgid "Epson PM G4500"
+msgstr "EPSON PM-G700"
+
+#: src/main/xmli18n-tmp.h:471
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "EPSON PX-V600"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:472
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "EPSON PX-G900"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:473
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "EPSON PX-G920"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:474
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "EPSON PX-G5000"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:475
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "EPSON PX-V500"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:476
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "EPSON PX-V600"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:477
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:478
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "EPSON PX-V500"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:479
 #, fuzzy
 msgid "Epson PX 7000"
 msgstr "EPSON PX-7000"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:480
 #, fuzzy
 msgid "Epson PX 9000"
 msgstr "EPSON PX-9000"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:481
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:482
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:483
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:484
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:425
+#: src/main/xmli18n-tmp.h:485
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:426
+#: src/main/xmli18n-tmp.h:486
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:427
+#: src/main/xmli18n-tmp.h:487
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:428
+#: src/main/xmli18n-tmp.h:488
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:429
+#: src/main/xmli18n-tmp.h:489
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:430
+#: src/main/xmli18n-tmp.h:490
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:431
+#: src/main/xmli18n-tmp.h:491
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:432
+#: src/main/xmli18n-tmp.h:492
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:433
+#: src/main/xmli18n-tmp.h:493
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:434
+#: src/main/xmli18n-tmp.h:494
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:435
+#: src/main/xmli18n-tmp.h:495
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:436
+#: src/main/xmli18n-tmp.h:496
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:437
+#: src/main/xmli18n-tmp.h:497
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:438
+#: src/main/xmli18n-tmp.h:498
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:439
+#: src/main/xmli18n-tmp.h:499
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:440
+#: src/main/xmli18n-tmp.h:500
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:441
+#: src/main/xmli18n-tmp.h:501
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:442
+#: src/main/xmli18n-tmp.h:502
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:443
+#: src/main/xmli18n-tmp.h:503
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:444
+#: src/main/xmli18n-tmp.h:504
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:445
+#: src/main/xmli18n-tmp.h:505
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:446
+#: src/main/xmli18n-tmp.h:506
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:447
+#: src/main/xmli18n-tmp.h:507
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:448
+#: src/main/xmli18n-tmp.h:508
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:449
+#: src/main/xmli18n-tmp.h:509
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:450
+#: src/main/xmli18n-tmp.h:510
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:451
+#: src/main/xmli18n-tmp.h:511
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:452
+#: src/main/xmli18n-tmp.h:512
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:453
+#: src/main/xmli18n-tmp.h:513
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:454
+#: src/main/xmli18n-tmp.h:514
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:455
+#: src/main/xmli18n-tmp.h:515
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:456
+#: src/main/xmli18n-tmp.h:516
 #, fuzzy
 msgid "Canon GP 335"
 msgstr "Canon BJC 85"
 
-#: src/main/xmli18n-tmp.h:457
+#: src/main/xmli18n-tmp.h:517
 #, fuzzy
 msgid "Canon LBP-4sx"
 msgstr "Canon BJC 240"
 
-#: src/main/xmli18n-tmp.h:458
+#: src/main/xmli18n-tmp.h:518
 #, fuzzy
 msgid "Canon LBP-430"
 msgstr "Canon BJC 4300"
 
-#: src/main/xmli18n-tmp.h:459
+#: src/main/xmli18n-tmp.h:519
 #, fuzzy
 msgid "Canon LBP-1000"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:460
+#: src/main/xmli18n-tmp.h:520
 #, fuzzy
 msgid "Canon LBP-1260"
 msgstr "Canon CP220"
 
-#: src/main/xmli18n-tmp.h:461
+#: src/main/xmli18n-tmp.h:521
 #, fuzzy
 msgid "Canon LBP-1760"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:462
+#: src/main/xmli18n-tmp.h:522
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:463
+#: src/main/xmli18n-tmp.h:523
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:464
+#: src/main/xmli18n-tmp.h:524
 msgid "DEC 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:465
+#: src/main/xmli18n-tmp.h:525
 msgid "DEC LN17"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:466
+#: src/main/xmli18n-tmp.h:526
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:467
+#: src/main/xmli18n-tmp.h:527
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:468
+#: src/main/xmli18n-tmp.h:528
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:469
+#: src/main/xmli18n-tmp.h:529
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:470
+#: src/main/xmli18n-tmp.h:530
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:471
+#: src/main/xmli18n-tmp.h:531
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:472
+#: src/main/xmli18n-tmp.h:532
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:473
+#: src/main/xmli18n-tmp.h:533
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:474
+#: src/main/xmli18n-tmp.h:534
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:475
+#: src/main/xmli18n-tmp.h:535
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:476
+#: src/main/xmli18n-tmp.h:536
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:477
+#: src/main/xmli18n-tmp.h:537
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:478
+#: src/main/xmli18n-tmp.h:538
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:479
+#: src/main/xmli18n-tmp.h:539
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:480
+#: src/main/xmli18n-tmp.h:540
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:481
+#: src/main/xmli18n-tmp.h:541
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:482
+#: src/main/xmli18n-tmp.h:542
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:483
+#: src/main/xmli18n-tmp.h:543
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:484
+#: src/main/xmli18n-tmp.h:544
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:485
+#: src/main/xmli18n-tmp.h:545
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:486
+#: src/main/xmli18n-tmp.h:546
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:487
+#: src/main/xmli18n-tmp.h:547
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:488
+#: src/main/xmli18n-tmp.h:548
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:489
+#: src/main/xmli18n-tmp.h:549
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "定義新的�表機"
 
-#: src/main/xmli18n-tmp.h:490
+#: src/main/xmli18n-tmp.h:550
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "定義新的�表機"
 
-#: src/main/xmli18n-tmp.h:491
+#: src/main/xmli18n-tmp.h:551
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "定義新的�表機"
 
-#: src/main/xmli18n-tmp.h:492
+#: src/main/xmli18n-tmp.h:552
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "定義新的�表機"
 
-#: src/main/xmli18n-tmp.h:493
+#: src/main/xmli18n-tmp.h:553
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:494
+#: src/main/xmli18n-tmp.h:554
 #, fuzzy
 msgid "HP Business Inkjet 2200"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:495
+#: src/main/xmli18n-tmp.h:555
 #, fuzzy
 msgid "HP Business Inkjet 2230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:496
+#: src/main/xmli18n-tmp.h:556
 #, fuzzy
 msgid "HP Business Inkjet 2250"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:497
+#: src/main/xmli18n-tmp.h:557
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:498
+#: src/main/xmli18n-tmp.h:558
 #, fuzzy
 msgid "HP Business Inkjet 2280"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:499
+#: src/main/xmli18n-tmp.h:559
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:500
+#: src/main/xmli18n-tmp.h:560
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:501
+#: src/main/xmli18n-tmp.h:561
 #, fuzzy
 msgid "HP Color LaserJet 2500"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:502
+#: src/main/xmli18n-tmp.h:562
 #, fuzzy
 msgid "HP Color LaserJet 4500"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:503
+#: src/main/xmli18n-tmp.h:563
 #, fuzzy
 msgid "HP Color LaserJet 4550"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:504
+#: src/main/xmli18n-tmp.h:564
 #, fuzzy
 msgid "HP Color LaserJet 4600"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:505
+#: src/main/xmli18n-tmp.h:565
 #, fuzzy
 msgid "HP Color LaserJet 5"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:506
+#: src/main/xmli18n-tmp.h:566
 #, fuzzy
 msgid "HP Color LaserJet 5000"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:507
+#: src/main/xmli18n-tmp.h:567
 #, fuzzy
 msgid "HP Color LaserJet 5500"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:508
+#: src/main/xmli18n-tmp.h:568
 #, fuzzy
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:509
+#: src/main/xmli18n-tmp.h:569
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:510
+#: src/main/xmli18n-tmp.h:570
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:511
+#: src/main/xmli18n-tmp.h:571
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:512
+#: src/main/xmli18n-tmp.h:572
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:513
+#: src/main/xmli18n-tmp.h:573
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:514
+#: src/main/xmli18n-tmp.h:574
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:515
+#: src/main/xmli18n-tmp.h:575
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:516
+#: src/main/xmli18n-tmp.h:576
 #, fuzzy
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:517
+#: src/main/xmli18n-tmp.h:577
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:518
+#: src/main/xmli18n-tmp.h:578
 #, fuzzy
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500C"
 
-#: src/main/xmli18n-tmp.h:519
+#: src/main/xmli18n-tmp.h:579
 #, fuzzy
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500C"
 
-#: src/main/xmli18n-tmp.h:520
+#: src/main/xmli18n-tmp.h:580
 #, fuzzy
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:521
+#: src/main/xmli18n-tmp.h:581
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:522
+#: src/main/xmli18n-tmp.h:582
 #, fuzzy
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:523
+#: src/main/xmli18n-tmp.h:583
 #, fuzzy
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:524
+#: src/main/xmli18n-tmp.h:584
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:525
+#: src/main/xmli18n-tmp.h:585
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:526
+#: src/main/xmli18n-tmp.h:586
 #, fuzzy
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:527
+#: src/main/xmli18n-tmp.h:587
 #, fuzzy
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:528
+#: src/main/xmli18n-tmp.h:588
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:529
+#: src/main/xmli18n-tmp.h:589
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:530
+#: src/main/xmli18n-tmp.h:590
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:531
+#: src/main/xmli18n-tmp.h:591
 #, fuzzy
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:532
+#: src/main/xmli18n-tmp.h:592
 #, fuzzy
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:533
+#: src/main/xmli18n-tmp.h:593
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:534
+#: src/main/xmli18n-tmp.h:594
 #, fuzzy
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:535
+#: src/main/xmli18n-tmp.h:595
 #, fuzzy
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:536
+#: src/main/xmli18n-tmp.h:596
 #, fuzzy
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:537
+#: src/main/xmli18n-tmp.h:597
 #, fuzzy
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:538
+#: src/main/xmli18n-tmp.h:598
 #, fuzzy
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:539
+#: src/main/xmli18n-tmp.h:599
 #, fuzzy
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:540
+#: src/main/xmli18n-tmp.h:600
 #, fuzzy
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:541
+#: src/main/xmli18n-tmp.h:601
 #, fuzzy
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:542
+#: src/main/xmli18n-tmp.h:602
 #, fuzzy
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:543
+#: src/main/xmli18n-tmp.h:603
 #, fuzzy
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:544
+#: src/main/xmli18n-tmp.h:604
 #, fuzzy
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:545
+#: src/main/xmli18n-tmp.h:605
 #, fuzzy
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:546
+#: src/main/xmli18n-tmp.h:606
 #, fuzzy
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:547
+#: src/main/xmli18n-tmp.h:607
 #, fuzzy
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:548
+#: src/main/xmli18n-tmp.h:608
 #, fuzzy
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:549
+#: src/main/xmli18n-tmp.h:609
 #, fuzzy
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:550
+#: src/main/xmli18n-tmp.h:610
 #, fuzzy
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:551
+#: src/main/xmli18n-tmp.h:611
 #, fuzzy
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:552
+#: src/main/xmli18n-tmp.h:612
 #, fuzzy
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:553
+#: src/main/xmli18n-tmp.h:613
 #, fuzzy
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:554
+#: src/main/xmli18n-tmp.h:614
 #, fuzzy
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:555
+#: src/main/xmli18n-tmp.h:615
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:556
+#: src/main/xmli18n-tmp.h:616
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:557
+#: src/main/xmli18n-tmp.h:617
 #, fuzzy
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:558
+#: src/main/xmli18n-tmp.h:618
 #, fuzzy
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:559
+#: src/main/xmli18n-tmp.h:619
 #, fuzzy
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:560
+#: src/main/xmli18n-tmp.h:620
 #, fuzzy
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:561
+#: src/main/xmli18n-tmp.h:621
 #, fuzzy
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:562
+#: src/main/xmli18n-tmp.h:622
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:563
+#: src/main/xmli18n-tmp.h:623
 #, fuzzy
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:564
+#: src/main/xmli18n-tmp.h:624
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:565
+#: src/main/xmli18n-tmp.h:625
 #, fuzzy
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:566
+#: src/main/xmli18n-tmp.h:626
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:567
+#: src/main/xmli18n-tmp.h:627
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:568
+#: src/main/xmli18n-tmp.h:628
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:569
+#: src/main/xmli18n-tmp.h:629
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:570
+#: src/main/xmli18n-tmp.h:630
 #, fuzzy
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:571
+#: src/main/xmli18n-tmp.h:631
 #, fuzzy
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:572
+#: src/main/xmli18n-tmp.h:632
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:573
+#: src/main/xmli18n-tmp.h:633
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:574
+#: src/main/xmli18n-tmp.h:634
 #, fuzzy
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:575
+#: src/main/xmli18n-tmp.h:635
 #, fuzzy
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:576
+#: src/main/xmli18n-tmp.h:636
 #, fuzzy
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:577
+#: src/main/xmli18n-tmp.h:637
 #, fuzzy
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:578
+#: src/main/xmli18n-tmp.h:638
 #, fuzzy
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:579
+#: src/main/xmli18n-tmp.h:639
 #, fuzzy
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:580
+#: src/main/xmli18n-tmp.h:640
 #, fuzzy
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:581
+#: src/main/xmli18n-tmp.h:641
 #, fuzzy
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:582
+#: src/main/xmli18n-tmp.h:642
 #, fuzzy
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:583
+#: src/main/xmli18n-tmp.h:643
 #, fuzzy
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:584
+#: src/main/xmli18n-tmp.h:644
 #, fuzzy
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:585
+#: src/main/xmli18n-tmp.h:645
 #, fuzzy
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:586
+#: src/main/xmli18n-tmp.h:646
 #, fuzzy
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:587
+#: src/main/xmli18n-tmp.h:647
 #, fuzzy
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:588
+#: src/main/xmli18n-tmp.h:648
 #, fuzzy
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:589
+#: src/main/xmli18n-tmp.h:649
 #, fuzzy
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:590
+#: src/main/xmli18n-tmp.h:650
 #, fuzzy
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:591
+#: src/main/xmli18n-tmp.h:651
 #, fuzzy
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:592
+#: src/main/xmli18n-tmp.h:652
 #, fuzzy
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:593
+#: src/main/xmli18n-tmp.h:653
 #, fuzzy
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:594
+#: src/main/xmli18n-tmp.h:654
 #, fuzzy
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:595
+#: src/main/xmli18n-tmp.h:655
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:596
+#: src/main/xmli18n-tmp.h:656
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:597
+#: src/main/xmli18n-tmp.h:657
 #, fuzzy
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:598
+#: src/main/xmli18n-tmp.h:658
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:599
+#: src/main/xmli18n-tmp.h:659
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:600
+#: src/main/xmli18n-tmp.h:660
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:601
+#: src/main/xmli18n-tmp.h:661
 #, fuzzy
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:602
+#: src/main/xmli18n-tmp.h:662
 #, fuzzy
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:603
+#: src/main/xmli18n-tmp.h:663
 #, fuzzy
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:604
+#: src/main/xmli18n-tmp.h:664
 #, fuzzy
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:605
+#: src/main/xmli18n-tmp.h:665
 #, fuzzy
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:606
+#: src/main/xmli18n-tmp.h:666
 #, fuzzy
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:607
+#: src/main/xmli18n-tmp.h:667
 #, fuzzy
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:608
+#: src/main/xmli18n-tmp.h:668
 #, fuzzy
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:609
+#: src/main/xmli18n-tmp.h:669
 #, fuzzy
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:610
+#: src/main/xmli18n-tmp.h:670
 #, fuzzy
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:611
+#: src/main/xmli18n-tmp.h:671
 #, fuzzy
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:612
+#: src/main/xmli18n-tmp.h:672
 #, fuzzy
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet IIP 系列"
 
-#: src/main/xmli18n-tmp.h:613
+#: src/main/xmli18n-tmp.h:673
 #, fuzzy
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:614
+#: src/main/xmli18n-tmp.h:674
 #, fuzzy
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:615
+#: src/main/xmli18n-tmp.h:675
 #, fuzzy
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:616
+#: src/main/xmli18n-tmp.h:676
 #, fuzzy
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:617
+#: src/main/xmli18n-tmp.h:677
 #, fuzzy
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:618
+#: src/main/xmli18n-tmp.h:678
 #, fuzzy
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:619
+#: src/main/xmli18n-tmp.h:679
 #, fuzzy
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:620
+#: src/main/xmli18n-tmp.h:680
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:621
+#: src/main/xmli18n-tmp.h:681
 #, fuzzy
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:622
+#: src/main/xmli18n-tmp.h:682
 #, fuzzy
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:623
+#: src/main/xmli18n-tmp.h:683
 #, fuzzy
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:624
+#: src/main/xmli18n-tmp.h:684
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:625
+#: src/main/xmli18n-tmp.h:685
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:626
+#: src/main/xmli18n-tmp.h:686
 #, fuzzy
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:627
+#: src/main/xmli18n-tmp.h:687
 #, fuzzy
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:628
+#: src/main/xmli18n-tmp.h:688
 #, fuzzy
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:629
+#: src/main/xmli18n-tmp.h:689
 #, fuzzy
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:630
+#: src/main/xmli18n-tmp.h:690
 #, fuzzy
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:631
+#: src/main/xmli18n-tmp.h:691
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:632
+#: src/main/xmli18n-tmp.h:692
 #, fuzzy
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:633
+#: src/main/xmli18n-tmp.h:693
 #, fuzzy
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:634
+#: src/main/xmli18n-tmp.h:694
 #, fuzzy
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:635
+#: src/main/xmli18n-tmp.h:695
 #, fuzzy
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:636
+#: src/main/xmli18n-tmp.h:696
 #, fuzzy
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:637
+#: src/main/xmli18n-tmp.h:697
 #, fuzzy
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:638
+#: src/main/xmli18n-tmp.h:698
 #, fuzzy
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:639
+#: src/main/xmli18n-tmp.h:699
 #, fuzzy
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:640
+#: src/main/xmli18n-tmp.h:700
 #, fuzzy
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:641
+#: src/main/xmli18n-tmp.h:701
 #, fuzzy
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:642
+#: src/main/xmli18n-tmp.h:702
 #, fuzzy
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:643
+#: src/main/xmli18n-tmp.h:703
 #, fuzzy
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:644
+#: src/main/xmli18n-tmp.h:704
 #, fuzzy
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:645
+#: src/main/xmli18n-tmp.h:705
 #, fuzzy
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:646
+#: src/main/xmli18n-tmp.h:706
 #, fuzzy
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:647
+#: src/main/xmli18n-tmp.h:707
 #, fuzzy
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:648
+#: src/main/xmli18n-tmp.h:708
 #, fuzzy
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:649
+#: src/main/xmli18n-tmp.h:709
 #, fuzzy
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:650
+#: src/main/xmli18n-tmp.h:710
 #, fuzzy
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:651
+#: src/main/xmli18n-tmp.h:711
 #, fuzzy
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:652
+#: src/main/xmli18n-tmp.h:712
 #, fuzzy
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:653
+#: src/main/xmli18n-tmp.h:713
 #, fuzzy
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:654
+#: src/main/xmli18n-tmp.h:714
 #, fuzzy
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:655
+#: src/main/xmli18n-tmp.h:715
 #, fuzzy
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:656
+#: src/main/xmli18n-tmp.h:716
 #, fuzzy
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:657
+#: src/main/xmli18n-tmp.h:717
 #, fuzzy
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:658
+#: src/main/xmli18n-tmp.h:718
 #, fuzzy
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:659
+#: src/main/xmli18n-tmp.h:719
 #, fuzzy
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:660
+#: src/main/xmli18n-tmp.h:720
 #, fuzzy
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:661
+#: src/main/xmli18n-tmp.h:721
 #, fuzzy
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:662
+#: src/main/xmli18n-tmp.h:722
 #, fuzzy
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:663
+#: src/main/xmli18n-tmp.h:723
 #, fuzzy
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:664
+#: src/main/xmli18n-tmp.h:724
 #, fuzzy
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:665
+#: src/main/xmli18n-tmp.h:725
 #, fuzzy
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:666
+#: src/main/xmli18n-tmp.h:726
 #, fuzzy
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:667
+#: src/main/xmli18n-tmp.h:727
 #, fuzzy
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:668
+#: src/main/xmli18n-tmp.h:728
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:669
+#: src/main/xmli18n-tmp.h:729
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:670
+#: src/main/xmli18n-tmp.h:730
 #, fuzzy
 msgid "HP OfficeJet 300"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:671
+#: src/main/xmli18n-tmp.h:731
 #, fuzzy
 msgid "HP OfficeJet 330"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:672
+#: src/main/xmli18n-tmp.h:732
 #, fuzzy
 msgid "HP OfficeJet 350"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:673
+#: src/main/xmli18n-tmp.h:733
 #, fuzzy
 msgid "HP OfficeJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:674
+#: src/main/xmli18n-tmp.h:734
 #, fuzzy
 msgid "HP OfficeJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:675
+#: src/main/xmli18n-tmp.h:735
 #, fuzzy
 msgid "HP OfficeJet 570"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:676
+#: src/main/xmli18n-tmp.h:736
 #, fuzzy
 msgid "HP OfficeJet 580"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:677
+#: src/main/xmli18n-tmp.h:737
 #, fuzzy
 msgid "HP OfficeJet 590"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:678
+#: src/main/xmli18n-tmp.h:738
 #, fuzzy
 msgid "HP OfficeJet 600"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:679
+#: src/main/xmli18n-tmp.h:739
 #, fuzzy
 msgid "HP OfficeJet 610"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:680
+#: src/main/xmli18n-tmp.h:740
 #, fuzzy
 msgid "HP OfficeJet 625"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:681
+#: src/main/xmli18n-tmp.h:741
 #, fuzzy
 msgid "HP OfficeJet 630"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:682
+#: src/main/xmli18n-tmp.h:742
 #, fuzzy
 msgid "HP OfficeJet 635"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:683
+#: src/main/xmli18n-tmp.h:743
 #, fuzzy
 msgid "HP OfficeJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:684
+#: src/main/xmli18n-tmp.h:744
 #, fuzzy
 msgid "HP OfficeJet 710"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:685
+#: src/main/xmli18n-tmp.h:745
 #, fuzzy
 msgid "HP OfficeJet 720"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:686
+#: src/main/xmli18n-tmp.h:746
 #, fuzzy
 msgid "HP OfficeJet 725"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:687
+#: src/main/xmli18n-tmp.h:747
 #, fuzzy
 msgid "HP OfficeJet 5105"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:688
+#: src/main/xmli18n-tmp.h:748
 #, fuzzy
 msgid "HP OfficeJet 5110"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:689
+#: src/main/xmli18n-tmp.h:749
 #, fuzzy
 msgid "HP OfficeJet 5110xi"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:690
+#: src/main/xmli18n-tmp.h:750
 #, fuzzy
 msgid "HP OfficeJet 6105"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:691
+#: src/main/xmli18n-tmp.h:751
 #, fuzzy
 msgid "HP OfficeJet 6110"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:692
+#: src/main/xmli18n-tmp.h:752
 #, fuzzy
 msgid "HP OfficeJet 7110"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:693
+#: src/main/xmli18n-tmp.h:753
 #, fuzzy
 msgid "HP OfficeJet 7130"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:694
+#: src/main/xmli18n-tmp.h:754
 #, fuzzy
 msgid "HP OfficeJet 7140"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:695
+#: src/main/xmli18n-tmp.h:755
 #, fuzzy
 msgid "HP OfficeJet D125"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:696
+#: src/main/xmli18n-tmp.h:756
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:697
+#: src/main/xmli18n-tmp.h:757
 #, fuzzy
 msgid "HP OfficeJet D145"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:698
+#: src/main/xmli18n-tmp.h:758
 #, fuzzy
 msgid "HP OfficeJet D155"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:699
+#: src/main/xmli18n-tmp.h:759
 #, fuzzy
 msgid "HP OfficeJet G55"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:700
+#: src/main/xmli18n-tmp.h:760
 #, fuzzy
 msgid "HP OfficeJet G85"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:701
+#: src/main/xmli18n-tmp.h:761
 #, fuzzy
 msgid "HP OfficeJet G95"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:702
+#: src/main/xmli18n-tmp.h:762
 #, fuzzy
 msgid "HP OfficeJet K60"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:703
+#: src/main/xmli18n-tmp.h:763
 #, fuzzy
 msgid "HP OfficeJet K60xi"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:704
+#: src/main/xmli18n-tmp.h:764
 #, fuzzy
 msgid "HP OfficeJet K80"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:705
+#: src/main/xmli18n-tmp.h:765
 #, fuzzy
 msgid "HP OfficeJet K80xi"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:706
+#: src/main/xmli18n-tmp.h:766
 #, fuzzy
 msgid "HP OfficeJet LX"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:707
+#: src/main/xmli18n-tmp.h:767
 #, fuzzy
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:708
+#: src/main/xmli18n-tmp.h:768
 #, fuzzy
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:709
+#: src/main/xmli18n-tmp.h:769
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:710
+#: src/main/xmli18n-tmp.h:770
 #, fuzzy
 msgid "HP OfficeJet R40"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:711
+#: src/main/xmli18n-tmp.h:771
 #, fuzzy
 msgid "HP OfficeJet R45"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:712
+#: src/main/xmli18n-tmp.h:772
 #, fuzzy
 msgid "HP OfficeJet R60"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:713
+#: src/main/xmli18n-tmp.h:773
 #, fuzzy
 msgid "HP OfficeJet R65"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:714
+#: src/main/xmli18n-tmp.h:774
 #, fuzzy
 msgid "HP OfficeJet R80"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:715
+#: src/main/xmli18n-tmp.h:775
 #, fuzzy
 msgid "HP OfficeJet T45"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:716
+#: src/main/xmli18n-tmp.h:776
 #, fuzzy
 msgid "HP OfficeJet T65"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:717
+#: src/main/xmli18n-tmp.h:777
 #, fuzzy
 msgid "HP OfficeJet V40"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:718
+#: src/main/xmli18n-tmp.h:778
 #, fuzzy
 msgid "HP OfficeJet V40xi"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:719
+#: src/main/xmli18n-tmp.h:779
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:720
+#: src/main/xmli18n-tmp.h:780
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:721
+#: src/main/xmli18n-tmp.h:781
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:722
+#: src/main/xmli18n-tmp.h:782
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:723
+#: src/main/xmli18n-tmp.h:783
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:724
+#: src/main/xmli18n-tmp.h:784
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:725
+#: src/main/xmli18n-tmp.h:785
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:726
+#: src/main/xmli18n-tmp.h:786
 #, fuzzy
 msgid "HP PSC 2110"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:727
+#: src/main/xmli18n-tmp.h:787
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:728
+#: src/main/xmli18n-tmp.h:788
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:729
+#: src/main/xmli18n-tmp.h:789
 #, fuzzy
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:730
+#: src/main/xmli18n-tmp.h:790
 #, fuzzy
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:731
+#: src/main/xmli18n-tmp.h:791
 #, fuzzy
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:732
+#: src/main/xmli18n-tmp.h:792
 #, fuzzy
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:733
+#: src/main/xmli18n-tmp.h:793
 #, fuzzy
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:734
+#: src/main/xmli18n-tmp.h:794
 #, fuzzy
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:735
+#: src/main/xmli18n-tmp.h:795
 #, fuzzy
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:736
+#: src/main/xmli18n-tmp.h:796
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:737
+#: src/main/xmli18n-tmp.h:797
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:738
+#: src/main/xmli18n-tmp.h:798
 #, fuzzy
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:739
+#: src/main/xmli18n-tmp.h:799
 #, fuzzy
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:740
+#: src/main/xmli18n-tmp.h:800
 #, fuzzy
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:741
+#: src/main/xmli18n-tmp.h:801
 #, fuzzy
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:742
+#: src/main/xmli18n-tmp.h:802
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:743
+#: src/main/xmli18n-tmp.h:803
 msgid "IBM 4019"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:744
+#: src/main/xmli18n-tmp.h:804
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:745
+#: src/main/xmli18n-tmp.h:805
 msgid "IBM 4312"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:746
+#: src/main/xmli18n-tmp.h:806
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:747
+#: src/main/xmli18n-tmp.h:807
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:748
+#: src/main/xmli18n-tmp.h:808
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:749
+#: src/main/xmli18n-tmp.h:809
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:750
+#: src/main/xmli18n-tmp.h:810
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:751
+#: src/main/xmli18n-tmp.h:811
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:752
+#: src/main/xmli18n-tmp.h:812
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:753
+#: src/main/xmli18n-tmp.h:813
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:754
+#: src/main/xmli18n-tmp.h:814
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:755
+#: src/main/xmli18n-tmp.h:815
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:756
+#: src/main/xmli18n-tmp.h:816
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:757
+#: src/main/xmli18n-tmp.h:817
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:758
+#: src/main/xmli18n-tmp.h:818
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:759
+#: src/main/xmli18n-tmp.h:819
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:760
+#: src/main/xmli18n-tmp.h:820
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:761
+#: src/main/xmli18n-tmp.h:821
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:762
+#: src/main/xmli18n-tmp.h:822
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:763
+#: src/main/xmli18n-tmp.h:823
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:764
+#: src/main/xmli18n-tmp.h:824
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:765
+#: src/main/xmli18n-tmp.h:825
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:766
+#: src/main/xmli18n-tmp.h:826
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:767
+#: src/main/xmli18n-tmp.h:827
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:768
+#: src/main/xmli18n-tmp.h:828
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:769
+#: src/main/xmli18n-tmp.h:829
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:770
+#: src/main/xmli18n-tmp.h:830
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:771
+#: src/main/xmli18n-tmp.h:831
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:772
+#: src/main/xmli18n-tmp.h:832
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:773
+#: src/main/xmli18n-tmp.h:833
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:774
+#: src/main/xmli18n-tmp.h:834
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:775
+#: src/main/xmli18n-tmp.h:835
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:776
+#: src/main/xmli18n-tmp.h:836
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:777
+#: src/main/xmli18n-tmp.h:837
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:778
+#: src/main/xmli18n-tmp.h:838
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:779
+#: src/main/xmli18n-tmp.h:839
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:780
+#: src/main/xmli18n-tmp.h:840
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:781
+#: src/main/xmli18n-tmp.h:841
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:782
+#: src/main/xmli18n-tmp.h:842
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:783
+#: src/main/xmli18n-tmp.h:843
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:784
+#: src/main/xmli18n-tmp.h:844
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:785
+#: src/main/xmli18n-tmp.h:845
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:786
+#: src/main/xmli18n-tmp.h:846
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:787
+#: src/main/xmli18n-tmp.h:847
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:788
+#: src/main/xmli18n-tmp.h:848
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:789
+#: src/main/xmli18n-tmp.h:849
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:790
+#: src/main/xmli18n-tmp.h:850
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:791
+#: src/main/xmli18n-tmp.h:851
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:792
+#: src/main/xmli18n-tmp.h:852
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:793
+#: src/main/xmli18n-tmp.h:853
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:794
+#: src/main/xmli18n-tmp.h:854
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:795
+#: src/main/xmli18n-tmp.h:855
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:796
+#: src/main/xmli18n-tmp.h:856
 #, fuzzy
 msgid "Lexmark Optra E"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:797
+#: src/main/xmli18n-tmp.h:857
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:798
+#: src/main/xmli18n-tmp.h:858
+#, fuzzy
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Z42"
+
+#: src/main/xmli18n-tmp.h:859
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:799
+#: src/main/xmli18n-tmp.h:860
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:800
+#: src/main/xmli18n-tmp.h:861
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:801
+#: src/main/xmli18n-tmp.h:862
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:802
+#: src/main/xmli18n-tmp.h:863
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:803
+#: src/main/xmli18n-tmp.h:864
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:804
+#: src/main/xmli18n-tmp.h:865
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:805
+#: src/main/xmli18n-tmp.h:866
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:806
+#: src/main/xmli18n-tmp.h:867
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:807
+#: src/main/xmli18n-tmp.h:868
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:808
+#: src/main/xmli18n-tmp.h:869
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:809
+#: src/main/xmli18n-tmp.h:870
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:810
+#: src/main/xmli18n-tmp.h:871
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:811
+#: src/main/xmli18n-tmp.h:872
 msgid "Okidata OL400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:812
+#: src/main/xmli18n-tmp.h:873
 msgid "Okidata OL400e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:813
+#: src/main/xmli18n-tmp.h:874
 msgid "Okidata OL400ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:814
+#: src/main/xmli18n-tmp.h:875
 msgid "Okidata OL410e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:815
+#: src/main/xmli18n-tmp.h:876
 msgid "Okidata OL600e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:816
+#: src/main/xmli18n-tmp.h:877
 msgid "Okidata OL610e/S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:817
+#: src/main/xmli18n-tmp.h:878
 msgid "Okidata OL800"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:818
+#: src/main/xmli18n-tmp.h:879
 msgid "Okidata OL810ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:819
+#: src/main/xmli18n-tmp.h:880
 msgid "Okidata Okipage 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:820
+#: src/main/xmli18n-tmp.h:881
 msgid "Okidata Okipage 6ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:821
+#: src/main/xmli18n-tmp.h:882
 msgid "Okidata Okipage 8p"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:822
+#: src/main/xmli18n-tmp.h:883
 msgid "Okidata Okipage 10e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:823
+#: src/main/xmli18n-tmp.h:884
 msgid "Okidata Okipage 10ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:824
+#: src/main/xmli18n-tmp.h:885
 msgid "Okidata Okipage 14ex"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:825
+#: src/main/xmli18n-tmp.h:886
 msgid "Okidata Super 6e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:826
+#: src/main/xmli18n-tmp.h:887
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:827
+#: src/main/xmli18n-tmp.h:888
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:828
+#: src/main/xmli18n-tmp.h:889
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:829
+#: src/main/xmli18n-tmp.h:890
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:830
+#: src/main/xmli18n-tmp.h:891
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:831
+#: src/main/xmli18n-tmp.h:892
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:832
+#: src/main/xmli18n-tmp.h:893
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:833
+#: src/main/xmli18n-tmp.h:894
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:834
+#: src/main/xmli18n-tmp.h:895
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:835
+#: src/main/xmli18n-tmp.h:896
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:836
+#: src/main/xmli18n-tmp.h:897
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:837
+#: src/main/xmli18n-tmp.h:898
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:838
+#: src/main/xmli18n-tmp.h:899
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:839
+#: src/main/xmli18n-tmp.h:900
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:840
+#: src/main/xmli18n-tmp.h:901
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:841
+#: src/main/xmli18n-tmp.h:902
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:842
+#: src/main/xmli18n-tmp.h:903
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:843
+#: src/main/xmli18n-tmp.h:904
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:844
+#: src/main/xmli18n-tmp.h:905
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:845
+#: src/main/xmli18n-tmp.h:906
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:846
+#: src/main/xmli18n-tmp.h:907
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:847
+#: src/main/xmli18n-tmp.h:908
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:848
+#: src/main/xmli18n-tmp.h:909
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:849
+#: src/main/xmli18n-tmp.h:910
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:850
+#: src/main/xmli18n-tmp.h:911
 #, fuzzy
 msgid "Sony IJP-V100"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:851
+#: src/main/xmli18n-tmp.h:912
 msgid "Star LS-04"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:852
+#: src/main/xmli18n-tmp.h:913
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "設定�表機"
 
-#: src/main/xmli18n-tmp.h:853
+#: src/main/xmli18n-tmp.h:914
 msgid "Tally MT908"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:854
+#: src/main/xmli18n-tmp.h:915
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:855
+#: src/main/xmli18n-tmp.h:916
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:856
+#: src/main/xmli18n-tmp.h:917
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:857
+#: src/main/xmli18n-tmp.h:918
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:858
+#: src/main/xmli18n-tmp.h:919
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:859
+#: src/main/xmli18n-tmp.h:920
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:860
+#: src/main/xmli18n-tmp.h:921
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:861
+#: src/main/xmli18n-tmp.h:922
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:862
+#: src/main/xmli18n-tmp.h:923
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:863
+#: src/main/xmli18n-tmp.h:924
+msgid "Xerox WorkCentre M118"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:925
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:926
+#, fuzzy
+msgid "Lexmark X73"
+msgstr "Lexmark Z43"
+
+#: src/main/xmli18n-tmp.h:927
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:864
+#: src/main/xmli18n-tmp.h:928
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:865
+#: src/main/xmli18n-tmp.h:929
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:866
+#: src/main/xmli18n-tmp.h:930
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:867
+#: src/main/xmli18n-tmp.h:931
 #, fuzzy
 msgid "Olympus P-10"
 msgstr "Olympus P10"
 
-#: src/main/xmli18n-tmp.h:868
+#: src/main/xmli18n-tmp.h:932
 #, fuzzy
 msgid "Olympus P-11"
 msgstr "Olympus P10"
 
-#: src/main/xmli18n-tmp.h:869
+#: src/main/xmli18n-tmp.h:933
 #, fuzzy
 msgid "Olympus P-200"
 msgstr "Olympus P200"
 
-#: src/main/xmli18n-tmp.h:870
+#: src/main/xmli18n-tmp.h:934
 #, fuzzy
 msgid "Olympus P-300"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:871
+#: src/main/xmli18n-tmp.h:935
 #, fuzzy
 msgid "Olympus P-300E"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:872
+#: src/main/xmli18n-tmp.h:936
 #, fuzzy
 msgid "Olympus P-300U"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:873
+#: src/main/xmli18n-tmp.h:937
 #, fuzzy
 msgid "Olympus P-330E"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:874
+#: src/main/xmli18n-tmp.h:938
 #, fuzzy
 msgid "Olympus P-330NE"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:875
+#: src/main/xmli18n-tmp.h:939
 #, fuzzy
 msgid "Olympus P-400"
 msgstr "Olympus P400"
 
-#: src/main/xmli18n-tmp.h:876
+#: src/main/xmli18n-tmp.h:940
 #, fuzzy
 msgid "Olympus P-440"
 msgstr "Olympus P440"
 
-#: src/main/xmli18n-tmp.h:877
+#: src/main/xmli18n-tmp.h:941
+#, fuzzy
+msgid "Olympus P-S100"
+msgstr "Olympus P10"
+
+#: src/main/xmli18n-tmp.h:942
+#, fuzzy
+msgid "Canon CP-10"
+msgstr "Canon CP100"
+
+#: src/main/xmli18n-tmp.h:943
 #, fuzzy
 msgid "Canon CP-100"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:878
+#: src/main/xmli18n-tmp.h:944
 #, fuzzy
 msgid "Canon CP-200"
 msgstr "Canon CP220"
 
-#: src/main/xmli18n-tmp.h:879
+#: src/main/xmli18n-tmp.h:945
 #, fuzzy
 msgid "Canon CP-220"
 msgstr "Canon CP220"
 
-#: src/main/xmli18n-tmp.h:880
+#: src/main/xmli18n-tmp.h:946
 #, fuzzy
 msgid "Canon CP-300"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:881
+#: src/main/xmli18n-tmp.h:947
 #, fuzzy
 msgid "Canon CP-330"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:882
+#: src/main/xmli18n-tmp.h:948
 #, fuzzy
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:883
+#: src/main/xmli18n-tmp.h:949
 #, fuzzy
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:884
+#: src/main/xmli18n-tmp.h:950
 #, fuzzy
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:885
+#: src/main/xmli18n-tmp.h:951
 #, fuzzy
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:886
+#: src/main/xmli18n-tmp.h:952
 #, fuzzy
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:887
+#: src/main/xmli18n-tmp.h:953
+#, fuzzy
+msgid "Sony DPP-EX5"
+msgstr "Sony UP-DP10"
+
+#: src/main/xmli18n-tmp.h:954
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:955
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:888
+#: src/main/xmli18n-tmp.h:956
+#, fuzzy
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DP10"
+
+#: src/main/xmli18n-tmp.h:957
 #, fuzzy
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:889
+#: src/main/xmli18n-tmp.h:958
 #, fuzzy
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix CX-400"
 
-#: src/main/xmli18n-tmp.h:890
+#: src/main/xmli18n-tmp.h:959
 #, fuzzy
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix CX-550"
 
-#: src/main/xmli18n-tmp.h:891
+#: src/main/xmli18n-tmp.h:960
+#, fuzzy
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm Printpix CX-400"
+
+#: src/main/xmli18n-tmp.h:961
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:962
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:892
+#: src/main/xmli18n-tmp.h:963
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Inch"
 msgstr "英�"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:273 src/gutenprintui2/panel.c:273
 msgid "Set the base unit of measurement to inches"
 msgstr "以英�作為長度單�"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "cm"
 msgstr "公分"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:275 src/gutenprintui2/panel.c:275
 msgid "Set the base unit of measurement to centimetres"
 msgstr "以公分作為長度單�"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Points"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:277 src/gutenprintui2/panel.c:277
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "mm"
 msgstr "毫米"
 
-#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
+#: src/gutenprintui/panel.c:279 src/gutenprintui2/panel.c:279
 msgid "Set the base unit of measurement to millimetres"
 msgstr "以毫米作為長度單�"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Pica"
 msgstr "鉛點"
 
-#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
+#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "以鉛點 (1/12\") 作為長度單�"
 
-#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
+#: src/gutenprintui/panel.c:288 src/gutenprintui2/panel.c:288
 msgid "Color output"
 msgstr "使用彩色列�"
 
-#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
+#: src/gutenprintui/panel.c:290 src/gutenprintui2/panel.c:290
 msgid "Print in shades of gray using black ink"
 msgstr "使用黑色墨水來列��階色彩"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Standard Command"
 msgstr "標準指令"
 
-#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
+#: src/gutenprintui/panel.c:302 src/gutenprintui2/panel.c:302
 msgid "Use standard print command"
 msgstr "使用標準列�指令"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Custom Command"
 msgstr "自�指令"
 
-#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
+#: src/gutenprintui/panel.c:303 src/gutenprintui2/panel.c:303
 msgid "Use custom print command"
 msgstr "使用自行指定的列�指令"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
-#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
+#: src/gutenprintui/panel.c:304 src/gutenprintui/plist.c:682
+#: src/gutenprintui/plist.c:765 src/gutenprintui2/panel.c:304
+#: src/gutenprintui2/plist.c:682 src/gutenprintui2/plist.c:765
 msgid "File"
 msgstr "檔案"
 
-#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
+#: src/gutenprintui/panel.c:304 src/gutenprintui2/panel.c:304
 msgid "Print to a file"
 msgstr "列�至檔案"
 
-#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
+#: src/gutenprintui/panel.c:520 src/gutenprintui2/panel.c:520
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
+#: src/gutenprintui/panel.c:531 src/gutenprintui2/panel.c:531
 msgid "Set Default"
 msgstr ""
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
+#: src/gutenprintui/panel.c:533 src/gutenprintui2/panel.c:533
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1528
-#: src/gutenprintui/panel.c:1768 src/gutenprintui/panel.c:1800
-#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1529
-#: src/gutenprintui2/panel.c:1768 src/gutenprintui2/panel.c:1800
+#: src/gutenprintui/panel.c:535 src/gutenprintui/panel.c:1531
+#: src/gutenprintui/panel.c:1786 src/gutenprintui/panel.c:1818
+#: src/gutenprintui2/panel.c:535 src/gutenprintui2/panel.c:1532
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1818
 msgid "OK"
 msgstr "確定"
 
-#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1193
-#: src/gutenprintui/panel.c:1530 src/gutenprintui/panel.c:1770
-#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1194
-#: src/gutenprintui2/panel.c:1531 src/gutenprintui2/panel.c:1770
+#: src/gutenprintui/panel.c:537 src/gutenprintui/panel.c:1196
+#: src/gutenprintui/panel.c:1533 src/gutenprintui/panel.c:1788
+#: src/gutenprintui2/panel.c:537 src/gutenprintui2/panel.c:1197
+#: src/gutenprintui2/panel.c:1534 src/gutenprintui2/panel.c:1788
 msgid "Cancel"
 msgstr "�消"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- 列�增效模組 %s 版本"
 
-#: src/gutenprintui/panel.c:1185 src/gutenprintui2/panel.c:1186
+#: src/gutenprintui/panel.c:1188 src/gutenprintui2/panel.c:1189
 msgid "About"
 msgstr "關於"
 
-#: src/gutenprintui/panel.c:1187 src/gutenprintui2/panel.c:1188
+#: src/gutenprintui/panel.c:1190 src/gutenprintui2/panel.c:1191
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -6431,7 +6611,7 @@ msgstr ""
 "列�並\n"
 "儲存設定"
 
-#: src/gutenprintui/panel.c:1189 src/gutenprintui2/panel.c:1190
+#: src/gutenprintui/panel.c:1192 src/gutenprintui2/panel.c:1193
 msgid ""
 "Save\n"
 "Settings"
@@ -6439,15 +6619,15 @@ msgstr ""
 "儲存\n"
 "設定"
 
-#: src/gutenprintui/panel.c:1191 src/gutenprintui2/panel.c:1192
+#: src/gutenprintui/panel.c:1194 src/gutenprintui2/panel.c:1195
 msgid "Print"
 msgstr "列�"
 
-#: src/gutenprintui/panel.c:1243 src/gutenprintui2/panel.c:1244
+#: src/gutenprintui/panel.c:1246 src/gutenprintui2/panel.c:1247
 msgid "Preview"
 msgstr "�覽"
 
-#: src/gutenprintui/panel.c:1268 src/gutenprintui2/panel.c:1269
+#: src/gutenprintui/panel.c:1271 src/gutenprintui2/panel.c:1272
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -6469,353 +6649,315 @@ msgstr ""
 "拖曳影�時按下 shift �，會�制影���水平或垂直方�移動。\n"
 "如果拖曳的時候�按多一個滑鼠按鈕，影�會還原至原來�置。"
 
-#: src/gutenprintui/panel.c:1315 src/gutenprintui2/panel.c:1316
+#: src/gutenprintui/panel.c:1318 src/gutenprintui2/panel.c:1319
 msgid "Paper Size"
 msgstr "紙張尺寸"
 
-#: src/gutenprintui/panel.c:1338 src/gutenprintui2/panel.c:1339
+#: src/gutenprintui/panel.c:1341 src/gutenprintui2/panel.c:1342
 msgid "Show All Paper Sizes"
 msgstr "顯示所有紙張尺寸"
 
-#: src/gutenprintui/panel.c:1354 src/gutenprintui2/panel.c:1355
+#: src/gutenprintui/panel.c:1357 src/gutenprintui2/panel.c:1358
 msgid "Dimensions:"
 msgstr "尺寸："
 
-#: src/gutenprintui/panel.c:1359 src/gutenprintui/panel.c:2033
-#: src/gutenprintui2/panel.c:1360 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:1362 src/gutenprintui/panel.c:2051
+#: src/gutenprintui2/panel.c:1363 src/gutenprintui2/panel.c:2051
 msgid "Width:"
 msgstr "寬度："
 
-#: src/gutenprintui/panel.c:1360 src/gutenprintui2/panel.c:1361
+#: src/gutenprintui/panel.c:1363 src/gutenprintui2/panel.c:1364
 msgid "Width of the paper that you wish to print to"
 msgstr "列�時的紙張寬度"
 
-#: src/gutenprintui/panel.c:1364 src/gutenprintui/panel.c:2035
-#: src/gutenprintui2/panel.c:1365 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:1367 src/gutenprintui/panel.c:2053
+#: src/gutenprintui2/panel.c:1368 src/gutenprintui2/panel.c:2053
 msgid "Height:"
 msgstr "高度："
 
-#: src/gutenprintui/panel.c:1365 src/gutenprintui2/panel.c:1366
+#: src/gutenprintui/panel.c:1368 src/gutenprintui2/panel.c:1369
 msgid "Height of the paper that you wish to print to"
 msgstr "列�時的紙張高度"
 
-#: src/gutenprintui/panel.c:1370 src/gutenprintui2/panel.c:1371
+#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1374
 msgid "Automatic Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1387 src/gutenprintui2/panel.c:1388
+#: src/gutenprintui/panel.c:1390 src/gutenprintui2/panel.c:1391
 msgid "Number of Copies"
 msgstr "份數"
 
-#: src/gutenprintui/panel.c:1399 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui/panel.c:1402 src/gutenprintui2/panel.c:1403
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr "請�擇列�多少份 (1-100 之間)"
 
-#: src/gutenprintui/panel.c:1431 src/gutenprintui2/panel.c:1432
+#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1435
 msgid "Image Position"
 msgstr "影��置"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1449
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1452
 msgid "Auto"
 msgstr "自動"
 
-#: src/gutenprintui/panel.c:1450 src/gutenprintui2/panel.c:1451
+#: src/gutenprintui/panel.c:1453 src/gutenprintui2/panel.c:1454
 msgid "Portrait"
 msgstr "直�"
 
-#: src/gutenprintui/panel.c:1452 src/gutenprintui2/panel.c:1453
+#: src/gutenprintui/panel.c:1455 src/gutenprintui2/panel.c:1456
 msgid "Landscape"
 msgstr "橫�"
 
-#: src/gutenprintui/panel.c:1454 src/gutenprintui2/panel.c:1455
+#: src/gutenprintui/panel.c:1457 src/gutenprintui2/panel.c:1458
 msgid "Upside down"
 msgstr "直�倒置"
 
-#: src/gutenprintui/panel.c:1456 src/gutenprintui2/panel.c:1457
+#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1460
 msgid "Seascape"
 msgstr "橫�倒置"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1461
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1464
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr "指定列�時的方�：直��橫��直�倒置�橫�倒置"
 
-#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1463
+#: src/gutenprintui/panel.c:1465 src/gutenprintui2/panel.c:1466
 msgid "Orientation:"
 msgstr "方�："
 
-#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1474
+#: src/gutenprintui/panel.c:1476 src/gutenprintui2/panel.c:1477
 msgid "Left:"
 msgstr "左："
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1477 src/gutenprintui2/panel.c:1478
 msgid "Distance from the left of the paper to the image"
 msgstr "從紙張左邊邊緣至影�之間的�離"
 
-#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
-#: src/gutenprintui2/panel.c:1478 src/gutenprintui2/panel.c:1482
+#: src/gutenprintui/panel.c:1480 src/gutenprintui/panel.c:1484
+#: src/gutenprintui2/panel.c:1481 src/gutenprintui2/panel.c:1485
 msgid "Right:"
 msgstr "�："
 
-#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1481 src/gutenprintui2/panel.c:1482
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "從紙張左邊邊緣至影��邊邊緣之間的�離"
 
-#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1483
+#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
 msgid "Distance from the right of the paper to the image"
 msgstr "從紙張�邊邊緣至影�之間的�離"
 
-#: src/gutenprintui/panel.c:1484 src/gutenprintui2/panel.c:1485
+#: src/gutenprintui/panel.c:1487 src/gutenprintui2/panel.c:1488
 msgid "Top:"
 msgstr "上："
 
-#: src/gutenprintui/panel.c:1485 src/gutenprintui2/panel.c:1486
+#: src/gutenprintui/panel.c:1488 src/gutenprintui2/panel.c:1489
 msgid "Distance from the top of the paper to the image"
 msgstr "從紙張頂部邊緣至影�之間的�離"
 
-#: src/gutenprintui/panel.c:1488 src/gutenprintui/panel.c:1492
-#: src/gutenprintui2/panel.c:1489 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1491 src/gutenprintui/panel.c:1495
+#: src/gutenprintui2/panel.c:1492 src/gutenprintui2/panel.c:1496
 msgid "Bottom:"
 msgstr "下："
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1490
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1493
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "從紙張頂部邊緣至影�底部邊緣之間的�離"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1494
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1497
 msgid "Distance from the bottom of the paper to the image"
 msgstr "從紙張底部邊緣至影�之間的�離"
 
-#: src/gutenprintui/panel.c:1503 src/gutenprintui2/panel.c:1504
+#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
 msgid "Center:"
 msgstr "置中："
 
-#: src/gutenprintui/panel.c:1506 src/gutenprintui2/panel.c:1507
+#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
 msgid "Horizontal"
 msgstr "æ°´å¹³"
 
-#: src/gutenprintui/panel.c:1507 src/gutenprintui2/panel.c:1508
+#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
 msgid "Center the image horizontally on the paper"
 msgstr "將影�的水平�置調整至紙張中間"
 
-#: src/gutenprintui/panel.c:1509 src/gutenprintui2/panel.c:1510
+#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
 msgid "Both"
 msgstr "兩者"
 
-#: src/gutenprintui/panel.c:1510 src/gutenprintui2/panel.c:1511
+#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
 msgid "Center the image on the paper"
 msgstr "將影�放置在紙張中間"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1513
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1516
 msgid "Vertical"
 msgstr "åž‚ç›´"
 
-#: src/gutenprintui/panel.c:1513 src/gutenprintui2/panel.c:1514
+#: src/gutenprintui/panel.c:1516 src/gutenprintui2/panel.c:1517
 msgid "Center the image vertically on the paper"
 msgstr "將影�的垂直�置調整至紙張中間"
 
-#: src/gutenprintui/panel.c:1526 src/gutenprintui2/panel.c:1527
+#: src/gutenprintui/panel.c:1529 src/gutenprintui2/panel.c:1530
 msgid "Setup Printer"
 msgstr "設定�表機"
 
-#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1551
+#: src/gutenprintui/panel.c:1554 src/gutenprintui2/panel.c:1554
 msgid "Printer Make:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1562 src/gutenprintui2/panel.c:1562
+#: src/gutenprintui/panel.c:1565 src/gutenprintui2/panel.c:1565
 msgid "Select the make of your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1580 src/gutenprintui/panel.c:1871
-#: src/gutenprintui2/panel.c:1580 src/gutenprintui2/panel.c:1871
+#: src/gutenprintui/panel.c:1583 src/gutenprintui/panel.c:1671
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1583
+#: src/gutenprintui2/panel.c:1671 src/gutenprintui2/panel.c:1889
 msgid "Printer Model:"
 msgstr "�表機型號："
 
-#: src/gutenprintui/panel.c:1591 src/gutenprintui2/panel.c:1591
+#: src/gutenprintui/panel.c:1594 src/gutenprintui2/panel.c:1594
 msgid "Select your printer model"
 msgstr "請���表機型號"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1639
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1642
 msgid "PPD File:"
 msgstr "PPD 檔："
 
-#: src/gutenprintui/panel.c:1653 src/gutenprintui2/panel.c:1653
+#: src/gutenprintui/panel.c:1658 src/gutenprintui2/panel.c:1658
 msgid "Enter the correct PPD filename for your printer"
 msgstr "請輸入��您的�表機使用的 PPD 檔案�稱"
 
-#: src/gutenprintui/panel.c:1655 src/gutenprintui/panel.c:1722
-#: src/gutenprintui2/panel.c:1655 src/gutenprintui2/panel.c:1722
+#: src/gutenprintui/panel.c:1660 src/gutenprintui/panel.c:1740
+#: src/gutenprintui2/panel.c:1660 src/gutenprintui2/panel.c:1740
 msgid "Browse"
 msgstr "�覽"
 
-#: src/gutenprintui/panel.c:1662 src/gutenprintui2/panel.c:1662
+#: src/gutenprintui/panel.c:1667 src/gutenprintui2/panel.c:1667
 msgid "Choose the correct PPD filename for your printer"
 msgstr "請�擇��您的�表機使用的 PPD 檔案�稱"
 
-#: src/gutenprintui/panel.c:1691 src/gutenprintui2/panel.c:1691
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1693 src/gutenprintui2/panel.c:1693
+#: src/gutenprintui/panel.c:1711 src/gutenprintui2/panel.c:1711
 msgid "Printer Queue:"
 msgstr "�表機佇列："
 
-#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1709
+#: src/gutenprintui/panel.c:1727 src/gutenprintui2/panel.c:1727
 msgid "Enter the correct command to print to your printer. "
 msgstr "請輸入列�所使用的指令。"
 
-#: src/gutenprintui/panel.c:1720 src/gutenprintui2/panel.c:1720
+#: src/gutenprintui/panel.c:1738 src/gutenprintui2/panel.c:1738
 msgid "Enter the file to print to. "
 msgstr "請輸入列�時寫入的檔案。"
 
-#: src/gutenprintui/panel.c:1728 src/gutenprintui2/panel.c:1728
+#: src/gutenprintui/panel.c:1746 src/gutenprintui2/panel.c:1746
 msgid "File to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1736 src/gutenprintui2/panel.c:1736
+#: src/gutenprintui/panel.c:1754 src/gutenprintui2/panel.c:1754
 msgid "Print To File"
 msgstr "列�至檔案"
 
-#: src/gutenprintui/panel.c:1766 src/gutenprintui2/panel.c:1766
+#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1784
 msgid "Define New Printer"
 msgstr "定義新的�表機"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui/panel.c:1868
-#: src/gutenprintui2/panel.c:1784 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1802 src/gutenprintui/panel.c:1886
+#: src/gutenprintui2/panel.c:1802 src/gutenprintui2/panel.c:1886
 msgid "Printer Name:"
 msgstr "�表機�稱："
 
-#: src/gutenprintui/panel.c:1788 src/gutenprintui2/panel.c:1788
+#: src/gutenprintui/panel.c:1806 src/gutenprintui2/panel.c:1806
 msgid "Enter the name you wish to give this logical printer"
 msgstr "為這個虛擬�表機命�"
 
-#: src/gutenprintui/panel.c:1798 src/gutenprintui2/panel.c:1798
+#: src/gutenprintui/panel.c:1816 src/gutenprintui2/panel.c:1816
 msgid "About Gutenprint "
 msgstr "關於 Gutenprint "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
+#: src/gutenprintui/panel.c:1823 src/gutenprintui2/panel.c:1823
 msgid "Gutenprint Version "
 msgstr "Gutenprint 版本 "
 
-#: src/gutenprintui/panel.c:1805 src/gutenprintui2/panel.c:1805
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
-"and the rest of the Gutenprint Development Team.\n"
-"\n"
-"Please visit our web site at http://gimp-print.sourceforge.net.\n"
-"\n"
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
-msgstr ""
-"\n"
-"\n"
-"版權所有 © 1997-2003 Michael Sweet�Robert Krawitz\n"
-"�整個 Gutenprint 開發隊�。\n"
-"\n"
-"請�覽我們的網�： http://gimp-print.sourceforge.net\n"
-"\n"
-"本程�為自由軟體；您��據自由軟體基金會所發表的GNU通用公共授權�款�定，就本"
-"程��為散布與�或修改；無論您�據的是本授權的第二版或（您自行�擇的）任一日"
-"後發行的版本。\n"
-"本程�係基於使用目的而加以散布，然而�負任何擔�責任；亦無��售性或特定目的"
-"�用性所為的默示性擔�。詳情請�照 GNU 通用公共授權。\n"
-"您應已收到附隨於本程�的GNU通用公共授權的副本；如無，請寫信至自由軟體基金會："
-"59 Temple Place – Suite 330, Boston, Ma 02111-1307, USA。\n"
-
-#: src/gutenprintui/panel.c:1853 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1871 src/gutenprintui2/panel.c:1871
 msgid "Printer Settings"
 msgstr "�表機設定"
 
-#: src/gutenprintui/panel.c:1866 src/gutenprintui2/panel.c:1866
+#: src/gutenprintui/panel.c:1884 src/gutenprintui2/panel.c:1884
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 msgstr "指定�表機�稱 (�是�表機類型或者型號)"
 
-#: src/gutenprintui/panel.c:1883 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1901 src/gutenprintui2/panel.c:1901
 msgid "Setup Printer..."
 msgstr "設定�表機..."
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1885
+#: src/gutenprintui/panel.c:1903 src/gutenprintui2/panel.c:1903
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr "��列�時使用的�表機型號�PPD 檔�指令"
 
-#: src/gutenprintui/panel.c:1898 src/gutenprintui2/panel.c:1898
+#: src/gutenprintui/panel.c:1916 src/gutenprintui2/panel.c:1916
 msgid "New Printer..."
 msgstr "新增�表機..."
 
-#: src/gutenprintui/panel.c:1899 src/gutenprintui2/panel.c:1899
+#: src/gutenprintui/panel.c:1917 src/gutenprintui2/panel.c:1917
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr "定義新的虛擬�表機。這個「�表機�其實是代表一組設定，以便將來使用。"
 
-#: src/gutenprintui/panel.c:1942 src/gutenprintui2/panel.c:1942
+#: src/gutenprintui/panel.c:1960 src/gutenprintui2/panel.c:1960
 msgid "Image Size"
 msgstr "影�尺寸"
 
-#: src/gutenprintui/panel.c:1967 src/gutenprintui2/panel.c:1967
+#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1985
 msgid "Scaling:"
 msgstr "縮放："
 
-#: src/gutenprintui/panel.c:1971 src/gutenprintui2/panel.c:1971
+#: src/gutenprintui/panel.c:1989 src/gutenprintui2/panel.c:1989
 msgid "Set the scale (size) of the image"
 msgstr "指定影�的縮放比例 (尺寸)"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1993
+#: src/gutenprintui/panel.c:2011 src/gutenprintui2/panel.c:2011
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1998 src/gutenprintui2/panel.c:1998
+#: src/gutenprintui/panel.c:2016 src/gutenprintui2/panel.c:2016
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr "指定放大縮�影�時的單�，是��尺寸的百分比，還是�英�有多少點"
 
-#: src/gutenprintui/panel.c:2001 src/gutenprintui2/panel.c:2001
+#: src/gutenprintui/panel.c:2019 src/gutenprintui2/panel.c:2019
 msgid "Percent"
 msgstr "百分比"
 
-#: src/gutenprintui/panel.c:2006 src/gutenprintui2/panel.c:2006
+#: src/gutenprintui/panel.c:2024 src/gutenprintui2/panel.c:2024
 msgid "Scale the print to the size of the page"
 msgstr "指定列�時的影�尺寸為��尺寸的�個百分比"
 
-#: src/gutenprintui/panel.c:2010 src/gutenprintui2/panel.c:2010
+#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2028
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2015 src/gutenprintui2/panel.c:2015
+#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
 msgid "Scale the print to the number of dots per inch"
 msgstr "列�時，��指定�英�有多少點來放大縮�影�"
 
-#: src/gutenprintui/panel.c:2033 src/gutenprintui2/panel.c:2033
+#: src/gutenprintui/panel.c:2051 src/gutenprintui2/panel.c:2051
 msgid "Set the width of the print"
 msgstr "指定列�時的影�寬度"
 
-#: src/gutenprintui/panel.c:2035 src/gutenprintui2/panel.c:2035
+#: src/gutenprintui/panel.c:2053 src/gutenprintui2/panel.c:2053
 msgid "Set the height of the print"
 msgstr "指定列�時的影�高度"
 
-#: src/gutenprintui/panel.c:2041 src/gutenprintui2/panel.c:2041
+#: src/gutenprintui/panel.c:2059 src/gutenprintui2/panel.c:2059
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -6823,101 +6965,101 @@ msgstr ""
 "使用影�\n"
 "原來的尺寸"
 
-#: src/gutenprintui/panel.c:2047 src/gutenprintui2/panel.c:2047
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2065
 msgid "Set the print size to the size of the image"
 msgstr "將列�時的影�尺寸設定為影�原來的尺寸"
 
-#: src/gutenprintui/panel.c:2070 src/gutenprintui2/panel.c:2071
+#: src/gutenprintui/panel.c:2088 src/gutenprintui2/panel.c:2089
 msgid "Print Color Adjust"
 msgstr "列�色彩調整"
 
-#: src/gutenprintui/panel.c:2073 src/gutenprintui2/panel.c:2074
+#: src/gutenprintui/panel.c:2091 src/gutenprintui2/panel.c:2092
 msgid "Set Defaults"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2075 src/gutenprintui2/panel.c:2076
+#: src/gutenprintui/panel.c:2093 src/gutenprintui2/panel.c:2094
 msgid "Close"
 msgstr "關閉"
 
-#: src/gutenprintui/panel.c:2104 src/gutenprintui2/panel.c:2105
+#: src/gutenprintui/panel.c:2122 src/gutenprintui2/panel.c:2123
 msgid "Image preview"
 msgstr "影��覽"
 
-#: src/gutenprintui/panel.c:2118 src/gutenprintui2/panel.c:2119
+#: src/gutenprintui/panel.c:2136 src/gutenprintui2/panel.c:2137
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2204 src/gutenprintui2/panel.c:2210
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2228
 msgid "Output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2238
+#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2256
 msgid "Output Type:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2236 src/gutenprintui2/panel.c:2242
+#: src/gutenprintui/panel.c:2254 src/gutenprintui2/panel.c:2260
 msgid "Select the desired output type"
 msgstr "指定輸出類型："
 
-#: src/gutenprintui/panel.c:2257 src/gutenprintui2/panel.c:2263
+#: src/gutenprintui/panel.c:2275 src/gutenprintui2/panel.c:2281
 msgid "Adjust Output..."
 msgstr "調整輸出�果..."
 
-#: src/gutenprintui/panel.c:2266 src/gutenprintui2/panel.c:2272
+#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2290
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr "調整色彩平衡�光度��差�彩度�擬色的�算方�"
 
-#: src/gutenprintui/panel.c:2284 src/gutenprintui2/panel.c:2291
+#: src/gutenprintui/panel.c:2302 src/gutenprintui2/panel.c:2309
 msgid "Size Units:"
 msgstr "尺寸單�："
 
-#: src/gutenprintui/panel.c:2287 src/gutenprintui2/panel.c:2294
+#: src/gutenprintui/panel.c:2305 src/gutenprintui2/panel.c:2312
 msgid " "
 msgstr ""
 
-#: src/gutenprintui/panel.c:2311 src/gutenprintui2/panel.c:2318
+#: src/gutenprintui/panel.c:2329 src/gutenprintui2/panel.c:2336
 msgid "Units:"
 msgstr "單�："
 
-#: src/gutenprintui/panel.c:2316 src/gutenprintui2/panel.c:2323
+#: src/gutenprintui/panel.c:2334 src/gutenprintui2/panel.c:2341
 msgid "Select the base unit of measurement for printing"
 msgstr "指定列�時的基本長度單�"
 
 #: src/gutenprintui/plist.c:90 src/gutenprintui/plist.c:99
-#: src/gutenprintui2/plist.c:90 src/gutenprintui2/plist.c:99
+#: src/gutenprintui2/plist.c:89 src/gutenprintui2/plist.c:98
 msgid "System V lp"
 msgstr "System V lp"
 
-#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:96
+#: src/gutenprintui/plist.c:96 src/gutenprintui2/plist.c:95
 msgid "CUPS"
 msgstr "CUPS"
 
-#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:102
+#: src/gutenprintui/plist.c:102 src/gutenprintui2/plist.c:101
 msgid "Berkeley lpd (/etc/lpc)"
 msgstr "Berkeley lpd (/etc/lpc)"
 
-#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:105
+#: src/gutenprintui/plist.c:105 src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/usr/bsd/lpc)"
 msgstr "Berkeley lpd (/usr/bsd/lpc)"
 
-#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:108
+#: src/gutenprintui/plist.c:108 src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/etc/lpc"
 msgstr "Berkeley lpd (/usr/etc/lpc"
 
-#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:111
+#: src/gutenprintui/plist.c:111 src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/libexec/lpc)"
 msgstr "Berkeley lpd (/usr/libexec/lpc)"
 
-#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:114
+#: src/gutenprintui/plist.c:114 src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
+#: src/gutenprintui/plist.c:1020 src/gutenprintui2/plist.c:1032
 msgid "Printer"
 msgstr "�表機"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
+#: src/gutenprintui/plist.c:1207 src/gutenprintui2/plist.c:1225
 msgid "(Default Printer)"
 msgstr "(�設�表機)"
 
@@ -6965,59 +7107,85 @@ msgstr ""
 msgid "_Gamma value"
 msgstr "_Gamma 值"
 
-#: src/cups/genppd.c:133
+#: src/cups/genppd.c:146
 msgid "Printer Features"
 msgstr "�表機功能"
 
-#: src/cups/genppd.c:134
+#: src/cups/genppd.c:147
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:139
+#: src/cups/genppd.c:152
 msgid "Common"
 msgstr ""
 
-#: src/cups/genppd.c:140
+#: src/cups/genppd.c:153
 msgid "Extra 1"
 msgstr ""
 
-#: src/cups/genppd.c:141
+#: src/cups/genppd.c:154
 msgid "Extra 2"
 msgstr ""
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:155
 msgid "Extra 3"
 msgstr ""
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:156
 msgid "Extra 4"
 msgstr ""
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:157
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:888
+#: src/cups/genppd.c:1055
 msgid "English"
 msgstr "Chinese-TW"
 
 #. TRANSLATORS: Specify PPD translation encoding e.g. ISOLatin1
-#: src/cups/genppd.c:890
+#: src/cups/genppd.c:1057
 msgid "ISOLatin1"
 msgstr ""
 
-#: src/cups/genppd.c:1465
+#: src/cups/genppd.c:1613
+#, fuzzy
+msgid "2-Sided Printing"
+msgstr "雙�列�"
+
+#: src/cups/genppd.c:1634
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1638
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1639
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1640
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1717
 msgid "No"
 msgstr "�"
 
-#: src/cups/genppd.c:1467
+#: src/cups/genppd.c:1719
 msgid "Yes"
 msgstr "是"
 
-#: src/cups/genppd.c:1497
+#: src/cups/genppd.c:1751 src/cups/genppd.c:1804
+#, fuzzy
+msgid "Value"
+msgstr "è—�"
+
+#: src/cups/genppd.c:1756
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -7025,14 +7193,6 @@ msgstr ""
 msgid "Escputil version "
 msgstr "Escputil 版本 "
 
-#: src/escputil/escputil.c:71
-msgid ""
-", Copyright (C) 2000-2006 Robert Krawitz\n"
-"Escputil comes with ABSOLUTELY NO WARRANTY; for details type 'escputil -l'\n"
-"This is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type 'escputil -l' for details.\n"
-msgstr ""
-
 #: src/escputil/escputil.c:76
 #, fuzzy
 msgid ""
@@ -7846,6 +8006,192 @@ msgstr ""
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Canon MULTIPASS MP500"
+#~ msgstr "Canon S4500"
+
+#, fuzzy
+#~ msgid "Canon MULTIPASS MP700"
+#~ msgstr "Canon S400"
+
+#, fuzzy
+#~ msgid "Canon MULTIPASS MP760"
+#~ msgstr "Canon CP100"
+
+#~ msgid " Gamma"
+#~ msgstr " Gamma"
+
+#, fuzzy
+#~ msgid "1440 x 1440"
+#~ msgstr "1440 x 1440 DPI"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI High Quality"
+#~ msgstr "2880 x 720 DPI 最高�質"
+
+#, fuzzy
+#~ msgid "1440 x 1440 DPI Highest Quality"
+#~ msgstr "1440 x 720 DPI 最高�質"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI High Quality"
+#~ msgstr "2880 x 720 DPI 最高�質"
+
+#, fuzzy
+#~ msgid "2880 x 1440 DPI Highest Quality"
+#~ msgstr "2880 x 720 DPI 最高�質"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Copyright (C) 1997-2003 Michael Sweet, Robert Krawitz,\n"
+#~ "and the rest of the Gutenprint Development Team.\n"
+#~ "\n"
+#~ "Please visit our web site at http://gimp-print.sourceforge.net.\n"
+#~ "\n"
+#~ "This program is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with this program; if not, write to the Free Software\n"
+#~ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+#~ "USA\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "版權所有 © 1997-2003 Michael Sweet�Robert Krawitz\n"
+#~ "�整個 Gutenprint 開發隊�。\n"
+#~ "\n"
+#~ "請�覽我們的網�： http://gimp-print.sourceforge.net\n"
+#~ "\n"
+#~ "本程�為自由軟體；您��據自由軟體基金會所發表的GNU通用公共授權�款�定，"
+#~ "就本程��為散布與�或修改；無論您�據的是本授權的第二版或（您自行�擇的）"
+#~ "任一日後發行的版本。\n"
+#~ "本程�係基於使用目的而加以散布，然而�負任何擔�責任；亦無��售性或特定目"
+#~ "的�用性所為的默示性擔�。詳情請�照 GNU 通用公共授權。\n"
+#~ "您應已收到附隨於本程�的GNU通用公共授權的副本；如無，請寫信至自由軟體基金"
+#~ "會：59 Temple Place – Suite 330, Boston, Ma 02111-1307, USA。\n"
+
+#~ msgid "90x90 DPI"
+#~ msgstr "90x90 DPI"
+
+#~ msgid "90x90 DPI DMT"
+#~ msgstr "90x90 DPI DMT"
+
+#~ msgid "180x180 DPI"
+#~ msgstr "180x180 DPI"
+
+#~ msgid "180x180 DPI DMT"
+#~ msgstr "180x180 DPI DMT"
+
+#~ msgid "360x360 DPI"
+#~ msgstr "360x360 DPI"
+
+#~ msgid "360x360 DPI DMT"
+#~ msgstr "360x360 DPI DMT"
+
+#~ msgid "720x360 DPI"
+#~ msgstr "720x360 DPI"
+
+#~ msgid "720x360 DPI DMT"
+#~ msgstr "720x360 DPI DMT"
+
+#~ msgid "720x720 DPI"
+#~ msgstr "720x720 DPI"
+
+#~ msgid "720x720 DPI DMT"
+#~ msgstr "720x720 DPI DMT"
+
+#~ msgid "1440x720 DPI"
+#~ msgstr "1440x720 DPI"
+
+#~ msgid "1440x720 DPI DMT"
+#~ msgstr "1440x720 DPI DMT"
+
+#~ msgid "1440x1440 DPI"
+#~ msgstr "1440x1440 DPI"
+
+#~ msgid "1440x1440 DPI DMT"
+#~ msgstr "1440x1440 DPI DMT"
+
+#~ msgid "2880x2880 DPI"
+#~ msgstr "2880x2880 DPI"
+
+#~ msgid "2880x2880 DPI DMT"
+#~ msgstr "2880x2880 DPI DMT"
+
+#~ msgid "150x150 DPI DMT"
+#~ msgstr "150x150 DPI DMT"
+
+#~ msgid "300x300 DPI DMT"
+#~ msgstr "300x300 DPI DMT"
+
+#~ msgid "600x300 DPI DMT"
+#~ msgstr "600x300 DPI DMT"
+
+#~ msgid "600x600 DPI DMT"
+#~ msgstr "600x600 DPI DMT"
+
+#~ msgid "1200x600 DPI DMT"
+#~ msgstr "1200x600 DPI DMT"
+
+#~ msgid "1200x1200 DPI"
+#~ msgstr "1200x1200 DPI"
+
+#~ msgid "1200x1200 DPI DMT"
+#~ msgstr "1200x1200 DPI DMT"
+
+#~ msgid "2400x2400 DPI"
+#~ msgstr "2400x2400 DPI"
+
+#~ msgid "2400x2400 DPI DMT"
+#~ msgstr "2400x2400 DPI DMT"
+
+#, fuzzy
+#~ msgid "Plain Paper PIXMA"
+#~ msgstr "普通紙張"
+
+#~ msgid "Envelope"
+#~ msgstr "ä¿¡å°�"
+
+# (Abel) from Canon
+#~ msgid "High Resolution Paper"
+#~ msgstr "高解�度彩色專用紙"
+
+# (Abel) from www.easyoffice.com.tw
+#~ msgid "T-Shirt Transfers"
+#~ msgstr "T�轉�紙"
+
+# (Abel) from Canon
+#~ msgid "High Gloss Film"
+#~ msgstr "影�寫真光澤膠片"
+
+# (Abel) from Canon
+#~ msgid "Glossy Photo Paper"
+#~ msgstr "影�寫真光澤紙"
+
+# (Abel) from Canon
+#~ msgid "Photo Paper Pro"
+#~ msgstr "專業級相紙"
+
+#~ msgid "CMYK Color"
+#~ msgstr "CMYK 色系"
+
+#~ msgid "CMY Color"
+#~ msgstr "CMY 色系"
+
+#, fuzzy
+#~ msgid "Canon iP4000"
+#~ msgstr "Canon S400"
+
 #~ msgid "Gutenprint"
 #~ msgstr "Gutenprint"
 
@@ -7853,10 +8199,6 @@ msgstr ""
 #~ msgid "Canon BJC 4400 photo"
 #~ msgstr "Canon BJC 4400 photo"
 
-#, fuzzy
-#~ msgid "Canon PIXMA iP4000"
-#~ msgstr "Canon S400"
-
 #~ msgid "EPSON Stylus Photo 785EPX"
 #~ msgstr "EPSON Stylus Photo 785EPX"
 
diff --git a/samples/Makefile.in b/samples/Makefile.in
index fcc946a..6322433 100644
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -47,18 +47,17 @@ subdir = samples
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-depcomp =
-am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -73,13 +72,18 @@ DATA = $(pkgsampledata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -105,6 +109,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -112,6 +118,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -124,12 +131,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -164,6 +173,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -259,14 +269,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -283,6 +296,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -300,17 +316,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -332,9 +352,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps samples/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  samples/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps samples/Makefile
+	  $(AUTOMAKE) --gnu  samples/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 96b0924..491a930 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -48,30 +48,34 @@ subdir = scripts
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-depcomp =
-am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -97,6 +101,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -104,6 +110,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -116,12 +123,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -156,6 +165,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -251,14 +261,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -275,6 +288,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -292,17 +308,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -330,9 +350,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps scripts/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  scripts/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps scripts/Makefile
+	  $(AUTOMAKE) --gnu  scripts/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index cb4eba4..c4679e5 100644
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -280,7 +280,7 @@ test -z "$convertloc" && {
 # Check for docbook version 4
 
 {
-  test -d "/usr/share/sgml/docbook_4" || test -d "/usr/share/sgml/docbook/dtd/4.0"
+  test -d "/usr/share/sgml/docbook_4" || test -d "/usr/share/sgml/docbook/dtd/4.0" || test -d "/usr/share/sgml/docbook_4.1"
 } || {
   echo " "
   echo "***Warning***: You must have "Docbook v4" installed to"
diff --git a/scripts/config.guess b/scripts/config.guess
index 910f4ee..33c9ad7 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-07-08'
+timestamp='2006-05-13'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -106,7 +107,7 @@ set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -216,6 +217,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
@@ -774,7 +778,14 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -789,8 +800,11 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+    x86:Interix*:[345]*)
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[345]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -804,7 +818,7 @@ EOF
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
-    amd64:CYGWIN*:*:*)
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
 	exit ;;
     p*:CYGWIN*:*)
@@ -825,25 +839,25 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux
+	echo cris-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux
+	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-${VENDOR}-linux
+    	echo frv-${VENDOR}-linux-gnu
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
@@ -861,8 +875,12 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; }
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -880,14 +898,21 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; }
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-${VENDOR}-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-${VENDOR}-linux
+	echo powerpc-${VENDOR}-linux-gnu
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-${VENDOR}-linux
+	echo powerpc64-${VENDOR}-linux-gnu
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -901,33 +926,36 @@ EOF
         esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-${VENDOR}-linux ;;
-	  PA8*) echo hppa2.0-${VENDOR}-linux ;;
-	  *)    echo hppa-${VENDOR}-linux ;;
+	  PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
+	  PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
+	  *)    echo hppa-${VENDOR}-linux-gnu ;;
 	esac
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-${VENDOR}-linux
+	echo hppa64-${VENDOR}-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-${VENDOR}-linux
+    	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-${VENDOR}-linux
+	echo x86_64-${VENDOR}-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -942,18 +970,18 @@ EOF
 				    p'`
         case "$ld_supported_targets" in
 	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
+		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
 		;;
 	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
+		echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
 		exit ;;
 	  coff-i386)
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
+		echo "${UNAME_MACHINE}-${VENDOR}-linux-gnucoff"
 		exit ;;
 	  "")
-		# Either a pre-BFD a.out linker (linuxoldld) or
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
+		echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
 		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
@@ -971,7 +999,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -981,9 +1009,13 @@ EOF
 	LIBC=dietlibc
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
 	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/'
+		echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
 		exit
 	}
 	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
@@ -1192,7 +1224,6 @@ EOF
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1271,6 +1302,9 @@ EOF
     i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/scripts/config.sub b/scripts/config.sub
index 6e2bdbf..4d936e2 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-07-08'
+timestamp='2006-05-13'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -119,8 +120,9 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -171,6 +173,10 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +193,10 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -239,7 +249,8 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -257,18 +268,19 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
@@ -276,9 +288,6 @@ case $basic_machine in
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -286,6 +295,9 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -316,7 +328,7 @@ case $basic_machine in
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -336,19 +348,20 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
+	| mt-* \
 	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
@@ -359,8 +372,6 @@ case $basic_machine in
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -696,6 +707,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -803,6 +817,12 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -859,6 +879,10 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -1101,7 +1125,7 @@ case $basic_machine in
 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1174,21 +1198,23 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku*)
+	      | -skyos* | -haiku* | -rdos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1215,6 +1241,9 @@ case $os in
 	-linux-dietlibc)
 		os=-linux-dietlibc
 		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 		;;
@@ -1337,6 +1366,9 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1346,9 +1378,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
diff --git a/scripts/depcomp b/scripts/depcomp
index ffcd540..04701da 100755
--- a/scripts/depcomp
+++ b/scripts/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2005-02-09.22
+scriptversion=2005-07-09.11
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 
@@ -17,8 +17,8 @@ scriptversion=2005-02-09.22
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -467,7 +467,8 @@ cpp)
   done
 
   "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
diff --git a/src/Makefile.in b/src/Makefile.in
index fed1cfc..ba6f519 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -46,18 +46,17 @@ subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-depcomp =
-am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -72,13 +71,18 @@ DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -104,6 +108,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -111,6 +117,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -123,12 +130,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -163,6 +172,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -258,14 +268,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -282,6 +295,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -299,17 +315,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -340,9 +360,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps src/Makefile
+	  $(AUTOMAKE) --gnu  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am
index 011bd07..8b99888 100644
--- a/src/cups/Makefile.am
+++ b/src/cups/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.87 2006/05/14 16:46:03 rlk Exp $
+## $Id: Makefile.am,v 1.87.8.2 2007/05/29 01:47:26 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -35,6 +35,7 @@ pkglibdir = $(cups_conf_serverbin)
 pkgsysconfdir = $(cups_conf_serverroot)
 
 cupsexec_backenddir = $(pkglibdir)/backend
+cupsexec_driverdir = $(pkglibdir)/driver
 cupsexec_filterdir = $(pkglibdir)/filter
 if CUPS_PPDS_AT_TOP_LEVEL
 cups_modeldir = $(pkgdatadir)/model/
@@ -51,6 +52,20 @@ TESTS= test-ppds
 
 ## Programs
 
+if BUILD_TRANSLATED_CUPS_PPDS
+PPD_NLS = $(PPD_NLS_1)
+LINGUAS = $(ALL_LINGUAS)
+TRANSLATE_PPDS = -DCUPS_TRANSLATED_PPDS
+endif
+
+if BUILD_SIMPLIFIED_CUPS_PPDS
+BUILD_SIMPLE_PPDS=-DGENERATE_SIMPLIFIED_PPDS
+endif
+
+if BUILD_CUPS_1_2
+cupsexec_driver_PROGRAMS = gutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
+endif
+
 if BUILD_CUPS
 bin_PROGRAMS = cups-calibrate
 sbin_PROGRAMS = cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
@@ -66,6 +81,9 @@ endif
 cups_calibrate_SOURCES = cups-calibrate.c
 cups_calibrate_LDADD = -lm
 
+commandtocanon_SOURCES = commandtocanon.c
+commandtocanon_LDADD = $(CUPS_LIBS)
+
 commandtoepson_SOURCES = commandtoepson.c
 commandtoepson_LDADD = $(CUPS_LIBS)
 
@@ -76,9 +94,15 @@ epson_SOURCES = epson.c
 epson_LDADD = $(CUPS_LIBS)
 
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c
+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS)
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
 
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS)
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
+
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = rastertoprinter.c
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS)
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
@@ -104,11 +128,6 @@ if BUILD_CUPS_PPDS
 INSTALL_DATA_LOCAL_DEPS = ppd-stamp
 endif
 
-if BUILD_TRANSLATED_CUPS_PPDS
-PPD_NLS = $(PPD_NLS_1)
-LINGUAS = $(ALL_LINGUAS)
-endif
-
 if USE_NLS
 PPD_NLS_1 = ppd-nls
 endif
@@ -117,7 +136,7 @@ endif
 ## Rules
 
 install-data-local: $(INSTALL_DATA_LOCAL_DEPS)
-	if test -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \
+	if test -n "$(CUPS_PKG)" -a -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \
 	  $(mkdir_p) $(DESTDIR)$(cups_modeldir); \
 	  cd ppd ; \
 	  for language in * ; do \
@@ -146,6 +165,7 @@ install-data-hook:
 	-rmdir $(DESTDIR)$(cups_modeldir)
 	-rmdir $(DESTDIR)$(pkgdatadir)
 	-rmdir $(DESTDIR)$(cupsexec_backenddir)
+	-rmdir $(DESTDIR)$(cupsexec_driverdir)
 	-rmdir $(DESTDIR)$(cupsexec_filterdir)
 	-rmdir $(DESTDIR)$(bindir)
 	-rmdir $(DESTDIR)$(pkglibdir)
@@ -174,7 +194,7 @@ ppd-nonls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 	for language in C ; do \
 	  mkdir ppd/$$language ; \
 	  echo "$$language:" ; \
-	  LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/$$language ; \
+	  LC_ALL=$$language LANG=$$language LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/$$language ; \
 	done
 
 ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
@@ -185,7 +205,7 @@ ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 	for language in `$(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -L -c \`pwd\`/catalog/share/locale` ; do \
 	  mkdir ppd/$$language ; \
 	  echo "$$language:" ; \
-	  LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/$$language -c `pwd`/catalog/share/locale ; \
+	  LC_ALL=$$language LANG=$$language LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -l $$language -p ppd/$$language -c `pwd`/catalog/share/locale ; \
 	done
 	$(RM) -r catalog
 
diff --git a/src/cups/Makefile.in b/src/cups/Makefile.in
index 848dee5..e1f7f29 100644
--- a/src/cups/Makefile.in
+++ b/src/cups/Makefile.in
@@ -44,6 +44,7 @@ host_triplet = @host@
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/cups-genppdconfig.in $(srcdir)/cups-genppdupdate.in \
 	$(top_srcdir)/scripts/global.mk COPYING
+@BUILD_CUPS_1_2_TRUE@cupsexec_driver_PROGRAMS = gutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT)
 @BUILD_CUPS_TRUE@bin_PROGRAMS = cups-calibrate$(EXEEXT)
 @BUILD_CUPS_TRUE@sbin_PROGRAMS = cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT)
 @BUILD_CUPS_TRUE@cupsexec_backend_PROGRAMS = epson$(EXEEXT) \
@@ -55,11 +56,12 @@ subdir = src/cups
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
@@ -67,30 +69,32 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = cups-genppdconfig cups-genppdupdate
 am__installdirs = "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(cupsexec_backenddir)" \
+	"$(DESTDIR)$(cupsexec_driverdir)" \
 	"$(DESTDIR)$(cupsexec_filterdir)" "$(DESTDIR)$(sbindir)" \
 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgdatadir)" \
 	"$(DESTDIR)$(pkgsysconfdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 cupsexec_backendPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+cupsexec_driverPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 cupsexec_filterPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS) $(cupsexec_backend_PROGRAMS) \
-	$(cupsexec_filter_PROGRAMS) $(sbin_PROGRAMS)
+	$(cupsexec_driver_PROGRAMS) $(cupsexec_filter_PROGRAMS) \
+	$(sbin_PROGRAMS)
 am_canon_OBJECTS = canon.$(OBJEXT)
 canon_OBJECTS = $(am_canon_OBJECTS)
 am__DEPENDENCIES_1 =
 canon_DEPENDENCIES = $(am__DEPENDENCIES_1)
-commandtocanon_SOURCES = commandtocanon.c
-commandtocanon_OBJECTS = commandtocanon.$(OBJEXT)
-commandtocanon_LDADD = $(LDADD)
+am_commandtocanon_OBJECTS = commandtocanon.$(OBJEXT)
+commandtocanon_OBJECTS = $(am_commandtocanon_OBJECTS)
+commandtocanon_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_commandtoepson_OBJECTS = commandtoepson.$(OBJEXT)
 commandtoepson_OBJECTS = $(am_commandtoepson_OBJECTS)
 commandtoepson_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_cups_calibrate_OBJECTS = cups-calibrate.$(OBJEXT)
 cups_calibrate_OBJECTS = $(am_cups_calibrate_OBJECTS)
 cups_calibrate_DEPENDENCIES =
-am_cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS =  \
-	genppd.$(OBJEXT)
+am_cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.$(OBJEXT)
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = $(am_cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS)
 am__DEPENDENCIES_2 = $(top_builddir)/src/main/libgutenprint.la
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES =  \
@@ -99,6 +103,10 @@ cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES =
 am_epson_OBJECTS = epson.$(OBJEXT)
 epson_OBJECTS = $(am_epson_OBJECTS)
 epson_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.$(OBJEXT)
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = $(am_gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS)
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 am_rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS =  \
 	rastertoprinter.$(OBJEXT)
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS = $(am_rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS)
@@ -107,8 +115,8 @@ rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDE
 sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(sbin_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp =
-am__depfiles_maybe =
+depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
+am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -117,15 +125,17 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(canon_SOURCES) commandtocanon.c $(commandtoepson_SOURCES) \
-	$(cups_calibrate_SOURCES) \
+SOURCES = $(canon_SOURCES) $(commandtocanon_SOURCES) \
+	$(commandtoepson_SOURCES) $(cups_calibrate_SOURCES) \
 	$(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES) \
 	$(epson_SOURCES) \
+	$(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES) \
 	$(rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES)
-DIST_SOURCES = $(canon_SOURCES) commandtocanon.c \
+DIST_SOURCES = $(canon_SOURCES) $(commandtocanon_SOURCES) \
 	$(commandtoepson_SOURCES) $(cups_calibrate_SOURCES) \
 	$(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES) \
 	$(epson_SOURCES) \
+	$(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES) \
 	$(rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -143,13 +153,18 @@ pkgdatadir = $(cups_conf_datadir)
 pkglibdir = $(cups_conf_serverbin)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -175,6 +190,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -182,6 +199,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -194,12 +212,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -234,6 +254,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -329,14 +350,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @cups_bindir@
@@ -353,6 +377,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -370,17 +397,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @cups_sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -389,6 +420,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS
 empty = 
 pkgsysconfdir = $(cups_conf_serverroot)
 cupsexec_backenddir = $(pkglibdir)/backend
+cupsexec_driverdir = $(pkglibdir)/driver
 cupsexec_filterdir = $(pkglibdir)/filter
 @CUPS_PPDS_AT_TOP_LEVEL_FALSE@cups_modeldir = $(pkgdatadir)/model/gutenprint/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/
 @CUPS_PPDS_AT_TOP_LEVEL_TRUE@cups_modeldir = $(pkgdatadir)/model/
@@ -396,10 +428,16 @@ cupsexec_filterdir = $(pkglibdir)/filter
 LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(CUPS_CFLAGS)
 STP_ENV = STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/main
 TESTS = test-ppds
+@BUILD_TRANSLATED_CUPS_PPDS_TRUE@PPD_NLS = $(PPD_NLS_1)
+@BUILD_TRANSLATED_CUPS_PPDS_TRUE@LINGUAS = $(ALL_LINGUAS)
+@BUILD_TRANSLATED_CUPS_PPDS_TRUE@TRANSLATE_PPDS = -DCUPS_TRANSLATED_PPDS
+@BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@BUILD_SIMPLE_PPDS = -DGENERATE_SIMPLIFIED_PPDS
 @BUILD_CUPS_TRUE@sbin_SCRIPTS = cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ cups-genppdupdate.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 @BUILD_GENPPD_STATIC_TRUE@STATIC_LDOPTS = -static -export-dynamic
 cups_calibrate_SOURCES = cups-calibrate.c
 cups_calibrate_LDADD = -lm
+commandtocanon_SOURCES = commandtocanon.c
+commandtocanon_LDADD = $(CUPS_LIBS)
 commandtoepson_SOURCES = commandtoepson.c
 commandtoepson_LDADD = $(CUPS_LIBS)
 canon_SOURCES = canon.c
@@ -407,8 +445,13 @@ canon_LDADD = $(CUPS_LIBS)
 epson_SOURCES = epson.c
 epson_LDADD = $(CUPS_LIBS)
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c
+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS)
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS)
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = rastertoprinter.c
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS)
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
@@ -417,8 +460,6 @@ rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS
 pkgdata_DATA = $(CUPS_PKG)
 pkgsysconf_DATA = $(CUPS_CONF)
 @BUILD_CUPS_PPDS_TRUE@INSTALL_DATA_LOCAL_DEPS = ppd-stamp
-@BUILD_TRANSLATED_CUPS_PPDS_TRUE@PPD_NLS = $(PPD_NLS_1)
-@BUILD_TRANSLATED_CUPS_PPDS_TRUE@LINGUAS = $(ALL_LINGUAS)
 @USE_NLS_TRUE@PPD_NLS_1 = ppd-nls
 CLEANFILES = ppd-stamp
 DISTCLEANFILES = cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ cups-genppdupdate.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
@@ -444,9 +485,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/cups/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/cups/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps src/cups/Makefile
+	  $(AUTOMAKE) --gnu  src/cups/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -524,6 +565,34 @@ clean-cupsexec_backendPROGRAMS:
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
+install-cupsexec_driverPROGRAMS: $(cupsexec_driver_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(cupsexec_driverdir)" || $(mkdir_p) "$(DESTDIR)$(cupsexec_driverdir)"
+	@list='$(cupsexec_driver_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cupsexec_driverPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(cupsexec_driverdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(cupsexec_driverPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(cupsexec_driverdir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-cupsexec_driverPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(cupsexec_driver_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(cupsexec_driverdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(cupsexec_driverdir)/$$f"; \
+	done
+
+clean-cupsexec_driverPROGRAMS:
+	@list='$(cupsexec_driver_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
 install-cupsexec_filterPROGRAMS: $(cupsexec_filter_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(cupsexec_filterdir)" || $(mkdir_p) "$(DESTDIR)$(cupsexec_filterdir)"
@@ -598,6 +667,9 @@ cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT): $(cu
 epson$(EXEEXT): $(epson_OBJECTS) $(epson_DEPENDENCIES) 
 	@rm -f epson$(EXEEXT)
 	$(LINK) $(epson_LDFLAGS) $(epson_OBJECTS) $(epson_LDADD) $(LIBS)
+gutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT): $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES) 
+	@rm -f gutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT)
+	$(LINK) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD) $(LIBS)
 rastertogutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT): $(rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS) $(rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDENCIES) 
 	@rm -f rastertogutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@$(EXEEXT)
 	$(LINK) $(rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS) $(rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_OBJECTS) $(rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD) $(LIBS)
@@ -627,14 +699,63 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandtocanon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandtoepson.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cups-calibrate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epson.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rastertoprinter.Po@am__quote@
+
 .c.o:
-	$(COMPILE) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.o: genppd.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -MT cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.o -MD -MP -MF "$(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo" -c -o cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.o `test -f 'genppd.c' || echo '$(srcdir)/'`genppd.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo" "$(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po"; else rm -f "$(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='genppd.c' object='cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -c -o cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.o `test -f 'genppd.c' || echo '$(srcdir)/'`genppd.c
+
+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj: genppd.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -MT cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj -MD -MP -MF "$(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo" -c -o cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj `if test -f 'genppd.c'; then $(CYGPATH_W) 'genppd.c'; else $(CYGPATH_W) '$(srcdir)/genppd.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo" "$(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po"; else rm -f "$(DEPDIR)/cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='genppd.c' object='cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -c -o cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj `if test -f 'genppd.c'; then $(CYGPATH_W) 'genppd.c'; else $(CYGPATH_W) '$(srcdir)/genppd.c'; fi`
+
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.o: genppd.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -MT gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.o -MD -MP -MF "$(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo" -c -o gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.o `test -f 'genppd.c' || echo '$(srcdir)/'`genppd.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo" "$(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po"; else rm -f "$(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='genppd.c' object='gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -c -o gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.o `test -f 'genppd.c' || echo '$(srcdir)/'`genppd.c
+
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj: genppd.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -MT gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj -MD -MP -MF "$(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo" -c -o gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj `if test -f 'genppd.c'; then $(CYGPATH_W) 'genppd.c'; else $(CYGPATH_W) '$(srcdir)/genppd.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo" "$(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Po"; else rm -f "$(DEPDIR)/gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='genppd.c' object='gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS) $(CFLAGS) -c -o gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@-genppd.obj `if test -f 'genppd.c'; then $(CYGPATH_W) 'genppd.c'; else $(CYGPATH_W) '$(srcdir)/genppd.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -837,7 +958,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) all-local
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cupsexec_backenddir)" "$(DESTDIR)$(cupsexec_filterdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgsysconfdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cupsexec_backenddir)" "$(DESTDIR)$(cupsexec_driverdir)" "$(DESTDIR)$(cupsexec_filterdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgsysconfdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -870,10 +991,12 @@ maintainer-clean-generic:
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-cupsexec_backendPROGRAMS \
-	clean-cupsexec_filterPROGRAMS clean-generic clean-libtool \
-	clean-local clean-sbinPROGRAMS mostlyclean-am
+	clean-cupsexec_driverPROGRAMS clean-cupsexec_filterPROGRAMS \
+	clean-generic clean-libtool clean-local clean-sbinPROGRAMS \
+	mostlyclean-am
 
 distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -894,6 +1017,7 @@ install-data-am: install-data-local install-pkgdataDATA \
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
 install-exec-am: install-binPROGRAMS install-cupsexec_backendPROGRAMS \
+	install-cupsexec_driverPROGRAMS \
 	install-cupsexec_filterPROGRAMS install-sbinPROGRAMS \
 	install-sbinSCRIPTS
 
@@ -904,6 +1028,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -921,18 +1046,20 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-cupsexec_backendPROGRAMS \
+	uninstall-cupsexec_driverPROGRAMS \
 	uninstall-cupsexec_filterPROGRAMS uninstall-info-am \
 	uninstall-local uninstall-pkgdataDATA uninstall-pkgsysconfDATA \
 	uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
 
 .PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \
 	clean clean-binPROGRAMS clean-cupsexec_backendPROGRAMS \
-	clean-cupsexec_filterPROGRAMS clean-generic clean-libtool \
-	clean-local clean-sbinPROGRAMS ctags dist-hook distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS \
+	clean-cupsexec_driverPROGRAMS clean-cupsexec_filterPROGRAMS \
+	clean-generic clean-libtool clean-local clean-sbinPROGRAMS \
+	ctags dist-hook distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
 	install-cupsexec_backendPROGRAMS \
+	install-cupsexec_driverPROGRAMS \
 	install-cupsexec_filterPROGRAMS install-data install-data-am \
 	install-data-hook install-data-local install-exec \
 	install-exec-am install-info install-info-am install-man \
@@ -943,6 +1070,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsexec_backendPROGRAMS \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
 	uninstall-cupsexec_backendPROGRAMS \
+	uninstall-cupsexec_driverPROGRAMS \
 	uninstall-cupsexec_filterPROGRAMS uninstall-info-am \
 	uninstall-local uninstall-pkgdataDATA uninstall-pkgsysconfDATA \
 	uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
@@ -970,7 +1098,7 @@ cups-genppdupdate.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@: $(top_b
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/cups-genppdupdate
 
 install-data-local: $(INSTALL_DATA_LOCAL_DEPS)
-	if test -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \
+	if test -n "$(CUPS_PKG)" -a -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \
 	  $(mkdir_p) $(DESTDIR)$(cups_modeldir); \
 	  cd ppd ; \
 	  for language in * ; do \
@@ -999,6 +1127,7 @@ install-data-hook:
 	-rmdir $(DESTDIR)$(cups_modeldir)
 	-rmdir $(DESTDIR)$(pkgdatadir)
 	-rmdir $(DESTDIR)$(cupsexec_backenddir)
+	-rmdir $(DESTDIR)$(cupsexec_driverdir)
 	-rmdir $(DESTDIR)$(cupsexec_filterdir)
 	-rmdir $(DESTDIR)$(bindir)
 	-rmdir $(DESTDIR)$(pkglibdir)
@@ -1027,7 +1156,7 @@ ppd-nonls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 	for language in C ; do \
 	  mkdir ppd/$$language ; \
 	  echo "$$language:" ; \
-	  LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/$$language ; \
+	  LC_ALL=$$language LANG=$$language LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/$$language ; \
 	done
 
 ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
@@ -1038,7 +1167,7 @@ ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 	for language in `$(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -L -c \`pwd\`/catalog/share/locale` ; do \
 	  mkdir ppd/$$language ; \
 	  echo "$$language:" ; \
-	  LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/$$language -c `pwd`/catalog/share/locale ; \
+	  LC_ALL=$$language LANG=$$language LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -l $$language -p ppd/$$language -c `pwd`/catalog/share/locale ; \
 	done
 	$(RM) -r catalog
 
diff --git a/src/cups/canon.c b/src/cups/canon.c
index 963d446..25c235e 100644
--- a/src/cups/canon.c
+++ b/src/cups/canon.c
@@ -35,6 +35,14 @@
 #  include <netdb.h>
 #endif /* WIN32 || __EMX__ */
 
+#ifdef __linux
+#  include <sys/param.h>
+#  include <sys/types.h>
+#  include <sys/stat.h>
+#  include <dirent.h>
+#  include <unistd.h>
+#endif /* __linux */
+
 #ifdef __sgi
 #  include <invent.h>
 #  ifndef INV_EPP_ECP_PLP
@@ -439,6 +447,7 @@ list_devices(void)
   int	fd;			/* File descriptor */
   char	device[255];		/* Device filename */
   FILE	*probe;			/* /proc/parport/n/autoprobe file */
+  DIR	*dirprobe;		/* scan /sys/bus/usb/drivers/usblp */
   char	line[1024],		/* Line from file */
 	*delim,			/* Delimiter in file */
 	make[IPP_MAX_NAME],	/* Make from file */
@@ -451,12 +460,17 @@ list_devices(void)
 
   for (i = 0; i < 4; i ++)
   {
-    sprintf(device, "/proc/parport/%d/autoprobe", i);
-    if ((probe = fopen(device, "r")) != NULL)
+    sprintf(device, "/proc/sys/dev/parport/parport%d/autoprobe", i);
+    probe = fopen(device, "r");
+    if ( probe == NULL )  /* older kernel versions */
+    {
+      sprintf(device, "/proc/parport/%d/autoprobe", i);
+      probe = fopen(device, "r");
+    }
+    if ( probe != NULL )
     {
       memset(make, 0, sizeof(make));
       memset(model, 0, sizeof(model));
-      strcpy(model, "CANON");
 
       while (fgets(line, sizeof(line), probe) != NULL)
       {
@@ -474,17 +488,17 @@ list_devices(void)
 	*/
 
         if (strncmp(line, "MODEL:", 6) == 0 &&
-	    strncmp(line, "MODEL:CANON", 13) != 0)
+	    strncmp(line, "MODEL:Unknown", 13) != 0)
 	  strncpy(model, line + 6, sizeof(model) - 1);
 	else if (strncmp(line, "MANUFACTURER:", 13) == 0 &&
-	         strncmp(line, "MANUFACTURER:CANON", 20) != 0)
+	         strncmp(line, "MANUFACTURER:Unknown", 20) != 0)
 	  strncpy(make, line + 13, sizeof(make) - 1);
       }
 
       fclose(probe);
 
-      if (strcmp(make, "CANON") == 0)
-	printf("direct canon:/dev/lp%d \"%s %s\" \"Parallel Port #%d\"\n",
+      if (strcasecmp(make, "CANON") == 0)
+	printf("direct canon:/dev/lp%d \"%s %s\" \"Gutenprint Parallel Port #%d\"\n",
 	       i, make, model, i + 1);
     }
     else
@@ -493,7 +507,7 @@ list_devices(void)
       if ((fd = open(device, O_RDWR)) >= 0)
       {
 	close(fd);
-	printf("direct canon:%s \"CANON\" \"Parallel Port #%d\"\n", device, i + 1);
+	printf("direct canon:%s \"CANON\" \"Gutenprint Parallel Port #%d\"\n", device, i + 1);
       }
     }
   }
@@ -502,7 +516,110 @@ list_devices(void)
   * Probe for USB devices...
   */
 
-  if ((probe = fopen("/proc/bus/usb/devices", "r")) != NULL)
+  if ((dirprobe = opendir("/sys/class/usb")) != NULL) /* SYSFS in kernel 2.6 */
+  {
+    struct dirent	*dirent;	/* directory entries */
+    struct stat		statbuf;	/* file stat */
+    char 		entry[MAXPATHLEN]; /* pathname to usb entries */
+    char 		link[MAXPATHLEN]; /* linkname of usb entries */
+    char		*cptr;		/* multi used character pointer */
+    FILE		*file;		/* read printer specific info from */
+
+    i = 0;
+    /* scan the directory entries */
+    while((dirent = readdir(dirprobe)) != 0)
+    {
+      /* skip "." and ".." */
+      if (dirent->d_name[0] != 'l' || dirent->d_name[1] != 'p')
+        continue;
+
+      /* generate path to work with */
+      snprintf(entry, MAXPATHLEN, "/sys/class/usb/%s/device", dirent->d_name);
+
+      /* look, if we have a pointer */
+      if(lstat(entry, &statbuf) < 0)
+      {
+      	perror(entry);
+	continue;
+      }
+
+      if (S_ISLNK(statbuf.st_mode))
+      {
+	/* get the path to the link */
+        if (readlink(entry, link, MAXPATHLEN) < 0)
+	  continue;
+
+	/* find right occurance of '/' */
+        if ((cptr = strrchr(link, '/')) == NULL)
+	{
+	  continue;
+	}
+	
+	/*
+	 * and truncate path: cut away everything after the '/',
+	 * because parallel directory contains the information we need
+	 */
+	*cptr = '\0';
+
+	memset(make, 0, sizeof(make));
+	memset(model, 0, sizeof(model));
+	/* read manufacturer */
+        snprintf(entry, MAXPATHLEN, "/sys/class/usb/%s/%s/manufacturer",
+	         dirent->d_name, link);
+
+	if ((file = fopen(entry, "r")) == NULL)
+	{
+	  /* skip this entry, there is no file "manufacturer" */
+	  continue;
+	}
+	/* read data in */
+	fread(make, sizeof(make)-1, sizeof(char), file);
+	fclose(file);
+
+	/* beautify "make" - strip newline away */
+        if ((cptr = strrchr(make, '\n')) != NULL)
+	{
+	  *cptr = '\0';
+	}
+
+	/* next entry, if manufacturer is not CANON */
+        if (strcasecmp(make, "CANON") != 0)
+	  continue;
+
+	/* read product name */
+        snprintf(entry, MAXPATHLEN, "/sys/class/usb/%s/%s/product",
+	         dirent->d_name, link);
+
+	if ((file = fopen(entry, "r")) == NULL)
+	{
+	  /* skip this entry, there is no file "product" */
+	  continue;
+	}
+	/* read data in */
+	fread(model, sizeof(model)-1, sizeof(char), file);
+	fclose(file);
+
+	/* beautify "model" - strip away newline */
+        if ((cptr = strrchr(model, '\n')) != NULL)
+	{
+	  *cptr = '\0';
+	}
+	sprintf(device, "/dev/usb/%s", dirent->d_name);
+	if (access(device, 0))
+	{
+	  sprintf(device, "/dev/usb/usb%s", dirent->d_name);
+
+	  if (access(device, 0))
+	    sprintf(device, "/dev/usb%s", dirent->d_name);
+	}
+
+	printf("direct canon:%s \"%s %s\" \"Gutenprint USB Printer #%d\"\n",
+	       device, make, model, ++i);
+      }
+    }
+    closedir(dirprobe);
+  }
+  else if ((probe = fopen("/proc/bus/usb/devices", "r")) != NULL)
   {
     i = 0;
 
@@ -556,7 +673,7 @@ list_devices(void)
 	      sprintf(device, "/dev/usblp%d", i);
 	  }
 
-	  printf("direct canon:%s \"%s %s\" \"USB Printer #%d\"\n",
+	  printf("direct canon:%s \"%s %s\" \"Gutenprint USB Printer #%d\"\n",
 		 device, make, model, i + 1);
         }
 
@@ -577,21 +694,21 @@ list_devices(void)
       if ((fd = open(device, O_RDWR)) >= 0)
       {
 	close(fd);
-	printf("direct canon:%s \"CANON\" \"USB Printer #%d\"\n", device, i + 1);
+	printf("direct canon:%s \"CANON\" \"Gutenprint USB Printer #%d\"\n", device, i + 1);
       }
 
       sprintf(device, "/dev/usb/usblp%d", i);
       if ((fd = open(device, O_RDWR)) >= 0)
       {
 	close(fd);
-	printf("direct canon:%s \"CANON\" \"USB Printer #%d\"\n", device, i + 1);
+	printf("direct canon:%s \"CANON\" \"Gutenprint USB Printer #%d\"\n", device, i + 1);
       }
 
       sprintf(device, "/dev/usblp%d", i);
       if ((fd = open(device, O_RDWR)) >= 0)
       {
 	close(fd);
-	printf("direct canon:%s \"CANON\" \"USB Printer #%d\"\n", device, i + 1);
+	printf("direct canon:%s \"CANON\" \"Gutenprint USB Printer #%d\"\n", device, i + 1);
       }
     }
   }
@@ -615,7 +732,7 @@ list_devices(void)
       * Standard parallel port...
       */
 
-      puts("direct canon:/dev/plpbi \"CANON\" \"Onboard Parallel Port\"");
+      puts("direct canon:/dev/plpbi \"CANON\" \"Gutenprint Onboard Parallel Port\"");
     }
   }
 
@@ -633,7 +750,7 @@ list_devices(void)
   {
     sprintf(device, "/dev/ecpp%d", i);
     if (access(device, 0) == 0)
-      printf("direct canon:%s \"CANON\" \"Sun IEEE-1284 Parallel Port #%d\"\n",
+      printf("direct canon:%s \"CANON\" \"Gutenprint Sun IEEE-1284 Parallel Port #%d\"\n",
              device, i + 1);
   }
 
@@ -642,7 +759,7 @@ list_devices(void)
     sprintf(device, "/dev/lp%d", i);
 
     if (access(device, 0) == 0)
-      printf("direct canon:%s \"CANON\" \"PC Parallel Port #%d\"\n",
+      printf("direct canon:%s \"CANON\" \"Gutenprint PC Parallel Port #%d\"\n",
              device, i + 1);
   }
 #elif defined(FreeBSD) || defined(OpenBSD) || defined(NetBSD)
@@ -661,14 +778,14 @@ list_devices(void)
     if ((fd = open(device, O_RDWR)) >= 0)
     {
       close(fd);
-      printf("direct canon:%s \"CANON\" \"Parallel Port #%d (interrupt-driven)\"\n", device, i + 1);
+      printf("direct canon:%s \"CANON\" \"Gutenprint Parallel Port #%d (interrupt-driven)\"\n", device, i + 1);
     }
 
     sprintf(device, "/dev/lpa%d", i);
     if ((fd = open(device, O_RDWR)) >= 0)
     {
       close(fd);
-      printf("direct canon:%s \"CANON\" \"Parallel Port #%d (polled)\"\n", device, i + 1);
+      printf("direct canon:%s \"CANON\" \"Gutenprint Parallel Port #%d (polled)\"\n", device, i + 1);
     }
   }
 
@@ -682,7 +799,7 @@ list_devices(void)
     if ((fd = open(device, O_RDWR)) >= 0)
     {
       close(fd);
-      printf("direct canon:%s \"CANON\" \"USB Port #%d\"\n", device, i + 1);
+      printf("direct canon:%s \"CANON\" \"Gutenprint USB Port #%d\"\n", device, i + 1);
     }
   }
 #endif
diff --git a/src/cups/cups-genppdconfig.in b/src/cups/cups-genppdconfig.in
index 26ae5e7..aa80920 100644
--- a/src/cups/cups-genppdconfig.in
+++ b/src/cups/cups-genppdconfig.in
@@ -1,5 +1,5 @@
 #! @PERL@ -w
-# $Id: cups-genppdconfig.in,v 1.13 2006/05/30 19:25:36 rleigh Exp $
+# $Id: cups-genppdconfig.in,v 1.13.8.1 2007/05/29 01:47:26 rlk Exp $
 # A user-friendly dialog-based wrapper for cups-genppd(8).
 # Copyright (C) 2002 Roger Leigh <rleigh@debian.org>
 #
@@ -396,7 +396,7 @@ sub create_ppds {
     $count = 0;
     foreach $language (@chosen_languages) { # loop through languages
 	open GENPPD,
-	"LANGUAGE=$language cups-genppd.$version -v -p $chosen_location/$language $printers 2>&1 |"
+	"LC_ALL=$language LANG=$language LANGUAGE=$language cups-genppd.$version -v -p $chosen_location/$language $printers 2>&1 |"
 	    or die "can't fork cups-genppd: $!";
 	$file = "";
 	while ( defined($file = <GENPPD>)) { # dump genppd stats into guage
diff --git a/src/cups/cups-genppdupdate.in b/src/cups/cups-genppdupdate.in
index 1a1a8f4..ee49a0b 100644
--- a/src/cups/cups-genppdupdate.in
+++ b/src/cups/cups-genppdupdate.in
@@ -1,5 +1,5 @@
 #! @PERL@ -w
-# $Id: cups-genppdupdate.in,v 1.25 2006/05/22 20:25:51 rleigh Exp $
+# $Id: cups-genppdupdate.in,v 1.25.8.2 2007/05/29 01:47:26 rlk Exp $
 # Update CUPS PPDs for Gutenprint queues.
 # Copyright (C) 2002-2003 Roger Leigh (rleigh@debian.org)
 #
@@ -25,6 +25,7 @@ use File::Copy qw(mv);
 
 sub parse_options ();
 sub update_ppd ($); # Original PPD filename
+sub get_ppd_contents ($$$$$); # Return contents of desired PPD
 sub find_ppd ($$$$); # Gutenprint Filename, driver, language (e.g. en, sv),
 		     # region (e.g. GB, DE)
 sub get_default_types (*); # Source PPD FH
@@ -49,6 +50,8 @@ my $quiet = 0;     # No output
 my $no_action = 0; # Don't output files
 my $reset_defaults = 0;		# Reset options to default settings
 my $version = "@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@";
+my $micro_version = "@GUTENPRINT_VERSION@";
+my $use_static_ppd = "@BUILD_CUPS_PPDS@";
 
 my $ppd_dir = "@cups_conf_serverroot@/ppd"; # Location of in-use CUPS PPDs
 my $ppd_root_dir = "@cups_conf_datadir@/model";
@@ -56,6 +59,11 @@ my $ppd_base_dir = "$ppd_root_dir/gutenprint/$version"; # Available PPDs
 my $ppd_out_dir = "";		# By default output into source directory
 my $gzext = ".gz";
 my $updated_ppd_count = 0;
+my $exit_after_parse_args = 0;
+
+my $serverdir = "@cups_conf_serverbin@";
+
+$Getopt::Std::STANDARD_HELP_VERSION = 1;
 
 my @ppd_files; # A list of in-use Gutenprint PPD files
 
@@ -166,21 +174,53 @@ if (!$quiet || $verbose) {
 	print STDOUT "Updated $updated_ppd_count PPD file${plural}.  Restart cupsd for the changes to take effect.\n";
 	exit (0);
     } else {
-	print STDOUT "Failed to update any PPD files\n";
+	if ($no_action) {
+	    print STDOUT "Did not update any PPD files\n";
+	} else {
+	    print STDOUT "Failed to update any PPD files\n";
+	}
 	exit (0);
     }
 }
 
+sub HELP_MESSAGE($;$$$) {
+    my ($fh) = @_;
+    print $fh "Usage: $0 [OPTION]... [PPD_FILE]...\n";
+    print $fh "Update CUPS+Gutenprint PPD files.\n\n";
+    print $fh "  -d flags    Enable debugging\n";
+    print $fh "  -h          Display this help text\n";
+    print $fh "  -n          No-action.  Don't overwrite any PPD files.\n";
+    print $fh "  -q          Quiet mode.  No messages except errors.\n";
+    print $fh "  -s ppd_dir  Use ppd_dir as the source PPD directory.\n";
+    print $fh "  -v          Verbose messages.\n";
+    print $fh "  -N          Reset options to defaults.\n";
+    print $fh "  -o out_dir  Output PPD files to out_dir.\n";
+    exit(0);
+}
 
+# Getopt::Std calls VERSION_MESSAGE followed by HELP_MESSAGE if --help
+# is passed.  If --version is passed, it calls only VERSION_MESSAGE.
+# So we have to make sure to exit, but we want to allow --help to
+# print out the help message.
+sub VERSION_MESSAGE($;$$$) {
+    my ($fh) = @_;
+    print "cups-genppdupdate from Gutenprint $micro_version\n";
+    $exit_after_parse_args = 1;
+}
 
-sub parse_options () {
-    getopts("dhnqs:vNo:");
+sub help() {
+    HELP_MESSAGE(\*STDOUT);
+}
 
+sub parse_options () {
+    if (!getopts('d:hnqs:vNo:')) {
+	help();
+    }
     if ($opt_n) {
 	$no_action = 1;
     }
     if ($opt_d) {
-	$debug = 1;
+	$debug = $opt_d;
     }
     if ($opt_s) {
 	if (-d $opt_s) {
@@ -210,20 +250,81 @@ sub parse_options () {
 	}
     }
     if ($opt_h) {
-	print "Usage: $0 [OPTION]... [PPD_FILE]...\n";
-	print "Update CUPS+Gutenprint PPD files.\n\n";
-        print "  -d          Enable debugging\n";
-        print "  -h          Display this help text\n";
-	print "  -n          No-action.  Don't overwrite any PPD files.\n";
-	print "  -q          Quiet mode.  No messages except errors.\n";
-	print "  -s ppd_dir  Use ppd_dir as the source PPD directory.\n";
-	print "  -v          Verbose messages.\n";
-	print "  -N          Reset options to defaults.\n";
-	print "  -o out_dir  Output PPD files to out_dir.\n";
-	exit (0);
+	help();
+    }
+    if ($exit_after_parse_args) {
+	exit(0);
     }
 }
 
+sub get_ppd_contents($$$$$) {
+    my ($ppd_source_filename, $filename, $driver, $locale, $region) = @_;
+
+    my $source_data;
+    my ($new_ppd_filename);
+
+    if ($use_static_ppd eq "no") {
+	my ($driver_bin) = "$serverdir/driver/gutenprint.$version";
+	my ($driver_version) = `$driver_bin VERSION`;
+	chomp $driver_version;
+	if ($driver_version eq "@VERSION@") {
+	    my ($simplified);
+	    if ($filename =~ m,.*/([^/]*)(.sim)(.ppd)?(.gz)?$,) {
+		$simplified = "simple";
+	    } else {
+		$simplified = "expert";
+	    }
+	    my ($url);
+	    foreach $url ("gutenprint.$version://$driver/$simplified/${locale}_${region}",
+			  "gutenprint.$version://$driver/$simplified/${locale}",
+			  "gutenprint.$version://$driver/$simplified") {
+		$new_ppd_filename = $url;
+		if (open PPD, "$driver_bin cat $url 2>/dev/null |") {
+		    while (<PPD>) {
+			$source_data .= $_;
+		    }
+		    close PPD;
+		    if ($source_data) {
+			return ( $new_ppd_filename, $source_data );
+		    }
+		}
+	    }
+	}
+	# Otherwise fall through and try to find a static PPD
+    }
+
+    # Search for a PPD matching our criteria...
+
+    $new_ppd_filename = find_ppd($filename, $driver, $locale, $region);
+    if (!defined($new_ppd_filename)) {
+        # There wasn't a valid source PPD file, so give up.
+        print STDERR "$ppd_source_filename: no valid candidate for replacement.  Skipping\n";
+        print STDERR "$ppd_source_filename: please upgrade this PPD manually\n";
+	return ("", 0);
+    }
+    if ($debug & 1) {
+	print "Candidate PPD: $new_ppd_filename\n";
+    }
+
+    my $suffix = "\\" . $gzext; # Add '\', so m// matches the '.'.
+    if ($new_ppd_filename =~ m/.gz$/) { # Decompress input buffer
+	open GZIN, "gunzip -c $new_ppd_filename |"
+	    or die "$_: can't open for decompression: $!";
+	while (<GZIN>) {
+	    $source_data .= $_;
+	}
+	close GZIN;
+    } else {
+	open SOURCE, $new_ppd_filename
+	    or die "$new_ppd_filename: can't open source file: $!";
+	binmode SOURCE;
+	my $source_size = (stat(SOURCE))[7];
+	read (SOURCE, $source_data, $source_size)
+	    or die "$new_ppd_filename: error reading source: $!";
+	close SOURCE or die "$new_ppd_filename: can't close file: $!";
+    }
+    return ( $new_ppd_filename, $source_data );
+}
 
 # Update the named PPD file.
 sub update_ppd ($) {
@@ -237,7 +338,7 @@ sub update_ppd ($) {
     open ORIG, $_ or die "$_: can't open PPD file: $!";
     seek (ORIG, 0, 0) or die "can't seek to start of PPD file";
     my @orig_metadata = stat(ORIG);
-    if ($debug) {
+    if ($debug & 1) {
 	print "Source Filename: $ppd_source_filename\n";
     }
     my ($filename) = "";
@@ -274,7 +375,7 @@ sub update_ppd ($) {
 	print STDERR "$ppd_source_filename: this PPD file cannot be upgraded automatically (only files based on Gutenprint 4.3.21 and newer can be)\n";
 	return 0;
     }
-    if ($debug) {
+    if ($debug & 2) {
 	print "Gutenprint Filename: $filename\n";
 	print "Locale: $locale\n";
 	print "Language: $lingo\n";
@@ -295,46 +396,19 @@ sub update_ppd ($) {
     if (! defined($region)) {
 	$region = "";
     }
-    if ($debug) {
-	print "Locale: $locale\n";
+    if ($debug & 2) {
+	print "Base Locale: $locale\n";
 	print "Region: $region\n";
     }
 
-    # Search for a PPD matching our criteria...
-
-    my $source = find_ppd($filename, $driver, $locale, $region);
-    if (!defined($source)) {
-        # There wasn't a valid source PPD file, so give up.
-        print STDERR "$ppd_source_filename: no valid candidate for replacement.  Skipping\n";
-        print STDERR "$ppd_source_filename: please upgrade this PPD manually\n";
-	return 0;
-    }
-    if ($debug) {
-	print "Candidate PPD: $source\n";
-    }
-
-
     # Read in the new PPD, decompressing it if needed...
 
-    my $source_data;
+    my ($new_ppd_filename, $source_data) =
+	get_ppd_contents($ppd_source_filename, $filename,
+			 $driver, $locale, $region);
 
-    my $suffix = "\\" . $gzext; # Add '\', so m// matches the '.'.
-    if ($source =~ m/.gz$/) { # Decompress input buffer
-	open GZIN, "gunzip -c $source |"
-	    or die "$_: can't open for decompression: $!";
-	while (<GZIN>) {
-	    $source_data .= $_;
-	}
-	close GZIN;
-    }
-    else {
-	open SOURCE, $source
-	    or die "$source: can't open source file: $!";
-	binmode SOURCE;
-	my $source_size = (stat(SOURCE))[7];
-	read (SOURCE, $source_data, $source_size)
-	    or die "$source: error reading source: $!";
-	close SOURCE or die "$source: can't close file: $!";
+    if (! $source_data) {
+	die "Unable to retrieve PPD file!\n";
     }
 
     # Save new PPD in a temporary file, for processing...
@@ -360,30 +434,55 @@ sub update_ppd ($) {
     close $tmpfile or die "can't close temporary file $tmpfile: $!";
 
 
-    if ($debug) {
-	print "Original Default Types:\n";
-	foreach (sort keys %orig_default_types) {
-	    print "  $_: $orig_default_types{$_}\n";
-	}
-	print "New Default Types:\n";
-	foreach (sort keys %new_default_types) {
-	    print "  $_: $new_default_types{$_}\n";
-	}
-	print "Defaults:\n";
-	foreach (sort keys %defaults) {
-	    print "  $_: $defaults{$_}\n";
-	}
-	print "Options:\n";
+    if ($debug & 4) {
+	print "Options (Old->New Default Type):\n";
 	foreach (sort keys %options) {
-	    print "  $_:  ";
+	    my ($old_type) = $orig_default_types{$_};
+	    my ($new_type) = $new_default_types{$_};
+	    if (! defined($old_type)) {
+		$old_type = '(New)';
+	    }
+	    if ($old_type ne $new_type) {
+		print "  $_ ($old_type -> $new_type) :  ";
+	    } else {
+		print "  $_ ($new_type) :  ";
+	    }
+	    my ($def) = $defaults{"Default$_"};
 	    foreach my $opt (@{$options{$_}}) {
+		if (defined $def && $def eq $opt) {
+		    print "*";
+		}
 		print "$opt ";
 	    }
 	    print "\n";
 	}
-
+	print "Non-UI Defaults:\n";
+	foreach (sort keys %defaults) {
+	    my ($xkey) = $_;
+	    $xkey =~ s/^Default//;
+	    if (! defined ($options{$xkey})) {
+		print "  $_: $defaults{$_}\n";
+	    }
+	}
+	print "Default Types of dropped options:\n";
+	foreach (sort keys %orig_default_types) {
+	    if (! defined($options{$_})) {
+		print "  $_: $orig_default_types{$_}\n";
+	    }
+	}
     }
 
+    if ($no_action) {
+	if (!$quiet || $verbose) {
+	    if ($ppd_dest_filename eq $ppd_source_filename) {
+		print STDOUT "Would update $ppd_source_filename using $new_ppd_filename\n";
+	    } else {
+		print STDOUT "Would update $ppd_source_filename to $ppd_dest_filename using $new_ppd_filename\n";
+	    }
+	}
+	return 0;
+    }	
+
     if  (! $reset_defaults) {
 	# Update source buffer with old defaults...
 
@@ -412,12 +511,10 @@ default_loop:
 			next default_loop;
 		    }
 		}
-		printf STDERR
-		    "$ppd_source_filename: Invalid option: *$default_option: $defaults{$default_option}.  Skipped.\n";
+		warn "Warning: $ppd_source_filename: Invalid option: *$default_option: $defaults{$default_option}.  Using default setting.\n";
 		next;
 	    }
-	    print STDERR
-		"$ppd_source_filename: PPD OpenUI method $new_default_types{$_} not understood.  Skipped\n";
+	    warn "Warning: $ppd_source_filename: PPD OpenUI method $new_default_types{$_} not understood.\n";
 	}
     }
 
@@ -445,9 +542,9 @@ default_loop:
 
     if (!$quiet || $verbose) {
 	if ($ppd_dest_filename eq $ppd_source_filename) {
-	    print STDOUT "Updated $ppd_source_filename using $source\n";
+	    print STDOUT "Updated $ppd_source_filename using $new_ppd_filename\n";
 	} else {
-	    print STDOUT "Updated $ppd_source_filename to $ppd_dest_filename using $source\n";
+	    print STDOUT "Updated $ppd_source_filename to $ppd_dest_filename using $new_ppd_filename\n";
 	}
     }
     return 1;
@@ -492,7 +589,7 @@ sub find_ppd ($$$$) {
 				  $ppd_root_dir) {
                     if (! $basedir || ! $base) { next; }
 		    my ($fn) = "$basedir/$lingo$base$suffix";
-		    if ($debug) {
+		    if ($debug & 8) {
                         print "Trying $fn for $gutenprintfilename, $lang, $region\n";
                     }
 # Check that it is a regular file, owned by root.root, not writable
@@ -508,17 +605,17 @@ sub find_ppd ($$$$) {
 			    $file_version = `cat $fn | grep '$key'`;
 			}
 			if ($file_version ne "") {
-                            if ($debug) {
+                            if ($debug & 8) {
 			        print "   Format valid: time $sb[9] best $current_best_time prev $current_best_file cur $fn!\n";
 			    }
 			    if ($sb[9] > $current_best_time) {
 				$current_best_time = $sb[9];
 				$current_best_file = $fn;
-		                if ($debug) {
+		                if ($debug & 8) {
                                     print STDERR "***current_best_file is $fn\n";
                                 }
 			    }
-			} elsif ($debug) {
+			} elsif ($debug & 8) {
 			    print "   Format invalid\n";
 			}
 		    }
diff --git a/src/cups/epson.c b/src/cups/epson.c
index 38fec8c..e1e14c4 100644
--- a/src/cups/epson.c
+++ b/src/cups/epson.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: epson.c,v 1.7 2006/03/18 23:54:49 rlk Exp $"
+ * "$Id: epson.c,v 1.7.8.1 2007/05/12 19:32:08 faust3 Exp $"
  *
  *   EPSON backend for the Common UNIX Printing System.
  *
@@ -66,6 +66,14 @@
 #  include <netdb.h>
 #endif /* WIN32 || __EMX__ */
 
+#ifdef __linux
+#  include <sys/param.h>
+#  include <sys/types.h>
+#  include <sys/stat.h>
+#  include <dirent.h>
+#  include <unistd.h>
+#endif /* __linux */
+
 #ifdef __sgi
 #  include <invent.h>
 #  ifndef INV_EPP_ECP_PLP
@@ -515,6 +523,7 @@ list_devices(void)
   int	fd;			/* File descriptor */
   char	device[255];		/* Device filename */
   FILE	*probe;			/* /proc/parport/n/autoprobe file */
+  DIR	*dirprobe;		/* scan /sys/bus/usb/drivers/usblp */
   char	line[1024],		/* Line from file */
 	*delim,			/* Delimiter in file */
 	make[IPP_MAX_NAME],	/* Make from file */
@@ -527,12 +536,17 @@ list_devices(void)
 
   for (i = 0; i < 4; i ++)
   {
-    sprintf(device, "/proc/parport/%d/autoprobe", i);
-    if ((probe = fopen(device, "r")) != NULL)
+    sprintf(device, "/proc/sys/dev/parport/parport%d/autoprobe", i);
+    probe = fopen(device, "r");
+    if ( probe == NULL )  /* older kernel versions */
+    {
+      sprintf(device, "/proc/parport/%d/autoprobe", i);
+      probe = fopen(device, "r");
+    } 
+    if ( probe != NULL )
     {
       memset(make, 0, sizeof(make));
       memset(model, 0, sizeof(model));
-      strcpy(model, "EPSON");
 
       while (fgets(line, sizeof(line), probe) != NULL)
       {
@@ -550,17 +564,17 @@ list_devices(void)
 	*/
 
         if (strncmp(line, "MODEL:", 6) == 0 &&
-	    strncmp(line, "MODEL:EPSON", 13) != 0)
+	    strncmp(line, "MODEL:Unknown", 13) != 0)
 	  strncpy(model, line + 6, sizeof(model) - 1);
 	else if (strncmp(line, "MANUFACTURER:", 13) == 0 &&
-	         strncmp(line, "MANUFACTURER:EPSON", 20) != 0)
+	         strncmp(line, "MANUFACTURER:Unknown", 20) != 0)
 	  strncpy(make, line + 13, sizeof(make) - 1);
       }
 
       fclose(probe);
 
-      if (strcmp(make, "EPSON") == 0)
-	printf("direct epson:/dev/lp%d \"%s %s\" \"Parallel Port #%d\"\n",
+      if (strcasecmp(make, "EPSON") == 0)
+	printf("direct epson:/dev/lp%d \"%s %s\" \"Gutenprint Parallel Port #%d\"\n",
 	       i, make, model, i + 1);
     }
     else
@@ -569,7 +583,7 @@ list_devices(void)
       if ((fd = open(device, O_RDWR)) >= 0)
       {
 	close(fd);
-	printf("direct epson:%s \"EPSON\" \"Parallel Port #%d\"\n", device, i + 1);
+	printf("direct epson:%s \"EPSON\" \"Gutenprint Parallel Port #%d\"\n", device, i + 1);
       }
     }
   }
@@ -578,7 +592,110 @@ list_devices(void)
   * Probe for USB devices...
   */
 
-  if ((probe = fopen("/proc/bus/usb/devices", "r")) != NULL)
+  if ((dirprobe = opendir("/sys/class/usb")) != NULL) /* SYSFS in kernel 2.6 */
+  {
+    struct dirent	*dirent;	/* directory entries */
+    struct stat		statbuf;	/* file stat */
+    char 		entry[MAXPATHLEN]; /* pathname to usb entries */
+    char 		link[MAXPATHLEN]; /* linkname of usb entries */
+    char		*cptr;		/* multi used character pointer */
+    FILE		*file;		/* read printer specific info from */
+
+    i = 0;
+    /* scan the directory entries */
+    while((dirent = readdir(dirprobe)) != 0)
+    {
+      /* skip "." and ".." */
+      if (dirent->d_name[0] != 'l' || dirent->d_name[1] != 'p')
+        continue;
+
+      /* generate path to work with */
+      snprintf(entry, MAXPATHLEN, "/sys/class/usb/%s/device", dirent->d_name);
+
+      /* look, if we have a pointer */
+      if(lstat(entry, &statbuf) < 0)
+      {
+      	perror(entry);
+	continue;
+      }
+
+      if (S_ISLNK(statbuf.st_mode))
+      {
+	/* get the path to the link */
+        if (readlink(entry, link, MAXPATHLEN) < 0)
+	  continue;
+
+	/* find right occurance of '/' */
+        if ((cptr = strrchr(link, '/')) == NULL)
+	{
+	  continue;
+	}
+	
+	/*
+	 * and truncate path: cut away everything after the '/',
+	 * because parallel directory contains the information we need
+	 */
+	*cptr = '\0';
+
+	memset(make, 0, sizeof(make));
+	memset(model, 0, sizeof(model));
+	/* read manufacturer */
+        snprintf(entry, MAXPATHLEN, "/sys/class/usb/%s/%s/manufacturer",
+	         dirent->d_name, link);
+
+	if ((file = fopen(entry, "r")) == NULL)
+	{
+	  /* skip this entry, there is no file "manufacturer" */
+	  continue;
+	}
+	/* read data in */
+	fread(make, sizeof(make)-1, sizeof(char), file);
+	fclose(file);
+
+	/* beautify "make" - strip newline away */
+        if ((cptr = strrchr(make, '\n')) != NULL)
+	{
+	  *cptr = '\0';
+	}
+
+	/* next entry, if manufacturer is not EPSON */
+        if (strcasecmp(make, "EPSON") != 0)
+	  continue;
+
+	/* read product name */
+        snprintf(entry, MAXPATHLEN, "/sys/class/usb/%s/%s/product",
+	         dirent->d_name, link);
+
+	if ((file = fopen(entry, "r")) == NULL)
+	{
+	  /* skip this entry, there is no file "product" */
+	  continue;
+	}
+	/* read data in */
+	fread(model, sizeof(model)-1, sizeof(char), file);
+	fclose(file);
+
+	/* beautify "model" - strip away newline */
+        if ((cptr = strrchr(model, '\n')) != NULL)
+	{
+	  *cptr = '\0';
+	}
+	sprintf(device, "/dev/usb/%s", dirent->d_name);
+	if (access(device, 0))
+	{
+	  sprintf(device, "/dev/usb/usb%s", dirent->d_name);
+
+	  if (access(device, 0))
+	    sprintf(device, "/dev/usb%s", dirent->d_name);
+	}
+
+	printf("direct epson:%s \"%s %s\" \"Gutenprint USB Printer #%d\"\n",
+	       device, make, model, ++i);
+      }
+    }
+    closedir(dirprobe);
+  }
+  else if ((probe = fopen("/proc/bus/usb/devices", "r")) != NULL)
   {
     i = 0;
 
@@ -632,7 +749,7 @@ list_devices(void)
 	      sprintf(device, "/dev/usblp%d", i);
 	  }
 
-	  printf("direct epson:%s \"%s %s\" \"USB Printer #%d\"\n",
+	  printf("direct epson:%s \"%s %s\" \"Gutenprint USB Printer #%d\"\n",
 		 device, make, model, i + 1);
         }
 
@@ -653,21 +770,21 @@ list_devices(void)
       if ((fd = open(device, O_RDWR)) >= 0)
       {
 	close(fd);
-	printf("direct epson:%s \"EPSON\" \"USB Printer #%d\"\n", device, i + 1);
+	printf("direct epson:%s \"EPSON\" \"Gutenprint USB Printer #%d\"\n", device, i + 1);
       }
 
       sprintf(device, "/dev/usb/usblp%d", i);
       if ((fd = open(device, O_RDWR)) >= 0)
       {
 	close(fd);
-	printf("direct epson:%s \"EPSON\" \"USB Printer #%d\"\n", device, i + 1);
+	printf("direct epson:%s \"EPSON\" \"Gutenprint USB Printer #%d\"\n", device, i + 1);
       }
 
       sprintf(device, "/dev/usblp%d", i);
       if ((fd = open(device, O_RDWR)) >= 0)
       {
 	close(fd);
-	printf("direct epson:%s \"EPSON\" \"USB Printer #%d\"\n", device, i + 1);
+	printf("direct epson:%s \"EPSON\" \"Gutenprint USB Printer #%d\"\n", device, i + 1);
       }
     }
   }
@@ -691,7 +808,7 @@ list_devices(void)
       * Standard parallel port...
       */
 
-      puts("direct epson:/dev/plpbi \"EPSON\" \"Onboard Parallel Port\"");
+      puts("direct epson:/dev/plpbi \"EPSON\" \"Gutenprint Onboard Parallel Port\"");
     }
   }
 
@@ -709,7 +826,7 @@ list_devices(void)
   {
     sprintf(device, "/dev/ecpp%d", i);
     if (access(device, 0) == 0)
-      printf("direct epson:%s \"EPSON\" \"Sun IEEE-1284 Parallel Port #%d\"\n",
+      printf("direct epson:%s \"EPSON\" \"Gutenprint Sun IEEE-1284 Parallel Port #%d\"\n",
              device, i + 1);
   }
 
@@ -718,7 +835,7 @@ list_devices(void)
     sprintf(device, "/dev/lp%d", i);
 
     if (access(device, 0) == 0)
-      printf("direct epson:%s \"EPSON\" \"PC Parallel Port #%d\"\n",
+      printf("direct epson:%s \"EPSON\" \"Gutenprint PC Parallel Port #%d\"\n",
              device, i + 1);
   }
 #elif defined(FreeBSD) || defined(OpenBSD) || defined(NetBSD)
@@ -737,14 +854,14 @@ list_devices(void)
     if ((fd = open(device, O_RDWR)) >= 0)
     {
       close(fd);
-      printf("direct epson:%s \"EPSON\" \"Parallel Port #%d (interrupt-driven)\"\n", device, i + 1);
+      printf("direct epson:%s \"EPSON\" \"Gutenprint Parallel Port #%d (interrupt-driven)\"\n", device, i + 1);
     }
 
     sprintf(device, "/dev/lpa%d", i);
     if ((fd = open(device, O_RDWR)) >= 0)
     {
       close(fd);
-      printf("direct epson:%s \"EPSON\" \"Parallel Port #%d (polled)\"\n", device, i + 1);
+      printf("direct epson:%s \"EPSON\" \"Gutenprint Parallel Port #%d (polled)\"\n", device, i + 1);
     }
   }
 
@@ -758,7 +875,7 @@ list_devices(void)
     if ((fd = open(device, O_RDWR)) >= 0)
     {
       close(fd);
-      printf("direct epson:%s \"EPSON\" \"USB Port #%d\"\n", device, i + 1);
+      printf("direct epson:%s \"EPSON\" \"Gutenprint USB Port #%d\"\n", device, i + 1);
     }
   }
 #endif
@@ -766,5 +883,5 @@ list_devices(void)
 
 
 /*
- * End of "$Id: epson.c,v 1.7 2006/03/18 23:54:49 rlk Exp $".
+ * End of "$Id: epson.c,v 1.7.8.1 2007/05/12 19:32:08 faust3 Exp $".
  */
diff --git a/src/cups/genppd.c b/src/cups/genppd.c
index 6f77c62..4b49ba6 100644
--- a/src/cups/genppd.c
+++ b/src/cups/genppd.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: genppd.c,v 1.118 2006/05/28 16:59:03 rlk Exp $"
+ * "$Id: genppd.c,v 1.119.2.3 2007/05/29 01:47:26 rlk Exp $"
  *
  *   PPD file generation program for the CUPS drivers.
  *
- *   Copyright 1993-2005 by Easy Software Products and Robert Krawitz.
+ *   Copyright 1993-2007 by Easy Software Products and Robert Krawitz.
  *
  *   This program is free software; you can redistribute it and/or
  *   modify it under the terms of the GNU General Public License,
@@ -21,7 +21,7 @@
  *       Attn: CUPS Licensing Information
  *       Easy Software Products
  *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
+ *       Hollywood, Maryland 20636 USA
  *
  *       Voice: (301) 373-9603
  *       EMail: cups-info@cups.org
@@ -29,14 +29,20 @@
  *
  * Contents:
  *
- *   main()                   - Process files on the command-line...
- *   usage()                  - Show program usage.
- *   help()                   - Show detailed program usage.
- *   getlangs()               - Get available translations.
- *   printlangs()             - Show available translations.
- *   printmodels()            - Show available printer models.
- *   checkcat()               - Check message catalogue exists.
- *   write_ppd()              - Write a PPD file.
+ *   main()              - Process files on the command-line...
+ *   cat_ppd()           - Copy the named PPD to stdout.
+ *   generate_ppd()      - Generate a PPD file.
+ *   getlangs()          - Get a list of available translations.
+ *   help()              - Show detailed help.
+ *   is_special_option() - Determine if an option should be grouped.
+ *   list_ppds()         - List the available drivers.
+ *   print_group_close() - Close a UI group.
+ *   print_group_open()  - Open a new UI group.
+ *   printlangs()        - Print list of available translations.
+ *   printmodels()       - Print a list of available models.
+ *   set_language()      - Set the current translation language.
+ *   usage()             - Show program usage.
+ *   write_ppd()         - Write a PPD file.
  */
 
 /*
@@ -57,8 +63,26 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
+#include <libgen.h>
+
+#ifdef CUPS_DRIVER_INTERFACE
+#  ifdef HAVE_LIBZ
+#    undef HAVE_LIBZ
+#  endif /* HAVE_LIBZ */
+#endif /* CUPS_DRIVER_INTERFACE */
+
+static const char *cups_modeldir = CUPS_MODELDIR;
+
 #ifdef HAVE_LIBZ
 #include <zlib.h>
+static const char *gzext = ".gz";
+#else
+static const char *gzext = "";
+#  define gzopen fopen
+#  define gzclose fclose
+#  define gzFile FILE *
+#  define gzprintf fprintf
+#  define gzputs(f,s) fputs((s),(f))
 #endif
 
 #include <cups/cups.h>
@@ -68,6 +92,17 @@
 #include <gutenprint/gutenprint-intl.h>
 
 /*
+ * Some of the Gutenprint resolution names are not PPD-compliant.
+ * In Gutenprint 5.0, use the legacy names with the CUPS 1.1 interface
+ * for back compatibility.  With CUPS 1.2, or Gutenprint 5.1 or above,
+ * generate compliant names.
+ */
+
+#if defined(CUPS_DRIVER_INTERFACE) || (STP_MAJOR_VERSION > 5) || (STP_MAJOR_VERSION == 5 && STP_MINOR_VERSION > 0)
+#define USE_COMPLIANT_RESOLUTIONS 1
+#endif
+
+/*
  * Note:
  *
  * The current release of ESP Ghostscript is fully Level 3 compliant,
@@ -76,33 +111,11 @@
 
 int cups_ppd_ps_level = CUPS_PPD_PS_LEVEL;
 
-static const char *cups_modeldir = CUPS_MODELDIR;
-
 /*
  * File handling stuff...
  */
 
 static const char *ppdext = ".ppd";
-#ifdef HAVE_LIBZ
-static const char *gzext = ".gz";
-#else
-static const char *gzext = "";
-#  define gzFile FILE *
-#  define gzopen fopen
-#  define gzclose fclose
-#  define gzprintf fprintf
-#  define gzputs(f,s) fputs((s),(f))
-#  define gzputc(f,c) putc((c),(f))
-#endif /* HAVE_LIBZ */
-
-
-/*
- * Size data...
- */
-
-#define DEFAULT_SIZE	"Letter"
-/*#define DEFAULT_SIZE	"A4"*/
-#define CATALOG       "LC_MESSAGES/gutenprint.mo"
 
 typedef struct				/**** Media size values ****/
 {
@@ -149,55 +162,271 @@ const char *parameter_level_names[] =
  * Local functions...
  */
 
-void	usage(void);
-void    help(void);
-char ** getlangs(void);
-static int stpi_scandir (const char *dir,
-			 struct dirent ***namelist,
-			 int (*sel) (const struct dirent *),
-			 int (*cmp) (const void *, const void *));
-int     checkcat (const struct dirent *localedir);
-void    printlangs(char** langs);
-void    printmodels(int verbose);
-int	write_ppd(const stp_printer_t *p, const char *prefix,
-		  const char *language, int verbose, int simplified);
+#ifdef CUPS_DRIVER_INTERFACE
+static int	cat_ppd(int argc, char **argv);
+static int	list_ppds(const char *argv0);
+#else  /* !CUPS_DRIVER_INTERFACE */
+static int	generate_ppd(const char *prefix, int verbose,
+		             const stp_printer_t *p, const char *language,
+			     int simplified);
+static void	help(void);
+static void	printlangs(char** langs);
+static void	printmodels(int verbose);
+static void	usage(void);
+#endif /* !CUPS_DRIVER_INTERFACE */
+#ifdef ENABLE_NLS
+static char	**getlangs(void);
+static void	set_language(const char *lang);
+#endif /* ENABLE_NLS */
+static int	is_special_option(const char *name);
+static void	print_group_close(gzFile fp, stp_parameter_class_t p_class,
+				  stp_parameter_level_t p_level);
+static void	print_group_open(gzFile fp, stp_parameter_class_t p_class,
+				 stp_parameter_level_t p_level);
+static int	write_ppd(gzFile fp, const stp_printer_t *p,
+		          const char *language, const char *ppd_location,
+			  int simplified);
+
+#ifdef ENABLE_NLS
 
+typedef struct {
+  const char *lang;
+  const char *mapping;
+} locale_map;
+
+static const locale_map lang_mappings[] =
+  {
+    { "cs", "CS_CZ" },
+    { "da", "da_DK" },
+    { "de", "de_DE" },
+    { "el", "el_GR" },
+    { "es", "es_ES" },
+    { "fr", "fr_FR" },
+    { "hu", "hu_HU" },
+    { "ja", "ja_JP" },
+    { "nb", "nb_NO" },
+    { "nl", "nl_NL" },
+    { "pl", "pl_PL" },
+    { "pt", "pt_PT" },
+    { "sk", "sk_SK" },
+    { "sv", "sv_SE" },
+  };
+static int lang_map_count = sizeof(lang_mappings) / sizeof(locale_map);
+
+static const char *baselocaledir = PACKAGE_LOCALE_DIR;
+#endif
 
 /*
  * Global variables...
  */
-const char *baselocaledir = PACKAGE_LOCALE_DIR;
 
-static int
-is_special_option(const char *name)
+
+#ifdef CUPS_DRIVER_INTERFACE
+
+/*
+ * 'main()' - Process files on the command-line...
+ */
+
+int				    /* O - Exit status */
+main(int  argc,			    /* I - Number of command-line arguments */
+     char *argv[])		    /* I - Command-line arguments */
 {
-  int i = 0;
-  while (special_options[i])
+
+ /*
+  * Initialise libgutenprint
+  */
+
+  stp_init();
+
+ /*
+  * Process command-line...
+  */
+
+  if (argc == 2 && !strcmp(argv[1], "list"))
+    return (list_ppds(argv[0]));
+  else if (argc == 3 && !strcmp(argv[1], "cat"))
+    return (cat_ppd(argc, argv));
+  else if (argc == 2 && !strcmp(argv[1], "VERSION"))
     {
-      if (strcmp(name, special_options[i]) == 0)
-	return 1;
-      i++;
+      printf("%s\n", VERSION);
+      return (0);
     }
-  return 0;
+  else
+  {
+    fprintf(stderr, "Usage: %s list\n", argv[0]);
+    fprintf(stderr, "       %s cat URI\n", argv[0]);
+    return (1);
+  }
 }
 
-static void
-print_group_open(FILE *fp, stp_parameter_class_t p_class,
-		 stp_parameter_level_t p_level)
+
+/*
+ * 'cat_ppd()' - Copy the named PPD to stdout.
+ */
+
+static int				/* O - Exit status */
+cat_ppd(int argc, char **argv)	/* I - Driver URI */
 {
-  gzprintf(fp, "*OpenGroup: %s %s\n\n",
-	   gettext(parameter_class_names[p_class]),
-	   gettext(parameter_level_names[p_level]));
+  const char		*uri = argv[2];
+  char			scheme[64],	/* URI scheme */
+			userpass[32],	/* URI user/pass (unused) */
+			hostname[32],	/* URI hostname */
+			resource[1024];	/* URI resource */
+  int			port;		/* URI port (unused) */
+  http_uri_status_t	status;		/* URI decode status */
+  const stp_printer_t	*p;		/* Printer driver */
+  const char		*lang = "C";
+  char			*s;
+#ifdef ENABLE_NLS
+  char			**all_langs = getlangs();
+#endif
+  char			filename[1024],		/* Filename */
+			ppd_location[1024];	/* Installed location */
+
+  if ((status = httpSeparateURI(HTTP_URI_CODING_ALL, uri,
+                                scheme, sizeof(scheme),
+                                userpass, sizeof(userpass),
+				hostname, sizeof(hostname),
+		                &port, resource, sizeof(resource)))
+				    < HTTP_URI_OK)
+  {
+    fprintf(stderr, "ERROR: Bad ppd-name \"%s\" (%d)!\n", uri, status);
+    return (1);
+  }
+
+  s = strchr(resource + 1, '/');
+  if (s)
+    {
+      lang = s + 1;
+      *s = '\0';
+    }
+
+#ifdef ENABLE_NLS
+  if (!lang || strcmp(lang, "C") != 0)
+    {
+      while (*all_langs)
+	{
+	  if (!strcmp(lang, *all_langs))
+	    break;
+	  all_langs++;
+	}
+      if (! *all_langs)
+	{
+	  fprintf(stderr, "ERROR: Unable to find language \"%s\"!\n", lang);
+	  return (1);
+	}
+    }
+  set_language(lang);
+#endif
+
+  if ((p = stp_get_printer_by_driver(hostname)) == NULL)
+  {
+    fprintf(stderr, "ERROR: Unable to find driver \"%s\"!\n", hostname);
+    return (1);
+  }
+
+  /*
+   * This isn't really the right thing to do.  We really shouldn't
+   * be embedding filenames in automatically generated PPD files, but
+   * if the user ever decides to go back from generated PPD files to
+   * static PPD files we'll need to have this for genppdupdate to work.
+   */
+  snprintf(filename, sizeof(filename) - 1, "%s/stp-%s.%s%s%s%s",
+	   "ppd", hostname, GUTENPRINT_RELEASE_VERSION,
+	   strcmp(resource + 1, "simple") ? "" : ".sim", ppdext, gzext);
+  snprintf(ppd_location, sizeof(ppd_location) - 1, "%s%s%s/%s",
+	   cups_modeldir,
+	   cups_modeldir[strlen(cups_modeldir) - 1] == '/' ? "" : "/",
+	   lang ? lang : "C",
+	   filename);
+
+  return (write_ppd(stdout, p, lang, ppd_location,
+		    !strcmp(resource + 1, "simple")));
 }
 
-static void
-print_group_close(FILE *fp, stp_parameter_class_t p_class,
-		 stp_parameter_level_t p_level)
+/*
+ * 'list_ppds()' - List the available drivers.
+ */
+
+static int				/* O - Exit status */
+list_ppds(const char *argv0)		/* I - Name of program */
 {
-  gzprintf(fp, "*CloseGroup: %s %s\n\n",
-	   gettext(parameter_class_names[p_class]),
-	   gettext(parameter_level_names[p_level]));
+  const char		*scheme;	/* URI scheme */
+  int			i;		/* Looping var */
+  const stp_printer_t	*printer;	/* Pointer to printer driver */
+#if defined(ENABLE_NLS) && defined(CUPS_TRANSLATED_PPDS)
+  char **langs = getlangs();
+  char **langptr;
+#endif
+
+  if ((scheme = strrchr(argv0, '/')) != NULL)
+    scheme ++;
+  else
+    scheme = argv0;
+
+  for (i = 0; i < stp_printer_model_count(); i++)
+    if ((printer = stp_get_printer_by_index(i)) != NULL)
+    {
+      if (!strcmp(stp_printer_get_family(printer), "ps") ||
+	  !strcmp(stp_printer_get_family(printer), "raw"))
+        continue;
+
+      printf("\"%s://%s/expert/%s\" "
+             "%s "
+	     "\"%s\" "
+             "\"%s" CUPS_PPD_NICKNAME_STRING VERSION "\" "
+	     "\"\"\n",			/* No IEEE-1284 Device ID yet */
+             scheme, stp_printer_get_driver(printer), "C",
+	     "en",
+	     stp_printer_get_manufacturer(printer),
+	     stp_printer_get_long_name(printer));
+
+#ifdef GENERATE_SIMPLIFIED_PPDS
+      printf("\"%s://%s/simple/%s\" "
+             "%s "
+	     "\"%s\" "
+             "\"%s" CUPS_PPD_NICKNAME_STRING VERSION " Simplified\" "
+	     "\"\"\n",			/* No IEEE-1284 Device ID yet */
+             scheme, stp_printer_get_driver(printer), "C",
+	     "en",
+	     stp_printer_get_manufacturer(printer),
+	     stp_printer_get_long_name(printer));
+#endif
+#if defined(ENABLE_NLS) && defined(CUPS_TRANSLATED_PPDS)
+      langptr = langs;
+      while (*langptr != 0 && strcmp(*langptr, "") != 0)
+	{
+	  printf("\"%s://%s/expert/%s\" "
+		 "%s "
+		 "\"%s\" "
+		 "\"%s" CUPS_PPD_NICKNAME_STRING VERSION "\" "
+		 "\"\"\n",		/* No IEEE-1284 Device ID yet */
+		 scheme, stp_printer_get_driver(printer), *langptr,
+		 *langptr,
+		 stp_printer_get_manufacturer(printer),
+		 stp_printer_get_long_name(printer));
+
+#ifdef GENERATE_SIMPLIFIED_PPDS
+	  printf("\"%s://%s/simple/%s\" "
+		 "%s "
+		 "\"%s\" "
+		 "\"%s" CUPS_PPD_NICKNAME_STRING VERSION " Simplified\" "
+		 "\"\"\n",		/* No IEEE-1284 Device ID yet */
+		 scheme, stp_printer_get_driver(printer), *langptr,
+		 *langptr,
+		 stp_printer_get_manufacturer(printer),
+		 stp_printer_get_long_name(printer));
+#endif
+	  langptr++;
+	}
+#endif
+    }
+
+  return (0);
 }
+#endif /* CUPS_DRIVER_INTERFACE */
+
+#ifndef CUPS_DRIVER_INTERFACE
 
 /*
  * 'main()' - Process files on the command-line...
@@ -239,6 +468,7 @@ main(int  argc,			    /* I - Number of command-line arguments */
       break;
     case 'h':
       help();
+      exit(EXIT_SUCCESS);
       break;
     case 'v':
       verbose = 1;
@@ -247,16 +477,18 @@ main(int  argc,			    /* I - Number of command-line arguments */
       verbose = 0;
       break;
     case 'c':
+#  ifdef ENABLE_NLS
       baselocaledir = optarg;
-#ifdef DEBUG
-      fprintf (stderr, "DEBUG: baselocaledir: %s\n", baselocaledir);
-#endif
+#  ifdef DEBUG
+      fprintf(stderr, "DEBUG: baselocaledir: %s\n", baselocaledir);
+#  endif
+#  endif
       break;
     case 'p':
       prefix = optarg;
-#ifdef DEBUG
-      fprintf (stderr, "DEBUG: prefix: %s\n", prefix);
-#endif
+#  ifdef DEBUG
+      fprintf(stderr, "DEBUG: prefix: %s\n", prefix);
+#  endif
       break;
     case 'l':
       language = optarg;
@@ -278,7 +510,7 @@ main(int  argc,			    /* I - Number of command-line arguments */
       break;
     case 'V':
       printf("cups-genppd version %s, "
-	     "Copyright (c) 1993-2005 by Easy Software Products and Robert Krawitz.\n\n",
+	     "Copyright 1993-2006 by Easy Software Products and Robert Krawitz.\n\n",
 	     VERSION);
       printf("Default CUPS PPD PostScript Level: %d\n", cups_ppd_ps_level);
       printf("Default PPD location (prefix):     %s\n", CUPS_MODELDIR);
@@ -291,8 +523,8 @@ main(int  argc,			    /* I - Number of command-line arguments */
 	   "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 	   "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
 	   "GNU General Public License for more details.\n"
-	   "\n"
-	   "You should have received a copy of the GNU General Public License\n"
+	   "\n");
+      puts("You should have received a copy of the GNU General Public License\n"
 	   "along with this program; if not, please contact Easy Software\n"
 	   "Products at:\n"
 	   "\n"
@@ -304,11 +536,11 @@ main(int  argc,			    /* I - Number of command-line arguments */
 	   "    Voice: (301) 373-9603\n"
 	   "    EMail: cups-info@cups.org\n"
 	   "      WWW: http://www.cups.org\n");
-      exit (EXIT_SUCCESS);
+      exit(EXIT_SUCCESS);
       break;
     default:
       usage();
-      exit (EXIT_FAILURE);
+      exit(EXIT_FAILURE);
       break;
     }
   }
@@ -320,15 +552,11 @@ main(int  argc,			    /* I - Number of command-line arguments */
       {
 	models[n] = argv[optind+n];
       }
-    models[numargs] = (char*) NULL;
+    models[numargs] = (char*)NULL;
 
     n=0;
   }
 
-#ifdef ENABLE_NLS
-  langs = getlangs();
-#endif
-
 /*
  * Initialise libgutenprint
  */
@@ -339,68 +567,27 @@ main(int  argc,			    /* I - Number of command-line arguments */
   * Set the language...
   */
 
-  if (language)
-    {
-      unsetenv("LC_CTYPE");
-      unsetenv("LC_COLLATE");
-      unsetenv("LC_TIME");
-      unsetenv("LC_NUMERIC");
-      unsetenv("LC_MONETARY");
-      unsetenv("LC_MESSAGES");
-      unsetenv("LC_ALL");
-      unsetenv("LANG");
-      setenv("LC_ALL", language, 1);
-      setenv("LANG", language, 1);
-    }
-  setlocale(LC_ALL, "");
+#  ifdef ENABLE_NLS
+  langs = getlangs();
 
-#ifdef LC_NUMERIC
-  setlocale(LC_NUMERIC, "C");
-#endif /* LC_NUMERIC */
+  if (language)
+    set_language(language);
+#  endif /* ENABLE_NLS */
 
  /*
-  * Set up the catalog
+  * Print lists
   */
 
-#ifdef ENABLE_NLS
-  if (baselocaledir)
-  {
-    if ((bindtextdomain(PACKAGE, baselocaledir)) == NULL)
-    {
-      fprintf(stderr, "cups-genppd: cannot load message catalog %s under %s: %s\n",
-	      PACKAGE, baselocaledir, strerror(errno));
-      exit(EXIT_FAILURE);
-    }
-#ifdef DEBUG
-    fprintf (stderr, "DEBUG: bound textdomain: %s under %s\n",
-	     PACKAGE, baselocaledir);
-#endif
-    if ((textdomain(PACKAGE)) == NULL)
-    {
-      fprintf(stderr, "cups-genppd: cannot select message catalog %s under %s: %s\n",
-              PACKAGE, baselocaledir, strerror(errno));
-      exit(EXIT_FAILURE);
-    }
-#ifdef DEBUG
-    fprintf (stderr, "DEBUG: textdomain set: %s\n", PACKAGE);
-#endif
-  }
-#endif
-
-  /*
-   * Print lists
-   */
-
   if (opt_printlangs)
     {
       printlangs(langs);
-      exit (EXIT_SUCCESS);
+      exit(EXIT_SUCCESS);
     }
 
   if (opt_printmodels)
     {
       printmodels(verbose);
-      exit (EXIT_SUCCESS);
+      exit(EXIT_SUCCESS);
     }
 
  /*
@@ -419,11 +606,11 @@ main(int  argc,			    /* I - Number of command-line arguments */
 	  if (printer)
 	    {
 	      if ((which_ppds & 1) &&
-		  write_ppd(printer, prefix, language, verbose, 1))
-		return 1;
+		  generate_ppd(prefix, verbose, printer, language, 1))
+		return (1);
 	      if ((which_ppds & 2) &&
-		  write_ppd(printer, prefix, language, verbose, 0))
-		return 1;
+		  generate_ppd(prefix, verbose, printer, language, 0))
+		return (1);
 	    }
 	  else
 	    {
@@ -442,45 +629,109 @@ main(int  argc,			    /* I - Number of command-line arguments */
 	  if (printer)
 	    {
 	      if ((which_ppds & 1) &&
-		  write_ppd(printer, prefix, language, verbose, 1))
+		  generate_ppd(prefix, verbose, printer, language, 1))
 		return (1);
 	      if ((which_ppds & 2) &&
-		  write_ppd(printer, prefix, language, verbose, 0))
+		  generate_ppd(prefix, verbose, printer, language, 0))
 		return (1);
 	    }
 	}
     }
   if (!verbose)
     fprintf(stderr, " done.\n");
-  if (langs)
-    {
-      char **langs_tmp = langs;
-      while (*langs_tmp)
-	{
-	  stp_free(*langs_tmp);
-	  langs_tmp++;
-	}
-      stp_free(langs);
-    }
 
   return (0);
 }
 
 /*
- * 'usage()' - Show program usage...
+ * 'generate_ppd()' - Generate a PPD file.
  */
 
-void
-usage(void)
+static int				/* O - Exit status */
+generate_ppd(
+    const char          *prefix,	/* I - PPD directory prefix */
+    int                 verbose,	/* I - Verbosity level */
+    const stp_printer_t *p,		/* I - Driver */
+    const char          *language,	/* I - Primary language */
+    int                 simplified)	/* I - 1 = simplified options */
 {
-  puts("Usage: cups-genppd [-c localedir] "
-        "[-l locale] [-p prefix] [-s | -a] [-q] [-v] models...\n"
-        "       cups-genppd -L [-c localedir]\n"
-	"       cups-genppd -M [-v]\n"
-	"       cups-genppd -h\n"
-	"       cups-genppd -V\n");
+  int		status;			/* Exit status */
+  gzFile	fp;			/* File to write to */
+  char		filename[1024],		/* Filename */
+		ppd_location[1024];	/* Installed location */
+  struct stat   dir;                    /* Prefix dir status */
+
+
+ /*
+  * Skip the PostScript drivers...
+  */
+
+  if (!strcmp(stp_printer_get_family(p), "ps") ||
+      !strcmp(stp_printer_get_family(p), "raw"))
+    return (0);
+
+ /*
+  * Make sure the destination directory exists...
+  */
+
+  if (stat(prefix, &dir) && !S_ISDIR(dir.st_mode))
+  {
+    if (mkdir(prefix, 0777))
+    {
+      printf("cups-genppd: Cannot create directory %s: %s\n",
+	     prefix, strerror(errno));
+      exit(EXIT_FAILURE);
+    }
+  }
+
+ /*
+  * The files will be named stp-<driver>.<major>.<minor>.ppd, for
+  * example:
+  *
+  * stp-escp2-ex.5.0.ppd
+  *
+  * or
+  *
+  * stp-escp2-ex.5.0.ppd.gz
+  */
+
+  snprintf(filename, sizeof(filename) - 1, "%s/stp-%s.%s%s%s%s",
+	   prefix, stp_printer_get_driver(p), GUTENPRINT_RELEASE_VERSION,
+	   simplified ? ".sim" : "", ppdext, gzext);
+
+ /*
+  * Open the PPD file...
+  */
+
+  if ((fp = gzopen(filename, "wb")) == NULL)
+  {
+    fprintf(stderr, "cups-genppd: Unable to create file \"%s\" - %s.\n",
+            filename, strerror(errno));
+    return (2);
+  }
+
+  if (verbose)
+    fprintf(stderr, "Writing %s...\n", filename);
+  else
+    fprintf(stderr, ".");
+
+  snprintf(ppd_location, sizeof(ppd_location), "%s%s%s/%s",
+	   cups_modeldir,
+	   cups_modeldir[strlen(cups_modeldir) - 1] == '/' ? "" : "/",
+	   language ? language : "C",
+	   basename(filename));
+
+  status = write_ppd(fp, p, language, ppd_location, simplified);
+
+  gzclose(fp);
+
+  return (status);
 }
 
+/*
+ * 'help()' - Show detailed help.
+ */
+
 void
 help(void)
 {
@@ -494,8 +745,8 @@ help(void)
        "  -L            List available translations (message catalogs).\n"
        "  -M            List available printer models.\n"
        "  -V            Show version information and defaults.\n"
-       "  The default is to output PPDs.\n"
-       "Options:\n"
+       "  The default is to output PPDs.\n");
+  puts("Options:\n"
        "  -c localedir  Use localedir as the base directory for locale data.\n"
        "  -l locale     Output PPDs translated with messages for locale.\n"
        "  -p prefix     Output PPDs in directory prefix.\n"
@@ -509,72 +760,46 @@ help(void)
 }
 
 /*
- * 'dirent_sort()' - sort directory entries
+ * 'usage()' - Show program usage.
  */
-static int
-dirent_sort(const void *a,
-	    const void *b)
-{
-  return strcoll ((*(const struct dirent *const *) a)->d_name,
-		  (*(const struct dirent *const *) b)->d_name);
-}
 
-/*
- * 'getlangs()' - Get a list of available translations
- */
-
-char **
-getlangs(void)
+void
+usage(void)
 {
-  struct dirent** langdirs = NULL;
-  int n;
-  char **langs;
-
-  n = stpi_scandir (baselocaledir, &langdirs, checkcat, dirent_sort);
-  if (n >= 0)
-    {
-      int idx;
-      langs = stp_malloc((n+1) * sizeof(char*));
-      for (idx = 0; idx < n; ++idx)
-	{
-	  langs[idx] = (char*) stp_malloc((strlen(langdirs[idx]->d_name)+1) * sizeof(char));
-	  strcpy(langs[idx], langdirs[idx]->d_name);
-	  free (langdirs[idx]); /* Must use plain free() */
-	}
-      langs[n] = NULL;
-      free (langdirs); /* Must use plain free() */
-    }
-  else
-    return NULL;
-
-  return langs;
+  puts("Usage: cups-genppd [-c localedir] "
+        "[-l locale] [-p prefix] [-s | -a] [-q] [-v] models...\n"
+        "       cups-genppd -L [-c localedir]\n"
+	"       cups-genppd -M [-v]\n"
+	"       cups-genppd -h\n"
+	"       cups-genppd -V\n");
 }
 
-
 /*
- * 'printlangs()' - Print list of available translations
+ * 'printlangs()' - Print list of available translations.
  */
 
-void printlangs(char **langs)
+void
+printlangs(char **langs)		/* I - Languages */
 {
   if (langs)
     {
       int n = 0;
       while (langs && langs[n])
 	{
-	  printf("%s\n", langs[n]);
+	  puts(langs[n]);
 	  n++;
 	}
     }
-  exit (EXIT_SUCCESS);
+  exit(EXIT_SUCCESS);
 }
 
 
 /*
- * 'printmodels' - Print a list of available models
+ * 'printmodels()' - Print a list of available models.
  */
 
-void printmodels(int verbose)
+void
+printmodels(int verbose)		/* I - Verbosity level */
 {
   const stp_printer_t *p;
   int i;
@@ -593,182 +818,177 @@ void printmodels(int verbose)
 	    printf("%s\n", stp_printer_get_driver(p));
 	}
     }
-  exit (EXIT_SUCCESS);
+  exit(EXIT_SUCCESS);
 }
 
-/* Adapted from GNU libc <dirent.h>
-   These macros extract size information from a `struct dirent *'.
-   They may evaluate their argument multiple times, so it must not
-   have side effects.  Each of these may involve a relatively costly
-   call to `strlen' on some systems, so these values should be cached.
-
-   _D_EXACT_NAMLEN (DP) returns the length of DP->d_name, not including
-   its terminating null character.
+#endif /* !CUPS_DRIVER_INTERFACE */
 
-   _D_ALLOC_NAMLEN (DP) returns a size at least (_D_EXACT_NAMLEN (DP) + 1);
-   that is, the allocation size needed to hold the DP->d_name string.
-   Use this macro when you don't need the exact length, just an upper bound.
-   This macro is less likely to require calling `strlen' than _D_EXACT_NAMLEN.
-   */
-
-#ifdef _DIRENT_HAVE_D_NAMLEN
-# ifndef _D_EXACT_NAMLEN
-#  define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
-# endif
-# ifndef _D_ALLOC_NAMLEN
-#  define _D_ALLOC_NAMLEN(d) (_D_EXACT_NAMLEN (d) + 1)
-# endif
-#else
-# ifndef _D_EXACT_NAMLEN
-#  define _D_EXACT_NAMLEN(d) (strlen ((d)->d_name))
-# endif
-# ifndef _D_ALLOC_NAMLEN
-#  ifdef _DIRENT_HAVE_D_RECLEN
-#   define _D_ALLOC_NAMLEN(d) (((char *) (d) + (d)->d_reclen) - &(d)->d_name[0])
-#  else
-#   define _D_ALLOC_NAMLEN(d) (sizeof (d)->d_name > 1 ? sizeof (d)->d_name : \
-                               _D_EXACT_NAMLEN (d) + 1)
-#  endif
-# endif
-#endif
 
 /*
- * 'stpi_scandir()' - BSD scandir() replacement.
+ * 'getlangs()' - Get a list of available translations.
  */
 
-static int
-stpi_scandir (const char *dir,
-	      struct dirent ***namelist,
-	      int (*sel) (const struct dirent *),
-	      int (*cmp) (const void *, const void *))
+#ifdef ENABLE_NLS
+char **					/* O - Array of languages */
+getlangs(void)
 {
-  DIR *dp = opendir (dir);
-  struct dirent **v = NULL;
-  size_t vsize = 0, i;
-  struct dirent *d;
-  int save;
+  int		i;			/* Looping var */
+  char		*ptr;			/* Pointer into string */
+  static char	all_linguas[] = ALL_LINGUAS;
+					/* List of languages from configure.ac */
+  static char **langs = NULL;		/* Array of languages */
 
-  if (dp == NULL)
-    return -1;
 
-  save = errno;
-  errno = 0;
+  if (!langs)
+  {
+   /*
+    * Create the langs array...
+    */
 
-  i = 0;
-  while ((d = readdir (dp)) != NULL)
-    if (sel == NULL || (*sel) (d))
-      {
-	struct dirent *vnew;
-	size_t dsize;
-
-	/* Ignore errors from sel or readdir */
-        errno = 0;
-
-	if (i == vsize)
-	  {
-	    struct dirent **new;
-	    if (vsize == 0)
-	      vsize = 10;
-	    else
-	      vsize *= 2;
-	    new = (struct dirent **) realloc (v, vsize * sizeof (*v));
-	    if (new == NULL)
-	      break;
-	    v = new;
-	  }
-
-	dsize = &d->d_name[_D_ALLOC_NAMLEN (d)] - (char *) d;
-	vnew = (struct dirent *) malloc (dsize);
-	if (vnew == NULL)
-	  break;
-
-	v[i++] = (struct dirent *) memcpy (vnew, d, dsize);
-      }
+    for (i = 1, ptr = strchr(all_linguas, ' '); ptr; ptr = strchr(ptr + 1, ' '))
+      i ++;
+
+    langs = calloc(i + 1, sizeof(char *));
 
-  if (errno != 0)
+    langs[0] = all_linguas;
+    for (i = 1, ptr = strchr(all_linguas, ' '); ptr; ptr = strchr(ptr + 1, ' '))
     {
-      save = errno;
+      *ptr     = '\0';
+      langs[i] = ptr + 1;
+      i ++;
+    }
+  }
 
-      while (i > 0)
-	free (v[--i]);
-      free (v);
+  return (langs);
+}
 
-      i = -1;
-    }
-  else
+/*
+ * 'set_language()' - Set the current translation language.
+ */
+
+static void
+set_language(const char *lang)		/* I - Locale name */
+{
+  char *l = setlocale(LC_ALL, lang ? lang : "");
+
+  /* Make sure the locale we tried to set was accepted! */
+  if (lang && !l)
     {
-      /* Sort the list if we have a comparison function to sort with.  */
-      if (cmp != NULL)
-	qsort (v, i, sizeof (*v), cmp);
+      int i;
+      for (i = 0; i < lang_map_count; i++)
+	{
+	  const locale_map *lm = &(lang_mappings[i]);
+	  if (!strcmp(lang, lm->lang))
+	    {
+	      l = setlocale(LC_ALL, lm->mapping);
+	      if (l)
+		break;
+	    }
+	}
+    }
 
-      *namelist = v;
+#  ifdef LC_CTYPE
+  setlocale(LC_CTYPE, l ? l : "");
+#  endif /* LC_CTYPE */
+#  ifdef LC_NUMERIC
+  setlocale(LC_NUMERIC, "C");
+#  endif /* LC_NUMERIC */
+
+ /*
+  * Set up the catalog
+  */
+
+  if (baselocaledir)
+  {
+    if ((bindtextdomain(PACKAGE, baselocaledir)) == NULL)
+    {
+      fprintf(stderr, "cups-genppd: cannot load message catalog %s under %s: %s\n",
+	      PACKAGE, baselocaledir, strerror(errno));
+      exit(EXIT_FAILURE);
     }
 
-  (void) closedir (dp);
-  errno = save;
+#  ifdef DEBUG
+    fprintf(stderr, "DEBUG: bound textdomain: %s under %s\n",
+	    PACKAGE, baselocaledir);
+#  endif /* DEBUG */
 
-  return i;
+    if ((textdomain(PACKAGE)) == NULL)
+    {
+      fprintf(stderr,
+              "cups-genppd: cannot select message catalog %s under %s: %s\n",
+              PACKAGE, baselocaledir, strerror(errno));
+      exit(EXIT_FAILURE);
+    }
+#  ifdef DEBUG
+    fprintf(stderr, "DEBUG: textdomain set: %s\n", PACKAGE);
+#  endif /* DEBUG */
+  }
 }
+#endif /* ENABLE_NLS */
 
 /*
- * 'checkcat()' - A callback for stpi_scandir() to check
- *                if a message catalogue exists
+ * 'is_special_option()' - Determine if an option should be grouped.
  */
 
-int
-checkcat (const struct dirent *localedir)
+static int				/* O - 1 if non-grouped, 0 otherwise */
+is_special_option(const char *name)	/* I - Option name */
 {
-  char* catpath;
-  int catlen, status = 0, savederr;
-  struct stat catstat;
-
-  savederr = errno; /* since we are a callback, preserve stpi_scandir() state */
-
-  /* LOCALEDIR / LANG / LC_MESSAGES/CATALOG */
-  /* Add 3, for two '/' separators and '\0'   */
-  catlen = strlen(baselocaledir) + strlen(localedir->d_name) + strlen(CATALOG) + 3;
-  catpath = (char*) stp_malloc(catlen * sizeof(char));
-
-  strncpy (catpath, baselocaledir, strlen(baselocaledir));
-  catlen = strlen(baselocaledir);
-  *(catpath+catlen) = '/';
-  catlen++;
-  strncpy (catpath+catlen, localedir->d_name, strlen(localedir->d_name));
-  catlen += strlen(localedir->d_name);
-  *(catpath+catlen) = '/';
-  catlen++;
-  strncpy (catpath+catlen, CATALOG, strlen(CATALOG));
-  catlen += strlen(CATALOG);
-  *(catpath+catlen) = '\0';
-
-  if (!stat (catpath, &catstat))
+  int i = 0;
+  while (special_options[i])
     {
-      if (S_ISREG(catstat.st_mode))
-	{
-	  status = 1;
-	}
-     }
+      if (strcmp(name, special_options[i]) == 0)
+	return 1;
+      i++;
+    }
+  return 0;
+}
+
+
+/*
+ * 'print_group_close()' - Close a UI group.
+ */
+
+static void
+print_group_close(
+    gzFile                fp,		/* I - File to write to */
+    stp_parameter_class_t p_class,	/* I - Option class */
+    stp_parameter_level_t p_level)	/* I - Option level */
+{
+  gzprintf(fp, "*CloseGroup: %s %s\n\n",
+	   gettext(parameter_class_names[p_class]),
+	   gettext(parameter_level_names[p_level]));
+}
 
-  stp_free (catpath);
 
-  errno = savederr;
-  return status;
+/*
+ * 'print_group_open()' - Open a new UI group.
+ */
+
+static void
+print_group_open(
+    gzFile                fp,		/* I - File to write to */
+    stp_parameter_class_t p_class,	/* I - Option class */
+    stp_parameter_level_t p_level)	/* I - Option level */
+{
+  gzprintf(fp, "*OpenGroup: %s %s\n\n",
+	   gettext(parameter_class_names[p_class]),
+	   gettext(parameter_level_names[p_level]));
 }
 
+
 /*
  * 'write_ppd()' - Write a PPD file.
  */
 
 int					/* O - Exit status */
-write_ppd(const stp_printer_t *p,	/* I - Printer driver */
-	  const char          *prefix,	/* I - Prefix (directory) for PPD files */
-	  const char	      *language,
-	  int                 verbose,
-	  int                 simplified)
+write_ppd(
+    gzFile              fp,		/* I - File to write to */
+    const stp_printer_t *p,		/* I - Printer driver */
+    const char          *language,	/* I - Primary language */
+    const char		*ppd_location,	/* I - Location of PPD file */
+    int                 simplified)	/* I - 1 = simplified options */
 {
   int		i, j, k, l;		/* Looping vars */
-  gzFile	fp;			/* File to write to */
-  char		filename[1024];		/* Filename */
   int		num_opts;		/* Number of printer options */
   int		xdpi, ydpi;		/* Resolution info */
   stp_vars_t	*v;			/* Variable info */
@@ -778,10 +998,9 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
   const char	*driver;		/* Driver name */
   const char	*long_name;		/* Driver long name */
   const char	*manufacturer;		/* Manufacturer of printer */
-  const stp_vars_t	*printvars;		/* Printer option names */
+  const stp_vars_t *printvars;		/* Printer option names */
   paper_t	*the_papers;		/* Media sizes */
   int		cur_opt;		/* Current option */
-  struct stat   dir;                    /* prefix dir status */
   int		variable_sizes;		/* Does the driver support variable sizes? */
   int		min_width,		/* Min/max custom size */
 		min_height,
@@ -795,6 +1014,7 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
   int maximum_level = simplified ?
     STP_PARAMETER_LEVEL_BASIC : STP_PARAMETER_LEVEL_ADVANCED4;
 
+
  /*
   * Initialize driver-specific variables...
   */
@@ -807,77 +1027,24 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
   cur_opt    = 0;
 
  /*
-  * Skip the PostScript drivers...
-  */
-
-  if (strcmp(stp_printer_get_family(p), "ps") == 0 ||
-      strcmp(stp_printer_get_family(p), "raw") == 0)
-    return (0);
-
- /*
-  * Make sure the destination directory exists...
-  */
-
-
-  if (stat(prefix, &dir) && !S_ISDIR(dir.st_mode))
-    {
-      if (mkdir(prefix, 0777))
-	{
-	  printf("cups-genppd: Cannot create directory %s: %s\n",
-		 prefix, strerror(errno));
-	  exit (EXIT_FAILURE);
-	}
-    }
-
-  /*
-   * The files will be named stp-<driver>.<major>.<minor>.ppd, for
-   * example:
-   * 
-   * stp-escp2-ex.5.0.ppd
-   * 
-   * or
-   * 
-   * stp-escp2-ex.5.0.ppd.gz
-   */
-  snprintf(filename, sizeof(filename) - 1, "%s/stp-%s.%s%s%s%s",
-	   prefix, driver, GUTENPRINT_RELEASE_VERSION,
-	   simplified ? ".sim" : "", ppdext, gzext);
-
- /*
-  * Open the PPD file...
-  */
-
-  if ((fp = gzopen(filename, "wb")) == NULL)
-  {
-    fprintf(stderr, "cups-genppd: Unable to create file \"%s\" - %s.\n",
-            filename, strerror(errno));
-    return (2);
-  }
-
- /*
   * Write a standard header...
   */
 
-  if (verbose)
-    fprintf(stderr, "Writing %s...\n", filename);
-  else
-    fprintf(stderr, ".");
-
   gzputs(fp, "*PPD-Adobe: \"4.3\"\n");
-  gzputs(fp, "*%PPD file for CUPS/Gutenprint.\n");
-  gzputs(fp, "*%Copyright 1993-2005 by Easy Software Products and Robert Krawitz.\n");
-  gzputs(fp, "*%This program is free software; you can redistribute it and/or\n");
-  gzputs(fp, "*%modify it under the terms of the GNU General Public License,\n");
-  gzputs(fp, "*%version 2, as published by the Free Software Foundation.\n");
+  gzputs(fp, "*% PPD file for CUPS/Gutenprint.\n");
+  gzputs(fp, "*% Copyright 1993-2006 by Easy Software Products and Robert Krawitz.\n");
+  gzputs(fp, "*% This program is free software; you can redistribute it and/or\n");
+  gzputs(fp, "*% modify it under the terms of the GNU General Public License,\n");
+  gzputs(fp, "*% version 2, as published by the Free Software Foundation.\n");
   gzputs(fp, "*%\n");
-  gzputs(fp, "*%This program is distributed in the hope that it will be useful, but\n");
-  gzputs(fp, "*%WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n");
-  gzputs(fp, "*%or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n");
-  gzputs(fp, "*%for more details.\n");
+  gzputs(fp, "*% This program is distributed in the hope that it will be useful, but\n");
+  gzputs(fp, "*% WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n");
+  gzputs(fp, "*% or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n");
+  gzputs(fp, "*% for more details.\n");
   gzputs(fp, "*%\n");
-  gzputs(fp, "*%You should have received a copy of the GNU General Public License\n");
-  gzputs(fp, "*%along with this program; if not, write to the Free Software\n");
-  gzputs(fp, "*%Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n");
+  gzputs(fp, "*% You should have received a copy of the GNU General Public License\n");
+  gzputs(fp, "*% along with this program; if not, write to the Free Software\n");
+  gzputs(fp, "*% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n");
   gzputs(fp, "*%\n");
   gzputs(fp, "*FormatVersion:	\"4.3\"\n");
   gzputs(fp, "*FileVersion:	\"" VERSION "\"\n");
@@ -925,11 +1092,11 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
   * with commas.  Now use a dash instead...
   */
 
-  /*
-   * NOTE - code in rastertoprinter looks for this version string.
-   * If this is changed, the corresponding change must be made in
-   * rastertoprinter.c.  Look for "ppd->nickname"
-   */
+ /*
+  * NOTE - code in rastertoprinter looks for this version string.
+  * If this is changed, the corresponding change must be made in
+  * rastertoprinter.c.  Look for "ppd->nickname"
+  */
   gzprintf(fp, "*NickName:      \"%s%s%s%s\"\n",
 	   long_name, CUPS_PPD_NICKNAME_STRING, VERSION,
 	   simplified ? " Simplified" : "");
@@ -987,16 +1154,8 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
     gzputs(fp, "*cupsFilter:	\"application/vnd.cups-command 33 commandtoepson\"\n");
   gzputs(fp, "\n");
   gzprintf(fp, "*StpDriverName:	\"%s\"\n", driver);
-  gzprintf(fp, "*StpPPDLocation:	\"%s%s%s/stp-%s.%s%s%s%s\"\n",
-	   cups_modeldir,
-	   cups_modeldir[strlen(cups_modeldir) - 1] == '/' ? "" : "/",
-	   language ? language : "C",
-	   driver,
-	   GUTENPRINT_RELEASE_VERSION,
-	   simplified ? ".sim" : "",
-	   ppdext,
-	   gzext);
-  gzprintf(fp, "*StpLocale:	\"%s\"\n", language ? language : "C");	
+  gzprintf(fp, "*StpPPDLocation: \"%s\"\n", ppd_location);
+  gzprintf(fp, "*StpLocale:	\"%s\"\n", language ? language : "C");
 
  /*
   * Get the page sizes from the driver...
@@ -1064,6 +1223,7 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
     the_papers[cur_opt].top    = height - top;
 
     cur_opt++;
+    stp_clear_string_parameter(v, "PageSize");
   }
 
  /*
@@ -1076,6 +1236,7 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
   gzputs(fp, "*OpenUI *PageSize: PickOne\n");
   gzputs(fp, "*OrderDependency: 10 AnySetup *PageSize\n");
   gzprintf(fp, "*DefaultPageSize: %s\n", desc.deflt.str);
+  gzprintf(fp, "*StpDefaultPageSize: %s\n", desc.deflt.str);
   for (i = 0; i < cur_opt; i ++)
   {
     gzprintf(fp,  "*PageSize %s", the_papers[i].name);
@@ -1087,6 +1248,7 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
   gzputs(fp, "*OpenUI *PageRegion: PickOne\n");
   gzputs(fp, "*OrderDependency: 10 AnySetup *PageRegion\n");
   gzprintf(fp, "*DefaultPageRegion: %s\n", desc.deflt.str);
+  gzprintf(fp, "*StpDefaultPageRegion: %s\n", desc.deflt.str);
   for (i = 0; i < cur_opt; i ++)
   {
     gzprintf(fp,  "*PageRegion %s", the_papers[i].name);
@@ -1096,6 +1258,7 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
   gzputs(fp, "*CloseUI: *PageRegion\n\n");
 
   gzprintf(fp, "*DefaultImageableArea: %s\n", desc.deflt.str);
+  gzprintf(fp, "*StpDefaultImageableArea: %s\n", desc.deflt.str);
   for (i = 0; i < cur_opt; i ++)
   {
     gzprintf(fp,  "*ImageableArea %s", the_papers[i].name);
@@ -1106,6 +1269,7 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
   gzputs(fp, "\n");
 
   gzprintf(fp, "*DefaultPaperDimension: %s\n", desc.deflt.str);
+  gzprintf(fp, "*StpDefaultPaperDimension: %s\n", desc.deflt.str);
 
   for (i = 0; i < cur_opt; i ++)
   {
@@ -1143,6 +1307,7 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
     gzputs(fp, "*ParamCustomPageSize WidthOffset:  3 points 0 0\n");
     gzputs(fp, "*ParamCustomPageSize HeightOffset: 4 points 0 0\n");
     gzputs(fp, "*ParamCustomPageSize Orientation:  5 int 0 0\n\n");
+    stp_clear_string_parameter(v, "PageSize");
   }
 
   stp_parameter_description_destroy(&desc);
@@ -1157,9 +1322,15 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
   gzputs(fp, "*OrderDependency: 10 AnySetup *ColorModel\n");
 
   if (printer_is_color)
-    gzputs(fp, "*DefaultColorModel: RGB\n");
+    {
+      gzputs(fp, "*DefaultColorModel: RGB\n");
+      gzputs(fp, "*StpDefaultColorModel: RGB\n");
+    }
   else
-    gzputs(fp, "*DefaultColorModel: Gray\n");
+    {
+      gzputs(fp, "*DefaultColorModel: Gray\n");
+      gzputs(fp, "*StpDefaultColorModel: Gray\n");
+    }
 
   gzprintf(fp, "*ColorModel Gray/Grayscale:\t\"<<"
                "/cupsColorSpace %d"
@@ -1218,6 +1389,7 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
       gzputs(fp, "*OpenUI *StpColorPrecision/Color Precision: PickOne\n");
       gzputs(fp, "*OrderDependency: 10 AnySetup *StpColorPrecision\n");
       gzputs(fp, "*DefaultStpColorPrecision: Normal\n");
+      gzputs(fp, "*StpDefaultStpColorPrecision: Normal\n");
       gzputs(fp, "*StpColorPrecision Normal/Normal:\t\"<<"
 	     "/cupsBitsPerColor 8>>setpagedevice\"\n");
       gzputs(fp, "*StpColorPrecision Best/Best:\t\"<<"
@@ -1238,6 +1410,7 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
     gzprintf(fp, "*OpenUI *MediaType/%s: PickOne\n", _("Media Type"));
     gzputs(fp, "*OrderDependency: 10 AnySetup *MediaType\n");
     gzprintf(fp, "*DefaultMediaType: %s\n", desc.deflt.str);
+    gzprintf(fp, "*StpDefaultMediaType: %s\n", desc.deflt.str);
 
     for (i = 0; i < num_opts; i ++)
     {
@@ -1262,6 +1435,7 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
     gzprintf(fp, "*OpenUI *InputSlot/%s: PickOne\n", _("Media Source"));
     gzputs(fp, "*OrderDependency: 10 AnySetup *InputSlot\n");
     gzprintf(fp, "*DefaultInputSlot: %s\n", desc.deflt.str);
+    gzprintf(fp, "*StpDefaultInputSlot: %s\n", desc.deflt.str);
 
     for (i = 0; i < num_opts; i ++)
     {
@@ -1284,8 +1458,9 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
       stp_clear_string_parameter(v, "Resolution");
       has_quality_parameter = 1;
       gzprintf(fp, "*OpenUI *StpQuality/%s: PickOne\n", gettext(desc.text));
-      gzputs(fp, "*OrderDependency: 5 AnySetup *StpQuality\n");
+      gzputs(fp, "*OrderDependency: 10 AnySetup *StpQuality\n");
       gzprintf(fp, "*DefaultStpQuality: %s\n", desc.deflt.str);
+      gzprintf(fp, "*StpDefaultStpQuality: %s\n", desc.deflt.str);
       num_opts = stp_string_list_count(desc.bounds.str);
       for (i = 0; i < num_opts; i++)
 	{
@@ -1319,12 +1494,43 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 
   if (!simplified || desc.p_level == STP_PARAMETER_LEVEL_BASIC)
     {
+#ifdef USE_COMPLIANT_RESOLUTIONS
+      stp_string_list_t *res_list = stp_string_list_create();
+      char res_name[64];	/* Plenty long enough for XXXxYYYdpi */
+      int resolution_ok;
+      int tmp_xdpi, tmp_ydpi;
+#endif
+
       gzprintf(fp, "*OpenUI *Resolution/%s: PickOne\n", _("Resolution"));
-      gzputs(fp, "*OrderDependency: 20 AnySetup *Resolution\n");
+      gzputs(fp, "*OrderDependency: 10 AnySetup *Resolution\n");
       if (has_quality_parameter)
-	gzprintf(fp, "*DefaultResolution: None\n");
+	{
+	  gzprintf(fp, "*DefaultResolution: None\n");
+	  gzprintf(fp, "*StpDefaultResolution: None\n");
+	}
       else
+      {
+#ifdef USE_COMPLIANT_RESOLUTIONS
+	stp_set_string_parameter(v, "Resolution", desc.deflt.str);
+	stp_describe_resolution(v, &xdpi, &ydpi);
+
+	if (xdpi == ydpi)
+	  (void) snprintf(res_name, 63, "%ddpi", xdpi);
+	else
+	  (void) snprintf(res_name, 63, "%dx%ddpi", xdpi, ydpi);
+	gzprintf(fp, "*DefaultResolution: %s\n", res_name);
+	gzprintf(fp, "*StpDefaultResolution: %s\n", res_name);
+	/*
+	 * We need to add this to the resolution list here so that
+	 * some non-default resolution won't wind up with the
+	 * default resolution name
+	 */
+	stp_string_list_add_string(res_list, res_name, res_name);
+#else  /* !USE_COMPLIANT_RESOLUTIONS */
 	gzprintf(fp, "*DefaultResolution: %s\n", desc.deflt.str);
+	gzprintf(fp, "*StpDefaultResolution: %s\n", desc.deflt.str);
+#endif /* USE_COMPLIANT_RESOLUTIONS */
+      }
 
       stp_clear_string_parameter(v, "Quality");
       if (has_quality_parameter)
@@ -1342,14 +1548,38 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 	  if (xdpi == -1 || ydpi == -1)
 	    continue;
 
-	  /*
-	   * Write the resolution option...
-	   */
-
+#ifdef USE_COMPLIANT_RESOLUTIONS
+	  resolution_ok = 0;
+	  tmp_xdpi = xdpi;
+	  tmp_ydpi = ydpi;
+	  do
+	    {
+	      if (tmp_xdpi == tmp_ydpi)
+		(void) snprintf(res_name, 63, "%ddpi", tmp_xdpi);
+	      else
+		(void) snprintf(res_name, 63, "%dx%ddpi", tmp_xdpi, tmp_ydpi);
+	      if (strcmp(opt->name, desc.deflt.str) == 0 ||
+		  !stp_string_list_is_present(res_list, res_name))
+		{
+		  resolution_ok = 1;
+		  stp_string_list_add_string(res_list, res_name, res_name);
+		}
+	      else if (tmp_ydpi > tmp_xdpi)
+		tmp_ydpi++;
+	      else
+		tmp_xdpi++;
+	    } while (!resolution_ok);
+	  gzprintf(fp, "*Resolution %s/%s:\t\"<</HWResolution[%d %d]/cupsCompression %d>>setpagedevice\"\n",
+		   res_name, opt->text, xdpi, ydpi, i + 1);
+#else  /* !USE_COMPLIANT_RESOLUTIONS */
 	  gzprintf(fp, "*Resolution %s/%s:\t\"<</HWResolution[%d %d]/cupsCompression %d>>setpagedevice\"\n",
 		   opt->name, opt->text, xdpi, ydpi, i + 1);
+#endif /* USE_COMPLIANT_RESOLUTIONS */
 	}
 
+#ifdef USE_COMPLIANT_RESOLUTIONS
+      stp_string_list_destroy(res_list);
+#endif
       gzputs(fp, "*CloseUI: *Resolution\n\n");
     }
 
@@ -1361,13 +1591,14 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
       gzputs(fp, "*OpenUI *OutputOrder: PickOne\n");
       gzputs(fp, "*OrderDependency: 10 AnySetup *OutputOrder\n");
       gzprintf(fp, "*DefaultOutputOrder: %s\n", desc.deflt.str);
+      gzprintf(fp, "*StpDefaultOutputOrder: %s\n", desc.deflt.str);
       gzputs(fp, "*OutputOrder Normal/Normal: \"\"\n");
       gzputs(fp, "*OutputOrder Reverse/Reverse: \"\"\n");
       gzputs(fp, "*CloseUI: *OutputOrder\n\n");
     }
   stp_parameter_description_destroy(&desc);
 
- /* 
+ /*
   * Duplex
   * Note that the opt->name strings MUST match those in the printer driver(s)
   * else the PPD files will not be generated correctly
@@ -1379,9 +1610,10 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
       num_opts = stp_string_list_count(desc.bounds.str);
       if (num_opts > 0)
       {
-        gzputs(fp, "*OpenUI *Duplex/Double-Sided Printing: PickOne\n");
-        gzputs(fp, "*OrderDependency: 20 AnySetup *Duplex\n");
+        gzprintf(fp, "*OpenUI *Duplex/%s: PickOne\n", _("2-Sided Printing"));
+        gzputs(fp, "*OrderDependency: 10 AnySetup *Duplex\n");
         gzprintf(fp, "*DefaultDuplex: %s\n", desc.deflt.str);
+        gzprintf(fp, "*StpDefaultDuplex: %s\n", desc.deflt.str);
 
         for (i = 0; i < num_opts; i++)
           {
@@ -1398,6 +1630,16 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
     }
   stp_parameter_description_destroy(&desc);
 
+  gzprintf(fp, "*OpenUI *StpiShrinkOutput/%s: PickOne\n",
+	   _("Shrink Page If Necessary to Fit Borders"));
+  gzputs(fp, "*OrderDependency: 10 AnySetup *StpiShrinkOutput\n");
+  gzputs(fp, "*DefaultStpiShrinkOutput: Shrink\n");
+  gzputs(fp, "*StpDefaultStpiShrinkOutput: Shrink\n");
+  gzprintf(fp, "*StpiShrinkOutput %s/%s: \"\"\n", "Shrink", _("Shrink (print the whole page)"));
+  gzprintf(fp, "*StpiShrinkOutput %s/%s: \"\"\n", "Crop", _("Crop (preserve dimensions)"));
+  gzprintf(fp, "*StpiShrinkOutput %s/%s: \"\"\n", "Expand", _("Expand (use maximum page area)"));
+  gzputs(fp, "*CloseUI: *StpiShrinkOutput\n\n");
+
   param_list = stp_get_parameter_list(v);
 
   for (j = 0; j <= STP_PARAMETER_CLASS_OUTPUT; j++)
@@ -1429,23 +1671,25 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 		    }
 		  gzprintf(fp, "*OpenUI *Stp%s/%s: PickOne\n",
 			   desc.name, gettext(desc.text));
-#if 0
-		  gzprintf(fp, "*OrderDependency: %d AnySetup *Stp%s\n",
-			   (100 + l + (j * param_count) +
-			    (k * STP_PARAMETER_LEVEL_INTERNAL * param_count)),
+		  gzprintf(fp, "*OrderDependency: 10 AnySetup *Stp%s\n",
 			   desc.name);
-#endif
-		  if (!desc.is_mandatory)
-		    gzprintf(fp, "*DefaultStp%s: None\n", desc.name);
 		  switch (desc.p_type)
 		    {
 		    case STP_PARAMETER_TYPE_STRING_LIST:
 		      if (desc.is_mandatory)
-			gzprintf(fp, "*DefaultStp%s: %s\n",
-				 desc.name, desc.deflt.str);
+			{
+			  gzprintf(fp, "*DefaultStp%s: %s\n",
+				   desc.name, desc.deflt.str);
+			  gzprintf(fp, "*StpDefaultStp%s: %s\n",
+				   desc.name, desc.deflt.str);
+			}
 		      else
-			gzprintf(fp, "*Stp%s %s/%s: \"\"\n", desc.name,
-				 "None", _("None"));
+			{
+			  gzprintf(fp, "*DefaultStp%s: None\n", desc.name);
+			  gzprintf(fp, "*StpDefaultStp%s: None\n", desc.name);
+			  gzprintf(fp, "*Stp%s %s/%s: \"\"\n", desc.name,
+				   "None", _("None"));
+			}
 		      num_opts = stp_string_list_count(desc.bounds.str);
 		      for (i = 0; i < num_opts; i++)
 			{
@@ -1456,21 +1700,27 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 		      break;
 		    case STP_PARAMETER_TYPE_BOOLEAN:
 		      if (desc.is_mandatory)
-			gzprintf(fp, "*DefaultStp%s: %s\n", desc.name,
-				 desc.deflt.boolean ? "True" : "False");
+			{
+			  gzprintf(fp, "*DefaultStp%s: %s\n", desc.name,
+				   desc.deflt.boolean ? "True" : "False");
+			  gzprintf(fp, "*StpDefaultStp%s: %s\n", desc.name,
+				   desc.deflt.boolean ? "True" : "False");
+			}
 		      else
-			gzprintf(fp, "*Stp%s %s/%s: \"\"\n", desc.name,
-				 "None", _("None"));
+			{
+			  gzprintf(fp, "*DefaultStp%s: None\n", desc.name);
+			  gzprintf(fp, "*StpDefaultStp%s: None\n", desc.name);
+			  gzprintf(fp, "*Stp%s %s/%s: \"\"\n", desc.name,
+				   "None", _("None"));
+			}
 		      gzprintf(fp, "*Stp%s %s/%s: \"\"\n",
 			       desc.name, "False", _("No"));
 		      gzprintf(fp, "*Stp%s %s/%s: \"\"\n",
 			       desc.name, "True", _("Yes"));
 		      break;
 		    case STP_PARAMETER_TYPE_DOUBLE:
-		      if (desc.is_mandatory)
-			{
-			  gzprintf(fp, "*DefaultStp%s: None\n", desc.name);
-			}
+		      gzprintf(fp, "*DefaultStp%s: None\n", desc.name);
+		      gzprintf(fp, "*StpDefaultStp%s: None\n", desc.name);
 		      for (i = desc.bounds.dbl.lower * 1000;
 			   i <= desc.bounds.dbl.upper * 1000 ; i += 100)
 			{
@@ -1491,11 +1741,21 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 			gzprintf(fp, "*Stp%s None/%.3f: \"\"\n",
 				 desc.name, desc.deflt.dbl);
 		      gzprintf(fp, "*CloseUI: *Stp%s\n\n", desc.name);
+
+                     /*
+		      * Add custom option code and value parameter...
+		      */
+
+		      gzprintf(fp, "*CustomStp%s True: \"pop\"\n", desc.name);
+		      gzprintf(fp, "*ParamCustomStp%s Value/%s: 1 real %.3f %.3f\n\n",
+		               desc.name, _("Value"),  desc.bounds.dbl.lower,
+			       desc.bounds.dbl.upper);
 		      if (!simplified)
 			{
 			  gzprintf(fp, "*OpenUI *StpFine%s/%s %s: PickOne\n",
 				   desc.name, gettext(desc.text), _("Fine Adjustment"));
 			  gzprintf(fp, "*DefaultStpFine%s:None\n", desc.name);
+			  gzprintf(fp, "*StpDefaultStpFine%s:None\n", desc.name);
 			  gzprintf(fp, "*StpFine%s None/0.000: \"\"\n", desc.name);
 			  for (i = 0; i < 100; i += 5)
 			    gzprintf(fp, "*StpFine%s %d/%.3f: \"\"\n",
@@ -1503,15 +1763,23 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 			  gzprintf(fp, "*CloseUI: *StpFine%s\n\n", desc.name);
 			}
 		      print_close_ui = 0;
-		      
+
 		      break;
 		    case STP_PARAMETER_TYPE_DIMENSION:
 		      if (desc.is_mandatory)
-			gzprintf(fp, "*DefaultStp%s: %d\n",
-				 desc.name, desc.deflt.dimension);
+			{
+			  gzprintf(fp, "*DefaultStp%s: %d\n",
+				   desc.name, desc.deflt.dimension);
+			  gzprintf(fp, "*StpDefaultStp%s: %d\n",
+				   desc.name, desc.deflt.dimension);
+			}
 		      else
-			gzprintf(fp, "*Stp%s %s/%s: \"\"\n", desc.name,
-				 "None", _("None"));
+			{
+			  gzprintf(fp, "*DefaultStp%s: None\n", desc.name);
+			  gzprintf(fp, "*StpDefaultStp%s: None\n", desc.name);
+			  gzprintf(fp, "*Stp%s %s/%s: \"\"\n", desc.name,
+				   "None", _("None"));
+			}
 		      for (i = desc.bounds.dimension.lower;
 			   i <= desc.bounds.dimension.upper; i++)
 			{
@@ -1523,6 +1791,20 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 			  gzprintf(fp, "*Stp%s %d/%.1f mm: \"\"\n",
 				   desc.name, i, ((double) i) * 25.4 / 72);
 			}
+
+		      print_close_ui = 0;
+		      gzprintf(fp, "*CloseUI: *Stp%s\n\n", desc.name);
+
+                     /*
+		      * Add custom option code and value parameter...
+		      */
+
+		      gzprintf(fp, "*CustomStp%s True: \"pop\"\n", desc.name);
+		      gzprintf(fp, "*ParamCustomStp%s Value/%s: 1 points %d %d\n\n",
+		               desc.name, _("Value"),
+			       desc.bounds.dimension.lower,
+			       desc.bounds.dimension.upper);
+
 		      break;
 		    default:
 		      break;
@@ -1579,12 +1861,9 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
   gzputs(fp, "*Font ZapfChancery-MediumItalic: Standard \"(001.007S)\" Standard ROM\n");
   gzputs(fp, "*Font ZapfDingbats: Special \"(001.004S)\" Standard ROM\n");
 
-  gzprintf(fp, "\n*%%End of stp-%s.%s%s\n",
-           driver,
-           GUTENPRINT_RELEASE_VERSION,
-           ppdext);
-
-  gzclose(fp);
+  gzprintf(fp, "\n*%% End of stp-%s.%s%s%s\n",
+           driver, GUTENPRINT_RELEASE_VERSION, simplified ? ".sim" : "",
+	   ppdext);
 
   stp_vars_destroy(v);
   return (0);
@@ -1592,5 +1871,5 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 
 
 /*
- * End of "$Id: genppd.c,v 1.118 2006/05/28 16:59:03 rlk Exp $".
+ * End of "$Id: genppd.c,v 1.119.2.3 2007/05/29 01:47:26 rlk Exp $".
  */
diff --git a/src/cups/rastertoprinter.c b/src/cups/rastertoprinter.c
index 626fcf9..52d3592 100644
--- a/src/cups/rastertoprinter.c
+++ b/src/cups/rastertoprinter.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: rastertoprinter.c,v 1.104 2006/07/04 02:19:14 rlk Exp $"
+ * "$Id: rastertoprinter.c,v 1.105.2.1 2007/03/02 12:01:16 rlk Exp $"
  *
  *   Gutenprint based raster filter for the Common UNIX Printing System.
  *
- *   Copyright 1993-2003 by Easy Software Products.
+ *   Copyright 1993-2007 by Easy Software Products.
  *
  *   This program is free software; you can redistribute it and/or
  *   modify it under the terms of the GNU General Public License,
@@ -89,6 +89,7 @@ typedef struct
   int			adjusted_width;
   int			adjusted_height;
   int			last_percent;
+  int			shrink_to_fit;
   cups_page_header_t	header;		/* Page header from file */
 } cups_image_t;
 
@@ -219,6 +220,7 @@ print_debug_block(const stp_vars_t *v, const cups_image_t *cups)
   fprintf(stderr, "DEBUG: Gutenprint stp_get_top(v) |%d|\n", stp_get_top(v));
   fprintf(stderr, "DEBUG: Gutenprint stp_get_page_width(v) |%d|\n", stp_get_page_width(v));
   fprintf(stderr, "DEBUG: Gutenprint stp_get_page_height(v) |%d|\n", stp_get_page_height(v));
+  fprintf(stderr, "DEBUG: Gutenprint shrink page to fit %d\n", cups->shrink_to_fit);
   params = stp_get_parameter_list(v);
   nparams = stp_parameter_list_count(params);
   for (i = 0; i < nparams; i++)
@@ -347,13 +349,13 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
   switch (cups->header.cupsColorSpace)
     {
     case CUPS_CSPACE_W :
-      /* Olympus photo printers don't support black & white ink! */
+      /* DyeSub photo printers don't support black & white ink! */
       if (printer_supports_bw(v))
 	set_string_parameter(v, "PrintingMode", "BW");
       set_string_parameter(v, "InputImageType", "Whitescale");
       break;
     case CUPS_CSPACE_K :
-      /* Olympus photo printers don't support black & white ink! */
+      /* DyeSub photo printers don't support black & white ink! */
       if (printer_supports_bw(v))
 	set_string_parameter(v, "PrintingMode", "BW");
       set_string_parameter(v, "InputImageType", "Grayscale");
@@ -413,6 +415,8 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
         set_string_parameter(v, "Duplex", "DuplexNoTumble");
     }
 
+  cups->shrink_to_fit = stp_get_int_parameter(v, "CUPSShrinkPage");
+
   set_string_parameter(v, "JobMode", "Job");
   validate_options(v, cups);
   stp_get_media_size(v, &(cups->width), &(cups->height));
@@ -437,9 +441,14 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
   tmp_height = cups->bottom - cups->top;
   if (tmp_left < cups->left)
     {
-      cups->left_trim = cups->left - tmp_left;
+      if (cups->shrink_to_fit != 1)
+	{
+	  cups->left_trim = cups->left - tmp_left;
+	  tmp_left = cups->left;
+	}
+      else
+	cups->left_trim = 0;
       fprintf(stderr, "DEBUG: Gutenprint left margin %d\n", cups->left_trim);
-      tmp_left = cups->left;
     }
   else
     {
@@ -450,9 +459,14 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
     }
   if (tmp_right > cups->right)
     {
-      cups->right_trim = tmp_right - cups->right;
+      if (cups->shrink_to_fit != 1)
+	{
+	  cups->right_trim = tmp_right - cups->right;
+	  tmp_right = cups->right;
+	}
+      else
+	cups->right_trim = 0;
       fprintf(stderr, "DEBUG: Gutenprint right margin %d\n", cups->right_trim);
-      tmp_right = cups->right;
     }
   else
     {
@@ -463,9 +477,14 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
     }
   if (tmp_top < cups->top)
     {
-      cups->top_trim = cups->top - tmp_top;
+      if (cups->shrink_to_fit != 1)
+	{
+	  cups->top_trim = cups->top - tmp_top;
+	  tmp_top = cups->top;
+	}
+      else
+	cups->top_trim = 0;
       fprintf(stderr, "DEBUG: Gutenprint top margin %d\n", cups->top_trim);
-      tmp_top = cups->top;
     }
   else
     {
@@ -476,9 +495,14 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
     }
   if (tmp_bottom > cups->bottom)
     {
-      cups->bottom_trim = tmp_bottom - cups->bottom;
+      if (cups->shrink_to_fit != 1)
+	{
+	  cups->bottom_trim = tmp_bottom - cups->bottom;
+	  tmp_bottom = cups->bottom;
+	}
+      else
+	cups->bottom_trim = 0;
       fprintf(stderr, "DEBUG: Gutenprint bottom margin %d\n", cups->bottom_trim);
-      tmp_bottom = cups->bottom;
     }
   else
     {
@@ -488,13 +512,28 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
       cups->bottom = tmp_bottom;
     }
 
-  stp_set_width(v, cups->right - cups->left);
-  stp_set_height(v, cups->bottom - cups->top);
-  stp_set_left(v, cups->left);
-  stp_set_top(v, cups->top);
+  if (cups->shrink_to_fit == 2)
+    {
+      int t_left, t_right, t_bottom, t_top;
+      stp_get_imageable_area(v, &(t_left), &(t_right), &(t_bottom), &(t_top));
+      stp_set_width(v, t_right - t_left);
+      stp_set_height(v, t_bottom - t_top);
+      stp_set_left(v, t_left);
+      stp_set_top(v, t_top);
+    }
+  else
+    {
+      stp_set_width(v, cups->right - cups->left);
+      stp_set_height(v, cups->bottom - cups->top);
+      stp_set_left(v, cups->left);
+      stp_set_top(v, cups->top);
+    }
 
   cups->right = cups->width - cups->right;
-  cups->width = cups->width - cups->left - cups->right;
+  if (cups->shrink_to_fit == 1)
+    cups->width = tmp_right - tmp_left;
+  else
+    cups->width = cups->width - cups->left - cups->right;
   cups->width = cups->header.HWResolution[0] * cups->width / 72;
   cups->left = cups->header.HWResolution[0] * cups->left / 72;
   cups->right = cups->header.HWResolution[0] * cups->right / 72;
@@ -505,7 +544,10 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings)
     cups->adjusted_width = cups->header.cupsWidth;
 
   cups->bottom = cups->height - cups->bottom;
-  cups->height = cups->height - cups->top - cups->bottom;
+  if (cups->shrink_to_fit == 1)
+    cups->height = tmp_bottom - tmp_top;
+  else
+    cups->height = cups->height - cups->top - cups->bottom;
   cups->height = cups->header.HWResolution[1] * cups->height / 72;
   cups->top = cups->header.HWResolution[1] * cups->top / 72;
   cups->bottom = cups->header.HWResolution[1] * cups->bottom / 72;
@@ -546,14 +588,32 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
   stp_parameter_list_t params = stp_get_parameter_list(v);
   int nparams = stp_parameter_list_count(params);
   int i;
+  const char *val;		/* CUPS option value */
+  ppd_option_t *ppd_option;
+  val = cupsGetOption("StpiShrinkOutput", num_options, options);
+  if (!val)
+    {
+      ppd_option = ppdFindOption(ppd, "StpiShrinkOutput");
+      if (ppd_option)
+	val = ppd_option->defchoice;
+    }
+  if (val)
+    {
+      if (!strcasecmp(val, "crop"))
+	stp_set_int_parameter(v, "CUPSShrinkPage", 0);
+      else if (!strcasecmp(val, "expand"))
+	stp_set_int_parameter(v, "CUPSShrinkPage", 2);
+      else
+	stp_set_int_parameter(v, "CUPSShrinkPage", 1);
+    }
+  else
+    stp_set_int_parameter(v, "CUPSShrinkPage", 1);
   for (i = 0; i < nparams; i++)
     {
       const stp_parameter_t *param = stp_parameter_list_param(params, i);
       stp_parameter_t desc;
       char *ppd_option_name = stp_malloc(strlen(param->name) + 8);	/* StpFineFOO\0 */
 
-      const char *val;		/* CUPS option value */
-      ppd_option_t *ppd_option;
       stp_describe_parameter(v, param->name, &desc);
       if (desc.p_type == STP_PARAMETER_TYPE_DOUBLE)
 	{
@@ -565,7 +625,17 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 	      if (ppd_option)
 		val = ppd_option->defchoice;
 	    }
-	  if (val && strlen(val) > 0 && strcmp(val, "None") != 0)
+	  if (val && !strncasecmp(val, "Custom.", 7))
+	    {
+	      double dval = atof(val + 7);
+
+	      fprintf(stderr, "DEBUG: Gutenprint set float %s to %f\n",
+		      desc.name, dval);
+	      if (dval > desc.bounds.dbl.upper)
+		dval = desc.bounds.dbl.upper;
+	      stp_set_float_parameter(v, desc.name, dval);
+            }
+	  else if (val && strlen(val) > 0 && strcmp(val, "None") != 0)
 	    {
 	      double coarse_val = atof(val) * 0.001;
 	      double fine_val = 0;
@@ -608,13 +678,20 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 		  set_string_parameter(v, desc.name, val);
 		  break;
 		case STP_PARAMETER_TYPE_INT:
+                  if (!strncasecmp(val, "Custom.", 7))
+		    val += 7;
+
 		  fprintf(stderr, "DEBUG: Gutenprint set int %s to %s\n",
 			  desc.name, val);
 		  stp_set_int_parameter(v, desc.name, atoi(val));
 		  break;
 		case STP_PARAMETER_TYPE_DIMENSION:
+                  if (!strncasecmp(val, "Custom.", 7))
+		    val += 7;
+
 		  fprintf(stderr, "DEBUG: Gutenprint set dimension %s to %s\n",
 			  desc.name, val);
+
 		  stp_set_dimension_parameter(v, desc.name, atoi(val));
 		  break;
 		case STP_PARAMETER_TYPE_BOOLEAN:
@@ -979,7 +1056,7 @@ cups_errfunc(void *file, const char *buf, size_t bytes)
  * 'cancel_job()' - Cancel the current job...
  */
 
-void
+static void
 cancel_job(int sig)			/* I - Signal */
 {
   (void)sig;
@@ -1018,7 +1095,7 @@ throwaway_data(int amount, cups_image_t *cups)
     cupsRasterReadPixels(cups->ras, trash, leftover);
 }
 
-stp_image_status_t
+static stp_image_status_t
 Image_get_row(stp_image_t   *image,	/* I - Image */
 	      unsigned char *data,	/* O - Row */
 	      size_t	    byte_limit,	/* I - how many bytes in data */
@@ -1201,5 +1278,5 @@ Image_width(stp_image_t *image)	/* I - Image */
 
 
 /*
- * End of "$Id: rastertoprinter.c,v 1.104 2006/07/04 02:19:14 rlk Exp $".
+ * End of "$Id: rastertoprinter.c,v 1.105.2.1 2007/03/02 12:01:16 rlk Exp $".
  */
diff --git a/src/escputil/Makefile.in b/src/escputil/Makefile.in
index b07898b..95fee43 100644
--- a/src/escputil/Makefile.in
+++ b/src/escputil/Makefile.in
@@ -48,11 +48,12 @@ subdir = src/escputil
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
@@ -67,8 +68,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/src/main/libgutenprint.la
 am__DEPENDENCIES_2 =
 escputil_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp =
-am__depfiles_maybe =
+depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
+am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -84,13 +85,18 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -116,6 +122,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -123,6 +131,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -135,12 +144,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -175,6 +186,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -270,14 +282,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -294,6 +309,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -311,17 +329,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -343,9 +365,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/escputil/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/escputil/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps src/escputil/Makefile
+	  $(AUTOMAKE) --gnu  src/escputil/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -401,14 +423,29 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/d4lib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escputil.Po@am__quote@
+
 .c.o:
-	$(COMPILE) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -533,6 +570,7 @@ clean: clean-am
 clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -558,6 +596,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/escputil/escputil.c b/src/escputil/escputil.c
index ffaacec..5394b77 100644
--- a/src/escputil/escputil.c
+++ b/src/escputil/escputil.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escputil.c,v 1.87 2006/05/31 08:31:59 rleigh Exp $"
+ * "$Id: escputil.c,v 1.87.8.1 2007/05/29 01:47:27 rlk Exp $"
  *
  *   Printer maintenance utility for EPSON Stylus (R) printers
  *
@@ -285,7 +285,7 @@ main(int argc, char **argv)
   int c;
 
   /* Set up gettext */
-#ifdef ENABLE_NLS
+#ifdef HAVE_LOCALE_H
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, PACKAGE_LOCALE_DIR);
 #endif
diff --git a/src/foomatic/Makefile.in b/src/foomatic/Makefile.in
index 897cfb3..830736e 100644
--- a/src/foomatic/Makefile.in
+++ b/src/foomatic/Makefile.in
@@ -53,11 +53,12 @@ subdir = src/foomatic
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
@@ -81,8 +82,8 @@ am_printers_OBJECTS = printers.$(OBJEXT)
 printers_OBJECTS = $(am_printers_OBJECTS)
 printers_DEPENDENCIES = $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp =
-am__depfiles_maybe =
+depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
+am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -102,13 +103,18 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -134,6 +140,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -141,6 +149,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -153,12 +162,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -193,6 +204,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -288,14 +300,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -312,6 +327,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -329,17 +347,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -381,9 +403,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/foomatic/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/foomatic/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps src/foomatic/Makefile
+	  $(AUTOMAKE) --gnu  src/foomatic/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -434,14 +456,32 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gutenprint-version.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paper_sizes.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printer_margins.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printer_options.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printers.Po@am__quote@
+
 .c.o:
-	$(COMPILE) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -568,6 +608,7 @@ clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
 	mostlyclean-am
 
 distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -593,6 +634,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/foomatic/foomatic-generator.in b/src/foomatic/foomatic-generator.in
index 02a863c..c72679d 100644
--- a/src/foomatic/foomatic-generator.in
+++ b/src/foomatic/foomatic-generator.in
@@ -110,10 +110,12 @@ print STDERR "done.\n";
 if ($foomatic3) {
     open PIPE, "./printer_margins $simplified_subopt|" or die "Cannot run printer_margins: $!\n";
     print STDERR "Loading margins from ./printer_margins $simplified_subopt...";
-    $code = join('', <PIPE>);
-    #print $code;
+    while(<PIPE>) {
+	#print $_;
+	next if m!^#!;
+	eval $_;
+    }
     close PIPE or die "Cannot run printer_margins: $!\n";
-    eval $code or die "Cannot run printer_margins: $!\n";
     print STDERR "done.\n";
 }
 
@@ -223,11 +225,11 @@ if ($foomatic3) {
 # for each value range. Therefore the filenames of numerical options
 # are numbered (eg. Contrast-1.xml).
 for $a (keys(%stp_float_values)) {
-    for $vtmp (keys %{$stp_float_values{$a}}) {
-	for $otmp (keys %{$stp_float_values{$a}{$vtmp}}) {
-	    my $min = $stp_float_values{$a}{'MINVAL'}{$otmp};
-	    my $max = $stp_float_values{$a}{'MAXVAL'}{$otmp};
-	    my $def = $stp_float_values{$a}{'DEFVAL'}{$otmp};
+    for $otmp (keys %{$stp_float_values{$a}}) {
+	for $vtmp (keys %{$stp_float_values{$a}{$otmp}}) {
+	    my $min = $stp_float_values{$a}{$otmp}{'MINVAL'};
+	    my $max = $stp_float_values{$a}{$otmp}{'MAXVAL'};
+	    my $def = $stp_float_values{$a}{$otmp}{'DEFVAL'};
 	    # Skip options with invalid values, the library contains such
 	    # options in the case when only one constant value is allowed
 	    next if (($min >= $max) || ($def < $min) || ($def > $max));
@@ -245,11 +247,11 @@ for $a (keys(%stp_float_values)) {
     }
 }
 for $a (keys(%stp_int_values)) {
-    for $vtmp (keys %{$stp_int_values{$a}}) {
-	for $otmp (keys %{$stp_int_values{$a}{$vtmp}}) {
-	    my $min = $stp_int_values{$a}{'MINVAL'}{$otmp};
-	    my $max = $stp_int_values{$a}{'MAXVAL'}{$otmp};
-	    my $def = $stp_int_values{$a}{'DEFVAL'}{$otmp};
+    for $otmp (keys %{$stp_int_values{$a}}) {
+	for $vtmp (keys %{$stp_int_values{$a}{$otmp}}) {
+	    my $min = $stp_int_values{$a}{$otmp}{'MINVAL'};
+	    my $max = $stp_int_values{$a}{$otmp}{'MAXVAL'};
+	    my $def = $stp_int_values{$a}{$otmp}{'DEFVAL'};
 	    # Skip options with invalid values, the library contains such
 	    # options in the case when only one constant value is allowed
 	    next if (($min >= $max) || ($def < $min) || ($def > $max));
@@ -268,11 +270,11 @@ for $a (keys(%stp_int_values)) {
 }
 
 for $a (keys(%stp_dimension_values)) {
-    for $vtmp (keys %{$stp_dimension_values{$a}}) {
-	for $otmp (keys %{$stp_dimension_values{$a}{$vtmp}}) {
-	    my $min = $stp_dimension_values{$a}{'MINVAL'}{$otmp};
-	    my $max = $stp_dimension_values{$a}{'MAXVAL'}{$otmp};
-	    my $def = $stp_dimension_values{$a}{'DEFVAL'}{$otmp};
+    for $otmp (keys %{$stp_dimension_values{$a}}) {
+	for $vtmp (keys %{$stp_dimension_values{$a}{$otmp}}) {
+	    my $min = $stp_dimension_values{$a}{$otmp}{'MINVAL'};
+	    my $max = $stp_dimension_values{$a}{$otmp}{'MAXVAL'};
+	    my $def = $stp_dimension_values{$a}{$otmp}{'DEFVAL'};
 	    # Skip options with invalid values, the library contains such
 	    # options in the case when only one constant value is allowed
 	    next if (($min >= $max) || ($def < $min) || ($def > $max));
@@ -844,22 +846,22 @@ sub build_num_cons {
 	# this option and a default value for it.
 	my $stpdef;
 	if ((defined($stpdef =
-		     $stp_float_values{$stpname}{"DEFVAL"}{$stpopt})) ||
+		     $stp_float_values{$stpname}{$stpopt}{"DEFVAL"})) ||
 	    (defined($stpdef =
-		     $stp_int_values{$stpname}{"DEFVAL"}{$stpopt})) ||
+		     $stp_int_values{$stpname}{$stpopt}{"DEFVAL"})) ||
 	    (defined($stpdef =
-		     $stp_dimension_values{$stpname}{"DEFVAL"}{$stpopt}))) {
+		     $stp_dimension_values{$stpname}{$stpopt}{"DEFVAL"}))) {
 	    # Find minimum and maximum
 	    my ($min, $max);
 	    if ($type eq "float") {
-		$min = $stp_float_values{$stpname}{"MINVAL"}{$stpopt};
-		$max = $stp_float_values{$stpname}{"MAXVAL"}{$stpopt};
+		$min = $stp_float_values{$stpname}{$stpopt}{"MINVAL"};
+		$max = $stp_float_values{$stpname}{$stpopt}{"MAXVAL"};
 	    } elsif ($type eq "dimension") {
-		$min = $stp_dimension_values{$stpname}{"MINVAL"}{$stpopt};
-		$max = $stp_dimension_values{$stpname}{"MAXVAL"}{$stpopt};
+		$min = $stp_dimension_values{$stpname}{$stpopt}{"MINVAL"};
+		$max = $stp_dimension_values{$stpname}{$stpopt}{"MAXVAL"};
 	    } else {
-		$min = $stp_int_values{$stpname}{"MINVAL"}{$stpopt};
-		$max = $stp_int_values{$stpname}{"MAXVAL"}{$stpopt};
+		$min = $stp_int_values{$stpname}{$stpopt}{"MINVAL"};
+		$max = $stp_int_values{$stpname}{$stpopt}{"MAXVAL"};
 	    }
 	    # Does the range of this option with this printer match
 	    # the Foomatic option entry we are building currently?
@@ -1314,6 +1316,8 @@ sub qualityorder {
 		    "oov",
 		    # Canon
 		    "dmt",
+		    "dpi_high",
+		    "dpi_draft"
 		    );
     my ($a, $b) = @_;
     # Bring the suffixes to lower case
diff --git a/src/foomatic/foomatic-printermap b/src/foomatic/foomatic-printermap
index 38758a3..bb0df69 100644
--- a/src/foomatic/foomatic-printermap
+++ b/src/foomatic/foomatic-printermap
@@ -57,6 +57,7 @@
 #gptofoo bjc-80 printer/Canon-BJC-80
 #gptofoo bjc-8200 printer/Canon-BJC-8200
 #gptofoo bjc-85 printer/Canon-BJC-85
+#gptofoo canon-cp10 printer/Canon-CP-10
 #gptofoo canon-cp100 printer/Canon-CP-100
 #gptofoo canon-cp200 printer/Canon-CP-200
 #gptofoo canon-cp220 printer/Canon-CP-220
@@ -83,9 +84,35 @@
 #gptofoo canon-cp510 printer/Canon-SELPHY-CP-510
 #gptofoo canon-cp600 printer/Canon-SELPHY-CP-600
 #gptofoo canon-cp710 printer/Canon-SELPHY-CP-710
+#gptofoo bjc-PIXMA-iP2000 printer/Canon-PIXMA-iP2000
+#gptofoo bjc-PIXMA-iP3000 printer/Canon-PIXMA-iP3000
+#gptofoo bjc-PIXMA-iP3100 printer/Canon-PIXMA-iP3100
 #gptofoo bjc-iP4000 printer/Canon-iP4000
+#gptofoo bjc-PIXMA-iP4100 printer/Canon-PIXMA-iP4100
+#gptofoo bjc-PIXMA-iP4200 printer/Canon-PIXMA-iP4200
+#gptofoo bjc-PIXMA-iP4300 printer/Canon-PIXMA-iP4300
+#gptofoo bjc-PIXMA-iP5000 printer/Canon-PIXMA-iP5000
+#gptofoo bjc-PIXMA-iP5200 printer/Canon-PIXMA-iP5200
+#gptofoo bjc-PIXMA-iP6700 printer/Canon-PIXMA-iP6700
+#gptofoo bjc-MULTIPASS-MP150 printer/Canon-MULTIPASS-MP150
+#gptofoo bjc-MULTIPASS-MP500 printer/Canon-MULTIPASS-MP500
+#gptofoo bjc-MULTIPASS-MP700 printer/Canon-MULTIPASS-MP700
+#gptofoo bjc-MULTIPASS-MP730 printer/Canon-MULTIPASS-MP730
+#gptofoo bjc-MULTIPASS-MP750 printer/Canon-MULTIPASS-MP750
+#gptofoo bjc-MULTIPASS-MP760 printer/Canon-MULTIPASS-MP760
+#gptofoo bjc-MULTIPASS-MP770 printer/Canon-MULTIPASS-MP770
+#gptofoo bjc-MULTIPASS-MP780 printer/Canon-MULTIPASS-MP780
+#gptofoo bjc-MULTIPASS-MP790 printer/Canon-MULTIPASS-MP790
+#gptofoo bjc-MULTIPASS-MP830 printer/Canon-MULTIPASS-MP830
+#gptofoo bjc-PIXUS-iP3100 printer/Canon-PIXUS-iP3100
+#gptofoo bjc-PIXUS-iP4100 printer/Canon-PIXUS-iP4100
+#gptofoo bjc-i560 printer/Canon-i560
+#gptofoo bjc-i850 printer/Canon-i850
+#gptofoo bjc-i860 printer/Canon-i860
+#gptofoo bjc-i865 printer/Canon-i865
 #gptofoo canon-ir_330s printer/Canon-imageRunner_330s
 #gptofoo citizen-projet_ii printer/Citizen-ProJet_II
+#gptofoo compaq-ij1200 printer/Compaq-IJ1200
 #gptofoo dec-1800 printer/DEC-1800
 #gptofoo dec-ln17 printer/DEC-LN17
 #gptofoo epson-actl_1100 printer/Epson-ActionLaser_1100
@@ -154,6 +181,7 @@
 #gptofoo escp2-pm980c printer/Epson-PM_980C
 #gptofoo escp2-pma650 printer/Epson-PM_A650
 #gptofoo escp2-pma750 printer/Epson-PM_A750
+#gptofoo escp2-pma820 printer/Epson-PM_A820
 #gptofoo escp2-pma890 printer/Epson-PM_A890
 #gptofoo escp2-pma900 printer/Epson-PM_A900
 #gptofoo escp2-pma950 printer/Epson-PM_A950
@@ -162,11 +190,14 @@
 #gptofoo escp2-pmd750 printer/Epson-PM_D750
 #gptofoo escp2-pmd770 printer/Epson-PM_D770
 #gptofoo escp2-pmd800 printer/Epson-PM_D800
+#gptofoo escp2-pmd870 printer/Epson-PM_D870
 #gptofoo escp2-pmg700 printer/Epson-PM_G700
 #gptofoo escp2-pmg720 printer/Epson-PM_G720
 #gptofoo escp2-pmg730 printer/Epson-PM_G730
 #gptofoo escp2-pmg800 printer/Epson-PM_G800
 #gptofoo escp2-pmg820 printer/Epson-PM_G820
+#gptofoo escp2-pmg850 printer/Epson-PM_G850
+#gptofoo escp2-pmg4500 printer/Epson-PM_G4500
 #gptofoo escp2-px5500 printer/Epson-PX_5500
 #gptofoo escp2-px7000 printer/Epson-PX_7000
 #gptofoo escp2-px9000 printer/Epson-PX_9000
@@ -179,6 +210,14 @@
 #gptofoo escp2-pxv630 printer/Epson-PX_V630
 #gptofoo escp2-picmate printer/Epson-PictureMate
 #gptofoo escp2-picmated printer/Epson-PictureMate_Deluxe
+#gptofoo escp2-picmateflash printer/Epson-PictureMate_Flash
+#gptofoo escp2-picmatepal printer/Epson-PictureMate_Pal
+#gptofoo escp2-picmatesnap printer/Epson-PictureMate_Snap
+#gptofoo escp2-picmate200 printer/Epson-PictureMate_200
+#gptofoo escp2-picmate210 printer/Epson-PictureMate_210
+#gptofoo escp2-picmate240 printer/Epson-PictureMate_240
+#gptofoo escp2-picmate250 printer/Epson-PictureMate_250
+#gptofoo escp2-picmate280 printer/Epson-PictureMate_280
 #gptofoo escp2-c20 printer/Epson-Stylus_C20
 #gptofoo escp2-c20sx printer/Epson-Stylus_C20SX
 #gptofoo escp2-c20ux printer/Epson-Stylus_C20UX
@@ -210,12 +249,14 @@
 #gptofoo escp2-c66 printer/Epson-Stylus_C66
 #gptofoo escp2-c68 printer/Epson-Stylus_C68
 #gptofoo escp2-c70 printer/Epson-Stylus_C70
+#gptofoo escp2-c79 printer/Epson-Stylus_C79
 #gptofoo escp2-c80 printer/Epson-Stylus_C80
 #gptofoo escp2-c82 printer/Epson-Stylus_C82
 #gptofoo escp2-c83 printer/Epson-Stylus_C83
 #gptofoo escp2-c84 printer/Epson-Stylus_C84
 #gptofoo escp2-c85 printer/Epson-Stylus_C85
 #gptofoo escp2-c86 printer/Epson-Stylus_C86
+#gptofoo escp2-c87 printer/Epson-Stylus_C87
 #gptofoo escp2-c88 printer/Epson-Stylus_C88
 #gptofoo escp2-cx1500 printer/Epson-Stylus_CX1500
 #gptofoo escp2-cx3100 printer/Epson-Stylus_CX3100
@@ -233,16 +274,20 @@
 #gptofoo escp2-cx4600 printer/Epson-Stylus_CX4600
 #gptofoo escp2-cx4700 printer/Epson-Stylus_CX4700
 #gptofoo escp2-cx4800 printer/Epson-Stylus_CX4800
+#gptofoo escp2-cx5000 printer/Epson-Stylus_CX5000
+#gptofoo escp2-cx5000f printer/Epson-Stylus_CX5000F
 #gptofoo escp2-cx5100 printer/Epson-Stylus_CX5100
 #gptofoo escp2-cx5200 printer/Epson-Stylus_CX5200
 #gptofoo escp2-cx5300 printer/Epson-Stylus_CX5300
 #gptofoo escp2-cx5400 printer/Epson-Stylus_CX5400
 #gptofoo escp2-cx5700 printer/Epson-Stylus_CX5700
 #gptofoo escp2-cx5800 printer/Epson-Stylus_CX5800
+#gptofoo escp2-cx6000 printer/Epson-Stylus_CX6000
 #gptofoo escp2-cx6300 printer/Epson-Stylus_CX6300
 #gptofoo escp2-cx6400 printer/Epson-Stylus_CX6400
 #gptofoo escp2-cx6500 printer/Epson-Stylus_CX6500
 #gptofoo escp2-cx6600 printer/Epson-Stylus_CX6600
+#gptofoo escp2-cx7000f printer/Epson-Stylus_CX7000F
 #gptofoo escp2-cx7700 printer/Epson-Stylus_CX7700
 #gptofoo escp2-cx7800 printer/Epson-Stylus_CX7800
 #gptofoo escp2-cx8300 printer/Epson-Stylus_CX8300
@@ -289,6 +334,8 @@
 #gptofoo escp2-1270 printer/Epson-Stylus_Photo_1270
 #gptofoo escp2-1280 printer/Epson-Stylus_Photo_1280
 #gptofoo escp2-1290 printer/Epson-Stylus_Photo_1290
+#gptofoo escp2-1400 printer/Epson-Stylus_Photo_1400
+#gptofoo escp2-1410 printer/Epson-Stylus_Photo_1410
 #gptofoo escp2-2000 printer/Epson-Stylus_Photo_2000P
 #gptofoo escp2-2100 printer/Epson-Stylus_Photo_2100
 #gptofoo escp2-2200 printer/Epson-Stylus_Photo_2200
@@ -316,14 +363,24 @@
 #gptofoo escp2-ex printer/Epson-Stylus_Photo_EX
 #gptofoo escp2-ex3 printer/Epson-Stylus_Photo_EX3
 #gptofoo escp2-r1800 printer/Epson-Stylus_Photo_R1800
+#gptofoo escp2-r2400 printer/Epson-Stylus_Photo_R2400
 #gptofoo escp2-r200 printer/Epson-Stylus_Photo_R200
 #gptofoo escp2-r210 printer/Epson-Stylus_Photo_R210
 #gptofoo escp2-r220 printer/Epson-Stylus_Photo_R220
-#gptofoo escp2-r2400 printer/Epson-Stylus_Photo_R2400
+#gptofoo escp2-r230 printer/Epson-Stylus_Photo_R230
+#gptofoo escp2-r240 printer/Epson-Stylus_Photo_R240
+#gptofoo escp2-r245 printer/Epson-Stylus_Photo_R245
+#gptofoo escp2-r260 printer/Epson-Stylus_Photo_R260
+#gptofoo escp2-r265 printer/Epson-Stylus_Photo_R265
+#gptofoo escp2-r270 printer/Epson-Stylus_Photo_R270
 #gptofoo escp2-r300 printer/Epson-Stylus_Photo_R300
 #gptofoo escp2-r310 printer/Epson-Stylus_Photo_R310
 #gptofoo escp2-r320 printer/Epson-Stylus_Photo_R320
 #gptofoo escp2-r340 printer/Epson-Stylus_Photo_R340
+#gptofoo escp2-r350 printer/Epson-Stylus_Photo_R350
+#gptofoo escp2-r360 printer/Epson-Stylus_Photo_R360
+#gptofoo escp2-r380 printer/Epson-Stylus_Photo_R380
+#gptofoo escp2-r390 printer/Epson-Stylus_Photo_R390
 #gptofoo escp2-r800 printer/Epson-Stylus_Photo_R800
 #gptofoo escp2-rx400 printer/Epson-Stylus_Photo_RX400
 #gptofoo escp2-rx420 printer/Epson-Stylus_Photo_RX420
@@ -331,9 +388,13 @@
 #gptofoo escp2-rx430 printer/Epson-Stylus_Photo_RX430
 #gptofoo escp2-rx500 printer/Epson-Stylus_Photo_RX500
 #gptofoo escp2-rx510 printer/Epson-Stylus_Photo_RX510
+#gptofoo escp2-rx560 printer/Epson-Stylus_Photo_RX560
+#gptofoo escp2-rx580 printer/Epson-Stylus_Photo_RX580
+#gptofoo escp2-rx590 printer/Epson-Stylus_Photo_RX590
 #gptofoo escp2-rx600 printer/Epson-Stylus_Photo_RX600
 #gptofoo escp2-rx620 printer/Epson-Stylus_Photo_RX620
 #gptofoo escp2-rx630 printer/Epson-Stylus_Photo_RX630
+#gptofoo escp2-rx640 printer/Epson-Stylus_Photo_RX640
 #gptofoo escp2-rx700 printer/Epson-Stylus_Photo_RX700
 #gptofoo escp2-10000 printer/Epson-Stylus_Pro_10000
 #gptofoo escp2-5000 printer/Epson-Stylus_Pro_5000
@@ -349,6 +410,7 @@
 #gptofoo escp2-scan2500 printer/Epson-Stylus_Scan_2500
 #gptofoo fujifilm-cx400 printer/Fujifilm-Printpix-CX-400
 #gptofoo fujifilm-cx550 printer/Fujifilm-Printpix-CX-550
+#gptofoo fujifilm-nx500 printer/Fujifilm-FinePix-NX-500
 #gptofoo fujitsu-pp_10v printer/Fujitsu-PrintPartner_10V
 #gptofoo fujitsu-pp_16dv printer/Fujitsu-PrintPartner_16DV
 #gptofoo fujitsu-pp_20w printer/Fujitsu-PrintPartner_20W
@@ -613,6 +675,7 @@
 #gptofoo ibm-infoprint_12 printer/IBM-Infoprint_12
 #gptofoo ibm-pp_3112 printer/IBM-Page_Printer_3112
 #gptofoo infotec-4651_mf printer/Infotec-4651_MF
+#gptofoo kodak-dock printer/Kodak-Easyshare-Printer-Dock
 #gptofoo kyocera-f-1010 printer/Kyocera-F-1010
 #gptofoo kyocera-fs-1000 printer/Kyocera-FS-1000
 #gptofoo kyocera-fs-1000plus printer/Kyocera-FS-1000plus
@@ -662,7 +725,9 @@
 #gptofoo lexmark-4076 printer/Lexmark-4076
 #gptofoo lexmark-optra_e printer/Lexmark-Optra_E
 #gptofoo lexmark-optra_eplus printer/Lexmark-Optra_Eplus
+#gptofoo lexmark-optra_e220 printer/Lexmark-Optra_E220
 #gptofoo lexmark-vw_300 printer/Lexmark-Valuewriter_300
+#gptofoo lexmark-x73 printer/Lexmark-X73
 #gptofoo lexmark-z42 printer/Lexmark-Z42
 #gptofoo lexmark-z43 printer/Lexmark-Z43
 #gptofoo lexmark-z52 printer/Lexmark-Z52
@@ -706,6 +771,7 @@
 #gptofoo olympus-p330ne printer/Olympus-P-330NE
 #gptofoo olympus-p400 printer/Olympus-P-400
 #gptofoo olympus-p440 printer/Olympus-P-440
+#gptofoo olympus-ps100 printer/Olympus-P-S100
 #gptofoo pcpi-1030 printer/PCPI-1030
 #gptofoo panasonic-kx-p4410 printer/Panasonic-KX-P4410
 #gptofoo panasonic-kx-p4450 printer/Panasonic-KX-P4450
@@ -729,7 +795,9 @@
 #gptofoo seiko-sj_200 printer/Seiko-SpeedJET_200
 #gptofoo sharp-ar-161 printer/Sharp-AR-161
 #gptofoo sony-ijp-v100 printer/Sony-IJP-V100
+#gptofoo sony-dppex5 printer/Sony-DPP-EX5
 #gptofoo sony-updp10 printer/Sony-UP-DP10
+#gptofoo sony-updr100 printer/Sony-UP-DR100
 #gptofoo sony-updr150 printer/Sony-UP-DR150
 #gptofoo star-ls-04 printer/Star-LS-04
 #gptofoo star-lp_8 printer/Star-LaserPrinter_8
@@ -743,3 +811,4 @@
 #gptofoo xerox-dp_p1202 printer/Xerox-DocuPrint_P1202
 #gptofoo xerox-dp_p8e printer/Xerox-DocuPrint_P8e
 #gptofoo xerox-dc_400 printer/Xerox-Document_Centre_400
+#gptofoo xerox-wc_m118 printer/Xerox-Work_Centre_M118
diff --git a/src/foomatic/gutenprint-version.c b/src/foomatic/gutenprint-version.c
index 786dfe6..16c248a 100644
--- a/src/foomatic/gutenprint-version.c
+++ b/src/foomatic/gutenprint-version.c
@@ -1,7 +1,7 @@
 /*
- * "$Id: gutenprint-version.c,v 1.2 2005/04/12 00:45:10 rlk Exp $"
+ * "$Id: gutenprint-version.c,v 1.2.18.1 2007/03/04 23:57:48 tillkamppeter Exp $"
  *
- *   Dump the per-printer options for Grant Taylor's *-omatic database
+ *   Dump the per-printer options for the OpenPrinting database
  *
  *   Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)
  *
diff --git a/src/foomatic/mk_printerlist.in b/src/foomatic/mk_printerlist.in
index a8f516f..da669ad 100644
--- a/src/foomatic/mk_printerlist.in
+++ b/src/foomatic/mk_printerlist.in
@@ -5,7 +5,7 @@
 
 eval `./printers`;
 
-open PRINTERS, "(wget -q -O - http://www.linuxprinting.org/printer_list.cgi; cat foomatic-printermap) |" or die "Can't get print list: $!";
+open PRINTERS, "(wget -q -O - http://www.openprinting.org/printer_list.cgi; cat foomatic-printermap) |" or die "Can't get print list: $!";
 
 while (<PRINTERS>) {
     if (/make ==/) {
diff --git a/src/foomatic/paper_sizes.c b/src/foomatic/paper_sizes.c
index e22f5fd..7b12fe1 100644
--- a/src/foomatic/paper_sizes.c
+++ b/src/foomatic/paper_sizes.c
@@ -1,7 +1,7 @@
 /*
- * "$Id: paper_sizes.c,v 1.8 2004/09/17 18:38:12 rleigh Exp $"
+ * "$Id: paper_sizes.c,v 1.8.18.1 2007/03/04 23:57:48 tillkamppeter Exp $"
  *
- *   Dump the per-printer options for Grant Taylor's *-omatic database
+ *   Dump the per-printer options for the OpenPrinting database
  *
  *   Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)
  *
diff --git a/src/foomatic/printer_margins.c b/src/foomatic/printer_margins.c
index 89c68ed..11c50ad 100644
--- a/src/foomatic/printer_margins.c
+++ b/src/foomatic/printer_margins.c
@@ -1,10 +1,10 @@
 /*
- * "$Id: printer_margins.c,v 1.17 2006/04/17 02:06:18 rlk Exp $"
+ * "$Id: printer_margins.c,v 1.17.8.2 2007/05/29 01:47:27 rlk Exp $"
  *
- *   Dump the per-printer margins for Grant Taylor's *-omatic database
+ *   Dump the per-printer margins for the OpenPrinting database
  *
  *   Copyright 2000, 2003 Robert Krawitz (rlk@alum.mit.edu) and
- *                        Till Kamppeter (till.kamppeter@gmx.net)
+ *                        Till Kamppeter (till.kamppeter@gmail.com)
  *
  *   This program is free software; you can redistribute it and/or modify it
  *   under the terms of the GNU General Public License as published by the Free
@@ -107,16 +107,16 @@ main(int argc, char **argv) {
 	height = 0;
       }
 
-      printf("$stpdata{'%s'}{'PageSize'}{'%s'} = '%s';\n",
+      printf("$stpdata{'%s'}{'PageSize'}{'%s'} = '%s';",
 	     driver, opt->name, opt->text);
-      printf("$imageableareas{'%s'}{'%s'} = {\n",
+      printf("$imageableareas{'%s'}{'%s'} = {",
 	     driver, opt->name);
-      printf("  'left' => '%d',\n", left);
-      printf("  'right' => '%d',\n", right);
-      printf("  'top' => '%d',\n", top);
-      printf("  'bottom' => '%d',\n", bottom);
-      printf("  'width' => '%d',\n", width);
-      printf("  'height' => '%d'\n", height);
+      printf("  'left' => '%d',", left);
+      printf("  'right' => '%d',", right);
+      printf("  'top' => '%d',", top);
+      printf("  'bottom' => '%d',", bottom);
+      printf("  'width' => '%d',", width);
+      printf("  'height' => '%d'", height);
       printf("};\n");
     }
     stp_parameter_description_destroy(&desc);
diff --git a/src/foomatic/printer_options.c b/src/foomatic/printer_options.c
index d3a3b42..6848354 100644
--- a/src/foomatic/printer_options.c
+++ b/src/foomatic/printer_options.c
@@ -1,7 +1,7 @@
 /*
- * "$Id: printer_options.c,v 1.50 2006/05/28 16:59:03 rlk Exp $"
+ * "$Id: printer_options.c,v 1.50.8.2 2007/05/29 01:47:27 rlk Exp $"
  *
- *   Dump the per-printer options for Grant Taylor's *-omatic database
+ *   Dump the per-printer options for the OpenPrinting database
  *
  *   Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)
  *
@@ -33,10 +33,12 @@ main(int argc, char **argv)
 {
   int i, j, k;
   stp_parameter_level_t max_level = STP_PARAMETER_LEVEL_ADVANCED4;
+  stp_string_list_t *params_seen;
   if (argc > 1 && !strcmp(argv[1], "-s"))
     max_level = STP_PARAMETER_LEVEL_BASIC;
 
   stp_init();
+  params_seen = stp_string_list_create();
   for (i = 0; i < stp_printer_model_count(); i++)
     {
       stp_parameter_list_t params;
@@ -83,65 +85,96 @@ main(int argc, char **argv)
 	  stp_describe_parameter(pv, p->name, &desc);
 	  if (desc.is_active)
 	    {
+	      char buf[1024];
+	      sprintf(buf, "STP_%s", desc.name);
+	      if (!stp_string_list_find(params_seen, buf))
+		{
+		  stp_string_list_add_string(params_seen, buf, buf);
+		  if ((desc.p_type == STP_PARAMETER_TYPE_DOUBLE ||
+		       desc.p_type == STP_PARAMETER_TYPE_DIMENSION ||
+		       desc.p_type == STP_PARAMETER_TYPE_INT) &&
+		      !desc.is_mandatory)
+		    {
+		      sprintf(buf, "STP_Enable%s", desc.name);
+		      if (!stp_string_list_find(params_seen, buf))
+			{
+			  stp_string_list_add_string(params_seen, buf, buf);
+			  /*
+			   * Create a dummy option that enables or disables
+			   * the option as appropriate.  The long name ends in
+			   * enable, rather than starts with enable, because
+			   * CUPS has this nasty habit of sorting options
+			   * alphabetically rather than leaving them in the
+			   * order listed.  This ensures that the enable
+			   * option is adjacent to the value it controls.
+			   */
+			  printf("$longnames{'STP_Enable%s'} = '%s Enable';",
+				 desc.name, desc.text);
+			  printf("$param_classes{'STP_Enable%s'} = %d;",
+				 desc.name, desc.p_class);
+			  printf("$param_levels{'STP_Enable%s'} = %d;",
+				 desc.name, desc.p_level);
+			  printf("$longnames{'STP_%s'} = '%s Value';",
+				 desc.name, desc.text);
+			}
+		    }
+		  else
+		    printf("$longnames{'STP_%s'} = '%s';",
+			   desc.name, desc.text);
+		  printf("$param_classes{'STP_%s'} = %d;",
+			 desc.name, desc.p_class);
+		  printf("$param_levels{'STP_%s'} = %d;",
+			 desc.name, desc.p_level);
+		}
 	      if ((desc.p_type == STP_PARAMETER_TYPE_DOUBLE ||
 		   desc.p_type == STP_PARAMETER_TYPE_DIMENSION ||
 		   desc.p_type == STP_PARAMETER_TYPE_INT) &&
 		  !desc.is_mandatory)
 		{
-		  /*
-		   * Create a dummy option that enables or disables
-		   * the option as appropriate.  The long name ends in
-		   * enable, rather than starts with enable, because
-		   * CUPS has this nasty habit of sorting options
-		   * alphabetically rather than leaving them in the
-		   * order listed.  This ensures that the enable
-		   * option is adjacent to the value it controls.
-		   */
-		  printf("$longnames{'STP_Enable%s'} = '%s Enable';\n",
-			 desc.name, desc.text);
-		  printf("$param_classes{'STP_Enable%s'} = %d;\n",
-			 desc.name, desc.p_class);
-		  printf("$param_levels{'STP_Enable%s'} = %d;\n",
-			 desc.name, desc.p_level);
-		  printf("$defaults{'%s'}{'STP_Enable%s'} = 'Disabled';\n",
+		  printf("$defaults{'%s'}{'STP_Enable%s'} = 'Disabled';",
 			 driver, desc.name);
-		  printf("$stpdata{'%s'}{'STP_Enable%s'}{'Disabled'} = 'Disabled';\n",
+		  printf("$stpdata{'%s'}{'STP_Enable%s'}{'Disabled'} = 'Disabled';",
 			 driver, desc.name);
-		  printf("$stpdata{'%s'}{'STP_Enable%s'}{'Enabled'} = 'Enabled';\n",
+		  printf("$stpdata{'%s'}{'STP_Enable%s'}{'Enabled'} = 'Enabled';",
 			 driver, desc.name);
-		  printf("$longnames{'STP_%s'} = '%s Value';\n",
-			 desc.name, desc.text);
 		}
-	      else
-		printf("$longnames{'STP_%s'} = '%s';\n",
-		       desc.name, desc.text);
-	      printf("$param_classes{'STP_%s'} = %d;\n",
-		     desc.name, desc.p_class);
-	      printf("$param_levels{'STP_%s'} = %d;\n",
-		     desc.name, desc.p_level);
 	      if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
 		{
 		  count = stp_string_list_count(desc.bounds.str);
 		  if (count > 0)
 		    {
+		      printf("{ $stpdata{'%s'}{'STP_%s'} = {};",
+			     driver, desc.name);
+		      printf("my $tmp = $stpdata{'%s'}{'STP_%s'};",
+			     driver, desc.name);
+		      if (strcmp(desc.name, "Resolution") == 0)
+			{
+			  printf("$stpdata{'%s'}{'x_resolution'} = {};",
+				 driver);
+			  printf("my $x_t = $stpdata{'%s'}{'x_resolution'};",
+				 driver);
+			  printf("$stpdata{'%s'}{'y_resolution'} = {};",
+				 driver);
+			  printf("my $y_t = $stpdata{'%s'}{'y_resolution'};",
+				 driver);
+			}
 		      if (desc.is_mandatory)
 			{
-			  printf("$defaults{'%s'}{'STP_%s'} = '%s';\n",
+			  printf("$defaults{'%s'}{'STP_%s'} = '%s';",
 				 driver, desc.name, desc.deflt.str);
 			}
 		      else
 			{
-			  printf("$defaults{'%s'}{'STP_%s'} = '%s';\n",
+			  printf("$defaults{'%s'}{'STP_%s'} = '%s';",
 				 driver, desc.name, "None");
-			  printf("$stpdata{'%s'}{'STP_%s'}{'%s'} = '%s';\n",
-				 driver, desc.name, "None", "None");
+			  printf("$$tmp{'%s'} = '%s';", "None", "None");
 			}
 		      for (j = 0; j < count; j++)
 			{
 			  const stp_param_string_t *param =
 			    stp_string_list_param(desc.bounds.str, j);
-			  printf("$stpdata{'%s'}{'STP_%s'}{'%s'} = '%s';\n",
-				 driver, desc.name, param->name, param->text);
+			  printf("$$tmp{'%s'} = '%s';",
+				 param->name, param->text);
 			  if (strcmp(desc.name, "Resolution") == 0)
 			    {
 			      int x, y;
@@ -150,31 +183,30 @@ main(int argc, char **argv)
 			      stp_describe_resolution(pv, &x, &y);
 			      if (x > 0 && y > 0)
 				{
-				  printf("$stpdata{'%s'}{'%s'}{'%s'} = '%d';\n",
-					 driver, "x_resolution", param->name, x);
-				  printf("$stpdata{'%s'}{'%s'}{'%s'} = '%d';\n",
-					 driver, "y_resolution", param->name, y);
+				  printf("$$x_t{'%s'} = '%d';",param->name, x);
+				  printf("$$y_t{'%s'} = '%d';",param->name, y);
 				}
 			    }
 			}
+		      printf("}\n");
 		    }
 		}
 	      else if (desc.p_type == STP_PARAMETER_TYPE_BOOLEAN)
 		{
 		  if (desc.is_mandatory)
 		    {
-		      printf("$defaults{'%s'}{'STP_%s'} = '%d';\n",
+		      printf("$defaults{'%s'}{'STP_%s'} = '%d';",
 			     driver, desc.name, desc.deflt.boolean);
 		    }
 		  else
 		    {
-		      printf("$defaults{'%s'}{'STP_%s'} = '%s';\n",
+		      printf("$defaults{'%s'}{'STP_%s'} = '%s';",
 			     driver, desc.name, "None");
-		      printf("$stpdata{'%s'}{'STP_%s'}{'%s'} = '%s';\n",
+		      printf("$stpdata{'%s'}{'STP_%s'}{'%s'} = '%s';",
 			     driver, desc.name, "None", "None");
 		    }
 		    
-		  printf("$stpdata{'%s'}{'STP_%s'}{'False'} = 'False';\n",
+		  printf("$stpdata{'%s'}{'STP_%s'}{'False'} = 'False';",
 			 driver, desc.name);
 		  printf("$stpdata{'%s'}{'STP_%s'}{'True'} = 'True';\n",
 			 driver, desc.name);
@@ -184,20 +216,25 @@ main(int argc, char **argv)
 		  if (desc.bounds.dbl.lower <= desc.deflt.dbl &&
 		      desc.bounds.dbl.upper >= desc.deflt.dbl)
 		    {
-		      printf("$stp_float_values{'%s'}{'MINVAL'}{'STP_%s'} = %.3f;\n",
-			     driver, desc.name, desc.bounds.dbl.lower);
-		      printf("$stp_float_values{'%s'}{'MAXVAL'}{'STP_%s'} = %.3f;\n",
-			     driver, desc.name, desc.bounds.dbl.upper);
-		      printf("$stp_float_values{'%s'}{'DEFVAL'}{'STP_%s'} = %.3f;\n",
-			     driver, desc.name, desc.deflt.dbl);
-		      /* printf("$stp_float_values{'%s'}{'LONG_NAME'}{'STP_%s'} = '%s';\n",
-			 driver, desc.name, gettext(desc.text)); */
-		      printf("$stp_float_values{'%s'}{'CATEGORY'}{'STP_%s'} = '%s';\n",
-			     driver, desc.name, gettext(desc.category));
-		      printf("$stp_float_values{'%s'}{'HELP'}{'STP_%s'} = q(%s);\n",
-			     driver, desc.name, (desc.help ? gettext(desc.help) : "''"));
-		      printf("$stp_float_values{'%s'}{'MANDATORY'}{'STP_%s'} = q(%d);\n",
-			     driver, desc.name, desc.is_mandatory);
+		      printf("{ $stp_float_values{'%s'}{'STP_%s'} = {};",
+			     driver, desc.name);
+		      printf("my $tmp = $stp_float_values{'%s'}{'STP_%s'};",
+			     driver, desc.name);
+		      printf("$$tmp{'MINVAL'} = %.3f;",
+			     desc.bounds.dbl.lower);
+		      printf("$$tmp{'MAXVAL'} = %.3f;",
+			     desc.bounds.dbl.upper);
+		      printf("$$tmp{'DEFVAL'} = %.3f;",
+			     desc.deflt.dbl);
+		      /* printf("$$tmp{'LONG_NAME'} = '%s';",
+			 gettext(desc.text)); */
+		      printf("$$tmp{'CATEGORY'} = '%s';",
+			     gettext(desc.category));
+		      printf("$$tmp{'HELP'} = q(%s);",
+			     (desc.help ? gettext(desc.help) : "''"));
+		      printf("$$tmp{'MANDATORY'} = q(%d);",
+			     desc.is_mandatory);
+		      printf("}\n");
 		    }
 		}
 	      else if (desc.p_type == STP_PARAMETER_TYPE_INT)
@@ -205,20 +242,25 @@ main(int argc, char **argv)
 		  if (desc.bounds.integer.lower <= desc.deflt.integer &&
 		      desc.bounds.integer.upper >= desc.deflt.integer)
 		    {
-		      printf("$stp_int_values{'%s'}{'MINVAL'}{'STP_%s'} = %d;\n",
-			     driver, desc.name, desc.bounds.integer.lower);
-		      printf("$stp_int_values{'%s'}{'MAXVAL'}{'STP_%s'} = %d;\n",
-			     driver, desc.name, desc.bounds.integer.upper);
-		      printf("$stp_int_values{'%s'}{'DEFVAL'}{'STP_%s'} = %d;\n",
-			     driver, desc.name, desc.deflt.integer);
-		      /* printf("$stp_int_values{'%s'}{'LONG_NAME'}{'STP_%s'} = '%s';\n",
-			 driver, desc.name, gettext(desc.text)); */
-		      printf("$stp_int_values{'%s'}{'CATEGORY'}{'STP_%s'} = '%s';\n",
-			     driver, desc.name, gettext(desc.category));
-		      printf("$stp_int_values{'%s'}{'HELP'}{'STP_%s'} = q(%s);\n",
-			     driver, desc.name, (desc.help ? gettext(desc.help) : "''"));
-		      printf("$stp_int_values{'%s'}{'MANDATORY'}{'STP_%s'} = q(%d);\n",
-			     driver, desc.name, desc.is_mandatory);
+		      printf("{ $stp_int_values{'%s'}{'STP_%s'} = {};",
+			     driver, desc.name);
+		      printf("my $tmp = $stp_int_values{'%s'}{'STP_%s'};",
+			     driver, desc.name);
+		      printf("$$tmp{'MINVAL'} = %d;",
+			     desc.bounds.integer.lower);
+		      printf("$$tmp{'MAXVAL'} = %d;",
+			     desc.bounds.integer.upper);
+		      printf("$$tmp{'DEFVAL'} = %d;",
+			     desc.deflt.integer);
+		      /* printf("$$tmp{'LONG_NAME'} = '%s';",
+			 gettext(desc.text)); */
+		      printf("$$tmp{'CATEGORY'} = '%s';",
+			     gettext(desc.category));
+		      printf("$$tmp{'HELP'} = q(%s);",
+			     (desc.help ? gettext(desc.help) : "''"));
+		      printf("$$tmp{'MANDATORY'} = q(%d);",
+			     desc.is_mandatory);
+		      printf("}\n");
 		    }
 		}
 	      else if (desc.p_type == STP_PARAMETER_TYPE_DIMENSION)
@@ -226,20 +268,25 @@ main(int argc, char **argv)
 		  if (desc.bounds.dimension.lower <= desc.deflt.dimension &&
 		      desc.bounds.dimension.upper >= desc.deflt.dimension)
 		    {
-		      printf("$stp_dimension_values{'%s'}{'MINVAL'}{'STP_%s'} = %d;\n",
-			     driver, desc.name, desc.bounds.dimension.lower);
-		      printf("$stp_dimension_values{'%s'}{'MAXVAL'}{'STP_%s'} = %d;\n",
-			     driver, desc.name, desc.bounds.dimension.upper);
-		      printf("$stp_dimension_values{'%s'}{'DEFVAL'}{'STP_%s'} = %d;\n",
-			     driver, desc.name, desc.deflt.dimension);
-		      /* printf("$stp_dimension_values{'%s'}{'LONG_NAME'}{'STP_%s'} = '%s';\n",
-			 driver, desc.name, gettext(desc.text)); */
-		      printf("$stp_dimension_values{'%s'}{'CATEGORY'}{'STP_%s'} = '%s';\n",
-			     driver, desc.name, gettext(desc.category));
-		      printf("$stp_dimension_values{'%s'}{'HELP'}{'STP_%s'} = q(%s);\n",
-			     driver, desc.name, (desc.help ? gettext(desc.help) : "''"));
-		      printf("$stp_dimension_values{'%s'}{'MANDATORY'}{'STP_%s'} = q(%d);\n",
-			     driver, desc.name, desc.is_mandatory);
+		      printf("{ $stp_dimension_values{'%s'}{'STP_%s'} = {};",
+			     driver, desc.name);
+		      printf("my $tmp = $stp_dimension_values{'%s'}{'STP_%s'};",
+			     driver, desc.name);
+		      printf("$$tmp{'MINVAL'} = %d;",
+			     desc.bounds.dimension.lower);
+		      printf("$$tmp{'MAXVAL'} = %d;",
+			     desc.bounds.dimension.upper);
+		      printf("$$tmp{'DEFVAL'} = %d;",
+			     desc.deflt.dimension);
+		      /* printf("$$tmp{'LONG_NAME'} = '%s';",
+			 gettext(desc.text)); */
+		      printf("$$tmp{'CATEGORY'} = '%s';",
+			     gettext(desc.category));
+		      printf("$$tmp{'HELP'} = q(%s);",
+			     (desc.help ? gettext(desc.help) : "''"));
+		      printf("$$tmp{'MANDATORY'} = q(%d);",
+			     desc.is_mandatory);
+		      printf("}\n");
 		    }
 		}
 	      tcount += count;
@@ -251,17 +298,17 @@ main(int argc, char **argv)
 	{
 	  if (printer_is_color)
 	    {
-	      printf("$defaults{'%s'}{'%s'} = '%s';\n",
+	      printf("$defaults{'%s'}{'%s'} = '%s';",
 		     driver, "Color", "Color");
-	      printf("$stpdata{'%s'}{'%s'}{'%s'} = '%s';\n",
+	      printf("$stpdata{'%s'}{'%s'}{'%s'} = '%s';",
 		     driver, "Color", "Color", "Color");
 	      printf("$stpdata{'%s'}{'%s'}{'%s'} = '%s';\n",
 		     driver, "Color", "RawCMYK", "Raw CMYK");
 	    }
 	  else
-	    printf("$defaults{'%s'}{'%s'} = '%s';\n",
+	    printf("$defaults{'%s'}{'%s'} = '%s';",
 		   driver, "Color", "Grayscale");
-	  printf("$stpdata{'%s'}{'%s'}{'%s'} = '%s';\n",
+	  printf("$stpdata{'%s'}{'%s'}{'%s'} = '%s';",
 		 driver, "Color", "Grayscale", "Gray Scale");
 	  printf("$stpdata{'%s'}{'%s'}{'%s'} = '%s';\n",
 		 driver, "Color", "BlackAndWhite", "Black and White");
diff --git a/src/foomatic/printers.c b/src/foomatic/printers.c
index 112abf0..9eb34ce 100644
--- a/src/foomatic/printers.c
+++ b/src/foomatic/printers.c
@@ -1,7 +1,7 @@
 /*
- * "$Id: printers.c,v 1.10 2004/09/17 18:38:12 rleigh Exp $"
+ * "$Id: printers.c,v 1.10.18.1 2007/03/04 23:57:48 tillkamppeter Exp $"
  *
- *   Dump the per-printer options for Grant Taylor's *-omatic database
+ *   Dump the per-printer options for the OpenPrinting database
  *
  *   Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)
  *
diff --git a/src/ghost/Makefile.in b/src/ghost/Makefile.in
index 4d1902e..da11a47 100644
--- a/src/ghost/Makefile.in
+++ b/src/ghost/Makefile.in
@@ -48,11 +48,12 @@ subdir = src/ghost
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
@@ -72,8 +73,8 @@ am__DEPENDENCIES_2 =
 @BUILD_GHOSTSCRIPT_TRUE@	$(am__DEPENDENCIES_1) \
 @BUILD_GHOSTSCRIPT_TRUE@	$(am__DEPENDENCIES_2)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp =
-am__depfiles_maybe =
+depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
+am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -89,13 +90,18 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -121,6 +127,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -128,6 +136,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -140,12 +149,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -180,6 +191,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -275,14 +287,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -299,6 +314,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -316,17 +334,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -350,9 +372,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/ghost/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/ghost/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps src/ghost/Makefile
+	  $(AUTOMAKE) --gnu  src/ghost/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -408,14 +430,28 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ijsgutenprint.Po@am__quote@
+
 .c.o:
-	$(COMPILE) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -540,6 +576,7 @@ clean: clean-am
 clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -565,6 +602,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/gimp/Makefile.in b/src/gimp/Makefile.in
index 6038199..83fc3fd 100644
--- a/src/gimp/Makefile.in
+++ b/src/gimp/Makefile.in
@@ -48,11 +48,12 @@ subdir = src/gimp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
@@ -67,8 +68,8 @@ am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 =  \
 	$(top_builddir)/src/gutenprintui/libgutenprintui.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp =
-am__depfiles_maybe =
+depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
+am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -84,13 +85,18 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -116,6 +122,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -123,6 +131,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -135,12 +144,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -175,6 +186,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -270,14 +282,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -294,6 +309,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -311,17 +329,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -350,9 +372,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/gimp/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/gimp/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps src/gimp/Makefile
+	  $(AUTOMAKE) --gnu  src/gimp/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -408,14 +430,29 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-image-gimp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Po@am__quote@
+
 .c.o:
-	$(COMPILE) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -541,6 +578,7 @@ clean-am: clean-generic clean-gimp_plug_inPROGRAMS clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -566,6 +604,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/gimp2/Makefile.in b/src/gimp2/Makefile.in
index d051d04..0f31ca7 100644
--- a/src/gimp2/Makefile.in
+++ b/src/gimp2/Makefile.in
@@ -49,11 +49,12 @@ subdir = src/gimp2
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
@@ -72,8 +73,8 @@ am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 am_print_OBJECTS = $(am__objects_1) print-print.$(OBJEXT)
 print_OBJECTS = $(am_print_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp =
-am__depfiles_maybe =
+depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
+am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -89,13 +90,18 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -121,6 +127,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -128,6 +136,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -140,12 +149,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -180,6 +191,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -275,14 +287,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -299,6 +314,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -316,17 +334,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -360,9 +382,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/gimp2/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/gimp2/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps src/gimp2/Makefile
+	  $(AUTOMAKE) --gnu  src/gimp2/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -421,14 +443,31 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-gutenprint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-image-gimp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-print.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Po@am__quote@
+
 .c.o:
-	$(COMPILE) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -555,6 +594,7 @@ clean-am: clean-generic clean-gimp2_plug_inPROGRAMS clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -580,6 +620,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/gutenprintui/Makefile.in b/src/gutenprintui/Makefile.in
index 96534d5..2da21b8 100644
--- a/src/gutenprintui/Makefile.in
+++ b/src/gutenprintui/Makefile.in
@@ -49,11 +49,12 @@ subdir = src/gutenprintui
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
@@ -79,8 +80,8 @@ libgutenprintui_la_OBJECTS = $(am_libgutenprintui_la_OBJECTS)
 @BUILD_LIBGUTENPRINTUI_TRUE@am_libgutenprintui_la_rpath = -rpath \
 @BUILD_LIBGUTENPRINTUI_TRUE@	$(libdir)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp =
-am__depfiles_maybe =
+depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
+am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -103,13 +104,18 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -135,6 +141,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -142,6 +150,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -154,12 +163,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -194,6 +205,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -289,14 +301,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -313,6 +328,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -330,17 +348,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -386,9 +408,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/gutenprintui/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/gutenprintui/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps src/gutenprintui/Makefile
+	  $(AUTOMAKE) --gnu  src/gutenprintui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -449,32 +471,75 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-panel.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-plist.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-print-image-thumbnail.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-printrcl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-printrcy.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-ui-utils.Plo@am__quote@
+
 .c.o:
-	$(COMPILE) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 libgutenprintui_la-printrcy.lo: printrcy.c
-	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-printrcy.lo `test -f 'printrcy.c' || echo '$(srcdir)/'`printrcy.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-printrcy.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui_la-printrcy.Tpo" -c -o libgutenprintui_la-printrcy.lo `test -f 'printrcy.c' || echo '$(srcdir)/'`printrcy.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui_la-printrcy.Tpo" "$(DEPDIR)/libgutenprintui_la-printrcy.Plo"; else rm -f "$(DEPDIR)/libgutenprintui_la-printrcy.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='printrcy.c' object='libgutenprintui_la-printrcy.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-printrcy.lo `test -f 'printrcy.c' || echo '$(srcdir)/'`printrcy.c
 
 libgutenprintui_la-printrcl.lo: printrcl.c
-	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-printrcl.lo `test -f 'printrcl.c' || echo '$(srcdir)/'`printrcl.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-printrcl.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui_la-printrcl.Tpo" -c -o libgutenprintui_la-printrcl.lo `test -f 'printrcl.c' || echo '$(srcdir)/'`printrcl.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui_la-printrcl.Tpo" "$(DEPDIR)/libgutenprintui_la-printrcl.Plo"; else rm -f "$(DEPDIR)/libgutenprintui_la-printrcl.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='printrcl.c' object='libgutenprintui_la-printrcl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-printrcl.lo `test -f 'printrcl.c' || echo '$(srcdir)/'`printrcl.c
 
 libgutenprintui_la-plist.lo: plist.c
-	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-plist.lo `test -f 'plist.c' || echo '$(srcdir)/'`plist.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-plist.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui_la-plist.Tpo" -c -o libgutenprintui_la-plist.lo `test -f 'plist.c' || echo '$(srcdir)/'`plist.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui_la-plist.Tpo" "$(DEPDIR)/libgutenprintui_la-plist.Plo"; else rm -f "$(DEPDIR)/libgutenprintui_la-plist.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='plist.c' object='libgutenprintui_la-plist.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-plist.lo `test -f 'plist.c' || echo '$(srcdir)/'`plist.c
 
 libgutenprintui_la-panel.lo: panel.c
-	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-panel.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui_la-panel.Tpo" -c -o libgutenprintui_la-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui_la-panel.Tpo" "$(DEPDIR)/libgutenprintui_la-panel.Plo"; else rm -f "$(DEPDIR)/libgutenprintui_la-panel.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel.c' object='libgutenprintui_la-panel.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c
 
 libgutenprintui_la-ui-utils.lo: ui-utils.c
-	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-ui-utils.lo `test -f 'ui-utils.c' || echo '$(srcdir)/'`ui-utils.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-ui-utils.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui_la-ui-utils.Tpo" -c -o libgutenprintui_la-ui-utils.lo `test -f 'ui-utils.c' || echo '$(srcdir)/'`ui-utils.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui_la-ui-utils.Tpo" "$(DEPDIR)/libgutenprintui_la-ui-utils.Plo"; else rm -f "$(DEPDIR)/libgutenprintui_la-ui-utils.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ui-utils.c' object='libgutenprintui_la-ui-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-ui-utils.lo `test -f 'ui-utils.c' || echo '$(srcdir)/'`ui-utils.c
 
 libgutenprintui_la-print-image-thumbnail.lo: print-image-thumbnail.c
-	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-print-image-thumbnail.lo `test -f 'print-image-thumbnail.c' || echo '$(srcdir)/'`print-image-thumbnail.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-print-image-thumbnail.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui_la-print-image-thumbnail.Tpo" -c -o libgutenprintui_la-print-image-thumbnail.lo `test -f 'print-image-thumbnail.c' || echo '$(srcdir)/'`print-image-thumbnail.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui_la-print-image-thumbnail.Tpo" "$(DEPDIR)/libgutenprintui_la-print-image-thumbnail.Plo"; else rm -f "$(DEPDIR)/libgutenprintui_la-print-image-thumbnail.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='print-image-thumbnail.c' object='libgutenprintui_la-print-image-thumbnail.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-print-image-thumbnail.lo `test -f 'print-image-thumbnail.c' || echo '$(srcdir)/'`print-image-thumbnail.c
 
 .l.c:
 	$(LEXCOMPILE) $<
@@ -646,6 +711,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -671,6 +737,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/gutenprintui/gutenprintui-internal.h b/src/gutenprintui/gutenprintui-internal.h
index 3eb98d8..7c4547d 100644
--- a/src/gutenprintui/gutenprintui-internal.h
+++ b/src/gutenprintui/gutenprintui-internal.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: gutenprintui-internal.h,v 1.2 2005/09/17 21:54:33 rlk Exp $"
+ * "$Id: gutenprintui-internal.h,v 1.2.12.1 2007/03/02 12:01:17 rlk Exp $"
  *
  *   Print plug-in for the GIMP.
  *
@@ -139,7 +139,7 @@ typedef struct
 extern gint stpui_plist_count;	   /* Number of system printers */
 extern gint stpui_plist_current;     /* Current system printer */
 extern stpui_plist_t *stpui_plist;		  /* System printers */
-extern const char *stpui_printrc_current_printer;
+extern char *stpui_printrc_current_printer;
 extern int stpui_show_all_paper_sizes;
 extern stp_string_list_t *stpui_system_print_queues;
 
diff --git a/src/gutenprintui/panel.c b/src/gutenprintui/panel.c
index ea8eb70..a8b1858 100644
--- a/src/gutenprintui/panel.c
+++ b/src/gutenprintui/panel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: panel.c,v 1.9 2006/07/16 21:02:22 rlk Exp $"
+ * "$Id: panel.c,v 1.9.6.1 2007/03/02 12:01:17 rlk Exp $"
  *
  *   Main window code for Print plug-in for the GIMP.
  *
@@ -120,6 +120,8 @@ static GtkWidget *ppd_box;
 static GtkWidget *ppd_label;           /* PPD file entry */
 static GtkWidget *ppd_button;          /* PPD file browse button */
 static GtkWidget *ppd_browser;         /* File selection dialog for PPDs */
+static GtkWidget *ppd_model_label;     /* PPD file entry */
+static GtkWidget *ppd_model;           /* PPD file entry */
 static GtkWidget *new_printer_dialog;  /* New printer dialog window */
 static GtkWidget *new_printer_entry;   /* New printer text entry */
 static GtkWidget *file_button;         /* PPD file browse button */
@@ -192,6 +194,7 @@ static void combo_callback        (GtkWidget *widget, gpointer data);
 static void output_type_callback  (GtkWidget *widget, gpointer data);
 static void unit_callback         (GtkWidget *widget, gpointer data);
 static void orientation_callback  (GtkWidget *widget, gpointer data);
+static void ppd_file_callback     (GtkWidget *widget, gpointer data);
 static void printandsave_callback (void);
 static void about_callback        (void);
 static void print_callback        (void);
@@ -1647,6 +1650,8 @@ create_printer_dialog (void)
                     GTK_FILL, GTK_FILL, 0, 0);
 
   ppd_file = gtk_entry_new ();
+  gtk_signal_connect(GTK_OBJECT(ppd_file), "activate",
+		     GTK_SIGNAL_FUNC(ppd_file_callback), NULL);
   gtk_box_pack_start (GTK_BOX (ppd_box), ppd_file, TRUE, TRUE, 0);
   gtk_widget_show (ppd_file);
 
@@ -1663,6 +1668,19 @@ create_printer_dialog (void)
   gtk_signal_connect (GTK_OBJECT (ppd_button), "clicked",
                       GTK_SIGNAL_FUNC (ppd_browse_callback), NULL);
 
+  ppd_model_label = gtk_label_new (_("Printer Model:"));
+  gtk_misc_set_alignment (GTK_MISC (ppd_model_label), 1.0, 0.5);
+  gtk_table_attach (GTK_TABLE (table), ppd_model_label, 1, 2, 4, 5,
+                    GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (ppd_model_label);
+
+  ppd_model = gtk_label_new ("");
+  gtk_misc_set_alignment (GTK_MISC (ppd_model), 0.0, 0.5);
+  gtk_table_attach (GTK_TABLE (table), ppd_model, 2, 7, 4, 5,
+                    GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (ppd_model);
+
+
   /*
    * Print command.
    */
@@ -1670,11 +1688,11 @@ create_printer_dialog (void)
   group = NULL;
   for (i = 0; i < command_options_count; i++)
     group = stpui_create_radio_button(&(command_options[i]), group, table,
-				      0, i > 0 ? i + 5 : i + 4,
+				      0, i > 0 ? i + 6 : i + 5,
 				      command_type_callback);
 
   standard_cmd_entry = gtk_entry_new();
-  gtk_table_attach (GTK_TABLE (table), standard_cmd_entry, 2, 7, 5, 6,
+  gtk_table_attach (GTK_TABLE (table), standard_cmd_entry, 2, 7, 6, 7,
                     GTK_FILL, GTK_FILL, 0, 0);
   gtk_entry_set_editable(GTK_ENTRY(standard_cmd_entry), FALSE);
   gtk_widget_set_sensitive(standard_cmd_entry, FALSE);
@@ -1692,13 +1710,13 @@ create_printer_dialog (void)
 			"or model, of printer) that you wish to print to"));
   label = gtk_label_new(_("Printer Queue:"));
   gtk_widget_show(label);
-  gtk_table_attach (GTK_TABLE (table), label, 2, 3, 4, 5,
+  gtk_table_attach (GTK_TABLE (table), label, 2, 3, 5, 6,
                     GTK_FILL, GTK_FILL, 0, 0);
-  gtk_table_attach (GTK_TABLE (table), event_box, 3, 7, 4, 5,
+  gtk_table_attach (GTK_TABLE (table), event_box, 3, 7, 5, 6,
                     GTK_FILL, GTK_FILL, 0, 0);
 
   custom_command_entry = gtk_entry_new ();
-  gtk_table_attach (GTK_TABLE (table), custom_command_entry, 2, 7, 6, 7,
+  gtk_table_attach (GTK_TABLE (table), custom_command_entry, 2, 7, 7, 8,
                     GTK_FILL, GTK_FILL, 0, 0);
   gtk_signal_connect(GTK_OBJECT(custom_command_entry), "activate",
 		     GTK_SIGNAL_FUNC(setup_callback), NULL);
@@ -1709,7 +1727,7 @@ create_printer_dialog (void)
     (custom_command_entry, _("Enter the correct command to print to your printer. "));
 
   file_entry = gtk_entry_new ();
-  gtk_table_attach (GTK_TABLE (table), file_entry, 2, 6, 7, 8,
+  gtk_table_attach (GTK_TABLE (table), file_entry, 2, 6, 8, 9,
                     GTK_FILL, GTK_FILL, 0, 0);
   gtk_signal_connect(GTK_OBJECT(file_entry), "activate",
 		     GTK_SIGNAL_FUNC(setup_callback), NULL);
@@ -1721,7 +1739,7 @@ create_printer_dialog (void)
 
   file_button = gtk_button_new_with_label (_("Browse"));
 
-  gtk_table_attach (GTK_TABLE (table), file_button, 6, 7, 7, 8,
+  gtk_table_attach (GTK_TABLE (table), file_button, 6, 7, 8, 9,
                     GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (file_button);
 
@@ -2597,9 +2615,10 @@ plist_build_combo (GtkWidget      *combo,       /* I - Combo widget */
 
   gtk_combo_set_popdown_strings (GTK_COMBO (combo), list);
 
-  for (i = 0; i < num_items; i ++)
-    if (strcmp(stp_string_list_param(items, i)->name, cur_item) == 0)
-      break;
+  if (cur_item)
+    for (i = 0; i < num_items; i ++)
+      if (strcmp(stp_string_list_param(items, i)->name, cur_item) == 0)
+	break;
 
   if (i >= num_items && def_value)
     for (i = 0; i < num_items; i ++)
@@ -3564,6 +3583,7 @@ setup_update (void)
   gint           idx = 0;
   gint i;
   gchar *tmp;
+  stp_parameter_t desc;
   const char *ppd_file_name = stp_get_file_parameter(pv->v, "PPDFile");
 
   for (i = 0; i < GTK_CLIST(manufacturer_clist)->rows; i++)
@@ -3586,23 +3606,49 @@ setup_update (void)
     idx = 0;
 */
   gtk_clist_select_row (GTK_CLIST (printer_driver), idx, 0);
-  gtk_label_set_text (GTK_LABEL (printer_model_label),
-                      gettext (stp_printer_get_long_name (tmp_printer)));
+  stp_describe_parameter(pv->v, "ModelName", &desc);
+  if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST && desc.is_active &&
+      desc.deflt.str)
+    {
+      const char *extra_printer_model = desc.deflt.str;
+      char *label_text =
+	g_malloc(strlen(gettext (stp_printer_get_long_name (tmp_printer))) +
+		 2 +		/* " (" */
+		 strlen(extra_printer_model) +
+		 2);		/* ")" + null terminator */
+      strcpy(label_text, extra_printer_model);
+      strcat(label_text, " (");
+      strcat(label_text, gettext (stp_printer_get_long_name (tmp_printer)));
+      strcat(label_text, ")");
+      gtk_label_set_text (GTK_LABEL (printer_model_label), label_text);
+      g_free(label_text);
+    }
+  else
+    {
+      gtk_label_set_text (GTK_LABEL (printer_model_label),
+			  gettext (stp_printer_get_long_name (tmp_printer)));
+    }
+  stp_parameter_description_destroy(&desc);
 
   if (ppd_file_name)
     gtk_entry_set_text (GTK_ENTRY (ppd_file), ppd_file_name);
   else
     gtk_entry_set_text (GTK_ENTRY (ppd_file), "");
+  ppd_file_callback(ppd_file, NULL);
 
   if (stp_parameter_find_in_settings(pv->v, "PPDFile"))
     {
       gtk_widget_show (ppd_box);
       gtk_widget_show (ppd_label);
+      gtk_widget_show (ppd_model_label);
+      gtk_widget_show (ppd_model);
     }
   else
     {
       gtk_widget_hide (ppd_box);
       gtk_widget_hide (ppd_label);
+      gtk_widget_hide (ppd_model_label);
+      gtk_widget_hide (ppd_model);
     }
   gtk_entry_set_text (GTK_ENTRY (custom_command_entry),
 		      stpui_plist_get_custom_command (pv));
@@ -3619,6 +3665,27 @@ setup_update (void)
 				 TRUE);
 }
 
+static void
+ppd_file_callback(GtkWidget *widget, gpointer data)
+{
+  const gchar *name = gtk_entry_get_text(GTK_ENTRY(widget));
+  if (name && pv && pv->v)
+    {
+      stp_parameter_t desc;
+      stp_vars_t *v = stp_vars_create_copy(pv->v);
+      stp_set_file_parameter(v, "PPDFile", name);
+      stp_describe_parameter(v, "ModelName", &desc);
+      if (desc.is_active)
+	gtk_label_set_text(GTK_LABEL(ppd_model), desc.deflt.str);
+      else
+	gtk_label_set_text(GTK_LABEL(ppd_model), "");
+      stp_parameter_description_destroy(&desc);
+      stp_vars_destroy(v);
+    }
+  else
+    gtk_label_set_text(GTK_LABEL(ppd_model), "");
+}  
+
 /*
  *  setup_open_callback() -
  */
@@ -3739,11 +3806,15 @@ pop_ppd_box(void)
     {
       gtk_widget_show (ppd_label);
       gtk_widget_show (ppd_box);
+      gtk_widget_show (ppd_model_label);
+      gtk_widget_show (ppd_model);
     }
   else
     {
       gtk_widget_hide (ppd_label);
       gtk_widget_hide (ppd_box);
+      gtk_widget_hide (ppd_model_label);
+      gtk_widget_hide (ppd_model);
     }
 }
 
@@ -3847,6 +3918,8 @@ ppd_ok_callback (void)
   gtk_entry_set_text
     (GTK_ENTRY (ppd_file),
      gtk_file_selection_get_filename (GTK_FILE_SELECTION (ppd_browser)));
+  ppd_file_callback(ppd_file, NULL);
+  update_options();
 }
 
 /*
diff --git a/src/gutenprintui/plist.c b/src/gutenprintui/plist.c
index cea5a43..3809eeb 100644
--- a/src/gutenprintui/plist.c
+++ b/src/gutenprintui/plist.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: plist.c,v 1.3 2006/07/16 23:07:32 rlk Exp $"
+ * "$Id: plist.c,v 1.3.6.1 2007/03/02 12:01:18 rlk Exp $"
  *
  *   Print plug-in for the GIMP.
  *
@@ -315,6 +315,19 @@ stpui_set_image_channel_depth(gint depth)
   image_channel_depth = depth;
 }
 
+static void
+writefunc(void *file, const char *buf, size_t bytes)
+{
+  FILE *prn = (FILE *)file;
+  fwrite(buf, 1, bytes, prn);
+}
+
+static void
+stpui_errfunc(void *file, const char *buf, size_t bytes)
+{
+  g_message(buf);
+}
+
 void
 stpui_printer_initialize(stpui_plist_t *printer)
 {
@@ -331,6 +344,8 @@ stpui_printer_initialize(stpui_plist_t *printer)
   printer->auto_size_roll_feed_paper = 0;
   printer->unit = 0;
   printer->v = stp_vars_create();
+  stp_set_errfunc(printer->v, writefunc);
+  stp_set_errdata(printer->v, stderr);
   stpui_plist_set_copy_count(printer, 1);
   stp_set_string_parameter(printer->v, "InputImageType", image_type);
   if (image_raw_channels)
@@ -566,11 +581,11 @@ do {									\
 } while (0)
 
 static void *
-psearch(const void *key, const void *base, size_t nmemb, size_t size,
+psearch(const void *key, void *base, size_t nmemb, size_t size,
 	int (*compar)(const void *, const void *))
 {
   int i;
-  const char *cbase = (const char *) base;
+  char *cbase = (char *) base;
   for (i = 0; i < nmemb; i++)
     {
       if ((*compar)(key, (const void *) cbase) == 0)
@@ -613,6 +628,8 @@ stpui_plist_add(const stpui_plist_t *key, int add_only)
    * always first in the list, else call psearch.
    */
   stpui_plist_t *p;
+  if (!stp_get_printer(key->v))
+    stp_set_driver(key->v, "ps2");
   if (stp_get_printer(key->v))
     {
       p = psearch(key, stpui_plist, stpui_plist_count,
@@ -642,8 +659,13 @@ stpui_plist_add(const stpui_plist_t *key, int add_only)
 #endif
 	  stpui_plist_copy(p, key);
 	}
+      return 1;
+    }
+  else
+    {
+      fprintf(stderr, "No printer found!\n");
+      return 0;
     }
-  return 1;
 }
 
 static void
@@ -910,7 +932,7 @@ stpui_printrc_load_v1(FILE *fp)
     }
 }  
 
-const char *stpui_printrc_current_printer = NULL;
+char *stpui_printrc_current_printer = NULL;
 extern FILE *yyin;
 extern int yyparse(void);
 
@@ -921,7 +943,9 @@ stpui_printrc_load_v2(FILE *fp)
   yyin = fp;
 
   stpui_printrc_current_printer = NULL;
+  setlocale(LC_ALL, "C");
   retval = yyparse();
+  setlocale(LC_ALL, "");
   if (stpui_printrc_current_printer)
     {
       int i;
@@ -1232,19 +1256,6 @@ usr1_handler (int sig)
   usr1_interrupt = 1;
 }
 
-static void
-writefunc(void *file, const char *buf, size_t bytes)
-{
-  FILE *prn = (FILE *)file;
-  fwrite(buf, 1, bytes, prn);
-}
-
-static void
-stpui_errfunc(void *file, const char *buf, size_t bytes)
-{
-  g_message(buf);
-}
-
 /*
  *
  * Process control for actually printing.  Documented 20040821
@@ -1751,5 +1762,5 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image)
 }
 
 /*
- * End of "$Id: plist.c,v 1.3 2006/07/16 23:07:32 rlk Exp $".
+ * End of "$Id: plist.c,v 1.3.6.1 2007/03/02 12:01:18 rlk Exp $".
  */
diff --git a/src/gutenprintui/printrcl.c b/src/gutenprintui/printrcl.c
index e1718e4..f4490d4 100644
--- a/src/gutenprintui/printrcl.c
+++ b/src/gutenprintui/printrcl.c
@@ -1,31 +1,92 @@
-/* A lexical scanner generated by flex */
 
-/* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
- */
+#line 3 "printrcl.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 33
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
 
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
 #include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
 
+/* end standard C headers. */
 
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
 #endif
 
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
 
-#ifdef __cplusplus
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
 
-#include <stdlib.h>
-#include <unistd.h>
+#endif /* ! FLEXINT_H */
 
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
+#ifdef __cplusplus
 
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
@@ -34,34 +95,17 @@
 
 #if __STDC__
 
-#define YY_USE_PROTOS
 #define YY_USE_CONST
 
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -76,71 +120,75 @@
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN yy_start = 1 + 2 *
+#define BEGIN (yy_start) = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START ((yy_start - 1) / 2)
+#define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
+#define YY_NEW_FILE yyrestart(yyin  )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE 16384
+#endif
 
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
 
 extern int yyleng;
+
 extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
 		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
 		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, yytext_ptr )
+#define unput(c) yyunput( c, (yytext_ptr)  )
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
-typedef unsigned int yy_size_t;
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef unsigned int yy_size_t;
+#endif
 
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
 	{
 	FILE *yy_input_file;
@@ -177,12 +225,16 @@ struct yy_buffer_state
 	 */
 	int yy_at_bol;
 
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
 	int yy_fill_buffer;
 
 	int yy_buffer_status;
+
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
 	/* When an EOF's been seen but there's still some text to process
@@ -196,28 +248,38 @@ struct yy_buffer_state
 	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
+
 	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-static YY_BUFFER_STATE yy_current_buffer = 0;
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER yy_current_buffer
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
 
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
 int yyleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
+static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
 /* Flag which is used to allow yywrap()'s to do buffer switches
@@ -225,69 +287,90 @@ static int yy_start = 0;	/* start state number */
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart YY_PROTO(( FILE *input_file ));
+void yyrestart (FILE *input_file  );
+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
+void yy_delete_buffer (YY_BUFFER_STATE b  );
+void yy_flush_buffer (YY_BUFFER_STATE b  );
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state (void );
+
+static void yyensure_buffer_stack (void );
+static void yy_load_buffer_state (void );
+static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
 
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
 
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
+void *yyalloc (yy_size_t  );
+void *yyrealloc (void *,yy_size_t  );
+void yyfree (void *  );
 
 #define yy_new_buffer yy_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
+	if ( ! YY_CURRENT_BUFFER ){\
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
-#define yywrap() 1
+#define yywrap(n) 1
 #define YY_SKIP_YYWRAP
+
 typedef unsigned char YY_CHAR;
+
 FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+
 typedef int yy_state_type;
+
+extern int yylineno;
 extern char *yytext;
 #define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
+	(yytext_ptr) = yy_bp; \
+	yyleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
+	(yy_c_buf_p) = yy_cp;
 
 #define YY_NUM_RULES 40
 #define YY_END_OF_BUFFER 41
-static yyconst short int yy_accept[335] =
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[335] =
     {   0,
         0,    0,   41,   40,   37,   39,   40,   38,   40,   40,
        31,   35,   35,   35,   35,   35,   35,   35,   35,   35,
@@ -328,7 +411,7 @@ static yyconst short int yy_accept[335] =
         0,    2,   18,    0
     } ;
 
-static yyconst int yy_ec[256] =
+static yyconst flex_int32_t yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -360,7 +443,7 @@ static yyconst int yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[39] =
+static yyconst flex_int32_t yy_meta[39] =
     {   0,
         1,    1,    2,    1,    1,    1,    1,    1,    1,    3,
         3,    1,    3,    3,    3,    3,    3,    3,    3,    3,
@@ -368,7 +451,7 @@ static yyconst int yy_meta[39] =
         3,    3,    3,    3,    3,    3,    3,    3
     } ;
 
-static yyconst short int yy_base[340] =
+static yyconst flex_int16_t yy_base[340] =
     {   0,
         0,    0,  374,  375,  371,  375,  368,  343,  364,   29,
        32,  336,  341,   18,   26,   21,   32,  343,    0,  340,
@@ -409,7 +492,7 @@ static yyconst short int yy_base[340] =
        81,  375,  375,  375,   94,   97,  100,   89,  103
     } ;
 
-static yyconst short int yy_def[340] =
+static yyconst flex_int16_t yy_def[340] =
     {   0,
       334,    1,  334,  334,  334,  334,  335,  336,  337,  334,
       334,  338,  338,  338,  338,  338,  338,  338,  338,  338,
@@ -450,7 +533,7 @@ static yyconst short int yy_def[340] =
       334,  334,  334,    0,  334,  334,  334,  334,  334
     } ;
 
-static yyconst short int yy_nxt[414] =
+static yyconst flex_int16_t yy_nxt[414] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   10,    4,   11,
        11,    4,    4,   12,   13,   14,   15,   16,   17,   18,
@@ -500,7 +583,7 @@ static yyconst short int yy_nxt[414] =
       334,  334,  334
     } ;
 
-static yyconst short int yy_chk[414] =
+static yyconst flex_int16_t yy_chk[414] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -553,6 +636,9 @@ static yyconst short int yy_chk[414] =
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
 
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
+
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
  */
@@ -562,7 +648,6 @@ static char *yy_last_accepting_cpos;
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
 #line 1 "printrcl.l"
-#define INITIAL 0
 /*		-*-Mode: C-*-
  * "$Id: printrcl.l,v 1.1 2004/09/17 18:38:14 rleigh Exp $"
  *
@@ -621,7 +706,23 @@ q_strdup(const char *s)
     return g_strndup(s + 1, strlen(s) - 2);
 }
 
-#line 625 "printrcl.c"
+#line 710 "printrcl.c"
+
+#define INITIAL 0
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -629,65 +730,30 @@ q_strdup(const char *s)
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
+extern "C" int yywrap (void );
 #else
-extern int yywrap YY_PROTO(( void ));
-#endif
+extern int yywrap (void );
 #endif
-
-#ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
 #endif
 
+    static void yyunput (int c,char *buf_ptr  );
+    
 #ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
+static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
+static int yy_flex_strlen (yyconst char * );
 #endif
 
 #ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
 
+#ifdef __cplusplus
+static int yyinput (void );
 #else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
+static int input (void );
 #endif
 
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
 #endif
 
 /* Amount of stuff to slurp up with each read. */
@@ -696,7 +762,6 @@ YY_MALLOC_DECL
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
-
 #ifndef ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
@@ -709,9 +774,10 @@ YY_MALLOC_DECL
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-	if ( yy_current_buffer->yy_is_interactive ) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
-		int c = '*', n; \
+		int c = '*'; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -721,9 +787,22 @@ YY_MALLOC_DECL
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(yyin); \
+			} \
+		}\
+\
+
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -744,12 +823,18 @@ YY_MALLOC_DECL
 #define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
 #endif
 
+/* end tables serialization structures and prototypes */
+
 /* Default declaration of generated scanner - a define so the user can
  * easily add parameters.
  */
 #ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
+#define YY_DECL_IS_OURS 1
+
+extern int yylex (void);
+
+#define YY_DECL int yylex (void)
+#endif /* !YY_DECL */
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
  * have been set up.
@@ -766,27 +851,29 @@ YY_MALLOC_DECL
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
+/** The main scanner function which does all the work.
+ */
 YY_DECL
-	{
+{
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-
+    
 #line 73 "printrcl.l"
 
 
-#line 779 "printrcl.c"
+#line 866 "printrcl.c"
 
-	if ( yy_init )
+	if ( !(yy_init) )
 		{
-		yy_init = 0;
+		(yy_init) = 1;
 
 #ifdef YY_USER_INIT
 		YY_USER_INIT;
 #endif
 
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
 
 		if ( ! yyin )
 			yyin = stdin;
@@ -794,34 +881,36 @@ YY_DECL
 		if ( ! yyout )
 			yyout = stdout;
 
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
+		if ( ! YY_CURRENT_BUFFER ) {
+			yyensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				yy_create_buffer(yyin,YY_BUF_SIZE );
+		}
 
-		yy_load_buffer_state();
+		yy_load_buffer_state( );
 		}
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
-		yy_cp = yy_c_buf_p;
+		yy_cp = (yy_c_buf_p);
 
 		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
+		*yy_cp = (yy_hold_char);
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
 		 * the current run.
 		 */
 		yy_bp = yy_cp;
 
-		yy_current_state = yy_start;
+		yy_current_state = (yy_start);
 yy_match:
 		do
 			{
 			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			if ( yy_accept[yy_current_state] )
 				{
-				yy_last_accepting_state = yy_current_state;
-				yy_last_accepting_cpos = yy_cp;
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
 				}
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
@@ -838,24 +927,22 @@ yy_find_action:
 		yy_act = yy_accept[yy_current_state];
 		if ( yy_act == 0 )
 			{ /* have to back up */
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
 			yy_act = yy_accept[yy_current_state];
 			}
 
 		YY_DO_BEFORE_ACTION;
 
-
 do_action:	/* This label is used only to access EOF actions. */
 
-
 		switch ( yy_act )
 	{ /* beginning of action switch */
 			case 0: /* must back up */
 			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = yy_hold_char;
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
 			goto yy_find_action;
 
 case 1:
@@ -1019,6 +1106,7 @@ YY_RULE_SETUP
 yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
 	YY_BREAK
 case 33:
+/* rule 33 can match eol */
 YY_RULE_SETUP
 #line 109 "printrcl.l"
 yylval.sval = q_strdup(yytext); DBG(tSTRING); return tSTRING;
@@ -1034,6 +1122,7 @@ YY_RULE_SETUP
 yylval.sval = g_strdup(yytext); DBG(tWORD); return tWORD;
 	YY_BREAK
 case 36:
+/* rule 36 can match eol */
 YY_RULE_SETUP
 #line 112 "printrcl.l"
 DBG(PRINTRC_HDR); return PRINTRC_HDR;
@@ -1049,6 +1138,7 @@ YY_RULE_SETUP
 DBG(comment1); 	/* Skip comments */
 	YY_BREAK
 case 39:
+/* rule 39 can match eol */
 YY_RULE_SETUP
 #line 115 "printrcl.l"
 DBG(newline); mylineno++;
@@ -1058,33 +1148,33 @@ YY_RULE_SETUP
 #line 116 "printrcl.l"
 ECHO;
 	YY_BREAK
-#line 1062 "printrcl.c"
+#line 1152 "printrcl.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
 	case YY_END_OF_BUFFER:
 		{
 		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
 
 		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
+		*yy_cp = (yy_hold_char);
 		YY_RESTORE_YY_MORE_OFFSET
 
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
 			{
 			/* We're scanning a new file or input source.  It's
 			 * possible that this happened because the user
 			 * just pointed yyin at a new source and called
 			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
+			 * consistency between YY_CURRENT_BUFFER and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
 		/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -1094,13 +1184,13 @@ case YY_STATE_EOF(INITIAL):
 		 * end-of-buffer state).  Contrast this with the test
 		 * in input().
 		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
 			{ /* This was really a NUL. */
 			yy_state_type yy_next_state;
 
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
 
-			yy_current_state = yy_get_previous_state();
+			yy_current_state = yy_get_previous_state(  );
 
 			/* Okay, we're now positioned to make the NUL
 			 * transition.  We couldn't have
@@ -1113,30 +1203,30 @@ case YY_STATE_EOF(INITIAL):
 
 			yy_next_state = yy_try_NUL_trans( yy_current_state );
 
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 
 			if ( yy_next_state )
 				{
 				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
+				yy_cp = ++(yy_c_buf_p);
 				yy_current_state = yy_next_state;
 				goto yy_match;
 				}
 
 			else
 				{
-				yy_cp = yy_c_buf_p;
+				yy_cp = (yy_c_buf_p);
 				goto yy_find_action;
 				}
 			}
 
-		else switch ( yy_get_next_buffer() )
+		else switch ( yy_get_next_buffer(  ) )
 			{
 			case EOB_ACT_END_OF_FILE:
 				{
-				yy_did_buffer_switch_on_eof = 0;
+				(yy_did_buffer_switch_on_eof) = 0;
 
-				if ( yywrap() )
+				if ( yywrap( ) )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
@@ -1147,7 +1237,7 @@ case YY_STATE_EOF(INITIAL):
 					 * YY_NULL, it'll still work - another
 					 * YY_NULL will get returned.
 					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
 
 					yy_act = YY_STATE_EOF(YY_START);
 					goto do_action;
@@ -1155,30 +1245,30 @@ case YY_STATE_EOF(INITIAL):
 
 				else
 					{
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 					}
 				break;
 				}
 
 			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
 
-				yy_current_state = yy_get_previous_state();
+				yy_current_state = yy_get_previous_state(  );
 
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 				goto yy_match;
 
 			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
 
-				yy_current_state = yy_get_previous_state();
+				yy_current_state = yy_get_previous_state(  );
 
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 				goto yy_find_action;
 			}
 		break;
@@ -1189,8 +1279,7 @@ case YY_STATE_EOF(INITIAL):
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-	} /* end of yylex */
-
+} /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -1199,21 +1288,20 @@ case YY_STATE_EOF(INITIAL):
  *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *	EOB_ACT_END_OF_FILE - end of file
  */
-
-static int yy_get_next_buffer()
-	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
 	register int number_to_move, i;
 	int ret_val;
 
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
 		YY_FATAL_ERROR(
 		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
 		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
 			{
 			/* We matched a single character, the EOB, so
 			 * treat this as a final EOF.
@@ -1233,34 +1321,30 @@ static int yy_get_next_buffer()
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
 
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
 		/* don't do the read, it's not guaranteed to return an EOF,
 		 * just force an EOF
 		 */
-		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
 
 	else
 		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
+			int num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
 
 			int yy_c_buf_p_offset =
-				(int) (yy_c_buf_p - b->yy_ch_buf);
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
 
 			if ( b->yy_is_our_buffer )
 				{
@@ -1273,8 +1357,7 @@ static int yy_get_next_buffer()
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 );
+					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
 				}
 			else
 				/* Can't grow it, we don't own it. */
@@ -1284,35 +1367,35 @@ static int yy_get_next_buffer()
 				YY_FATAL_ERROR(
 				"fatal error - scanner input buffer overflow" );
 
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
 
-			num_to_read = yy_current_buffer->yy_buf_size -
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
 						number_to_move - 1;
-#endif
+
 			}
 
 		if ( num_to_read > YY_READ_BUF_SIZE )
 			num_to_read = YY_READ_BUF_SIZE;
 
 		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
 
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	if ( yy_n_chars == 0 )
+	if ( (yy_n_chars) == 0 )
 		{
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
+			yyrestart(yyin  );
 			}
 
 		else
 			{
 			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
 		}
@@ -1320,32 +1403,31 @@ static int yy_get_next_buffer()
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
 
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
 
 	return ret_val;
-	}
-
+}
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-static yy_state_type yy_get_previous_state()
-	{
+    static yy_state_type yy_get_previous_state (void)
+{
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
 
-	yy_current_state = yy_start;
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
 		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
-			yy_last_accepting_state = yy_current_state;
-			yy_last_accepting_cpos = yy_cp;
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
 			}
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
@@ -1357,30 +1439,23 @@ static yy_state_type yy_get_previous_state()
 		}
 
 	return yy_current_state;
-	}
-
+}
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
  *	next_state = yy_try_NUL_trans( current_state );
  */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-	{
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
 	register int yy_is_jam;
-	register char *yy_cp = yy_c_buf_p;
+    	register char *yy_cp = (yy_c_buf_p);
 
 	register YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
-		yy_last_accepting_state = yy_current_state;
-		yy_last_accepting_cpos = yy_cp;
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
 		}
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
@@ -1392,80 +1467,73 @@ yy_state_type yy_current_state;
 	yy_is_jam = (yy_current_state == 334);
 
 	return yy_is_jam ? 0 : yy_current_state;
-	}
-
+}
 
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-	{
-	register char *yy_cp = yy_c_buf_p;
+    static void yyunput (int c, register char * yy_bp )
+{
+	register char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
 
 	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
+	*yy_cp = (yy_hold_char);
 
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
+		register int number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
 		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
 
-		while ( source > yy_current_buffer->yy_ch_buf )
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			*--dest = *--source;
 
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
-		yy_current_buffer->yy_n_chars =
-			yy_n_chars = yy_current_buffer->yy_buf_size;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
 
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
 		}
 
 	*--yy_cp = (char) c;
 
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
 
-	yytext_ptr = yy_bp;
-	yy_hold_char = *yy_cp;
-	yy_c_buf_p = yy_cp;
-	}
-#endif	/* ifndef YY_NO_UNPUT */
-
-
+#ifndef YY_NO_INPUT
 #ifdef __cplusplus
-static int yyinput()
+    static int yyinput (void)
 #else
-static int input()
+    static int input  (void)
 #endif
-	{
-	int c;
 
-	*yy_c_buf_p = yy_hold_char;
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
 
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
 		{
 		/* yy_c_buf_p now points to the character we want to return.
 		 * If this occurs *before* the EOB characters, then it's a
 		 * valid NUL; if not, then we've hit the end of the buffer.
 		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
 			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
+			*(yy_c_buf_p) = '\0';
 
 		else
 			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
-			++yy_c_buf_p;
+			int offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
 
-			switch ( yy_get_next_buffer() )
+			switch ( yy_get_next_buffer(  ) )
 				{
 				case EOB_ACT_LAST_MATCH:
 					/* This happens because yy_g_n_b()
@@ -1479,16 +1547,16 @@ static int input()
 					 */
 
 					/* Reset buffer status. */
-					yyrestart( yyin );
+					yyrestart(yyin );
 
-					/* fall through */
+					/*FALLTHROUGH*/
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( yywrap() )
+					if ( yywrap( ) )
 						return EOF;
 
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 #ifdef __cplusplus
 					return yyinput();
@@ -1498,90 +1566,92 @@ static int input()
 					}
 
 				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
+					(yy_c_buf_p) = (yytext_ptr) + offset;
 					break;
 				}
 			}
 		}
 
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
-
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve yytext */
+	(yy_hold_char) = *++(yy_c_buf_p);
 
 	return c;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
+}
+#endif	/* ifndef YY_NO_INPUT */
 
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void yyrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        yyensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            yy_create_buffer(yyin,YY_BUF_SIZE );
 	}
 
+	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+	yy_load_buffer_state( );
+}
 
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		yypop_buffer_state();
+	 *		yypush_buffer_state(new_buffer);
+     */
+	yyensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
 		return;
 
-	if ( yy_current_buffer )
+	if ( YY_CURRENT_BUFFER )
 		{
 		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	yy_load_buffer_state( );
 
 	/* We don't actually know whether we did this switch during
 	 * EOF (yywrap()) processing, but the only time this flag
 	 * is looked at is after yywrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
+	(yy_did_buffer_switch_on_eof) = 1;
+}
 
+static void yy_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
 
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-	{
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+{
 	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+    
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
@@ -1590,80 +1660,75 @@ int size;
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
+	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
 	if ( ! b->yy_ch_buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	yy_init_buffer( b, file );
+	yy_init_buffer(b,file );
 
 	return b;
-	}
-
+}
 
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
+/** Destroy the buffer.
+ * @param b a buffer created with yy_create_buffer()
+ * 
+ */
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
 	if ( ! b )
 		return;
 
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
-
-	yy_flex_free( (void *) b );
-	}
+		yyfree((void *) b->yy_ch_buf  );
 
+	yyfree((void *) b  );
+}
 
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a yyrestart() or at EOF.
+ */
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
-	{
-	yy_flush_buffer( b );
+{
+	int oerrno = errno;
+    
+	yy_flush_buffer(b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
 
-	{
-	if ( ! b )
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
 		return;
 
 	b->yy_n_chars = 0;
@@ -1680,29 +1745,121 @@ YY_BUFFER_STATE b;
 	b->yy_at_bol = 1;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	if ( b == yy_current_buffer )
-		yy_load_buffer_state();
+	if ( b == YY_CURRENT_BUFFER )
+		yy_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	yyensure_buffer_stack();
+
+	/* This block is copied from yy_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from yy_switch_to_buffer. */
+	yy_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void yypop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	yy_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		yy_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
 	}
+}
 
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void yyensure_buffer_stack (void)
+{
+	int num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
 
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-	{
-	YY_BUFFER_STATE b;
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
 
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
 		return 0;
 
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
@@ -1716,56 +1873,51 @@ yy_size_t size;
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	yy_switch_to_buffer( b );
+	yy_switch_to_buffer(b  );
 
 	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-	{
-	int len;
-	for ( len = 0; yy_str[len]; ++len )
-		;
-
-	return yy_scan_bytes( yy_str, len );
-	}
-#endif
+}
 
+/** Setup the input buffer state to scan a string. The next call to yylex() will
+ * scan from a @e copy of @a str.
+ * @param str a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
+{
+    
+	return yy_scan_bytes(yystr,strlen(yystr) );
+}
 
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-	{
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
+{
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
 	int i;
-
+    
 	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = len + 2;
-	buf = (char *) yy_flex_alloc( n );
+	n = _yybytes_len + 2;
+	buf = (char *) yyalloc(n  );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
-	for ( i = 0; i < len; ++i )
-		buf[i] = bytes[i];
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
 
-	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = yy_scan_buffer( buf, n );
+	b = yy_scan_buffer(buf,n );
 	if ( ! b )
 		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
 
@@ -1775,148 +1927,177 @@ int len;
 	b->yy_is_our_buffer = 1;
 
 	return b;
-	}
-#endif
-
+}
 
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
 #endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		yy_size_t new_size;
 
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
 
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		yytext[yyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = yytext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		yyleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
 
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
+/* Accessor  methods (get/set functions) to struct members. */
 
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
+/** Get the input stream.
+ * 
+ */
+FILE *yyget_in  (void)
+{
+        return yyin;
+}
 
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
+/** Get the output stream.
+ * 
+ */
+FILE *yyget_out  (void)
+{
+        return yyout;
+}
 
-	BEGIN(new_state);
-	}
-#endif
+/** Get the length of the current token.
+ * 
+ */
+int yyget_leng  (void)
+{
+        return yyleng;
+}
 
+/** Get the current token.
+ * 
+ */
 
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
+char *yyget_text  (void)
+{
+        return yytext;
+}
 
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see yy_switch_to_buffer
+ */
+void yyset_in (FILE *  in_str )
+{
+        yyin = in_str ;
+}
 
+void yyset_out (FILE *  out_str )
+{
+        yyout = out_str ;
+}
 
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
+int yyget_debug  (void)
+{
+        return yy_flex_debug;
+}
 
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
+void yyset_debug (int  bdebug )
+{
+        yy_flex_debug = bdebug ;
+}
 
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from yylex_destroy(), so don't allocate here.
+     */
+
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    yyin = stdin;
+    yyout = stdout;
 #else
-static void yy_fatal_error( msg )
-char msg[];
+    yyin = (FILE *) 0;
+    yyout = (FILE *) 0;
 #endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-	}
 
+    /* For future reference: Set errno on error, since we are called by
+     * yylex_init()
+     */
+    return 0;
+}
 
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		yy_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		yypop_buffer_state();
+	}
 
-/* Redefine yyless() so it works in section 3 code. */
+	/* Destroy the stack itself. */
+	yyfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
 
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
-		} \
-	while ( 0 )
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * yylex() is called, initialization will occur. */
+    yy_init_globals( );
 
+    return 0;
+}
 
-/* Internal utility routines. */
+/*
+ * Internal utility routines.
+ */
 
 #ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-	{
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
 	register int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
-	}
+}
 #endif
 
 #ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-	{
+static int yy_flex_strlen (yyconst char * s )
+{
 	register int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
-	}
+}
 #endif
 
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
+void *yyalloc (yy_size_t  size )
+{
 	return (void *) malloc( size );
-	}
+}
 
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-	{
+void *yyrealloc  (void * ptr, yy_size_t  size )
+{
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -1925,23 +2106,13 @@ yy_size_t size;
 	 * as though doing an assignment.
 	 */
 	return (void *) realloc( (char *) ptr, size );
-	}
+}
 
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
+void yyfree (void * ptr )
+{
+	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
 
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
-#endif
 #line 116 "printrcl.l"
diff --git a/src/gutenprintui/printrcy.c b/src/gutenprintui/printrcy.c
index 1609566..ffc38c6 100644
--- a/src/gutenprintui/printrcy.c
+++ b/src/gutenprintui/printrcy.c
@@ -1,7 +1,9 @@
-/* A Bison parser, made by GNU Bison 1.875.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,16 +17,24 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
 
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
 
-/* Written by Richard Stallman by simplifying the original so called
-   ``semantic'' parser.  */
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
 
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
@@ -36,6 +46,9 @@
 /* Identify Bison output.  */
 #define YYBISON 1
 
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
@@ -93,6 +106,7 @@
      pCURVE = 295
    };
 #endif
+/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tDIMENSION 260
@@ -183,7 +197,12 @@ static stpui_plist_t *current_printer = NULL;
 # define YYERROR_VERBOSE 0
 #endif
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -195,49 +214,171 @@ typedef int YYSTYPE;
 /* Copy the second part of user declarations.  */
 
 
-/* Line 214 of yacc.c.  */
-#line 199 "printrcy.c"
+/* Line 216 of yacc.c.  */
+#line 219 "printrcy.c"
 
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
+#ifdef short
+# undef short
+#endif
 
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
 
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
 # else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
+{
+  return i;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
 #   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
 #    endif
 #   endif
 #  endif
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
 # else
-#  if defined (__STDC__) || defined (__cplusplus)
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
 #  endif
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
 # endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
 
 
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (YYSTYPE_IS_TRIVIAL)))
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short yyss;
+  yytype_int16 yyss;
   YYSTYPE yyvs;
   };
 
@@ -247,24 +388,24 @@ union yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if 1 < __GNUC__
+#  if defined __GNUC__ && 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
 #   define YYCOPY(To, From, Count)		\
       do					\
 	{					\
-	  register YYSIZE_T yyi;		\
+	  YYSIZE_T yyi;				\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
-      while (0)
+      while (YYID (0))
 #  endif
 # endif
 
@@ -282,39 +423,33 @@ union yyalloc
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
-    while (0)
+    while (YYID (0))
 
 #endif
 
-#if defined (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short yysigned_char;
-#endif
-
-/* YYFINAL -- State number of the termination state. */
+/* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  10
 /* YYLAST -- Last index in YYTABLE.  */
 #define YYLAST   75
 
-/* YYNTOKENS -- Number of terminals. */
+/* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  41
-/* YYNNTS -- Number of nonterminals. */
+/* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  42
-/* YYNRULES -- Number of rules. */
+/* YYNRULES -- Number of rules.  */
 #define YYNRULES  70
-/* YYNRULES -- Number of states. */
+/* YYNRULES -- Number of states.  */
 #define YYNSTATES  114
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   295
 
-#define YYTRANSLATE(YYX) 						\
+#define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const unsigned char yytranslate[] =
+static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -351,7 +486,7 @@ static const unsigned char yytranslate[] =
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const unsigned char yyprhs[] =
+static const yytype_uint8 yyprhs[] =
 {
        0,     0,     3,     7,    10,    13,    16,    19,    22,    25,
       28,    31,    34,    37,    40,    43,    46,    49,    52,    53,
@@ -363,8 +498,8 @@ static const unsigned char yyprhs[] =
      189
 };
 
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yysigned_char yyrhs[] =
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
 {
       82,     0,    -1,    12,     7,     7,    -1,    13,     7,    -1,
       26,     7,    -1,    27,     7,    -1,    28,     7,    -1,    29,
@@ -389,50 +524,50 @@ static const yysigned_char yyrhs[] =
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short yyrline[] =
+static const yytype_uint16 yyrline[] =
 {
-       0,   100,   100,   111,   118,   128,   138,   148,   158,   164,
-     168,   172,   176,   180,   184,   188,   206,   210,   214,   217,
-     231,   246,   261,   275,   289,   307,   327,   327,   327,   327,
-     328,   328,   328,   331,   334,   334,   337,   337,   337,   337,
-     338,   338,   338,   338,   338,   339,   339,   339,   339,   340,
-     340,   343,   343,   346,   349,   349,   352,   356,   366,   366,
-     369,   372,   383,   383,   386,   386,   389,   392,   392,   392,
-     395
+       0,   100,   100,   111,   118,   128,   138,   148,   158,   165,
+     172,   179,   186,   193,   200,   207,   228,   235,   242,   245,
+     262,   280,   298,   315,   332,   353,   376,   376,   376,   376,
+     377,   377,   377,   380,   383,   383,   386,   386,   386,   386,
+     387,   387,   387,   387,   387,   388,   388,   388,   388,   389,
+     389,   392,   392,   395,   398,   398,   401,   405,   415,   415,
+     418,   421,   432,   432,   435,   435,   438,   441,   441,   441,
+     444
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tDIMENSION", 
-  "tBOOLEAN", "tSTRING", "tWORD", "tGSWORD", "CURRENT_PRINTER", 
-  "SHOW_ALL_PAPER_SIZES", "PRINTER", "DESTINATION", "SCALING", 
-  "ORIENTATION", "AUTOSIZE_ROLL_PAPER", "UNIT", "DRIVER", "LEFT", "TOP", 
-  "CUSTOM_PAGE_WIDTH", "CUSTOM_PAGE_HEIGHT", "OUTPUT_TYPE", "PRINTRC_HDR", 
-  "PARAMETER", "QUEUE_NAME", "OUTPUT_FILENAME", "EXTRA_PRINTER_OPTIONS", 
-  "CUSTOM_COMMAND", "COMMAND_TYPE", "GLOBAL_SETTINGS", "GLOBAL", 
-  "END_GLOBAL_SETTINGS", "pINT", "pSTRING_LIST", "pFILE", "pDOUBLE", 
-  "pDIMENSION", "pBOOLEAN", "pCURVE", "$accept", "Printer", "Destination", 
-  "Queue_Name", "Output_Filename", "Extra_Printer_Options", 
-  "Custom_Command", "Command_Type", "Scaling", "Orientation", 
-  "Autosize_Roll_Paper", "Unit", "Left", "Top", "Output_Type", 
-  "Custom_Page_Width", "Custom_Page_Height", "Empty", "Int_Param", 
-  "String_List_Param", "File_Param", "Double_Param", "Dimension_Param", 
-  "Boolean_Param", "Curve_Param", "Typed_Param", "Parameter", 
-  "Parameters", "Standard_Value", "Standard_Values", "A_Printer", 
-  "Printers", "Current_Printer", "Show_All_Paper_Sizes", "Global", 
-  "Old_Globals", "New_Global_Setting", "Global_Setting", 
-  "Global_Settings", "Global_Subblock", "Global_Block", "Thing", 0
+  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tDIMENSION",
+  "tBOOLEAN", "tSTRING", "tWORD", "tGSWORD", "CURRENT_PRINTER",
+  "SHOW_ALL_PAPER_SIZES", "PRINTER", "DESTINATION", "SCALING",
+  "ORIENTATION", "AUTOSIZE_ROLL_PAPER", "UNIT", "DRIVER", "LEFT", "TOP",
+  "CUSTOM_PAGE_WIDTH", "CUSTOM_PAGE_HEIGHT", "OUTPUT_TYPE", "PRINTRC_HDR",
+  "PARAMETER", "QUEUE_NAME", "OUTPUT_FILENAME", "EXTRA_PRINTER_OPTIONS",
+  "CUSTOM_COMMAND", "COMMAND_TYPE", "GLOBAL_SETTINGS", "GLOBAL",
+  "END_GLOBAL_SETTINGS", "pINT", "pSTRING_LIST", "pFILE", "pDOUBLE",
+  "pDIMENSION", "pBOOLEAN", "pCURVE", "$accept", "Printer", "Destination",
+  "Queue_Name", "Output_Filename", "Extra_Printer_Options",
+  "Custom_Command", "Command_Type", "Scaling", "Orientation",
+  "Autosize_Roll_Paper", "Unit", "Left", "Top", "Output_Type",
+  "Custom_Page_Width", "Custom_Page_Height", "Empty", "Int_Param",
+  "String_List_Param", "File_Param", "Double_Param", "Dimension_Param",
+  "Boolean_Param", "Curve_Param", "Typed_Param", "Parameter", "Parameters",
+  "Standard_Value", "Standard_Values", "A_Printer", "Printers",
+  "Current_Printer", "Show_All_Paper_Sizes", "Global", "Old_Globals",
+  "New_Global_Setting", "Global_Setting", "Global_Settings",
+  "Global_Subblock", "Global_Block", "Thing", 0
 };
 #endif
 
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short yytoknum[] =
+static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -443,7 +578,7 @@ static const unsigned short yytoknum[] =
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const unsigned char yyr1[] =
+static const yytype_uint8 yyr1[] =
 {
        0,    41,    42,    43,    44,    45,    46,    47,    48,    49,
       50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
@@ -456,7 +591,7 @@ static const unsigned char yyr1[] =
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const unsigned char yyr2[] =
+static const yytype_uint8 yyr2[] =
 {
        0,     2,     3,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     0,     4,
@@ -471,7 +606,7 @@ static const unsigned char yyr2[] =
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
    STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
-static const unsigned char yydefact[] =
+static const yytype_uint8 yydefact[] =
 {
        0,    18,     0,     0,    18,    69,     0,    68,    67,    18,
        1,    56,    65,     0,     0,    60,    55,    70,     0,    66,
@@ -487,8 +622,8 @@ static const unsigned char yydefact[] =
       22,    23,    24,    25
 };
 
-/* YYDEFGOTO[NTERM-NUM]. */
-static const yysigned_char yydefgoto[] =
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
 {
       -1,    27,    49,    50,    51,    52,    53,    54,    55,    56,
       57,    58,    59,    60,    61,    62,    63,     5,    85,    86,
@@ -500,7 +635,7 @@ static const yysigned_char yydefgoto[] =
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 #define YYPACT_NINF -26
-static const yysigned_char yypact[] =
+static const yytype_int8 yypact[] =
 {
      -22,    -2,     6,     0,   -26,   -26,     5,   -26,   -26,   -26,
      -26,   -26,   -26,    -7,    11,   -26,   -26,     7,    13,   -26,
@@ -517,7 +652,7 @@ static const yysigned_char yypact[] =
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const yysigned_char yypgoto[] =
+static const yytype_int8 yypgoto[] =
 {
      -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,
      -26,   -26,   -26,   -26,   -26,   -26,   -26,    -4,   -26,   -26,
@@ -531,7 +666,7 @@ static const yysigned_char yypgoto[] =
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -1
-static const unsigned char yytable[] =
+static const yytype_uint8 yytable[] =
 {
       12,    18,     1,     3,    14,    16,    10,    11,     3,    93,
       94,    95,    96,    97,    98,    99,    14,    25,    84,    26,
@@ -543,7 +678,7 @@ static const unsigned char yytable[] =
      108,   109,   110,   111,   113,   112
 };
 
-static const yysigned_char yycheck[] =
+static const yytype_int8 yycheck[] =
 {
        4,     8,    24,    10,    11,     9,     0,     7,    10,    34,
       35,    36,    37,    38,    39,    40,    11,     6,     8,    12,
@@ -557,7 +692,7 @@ static const yysigned_char yycheck[] =
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
+static const yytype_uint8 yystos[] =
 {
        0,    24,    82,    10,    31,    58,    73,    76,    80,    81,
        0,     7,    58,    79,    11,    74,    58,    72,     8,    33,
@@ -573,22 +708,6 @@ static const unsigned char yystos[] =
        4,     3,     6,     7
 };
 
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
 #define YYEMPTY		(-2)
@@ -596,7 +715,8 @@ static const unsigned char yystos[] =
 
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrlab1
+#define YYERROR		goto yyerrorlab
+
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
@@ -613,30 +733,63 @@ do								\
       yychar = (Token);						\
       yylval = (Value);						\
       yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
+      YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
   else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
-while (0)
+while (YYID (0))
+
 
 #define YYTERROR	1
 #define YYERRCODE	256
 
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).  */
 
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)         \
-  Current.first_line   = Rhs[1].first_line;      \
-  Current.first_column = Rhs[1].first_column;    \
-  Current.last_line    = Rhs[N].last_line;       \
-  Current.last_column  = Rhs[N].last_column;
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
 #endif
 
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 #ifdef YYLEX_PARAM
@@ -657,42 +810,96 @@ while (0)
 do {						\
   if (yydebug)					\
     YYFPRINTF Args;				\
-} while (0)
+} while (YYID (0))
 
-# define YYDSYMPRINT(Args)			\
-do {						\
-  if (yydebug)					\
-    yysymprint Args;				\
-} while (0)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
 
-# define YYDSYMPRINTF(Title, Token, Value, Location)		\
-do {								\
-  if (yydebug)							\
-    {								\
-      YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr, 					\
-                  Token, Value);	\
-      YYFPRINTF (stderr, "\n");					\
-    }								\
-} while (0)
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (cinluded).                                                   |
+| TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (short *bottom, short *top)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
 #else
 static void
 yy_stack_print (bottom, top)
-    short *bottom;
-    short *top;
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (/* Nothing. */; bottom <= top; ++bottom)
+  for (; bottom <= top; ++bottom)
     YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
 }
@@ -701,45 +908,52 @@ yy_stack_print (bottom, top)
 do {								\
   if (yydebug)							\
     yy_stack_print ((Bottom), (Top));				\
-} while (0)
+} while (YYID (0))
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (int yyrule)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
 #else
 static void
-yy_reduce_print (yyrule)
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
     int yyrule;
 #endif
 {
+  int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned int yylineno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-             yyrule - 1, yylineno);
-  /* Print the symbols being reduced, and their result.  */
-  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      fprintf (stderr, "\n");
+    }
 }
 
 # define YY_REDUCE_PRINT(Rule)		\
 do {					\
   if (yydebug)				\
-    yy_reduce_print (Rule);		\
-} while (0)
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
-# define YYDSYMPRINT(Args)
-# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -754,13 +968,9 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
@@ -770,45 +980,47 @@ int yydebug;
 #if YYERROR_VERBOSE
 
 # ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
+#  if defined __GLIBC__ && defined _STRING_H
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
 yystrlen (const char *yystr)
-#   else
+#else
+static YYSIZE_T
 yystrlen (yystr)
-     const char *yystr;
-#   endif
+    const char *yystr;
+#endif
 {
-  register const char *yys = yystr;
-
-  while (*yys++ != '\0')
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
     continue;
-
-  return yys - yystr - 1;
+  return yylen;
 }
 #  endif
 # endif
 
 # ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
 #   define yystpcpy stpcpy
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static char *
-#   if defined (__STDC__) || defined (__cplusplus)
 yystpcpy (char *yydest, const char *yysrc)
-#   else
+#else
+static char *
 yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
+    char *yydest;
+    const char *yysrc;
+#endif
 {
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;
@@ -818,70 +1030,192 @@ yystpcpy (yydest, yysrc)
 #  endif
 # endif
 
-#endif /* !YYERROR_VERBOSE */
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
 
-
+  if (! yyres)
+    return yystrlen (yystr);
 
-#if YYDEBUG
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
 
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yysymprint (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  int yyn = yypact[yystate];
 
-  if (yytype < YYNTOKENS)
-    {
-      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
-      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-    }
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
   else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-
-  switch (yytype)
     {
-      default:
-        break;
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
     }
-  YYFPRINTF (yyoutput, ")");
 }
+#endif /* YYERROR_VERBOSE */
+
 
-#endif /* ! YYDEBUG */
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
 #else
 static void
-yydestruct (yytype, yyvaluep)
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
     int yytype;
     YYSTYPE *yyvaluep;
 #endif
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
   switch (yytype)
     {
 
       default:
-        break;
+	break;
     }
 }
 
@@ -889,13 +1223,13 @@ yydestruct (yytype, yyvaluep)
 /* Prevent warnings from -Wmissing-prototypes.  */
 
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
+#if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
-# else
+#else
 int yyparse ();
-# endif
+#endif
 #else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#if defined __STDC__ || defined __cplusplus
 int yyparse (void);
 #else
 int yyparse ();
@@ -904,10 +1238,10 @@ int yyparse ();
 
 
 
-/* The lookahead symbol.  */
+/* The look-ahead symbol.  */
 int yychar;
 
-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
@@ -920,14 +1254,18 @@ int yynerrs;
 `----------*/
 
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM)
-# else
-int yyparse (YYPARSE_PARAM)
-  void *YYPARSE_PARAM;
-# endif
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
 #else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 int
 yyparse (void)
 #else
@@ -938,13 +1276,19 @@ yyparse ()
 #endif
 {
   
-  register int yystate;
-  register int yyn;
+  int yystate;
+  int yyn;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
+  /* Look-ahead token as an internal (translated) token number.  */
   int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
 
   /* Three stacks and their tools:
      `yyss': related to states,
@@ -955,18 +1299,18 @@ yyparse ()
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short	yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
+  YYSTYPE *yyvsp;
 
 
 
-#define YYPOPSTACK   (yyvsp--, yyssp--)
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
   YYSIZE_T yystacksize = YYINITDEPTH;
 
@@ -975,9 +1319,9 @@ yyparse ()
   YYSTYPE yyval;
 
 
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule.  */
-  int yylen;
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
 
@@ -1001,8 +1345,7 @@ yyparse ()
 `------------------------------------------------------------*/
  yynewstate:
   /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
+     have just been pushed.  So pushing a state here evens the stacks.  */
   yyssp++;
 
  yysetstate:
@@ -1015,18 +1358,18 @@ yyparse ()
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack. Use copies of
+	/* Give user a chance to reallocate the stack.  Use copies of
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 
 
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
 	   be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
+	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
 
@@ -1037,21 +1380,21 @@ yyparse ()
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
+      goto yyexhaustedlab;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyoverflowlab;
+	goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
 
       {
-	short *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyoverflowlab;
+	  goto yyexhaustedlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
 
@@ -1082,19 +1425,17 @@ yyparse ()
 `-----------*/
 yybackup:
 
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
 
+  /* First try to decide what to do without reference to look-ahead token.  */
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1109,7 +1450,7 @@ yybackup:
   else
     {
       yytoken = YYTRANSLATE (yychar);
-      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1129,22 +1470,21 @@ yybackup:
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-
-
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
   yystate = yyn;
+  *++yyvsp = yylval;
+
   goto yynewstate;
 
 
@@ -1182,27 +1522,27 @@ yyreduce:
         case 2:
 #line 101 "printrcy.y"
     {
-	  current_printer = stpui_plist_create(yyvsp[-1].sval, yyvsp[0].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  current_printer = stpui_plist_create((yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval));
+	  g_free((yyvsp[(2) - (3)].sval));
+	  g_free((yyvsp[(3) - (3)].sval));
 	}
     break;
 
   case 3:
 #line 112 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
-	    g_free(yyvsp[0].sval);
+	  if ((yyvsp[(2) - (2)].sval))
+	    g_free((yyvsp[(2) - (2)].sval));
 	}
     break;
 
   case 4:
 #line 119 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if (current_printer && (yyvsp[(2) - (2)].sval))
 	    {
-	      stpui_plist_set_queue_name(current_printer, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_plist_set_queue_name(current_printer, (yyvsp[(2) - (2)].sval));
+	      g_free((yyvsp[(2) - (2)].sval));
 	    }
 	}
     break;
@@ -1210,10 +1550,10 @@ yyreduce:
   case 5:
 #line 129 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if (current_printer && (yyvsp[(2) - (2)].sval))
 	    {
-	      stpui_plist_set_output_filename(current_printer, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_plist_set_output_filename(current_printer, (yyvsp[(2) - (2)].sval));
+	      g_free((yyvsp[(2) - (2)].sval));
 	    }
 	}
     break;
@@ -1221,10 +1561,10 @@ yyreduce:
   case 6:
 #line 139 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if (current_printer && (yyvsp[(2) - (2)].sval))
 	    {
-	      stpui_plist_set_extra_printer_options(current_printer, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_plist_set_extra_printer_options(current_printer, (yyvsp[(2) - (2)].sval));
+	      g_free((yyvsp[(2) - (2)].sval));
 	    }
 	}
     break;
@@ -1232,10 +1572,10 @@ yyreduce:
   case 7:
 #line 149 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if (current_printer && (yyvsp[(2) - (2)].sval))
 	    {
-	      stpui_plist_set_custom_command(current_printer, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_plist_set_custom_command(current_printer, (yyvsp[(2) - (2)].sval));
+	      g_free((yyvsp[(2) - (2)].sval));
 	    }
 	}
     break;
@@ -1243,224 +1583,272 @@ yyreduce:
   case 8:
 #line 159 "printrcy.y"
     {
-	  stpui_plist_set_command_type(current_printer, yyvsp[0].ival);
+	  if (current_printer)
+	    stpui_plist_set_command_type(current_printer, (yyvsp[(2) - (2)].ival));
 	}
     break;
 
   case 9:
-#line 165 "printrcy.y"
-    { current_printer->scaling = yyvsp[0].dval; }
+#line 166 "printrcy.y"
+    {
+	  if (current_printer)
+	    current_printer->scaling = (yyvsp[(2) - (2)].dval); 
+	}
     break;
 
   case 10:
-#line 169 "printrcy.y"
-    { current_printer->orientation = yyvsp[0].ival; }
+#line 173 "printrcy.y"
+    {
+	  if (current_printer)
+	    current_printer->orientation = (yyvsp[(2) - (2)].ival);
+	}
     break;
 
   case 11:
-#line 173 "printrcy.y"
-    { current_printer->auto_size_roll_feed_paper = yyvsp[0].ival; }
+#line 180 "printrcy.y"
+    {
+	  if (current_printer)
+	    current_printer->auto_size_roll_feed_paper = (yyvsp[(2) - (2)].ival);
+	}
     break;
 
   case 12:
-#line 177 "printrcy.y"
-    { current_printer->unit = yyvsp[0].ival; }
+#line 187 "printrcy.y"
+    {
+	  if (current_printer)
+	    current_printer->unit = (yyvsp[(2) - (2)].ival); 
+	}
     break;
 
   case 13:
-#line 181 "printrcy.y"
-    { stp_set_left(current_printer->v, yyvsp[0].ival); }
+#line 194 "printrcy.y"
+    {
+	  if (current_printer)
+	    stp_set_left(current_printer->v, (yyvsp[(2) - (2)].ival));
+	}
     break;
 
   case 14:
-#line 185 "printrcy.y"
-    { stp_set_top(current_printer->v, yyvsp[0].ival); }
+#line 201 "printrcy.y"
+    {
+	  if (current_printer)
+	    stp_set_top(current_printer->v, (yyvsp[(2) - (2)].ival));
+	}
     break;
 
   case 15:
-#line 189 "printrcy.y"
+#line 208 "printrcy.y"
     {
-	  switch (yyvsp[0].ival)
+	  if (current_printer)
 	    {
-	    case 0:
-	      stp_set_string_parameter
-		(current_printer->v, "PrintingMode", "BW");
-	      break;
-	    case 1:
-	    case 2:
-	    default:
-	      stp_set_string_parameter
-		(current_printer->v, "PrintingMode", "Color");
-	      break;
+	      switch ((yyvsp[(2) - (2)].ival))
+		{
+		case 0:
+		  stp_set_string_parameter
+		    (current_printer->v, "PrintingMode", "BW");
+		  break;
+		case 1:
+		case 2:
+		default:
+		  stp_set_string_parameter
+		    (current_printer->v, "PrintingMode", "Color");
+		  break;
+		}
 	    }
 	}
     break;
 
   case 16:
-#line 207 "printrcy.y"
-    { stp_set_page_width(current_printer->v, yyvsp[0].ival); }
+#line 229 "printrcy.y"
+    {
+	  if (current_printer)
+	    stp_set_page_width(current_printer->v, (yyvsp[(2) - (2)].ival));
+	}
     break;
 
   case 17:
-#line 211 "printrcy.y"
-    { stp_set_page_height(current_printer->v, yyvsp[0].ival); }
+#line 236 "printrcy.y"
+    {
+	  if (current_printer)
+	    stp_set_page_height(current_printer->v, (yyvsp[(2) - (2)].ival));
+	}
     break;
 
   case 19:
-#line 218 "printrcy.y"
+#line 246 "printrcy.y"
     {
-	  stp_set_int_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].ival);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_int_parameter_active(current_printer->v, yyvsp[-3].sval,
-					 STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_int_parameter_active(current_printer->v, yyvsp[-3].sval,
-					 STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
+	  if (current_printer)
+	    {
+	      stp_set_int_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].ival));
+	      if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0)
+		stp_set_int_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+					     STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_int_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+					     STP_PARAMETER_ACTIVE);
+	    }
+	  g_free((yyvsp[(1) - (4)].sval));
+	  g_free((yyvsp[(3) - (4)].sval));
 	}
     break;
 
   case 20:
-#line 232 "printrcy.y"
+#line 263 "printrcy.y"
     {
-	  stp_set_string_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].sval);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_string_parameter_active(current_printer->v, yyvsp[-3].sval,
-					    STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_string_parameter_active(current_printer->v, yyvsp[-3].sval,
-					    STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  if (current_printer)
+	    {
+	      stp_set_string_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].sval));
+	      if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0)
+		stp_set_string_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+						STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_string_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+						STP_PARAMETER_ACTIVE);
+	    }
+	  g_free((yyvsp[(1) - (4)].sval));
+	  g_free((yyvsp[(3) - (4)].sval));
+	  g_free((yyvsp[(4) - (4)].sval));
 	}
     break;
 
   case 21:
-#line 247 "printrcy.y"
+#line 281 "printrcy.y"
     {
-	  stp_set_file_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].sval);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_file_parameter_active(current_printer->v, yyvsp[-3].sval,
-					  STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_file_parameter_active(current_printer->v, yyvsp[-3].sval,
-					  STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  if (current_printer)
+	    {
+	      stp_set_file_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].sval));
+	      if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0)
+		stp_set_file_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+					      STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_file_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+					      STP_PARAMETER_ACTIVE);
+	    }
+	  g_free((yyvsp[(1) - (4)].sval));
+	  g_free((yyvsp[(3) - (4)].sval));
+	  g_free((yyvsp[(4) - (4)].sval));
 	}
     break;
 
   case 22:
-#line 262 "printrcy.y"
+#line 299 "printrcy.y"
     {
-	  stp_set_float_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].dval);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_float_parameter_active(current_printer->v, yyvsp[-3].sval,
-					   STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_float_parameter_active(current_printer->v, yyvsp[-3].sval,
-					   STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
+	  if (current_printer)
+	    {
+	      stp_set_float_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].dval));
+	      if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0)
+		stp_set_float_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+					       STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_float_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+					       STP_PARAMETER_ACTIVE);
+	    }
+	  g_free((yyvsp[(1) - (4)].sval));
+	  g_free((yyvsp[(3) - (4)].sval));
 	}
     break;
 
   case 23:
-#line 276 "printrcy.y"
+#line 316 "printrcy.y"
     {
-	  stp_set_dimension_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].ival);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_dimension_parameter_active(current_printer->v, yyvsp[-3].sval,
-					       STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_dimension_parameter_active(current_printer->v, yyvsp[-3].sval,
-					       STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
+	  if (current_printer)
+	    {
+	      stp_set_dimension_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].ival));
+	      if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0)
+		stp_set_dimension_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+						   STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_dimension_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+						   STP_PARAMETER_ACTIVE);
+	    }
+	  g_free((yyvsp[(1) - (4)].sval));
+	  g_free((yyvsp[(3) - (4)].sval));
 	}
     break;
 
   case 24:
-#line 290 "printrcy.y"
+#line 333 "printrcy.y"
     {
-	  if (strcmp(yyvsp[0].sval, "False") == 0)
-	    stp_set_boolean_parameter(current_printer->v, yyvsp[-3].sval, 0);
-	  else
-	    stp_set_boolean_parameter(current_printer->v, yyvsp[-3].sval, 1);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_boolean_parameter_active(current_printer->v, yyvsp[-3].sval,
-					     STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_boolean_parameter_active(current_printer->v, yyvsp[-3].sval,
-					     STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  if (current_printer)
+	    {
+	      if (strcmp((yyvsp[(4) - (4)].sval), "False") == 0)
+		stp_set_boolean_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), 0);
+	      else
+		stp_set_boolean_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), 1);
+	      if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0)
+		stp_set_boolean_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+						 STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_boolean_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+						 STP_PARAMETER_ACTIVE);
+	    }
+	  g_free((yyvsp[(1) - (4)].sval));
+	  g_free((yyvsp[(3) - (4)].sval));
+	  g_free((yyvsp[(4) - (4)].sval));
 	}
     break;
 
   case 25:
-#line 308 "printrcy.y"
+#line 354 "printrcy.y"
     {
-	  stp_curve_t *curve = stp_curve_create_from_string(yyvsp[0].sval);
-	  if (curve)
+	  if (current_printer)
 	    {
-	      stp_set_curve_parameter(current_printer->v, yyvsp[-3].sval, curve);
-	      if (strcmp(yyvsp[-1].sval, "False") == 0)
-		stp_set_curve_parameter_active(current_printer->v, yyvsp[-3].sval,
-					       STP_PARAMETER_INACTIVE);
-	      else
-		stp_set_curve_parameter_active(current_printer->v, yyvsp[-3].sval,
-					       STP_PARAMETER_ACTIVE);
-	      stp_curve_destroy(curve);
+	      stp_curve_t *curve = stp_curve_create_from_string((yyvsp[(4) - (4)].sval));
+	      if (curve)
+		{
+		  stp_set_curve_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), curve);
+		  if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0)
+		    stp_set_curve_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+						   STP_PARAMETER_INACTIVE);
+		  else
+		    stp_set_curve_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+						   STP_PARAMETER_ACTIVE);
+		  stp_curve_destroy(curve);
+		}
 	    }
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  g_free((yyvsp[(1) - (4)].sval));
+	  g_free((yyvsp[(3) - (4)].sval));
+	  g_free((yyvsp[(4) - (4)].sval));
 	}
     break;
 
   case 56:
-#line 353 "printrcy.y"
-    { stpui_printrc_current_printer = yyvsp[0].sval; }
+#line 402 "printrcy.y"
+    { stpui_printrc_current_printer = (yyvsp[(2) - (2)].sval); }
     break;
 
   case 57:
-#line 357 "printrcy.y"
+#line 406 "printrcy.y"
     {
-	  if (strcmp(yyvsp[0].sval, "True") == 0)
+	  if (strcmp((yyvsp[(2) - (2)].sval), "True") == 0)
 	    stpui_show_all_paper_sizes = 1;
 	  else
 	    stpui_show_all_paper_sizes = 0;
-	  g_free(yyvsp[0].sval);
+	  g_free((yyvsp[(2) - (2)].sval));
 	}
     break;
 
   case 61:
-#line 373 "printrcy.y"
+#line 422 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if ((yyvsp[(2) - (2)].sval))
 	    {
-	      stpui_set_global_parameter(yyvsp[-1].sval, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_set_global_parameter((yyvsp[(1) - (2)].sval), (yyvsp[(2) - (2)].sval));
+	      g_free((yyvsp[(2) - (2)].sval));
 	    }
-	  g_free(yyvsp[-1].sval);
+	  g_free((yyvsp[(1) - (2)].sval));
 	}
     break;
 
 
+/* Line 1267 of yacc.c.  */
+#line 1846 "printrcy.c"
+      default: break;
     }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
-/* Line 991 of yacc.c.  */
-#line 1458 "printrcy.c"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-
-
+  YYPOPSTACK (yylen);
+  yylen = 0;
   YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
@@ -1489,109 +1877,93 @@ yyerrlab:
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
-	{
-	  YYSIZE_T yysize = 0;
-	  int yytype = YYTRANSLATE (yychar);
-	  char *yymsg;
-	  int yyx, yycount;
-
-	  yycount = 0;
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  for (yyx = yyn < 0 ? -yyn : 0;
-	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-	  yysize += yystrlen ("syntax error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[yytype]);
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
-	    {
-	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[yytype]);
-
-	      if (yycount < 5)
-		{
-		  yycount = 0;
-		  for (yyx = yyn < 0 ? -yyn : 0;
-		       yyx < (int) (sizeof (yytname) / sizeof (char *));
-		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-		      {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
-			yyp = yystpcpy (yyp, yyq);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
-		      }
-		}
-	      yyerror (yymsg);
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
 	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    yyerror ("syntax error; also virtual memory exhausted");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror ("syntax error");
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
     }
 
 
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it.  */
 
-      /* Return failure if at end of input.  */
-      if (yychar == YYEOF)
-        {
-	  /* Pop the error token.  */
-          YYPOPSTACK;
-	  /* Pop the rest of the stack.  */
-	  while (yyss < yyssp)
-	    {
-	      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-	      yydestruct (yystos[*yyssp], yyvsp);
-	      YYPOPSTACK;
-	    }
-	  YYABORT;
-        }
-
-      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-      yydestruct (yytoken, &yylval);
-      yychar = YYEMPTY;
-
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
-  goto yyerrlab2;
+  goto yyerrlab1;
 
 
-/*----------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action.  |
-`----------------------------------------------------*/
-yyerrlab1:
-
-  /* Suppress GCC warning that yyerrlab1 is unused when no action
-     invokes YYERROR.  */
-#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) \
-    && !defined __cplusplus
-  __attribute__ ((__unused__))
-#endif
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
 
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
 
-  goto yyerrlab2;
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
 
 
-/*---------------------------------------------------------------.
-| yyerrlab2 -- pop states until the error token can be shifted.  |
-`---------------------------------------------------------------*/
-yyerrlab2:
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
   yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
   for (;;)
@@ -1612,22 +1984,23 @@ yyerrlab2:
       if (yyssp == yyss)
 	YYABORT;
 
-      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-      yydestruct (yystos[yystate], yyvsp);
-      yyvsp--;
-      yystate = *--yyssp;
 
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
   *++yyvsp = yylval;
 
 
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
   yystate = yyn;
   goto yynewstate;
 
@@ -1647,24 +2020,42 @@ yyabortlab:
   goto yyreturn;
 
 #ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here.  |
-`----------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
-  return yyresult;
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
 
 
-#line 398 "printrcy.y"
+#line 447 "printrcy.y"
 
 
diff --git a/src/gutenprintui/printrcy.h b/src/gutenprintui/printrcy.h
index afa662b..8a6c041 100644
--- a/src/gutenprintui/printrcy.h
+++ b/src/gutenprintui/printrcy.h
@@ -1,7 +1,9 @@
-/* A Bison parser, made by GNU Bison 1.875.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,13 +17,21 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
 
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -69,6 +79,7 @@
      pCURVE = 295
    };
 #endif
+/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tDIMENSION 260
@@ -111,7 +122,7 @@
 
 
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -120,5 +131,3 @@ typedef int YYSTYPE;
 
 extern YYSTYPE yylval;
 
-
-
diff --git a/src/gutenprintui/printrcy.y b/src/gutenprintui/printrcy.y
index 99cfaeb..f2dd851 100644
--- a/src/gutenprintui/printrcy.y
+++ b/src/gutenprintui/printrcy.y
@@ -1,5 +1,5 @@
 /*
- * "$Id: printrcy.y,v 1.1 2004/09/17 18:38:14 rleigh Exp $"
+ * "$Id: printrcy.y,v 1.1.18.1 2007/03/02 12:01:19 rlk Exp $"
  *
  *   Test pattern generator for Gutenprint
  *
@@ -117,7 +117,7 @@ Destination: DESTINATION tSTRING
 
 Queue_Name: QUEUE_NAME tSTRING
 	{
-	  if ($2)
+	  if (current_printer && $2)
 	    {
 	      stpui_plist_set_queue_name(current_printer, $2);
 	      g_free($2);
@@ -127,7 +127,7 @@ Queue_Name: QUEUE_NAME tSTRING
 
 Output_Filename: OUTPUT_FILENAME tSTRING
 	{
-	  if ($2)
+	  if (current_printer && $2)
 	    {
 	      stpui_plist_set_output_filename(current_printer, $2);
 	      g_free($2);
@@ -137,7 +137,7 @@ Output_Filename: OUTPUT_FILENAME tSTRING
 
 Extra_Printer_Options: EXTRA_PRINTER_OPTIONS tSTRING
 	{
-	  if ($2)
+	  if (current_printer && $2)
 	    {
 	      stpui_plist_set_extra_printer_options(current_printer, $2);
 	      g_free($2);
@@ -147,7 +147,7 @@ Extra_Printer_Options: EXTRA_PRINTER_OPTIONS tSTRING
 
 Custom_Command: CUSTOM_COMMAND tSTRING
 	{
-	  if ($2)
+	  if (current_printer && $2)
 	    {
 	      stpui_plist_set_custom_command(current_printer, $2);
 	      g_free($2);
@@ -157,58 +157,86 @@ Custom_Command: CUSTOM_COMMAND tSTRING
 
 Command_Type: COMMAND_TYPE tINT
 	{
-	  stpui_plist_set_command_type(current_printer, $2);
+	  if (current_printer)
+	    stpui_plist_set_command_type(current_printer, $2);
 	}
 ;
 
 Scaling: SCALING tDOUBLE
-	{ current_printer->scaling = $2; }
+	{
+	  if (current_printer)
+	    current_printer->scaling = $2; 
+	}
 ;
 
 Orientation: ORIENTATION tINT
-	{ current_printer->orientation = $2; }
+	{
+	  if (current_printer)
+	    current_printer->orientation = $2;
+	}
 ;
 
 Autosize_Roll_Paper: AUTOSIZE_ROLL_PAPER tINT
-	{ current_printer->auto_size_roll_feed_paper = $2; }
+	{
+	  if (current_printer)
+	    current_printer->auto_size_roll_feed_paper = $2;
+	}
 ;
 
 Unit: UNIT tINT
-	{ current_printer->unit = $2; }
+	{
+	  if (current_printer)
+	    current_printer->unit = $2; 
+	}
 ;
 
 Left: LEFT tINT
-	{ stp_set_left(current_printer->v, $2); }
+	{
+	  if (current_printer)
+	    stp_set_left(current_printer->v, $2);
+	}
 ;
 
 Top: TOP tINT
-	{ stp_set_top(current_printer->v, $2); }
+	{
+	  if (current_printer)
+	    stp_set_top(current_printer->v, $2);
+	}
 ;
 
 Output_Type: OUTPUT_TYPE tINT
 	{
-	  switch ($2)
+	  if (current_printer)
 	    {
-	    case 0:
-	      stp_set_string_parameter
-		(current_printer->v, "PrintingMode", "BW");
-	      break;
-	    case 1:
-	    case 2:
-	    default:
-	      stp_set_string_parameter
-		(current_printer->v, "PrintingMode", "Color");
-	      break;
+	      switch ($2)
+		{
+		case 0:
+		  stp_set_string_parameter
+		    (current_printer->v, "PrintingMode", "BW");
+		  break;
+		case 1:
+		case 2:
+		default:
+		  stp_set_string_parameter
+		    (current_printer->v, "PrintingMode", "Color");
+		  break;
+		}
 	    }
 	}
 ;
 
 Custom_Page_Width: CUSTOM_PAGE_WIDTH tINT
-	{ stp_set_page_width(current_printer->v, $2); }
+	{
+	  if (current_printer)
+	    stp_set_page_width(current_printer->v, $2);
+	}
 ;
 
 Custom_Page_Height: CUSTOM_PAGE_HEIGHT tINT
-	{ stp_set_page_height(current_printer->v, $2); }
+	{
+	  if (current_printer)
+	    stp_set_page_height(current_printer->v, $2);
+	}
 ;
 
 Empty:
@@ -216,13 +244,16 @@ Empty:
 
 Int_Param: tWORD pINT tBOOLEAN tINT
 	{
-	  stp_set_int_parameter(current_printer->v, $1, $4);
-	  if (strcmp($3, "False") == 0)
-	    stp_set_int_parameter_active(current_printer->v, $1,
-					 STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_int_parameter_active(current_printer->v, $1,
-					 STP_PARAMETER_ACTIVE);
+	  if (current_printer)
+	    {
+	      stp_set_int_parameter(current_printer->v, $1, $4);
+	      if (strcmp($3, "False") == 0)
+		stp_set_int_parameter_active(current_printer->v, $1,
+					     STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_int_parameter_active(current_printer->v, $1,
+					     STP_PARAMETER_ACTIVE);
+	    }
 	  g_free($1);
 	  g_free($3);
 	}
@@ -230,13 +261,16 @@ Int_Param: tWORD pINT tBOOLEAN tINT
 
 String_List_Param: tWORD pSTRING_LIST tBOOLEAN tSTRING
 	{
-	  stp_set_string_parameter(current_printer->v, $1, $4);
-	  if (strcmp($3, "False") == 0)
-	    stp_set_string_parameter_active(current_printer->v, $1,
-					    STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_string_parameter_active(current_printer->v, $1,
-					    STP_PARAMETER_ACTIVE);
+	  if (current_printer)
+	    {
+	      stp_set_string_parameter(current_printer->v, $1, $4);
+	      if (strcmp($3, "False") == 0)
+		stp_set_string_parameter_active(current_printer->v, $1,
+						STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_string_parameter_active(current_printer->v, $1,
+						STP_PARAMETER_ACTIVE);
+	    }
 	  g_free($1);
 	  g_free($3);
 	  g_free($4);
@@ -245,13 +279,16 @@ String_List_Param: tWORD pSTRING_LIST tBOOLEAN tSTRING
 
 File_Param: tWORD pFILE tBOOLEAN tSTRING
 	{
-	  stp_set_file_parameter(current_printer->v, $1, $4);
-	  if (strcmp($3, "False") == 0)
-	    stp_set_file_parameter_active(current_printer->v, $1,
-					  STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_file_parameter_active(current_printer->v, $1,
-					  STP_PARAMETER_ACTIVE);
+	  if (current_printer)
+	    {
+	      stp_set_file_parameter(current_printer->v, $1, $4);
+	      if (strcmp($3, "False") == 0)
+		stp_set_file_parameter_active(current_printer->v, $1,
+					      STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_file_parameter_active(current_printer->v, $1,
+					      STP_PARAMETER_ACTIVE);
+	    }
 	  g_free($1);
 	  g_free($3);
 	  g_free($4);
@@ -260,13 +297,16 @@ File_Param: tWORD pFILE tBOOLEAN tSTRING
 
 Double_Param: tWORD pDOUBLE tBOOLEAN tDOUBLE
 	{
-	  stp_set_float_parameter(current_printer->v, $1, $4);
-	  if (strcmp($3, "False") == 0)
-	    stp_set_float_parameter_active(current_printer->v, $1,
-					   STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_float_parameter_active(current_printer->v, $1,
-					   STP_PARAMETER_ACTIVE);
+	  if (current_printer)
+	    {
+	      stp_set_float_parameter(current_printer->v, $1, $4);
+	      if (strcmp($3, "False") == 0)
+		stp_set_float_parameter_active(current_printer->v, $1,
+					       STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_float_parameter_active(current_printer->v, $1,
+					       STP_PARAMETER_ACTIVE);
+	    }
 	  g_free($1);
 	  g_free($3);
 	}
@@ -274,13 +314,16 @@ Double_Param: tWORD pDOUBLE tBOOLEAN tDOUBLE
 
 Dimension_Param: tWORD pDIMENSION tBOOLEAN tINT
 	{
-	  stp_set_dimension_parameter(current_printer->v, $1, $4);
-	  if (strcmp($3, "False") == 0)
-	    stp_set_dimension_parameter_active(current_printer->v, $1,
-					       STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_dimension_parameter_active(current_printer->v, $1,
-					       STP_PARAMETER_ACTIVE);
+	  if (current_printer)
+	    {
+	      stp_set_dimension_parameter(current_printer->v, $1, $4);
+	      if (strcmp($3, "False") == 0)
+		stp_set_dimension_parameter_active(current_printer->v, $1,
+						   STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_dimension_parameter_active(current_printer->v, $1,
+						   STP_PARAMETER_ACTIVE);
+	    }
 	  g_free($1);
 	  g_free($3);
 	}
@@ -288,16 +331,19 @@ Dimension_Param: tWORD pDIMENSION tBOOLEAN tINT
 
 Boolean_Param: tWORD pBOOLEAN tBOOLEAN tBOOLEAN
 	{
-	  if (strcmp($4, "False") == 0)
-	    stp_set_boolean_parameter(current_printer->v, $1, 0);
-	  else
-	    stp_set_boolean_parameter(current_printer->v, $1, 1);
-	  if (strcmp($3, "False") == 0)
-	    stp_set_boolean_parameter_active(current_printer->v, $1,
-					     STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_boolean_parameter_active(current_printer->v, $1,
-					     STP_PARAMETER_ACTIVE);
+	  if (current_printer)
+	    {
+	      if (strcmp($4, "False") == 0)
+		stp_set_boolean_parameter(current_printer->v, $1, 0);
+	      else
+		stp_set_boolean_parameter(current_printer->v, $1, 1);
+	      if (strcmp($3, "False") == 0)
+		stp_set_boolean_parameter_active(current_printer->v, $1,
+						 STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_boolean_parameter_active(current_printer->v, $1,
+						 STP_PARAMETER_ACTIVE);
+	    }
 	  g_free($1);
 	  g_free($3);
 	  g_free($4);
@@ -306,17 +352,20 @@ Boolean_Param: tWORD pBOOLEAN tBOOLEAN tBOOLEAN
 
 Curve_Param: tWORD pCURVE tBOOLEAN tSTRING
 	{
-	  stp_curve_t *curve = stp_curve_create_from_string($4);
-	  if (curve)
+	  if (current_printer)
 	    {
-	      stp_set_curve_parameter(current_printer->v, $1, curve);
-	      if (strcmp($3, "False") == 0)
-		stp_set_curve_parameter_active(current_printer->v, $1,
-					       STP_PARAMETER_INACTIVE);
-	      else
-		stp_set_curve_parameter_active(current_printer->v, $1,
-					       STP_PARAMETER_ACTIVE);
-	      stp_curve_destroy(curve);
+	      stp_curve_t *curve = stp_curve_create_from_string($4);
+	      if (curve)
+		{
+		  stp_set_curve_parameter(current_printer->v, $1, curve);
+		  if (strcmp($3, "False") == 0)
+		    stp_set_curve_parameter_active(current_printer->v, $1,
+						   STP_PARAMETER_INACTIVE);
+		  else
+		    stp_set_curve_parameter_active(current_printer->v, $1,
+						   STP_PARAMETER_ACTIVE);
+		  stp_curve_destroy(curve);
+		}
 	    }
 	  g_free($1);
 	  g_free($3);
diff --git a/src/gutenprintui2/Makefile.in b/src/gutenprintui2/Makefile.in
index 9226fe7..3500a8d 100644
--- a/src/gutenprintui2/Makefile.in
+++ b/src/gutenprintui2/Makefile.in
@@ -49,11 +49,12 @@ subdir = src/gutenprintui2
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
@@ -81,8 +82,8 @@ libgutenprintui2_la_OBJECTS = $(am_libgutenprintui2_la_OBJECTS)
 @BUILD_LIBGUTENPRINTUI2_TRUE@am_libgutenprintui2_la_rpath = -rpath \
 @BUILD_LIBGUTENPRINTUI2_TRUE@	$(libdir)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp =
-am__depfiles_maybe =
+depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
+am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -105,13 +106,18 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -137,6 +143,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -144,6 +152,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -156,12 +165,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -196,6 +207,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -291,14 +303,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -315,6 +330,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -332,17 +350,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -400,9 +422,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/gutenprintui2/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/gutenprintui2/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps src/gutenprintui2/Makefile
+	  $(AUTOMAKE) --gnu  src/gutenprintui2/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -463,41 +485,99 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-curve.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-gammacurve.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-panel.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-plist.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-printrcl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-printrcy.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-typebuiltins.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-ui-utils.Plo@am__quote@
+
 .c.o:
-	$(COMPILE) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 libgutenprintui2_la-printrcy.lo: printrcy.c
-	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-printrcy.lo `test -f 'printrcy.c' || echo '$(srcdir)/'`printrcy.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-printrcy.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-printrcy.Tpo" -c -o libgutenprintui2_la-printrcy.lo `test -f 'printrcy.c' || echo '$(srcdir)/'`printrcy.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-printrcy.Tpo" "$(DEPDIR)/libgutenprintui2_la-printrcy.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-printrcy.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='printrcy.c' object='libgutenprintui2_la-printrcy.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-printrcy.lo `test -f 'printrcy.c' || echo '$(srcdir)/'`printrcy.c
 
 libgutenprintui2_la-printrcl.lo: printrcl.c
-	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-printrcl.lo `test -f 'printrcl.c' || echo '$(srcdir)/'`printrcl.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-printrcl.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-printrcl.Tpo" -c -o libgutenprintui2_la-printrcl.lo `test -f 'printrcl.c' || echo '$(srcdir)/'`printrcl.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-printrcl.Tpo" "$(DEPDIR)/libgutenprintui2_la-printrcl.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-printrcl.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='printrcl.c' object='libgutenprintui2_la-printrcl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-printrcl.lo `test -f 'printrcl.c' || echo '$(srcdir)/'`printrcl.c
 
 libgutenprintui2_la-panel.lo: panel.c
-	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-panel.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-panel.Tpo" -c -o libgutenprintui2_la-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-panel.Tpo" "$(DEPDIR)/libgutenprintui2_la-panel.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-panel.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel.c' object='libgutenprintui2_la-panel.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c
 
 libgutenprintui2_la-plist.lo: plist.c
-	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-plist.lo `test -f 'plist.c' || echo '$(srcdir)/'`plist.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-plist.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-plist.Tpo" -c -o libgutenprintui2_la-plist.lo `test -f 'plist.c' || echo '$(srcdir)/'`plist.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-plist.Tpo" "$(DEPDIR)/libgutenprintui2_la-plist.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-plist.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='plist.c' object='libgutenprintui2_la-plist.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-plist.lo `test -f 'plist.c' || echo '$(srcdir)/'`plist.c
 
 libgutenprintui2_la-ui-utils.lo: ui-utils.c
-	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-ui-utils.lo `test -f 'ui-utils.c' || echo '$(srcdir)/'`ui-utils.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-ui-utils.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-ui-utils.Tpo" -c -o libgutenprintui2_la-ui-utils.lo `test -f 'ui-utils.c' || echo '$(srcdir)/'`ui-utils.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-ui-utils.Tpo" "$(DEPDIR)/libgutenprintui2_la-ui-utils.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-ui-utils.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ui-utils.c' object='libgutenprintui2_la-ui-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-ui-utils.lo `test -f 'ui-utils.c' || echo '$(srcdir)/'`ui-utils.c
 
 libgutenprintui2_la-print-image-thumbnail.lo: print-image-thumbnail.c
-	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-print-image-thumbnail.lo `test -f 'print-image-thumbnail.c' || echo '$(srcdir)/'`print-image-thumbnail.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-print-image-thumbnail.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Tpo" -c -o libgutenprintui2_la-print-image-thumbnail.lo `test -f 'print-image-thumbnail.c' || echo '$(srcdir)/'`print-image-thumbnail.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Tpo" "$(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='print-image-thumbnail.c' object='libgutenprintui2_la-print-image-thumbnail.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-print-image-thumbnail.lo `test -f 'print-image-thumbnail.c' || echo '$(srcdir)/'`print-image-thumbnail.c
 
 libgutenprintui2_la-curve.lo: curve.c
-	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-curve.lo `test -f 'curve.c' || echo '$(srcdir)/'`curve.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-curve.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-curve.Tpo" -c -o libgutenprintui2_la-curve.lo `test -f 'curve.c' || echo '$(srcdir)/'`curve.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-curve.Tpo" "$(DEPDIR)/libgutenprintui2_la-curve.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-curve.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='curve.c' object='libgutenprintui2_la-curve.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-curve.lo `test -f 'curve.c' || echo '$(srcdir)/'`curve.c
 
 libgutenprintui2_la-gammacurve.lo: gammacurve.c
-	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-gammacurve.lo `test -f 'gammacurve.c' || echo '$(srcdir)/'`gammacurve.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-gammacurve.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-gammacurve.Tpo" -c -o libgutenprintui2_la-gammacurve.lo `test -f 'gammacurve.c' || echo '$(srcdir)/'`gammacurve.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-gammacurve.Tpo" "$(DEPDIR)/libgutenprintui2_la-gammacurve.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-gammacurve.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gammacurve.c' object='libgutenprintui2_la-gammacurve.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-gammacurve.lo `test -f 'gammacurve.c' || echo '$(srcdir)/'`gammacurve.c
 
 libgutenprintui2_la-typebuiltins.lo: typebuiltins.c
-	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-typebuiltins.lo `test -f 'typebuiltins.c' || echo '$(srcdir)/'`typebuiltins.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-typebuiltins.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-typebuiltins.Tpo" -c -o libgutenprintui2_la-typebuiltins.lo `test -f 'typebuiltins.c' || echo '$(srcdir)/'`typebuiltins.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-typebuiltins.Tpo" "$(DEPDIR)/libgutenprintui2_la-typebuiltins.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-typebuiltins.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='typebuiltins.c' object='libgutenprintui2_la-typebuiltins.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-typebuiltins.lo `test -f 'typebuiltins.c' || echo '$(srcdir)/'`typebuiltins.c
 
 .l.c:
 	$(LEXCOMPILE) $<
@@ -669,6 +749,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -694,6 +775,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/gutenprintui2/panel.c b/src/gutenprintui2/panel.c
index d979ab7..cf4a06b 100644
--- a/src/gutenprintui2/panel.c
+++ b/src/gutenprintui2/panel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: panel.c,v 1.11 2006/05/28 16:59:04 rlk Exp $"
+ * "$Id: panel.c,v 1.11.8.2 2007/05/29 01:47:27 rlk Exp $"
  *
  *   Main window code for Print plug-in for the GIMP.
  *
@@ -120,6 +120,8 @@ static GtkWidget *ppd_box;
 static GtkWidget *ppd_label;           /* PPD file entry */
 static GtkWidget *ppd_button;          /* PPD file browse button */
 static GtkWidget *ppd_browser;         /* File selection dialog for PPDs */
+static GtkWidget *ppd_model_label;     /* PPD file entry */
+static GtkWidget *ppd_model;           /* PPD file entry */
 static GtkWidget *new_printer_dialog;  /* New printer dialog window */
 static GtkWidget *new_printer_entry;   /* New printer text entry */
 static GtkWidget *file_button;         /* PPD file browse button */
@@ -192,6 +194,7 @@ static void combo_callback        (GtkWidget *widget, gpointer data);
 static void output_type_callback  (GtkWidget *widget, gpointer data);
 static void unit_callback         (GtkWidget *widget, gpointer data);
 static void orientation_callback  (GtkWidget *widget, gpointer data);
+static void ppd_file_callback     (GtkWidget *widget, gpointer data);
 static void printandsave_callback (void);
 static void about_callback        (void);
 static void print_callback        (void);
@@ -1647,6 +1650,8 @@ create_printer_dialog (void)
                     GTK_FILL, GTK_FILL, 0, 0);
 
   ppd_file = gtk_entry_new ();
+  g_signal_connect(G_OBJECT(ppd_file), "activate",
+		   G_CALLBACK(ppd_file_callback), NULL);
   gtk_box_pack_start (GTK_BOX (ppd_box), ppd_file, TRUE, TRUE, 0);
   gtk_widget_show (ppd_file);
 
@@ -1663,6 +1668,19 @@ create_printer_dialog (void)
   g_signal_connect (G_OBJECT (ppd_button), "clicked",
 		    G_CALLBACK (ppd_browse_callback), NULL);
 
+  ppd_model_label = gtk_label_new (_("Printer Model:"));
+  gtk_misc_set_alignment (GTK_MISC (ppd_model_label), 1.0, 0.5);
+  gtk_table_attach (GTK_TABLE (table), ppd_model_label, 1, 2, 4, 5,
+                    GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (ppd_model_label);
+
+  ppd_model = gtk_label_new ("");
+  gtk_misc_set_alignment (GTK_MISC (ppd_model), 0.0, 0.5);
+  gtk_table_attach (GTK_TABLE (table), ppd_model, 2, 7, 4, 5,
+                    GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (ppd_model);
+
+
   /*
    * Print command.
    */
@@ -1670,11 +1688,11 @@ create_printer_dialog (void)
   group = NULL;
   for (i = 0; i < command_options_count; i++)
     group = stpui_create_radio_button(&(command_options[i]), group, table,
-				      0, i > 0 ? i + 5 : i + 4,
+				      0, i > 0 ? i + 6 : i + 5,
 				      G_CALLBACK(command_type_callback));
 
   standard_cmd_entry = gtk_entry_new();
-  gtk_table_attach (GTK_TABLE (table), standard_cmd_entry, 2, 7, 5, 6,
+  gtk_table_attach (GTK_TABLE (table), standard_cmd_entry, 2, 7, 6, 7,
                     GTK_FILL, GTK_FILL, 0, 0);
   gtk_entry_set_editable(GTK_ENTRY(standard_cmd_entry), FALSE);
   gtk_widget_set_sensitive(standard_cmd_entry, FALSE);
@@ -1692,13 +1710,13 @@ create_printer_dialog (void)
 			"or model, of printer) that you wish to print to"));
   label = gtk_label_new(_("Printer Queue:"));
   gtk_widget_show(label);
-  gtk_table_attach (GTK_TABLE (table), label, 2, 3, 4, 5,
+  gtk_table_attach (GTK_TABLE (table), label, 2, 3, 5, 6,
                     GTK_FILL, GTK_FILL, 0, 0);
-  gtk_table_attach (GTK_TABLE (table), event_box, 3, 7, 4, 5,
+  gtk_table_attach (GTK_TABLE (table), event_box, 3, 7, 5, 6,
                     GTK_FILL, GTK_FILL, 0, 0);
 
   custom_command_entry = gtk_entry_new ();
-  gtk_table_attach (GTK_TABLE (table), custom_command_entry, 2, 7, 6, 7,
+  gtk_table_attach (GTK_TABLE (table), custom_command_entry, 2, 7, 7, 8,
                     GTK_FILL, GTK_FILL, 0, 0);
   g_signal_connect(G_OBJECT(custom_command_entry), "activate",
 		   G_CALLBACK(setup_callback), NULL);
@@ -1709,7 +1727,7 @@ create_printer_dialog (void)
     (custom_command_entry, _("Enter the correct command to print to your printer. "));
 
   file_entry = gtk_entry_new ();
-  gtk_table_attach (GTK_TABLE (table), file_entry, 2, 6, 7, 8,
+  gtk_table_attach (GTK_TABLE (table), file_entry, 2, 6, 8, 9,
                     GTK_FILL, GTK_FILL, 0, 0);
   g_signal_connect(G_OBJECT(file_entry), "activate",
 		   G_CALLBACK(setup_callback), NULL);
@@ -1721,7 +1739,7 @@ create_printer_dialog (void)
 
   file_button = gtk_button_new_with_label (_("Browse"));
 
-  gtk_table_attach (GTK_TABLE (table), file_button, 6, 7, 7, 8,
+  gtk_table_attach (GTK_TABLE (table), file_button, 6, 7, 8, 9,
                     GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (file_button);
 
@@ -2623,9 +2641,10 @@ plist_build_combo (GtkWidget      *combo,       /* I - Combo widget */
 
   gtk_combo_set_popdown_strings (GTK_COMBO (combo), list);
 
-  for (i = 0; i < num_items; i ++)
-    if (strcmp(stp_string_list_param(items, i)->name, cur_item) == 0)
-      break;
+  if (cur_item)
+    for (i = 0; i < num_items; i ++)
+      if (strcmp(stp_string_list_param(items, i)->name, cur_item) == 0)
+	break;
 
   if (i >= num_items && def_value)
     for (i = 0; i < num_items; i ++)
@@ -3601,6 +3620,7 @@ setup_update (void)
   gint           idx = 0;
   gint i;
   gchar *tmp;
+  stp_parameter_t desc;
   const char *ppd_file_name = stp_get_file_parameter(pv->v, "PPDFile");
 
   for (i = 0; i < GTK_CLIST(manufacturer_clist)->rows; i++)
@@ -3623,23 +3643,49 @@ setup_update (void)
     idx = 0;
 */
   gtk_clist_select_row (GTK_CLIST (printer_driver), idx, 0);
-  gtk_label_set_text (GTK_LABEL (printer_model_label),
-                      gettext (stp_printer_get_long_name (tmp_printer)));
+  stp_describe_parameter(pv->v, "ModelName", &desc);
+  if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST && desc.is_active &&
+      desc.deflt.str)
+    {
+      const char *extra_printer_model = desc.deflt.str;
+      char *label_text =
+	g_malloc(strlen(gettext (stp_printer_get_long_name (tmp_printer))) +
+		 2 +		/* " (" */
+		 strlen(extra_printer_model) +
+		 2);		/* ")" + null terminator */
+      strcpy(label_text, extra_printer_model);
+      strcat(label_text, " (");
+      strcat(label_text, gettext (stp_printer_get_long_name (tmp_printer)));
+      strcat(label_text, ")");
+      gtk_label_set_text (GTK_LABEL (printer_model_label), label_text);
+      g_free(label_text);
+    }
+  else
+    {
+      gtk_label_set_text (GTK_LABEL (printer_model_label),
+			  gettext (stp_printer_get_long_name (tmp_printer)));
+    }
+  stp_parameter_description_destroy(&desc);
 
   if (ppd_file_name)
     gtk_entry_set_text (GTK_ENTRY (ppd_file), ppd_file_name);
   else
     gtk_entry_set_text (GTK_ENTRY (ppd_file), "");
+  ppd_file_callback(ppd_file, NULL);
 
   if (stp_parameter_find_in_settings(pv->v, "PPDFile"))
     {
       gtk_widget_show (ppd_box);
       gtk_widget_show (ppd_label);
+      gtk_widget_show (ppd_model_label);
+      gtk_widget_show (ppd_model);
     }
   else
     {
       gtk_widget_hide (ppd_box);
       gtk_widget_hide (ppd_label);
+      gtk_widget_hide (ppd_model_label);
+      gtk_widget_hide (ppd_model);
     }
   gtk_entry_set_text (GTK_ENTRY (custom_command_entry),
 		      stpui_plist_get_custom_command (pv));
@@ -3656,6 +3702,27 @@ setup_update (void)
 				 TRUE);
 }
 
+static void
+ppd_file_callback(GtkWidget *widget, gpointer data)
+{
+  const gchar *name = gtk_entry_get_text(GTK_ENTRY(widget));
+  if (name && pv && pv->v)
+    {
+      stp_parameter_t desc;
+      stp_vars_t *v = stp_vars_create_copy(pv->v);
+      stp_set_file_parameter(v, "PPDFile", name);
+      stp_describe_parameter(v, "ModelName", &desc);
+      if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST && desc.is_active)
+	gtk_label_set_text(GTK_LABEL(ppd_model), desc.deflt.str);
+      else
+	gtk_label_set_text(GTK_LABEL(ppd_model), "");
+      stp_parameter_description_destroy(&desc);
+      stp_vars_destroy(v);
+    }
+  else
+    gtk_label_set_text(GTK_LABEL(ppd_model), "");
+}  
+
 /*
  *  setup_open_callback() -
  */
@@ -3776,11 +3843,15 @@ pop_ppd_box(void)
     {
       gtk_widget_show (ppd_label);
       gtk_widget_show (ppd_box);
+      gtk_widget_show (ppd_model_label);
+      gtk_widget_show (ppd_model);
     }
   else
     {
       gtk_widget_hide (ppd_label);
       gtk_widget_hide (ppd_box);
+      gtk_widget_hide (ppd_model_label);
+      gtk_widget_hide (ppd_model);
     }
 }
 
@@ -3884,6 +3955,8 @@ ppd_ok_callback (void)
   gtk_entry_set_text
     (GTK_ENTRY (ppd_file),
      gtk_file_selection_get_filename (GTK_FILE_SELECTION (ppd_browser)));
+  ppd_file_callback(ppd_file, NULL);
+  update_options();
 }
 
 /*
@@ -4903,12 +4976,13 @@ dimension_update (GtkAdjustment *adjustment)
 	  opt->info.flt.adjustment &&
 	  adjustment == GTK_ADJUSTMENT(opt->info.flt.adjustment))
 	{
+	  int new_value = (adjustment->value + (.5 / unit_scaler)) * unit_scaler;
 	  invalidate_preview_thumbnail ();
 	  if (stp_get_dimension_parameter(pv->v, opt->fast_desc->name) !=
-	      adjustment->value * unit_scaler)
+	      new_value)
 	    {
 	      stp_set_dimension_parameter(pv->v, opt->fast_desc->name,
-					  adjustment->value * unit_scaler);
+					  new_value);
 	      update_adjusted_thumbnail(FALSE);
 	    }
 	}
diff --git a/src/gutenprintui2/plist.c b/src/gutenprintui2/plist.c
index 05a13ee..96036a4 100644
--- a/src/gutenprintui2/plist.c
+++ b/src/gutenprintui2/plist.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: plist.c,v 1.6 2005/10/26 01:28:35 rlk Exp $"
+ * "$Id: plist.c,v 1.6.10.3 2007/05/29 01:47:28 rlk Exp $"
  *
  *   Print plug-in for the GIMP.
  *
@@ -41,7 +41,6 @@
 #include <signal.h>
 #include <sys/wait.h>
 
-
 typedef enum
 {
   PRINTERS_NONE,
@@ -180,6 +179,7 @@ stpui_build_standard_print_command(const stpui_plist_t *plist,
   int raw = 0;
   char *print_cmd;
   char *count_string = NULL;
+  char *quoted_queue_name = NULL;
   if (!queue_name)
     queue_name = "";
   identify_print_system();
@@ -192,15 +192,19 @@ stpui_build_standard_print_command(const stpui_plist_t *plist,
     stp_asprintf(&count_string, "%s %d ",
 		 global_printing_system->copy_count_command, copy_count);
 
+  if (queue_name[0])
+    quoted_queue_name = g_shell_quote(queue_name);
+
   stp_asprintf(&print_cmd, "%s %s %s %s %s%s%s",
 	       global_printing_system->print_command,
 	       queue_name[0] ? global_printing_system->queue_select : "",
-	       queue_name[0] ? g_shell_quote(queue_name) : "",
+	       queue_name[0] ? quoted_queue_name : "",
 	       count_string ? count_string : "",
 	       raw ? global_printing_system->raw_flag : "",
 	       extra_options ? " " : "",
 	       extra_options ? extra_options : "");
   SAFE_FREE(count_string);
+  SAFE_FREE(quoted_queue_name);
   return print_cmd;
 }
 
@@ -321,7 +325,7 @@ writefunc(void *file, const char *buf, size_t bytes)
 static void
 stpui_errfunc(void *file, const char *buf, size_t bytes)
 {
-  g_message(buf);
+  g_message("%s",buf);
 }
 
 void
@@ -624,6 +628,8 @@ stpui_plist_add(const stpui_plist_t *key, int add_only)
    * always first in the list, else call psearch.
    */
   stpui_plist_t *p;
+  if (!stp_get_printer(key->v))
+    stp_set_driver(key->v, "ps2");
   if (stp_get_printer(key->v))
     {
       p = psearch(key, stpui_plist, stpui_plist_count,
@@ -653,8 +659,13 @@ stpui_plist_add(const stpui_plist_t *key, int add_only)
 #endif
 	  stpui_plist_copy(p, key);
 	}
+      return 1;
+    }
+  else
+    {
+      fprintf(stderr, "No printer found!\n");
+      return 0;
     }
-  return 1;
 }
 
 static void
@@ -796,8 +807,7 @@ stpui_printrc_load_v1(FILE *fp)
 #endif
       if (strcasecmp("current-printer", keyword) == 0)
 	{
-	  if (current_printer)
-	    g_free (current_printer);
+	  SAFE_FREE(current_printer);
 	  current_printer = g_strdup(value);
 	}
       else if (strcasecmp("printer", keyword) == 0)
@@ -930,11 +940,18 @@ stpui_printrc_load_v2(FILE *fp)
 {
   int retval;
   yyin = fp;
+  char *locale;
 
   stpui_printrc_current_printer = NULL;
-  setlocale(LC_ALL, "C");
+#ifdef HAVE_LOCALE_H
+  locale = g_strdup(setlocale(LC_NUMERIC, NULL));
+  setlocale(LC_NUMERIC, "C");
+#endif
   retval = yyparse();
-  setlocale(LC_ALL, "");
+#ifdef HAVE_LOCALE_H
+  setlocale(LC_NUMERIC, locale);
+  SAFE_FREE(locale);
+#endif
   if (stpui_printrc_current_printer)
     {
       int i;
@@ -976,17 +993,23 @@ stpui_printrc_load(void)
       (void) memset(line, 0, 1024);
       if (fgets(line, sizeof(line), fp) != NULL)
 	{
-	  /* Force locale to "C", so that numbers scan correctly */
-	  setlocale(LC_ALL, "C");
+#ifdef HAVE_LOCALE_H
+	  char *locale = g_strdup(setlocale(LC_NUMERIC, NULL));
+	  setlocale(LC_NUMERIC, "C");
+#endif
 	  if (strncmp("#PRINTRCv", line, 9) == 0)
 	    {
+	      /* Force locale to "C", so that numbers scan correctly */
 #ifdef DEBUG
 	      fprintf(stderr, "Found printrc version tag: `%s'\n", line);
 	      fprintf(stderr, "Version number: `%s'\n", &(line[9]));
 #endif
 	      (void) sscanf(&(line[9]), "%d", &format);
 	    }
-	  setlocale(LC_ALL, "");
+#ifdef HAVE_LOCALE_H
+	  setlocale(LC_NUMERIC, locale);
+	  SAFE_FREE(locale);
+#endif
 	}
       rewind(fp);
       switch (format)
@@ -1029,7 +1052,10 @@ stpui_printrc_save(void)
        */
 
       /* Force locale to "C", so that numbers print correctly */
-      setlocale(LC_ALL, "C");
+#ifdef HAVE_LOCALE_H
+      char *locale = g_strdup(setlocale(LC_NUMERIC, NULL));
+      setlocale(LC_NUMERIC, "C");
+#endif
 #ifdef DEBUG
       fprintf(stderr, "Number of printers: %d\n", stpui_plist_count);
 #endif
@@ -1164,7 +1190,10 @@ stpui_printrc_save(void)
 	  fprintf(stderr, "Wrote printer %d: %s\n", i, p->name);
 #endif
 	}
-      setlocale(LC_ALL, "");
+#ifdef HAVE_LOCALE_H
+      setlocale(LC_NUMERIC, locale);
+      SAFE_FREE(locale);
+#endif
       fclose(fp);
     }
   else
@@ -1202,6 +1231,8 @@ stpui_get_system_printers(void)
   identify_print_system();
   if (global_printing_system)
   {
+    const char *old_locale = getenv("LC_ALL");
+    (void) setenv("LC_ALL", "C", 1);
     if ((pfile = popen(global_printing_system->scan_command, "r")) != NULL)
     {
      /*
@@ -1223,6 +1254,10 @@ stpui_get_system_printers(void)
 	    }
 	}
       pclose(pfile);
+      if (old_locale)
+	setenv("LC_ALL", old_locale, 1);
+      else
+	unsetenv("LC_ALL");
     }
   }
 }
@@ -1751,5 +1786,5 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image)
 }
 
 /*
- * End of "$Id: plist.c,v 1.6 2005/10/26 01:28:35 rlk Exp $".
+ * End of "$Id: plist.c,v 1.6.10.3 2007/05/29 01:47:28 rlk Exp $".
  */
diff --git a/src/gutenprintui2/printrcy.c b/src/gutenprintui2/printrcy.c
index 0c96062..178c7f5 100644
--- a/src/gutenprintui2/printrcy.c
+++ b/src/gutenprintui2/printrcy.c
@@ -1,7 +1,9 @@
-/* A Bison parser, made by GNU Bison 1.875.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,16 +17,24 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
 
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
 
-/* Written by Richard Stallman by simplifying the original so called
-   ``semantic'' parser.  */
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
 
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
@@ -36,6 +46,9 @@
 /* Identify Bison output.  */
 #define YYBISON 1
 
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
@@ -93,6 +106,7 @@
      pCURVE = 295
    };
 #endif
+/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tDIMENSION 260
@@ -183,7 +197,12 @@ static stpui_plist_t *current_printer = NULL;
 # define YYERROR_VERBOSE 0
 #endif
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -195,49 +214,171 @@ typedef int YYSTYPE;
 /* Copy the second part of user declarations.  */
 
 
-/* Line 214 of yacc.c.  */
-#line 199 "printrcy.c"
+/* Line 216 of yacc.c.  */
+#line 219 "printrcy.c"
 
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
+#ifdef short
+# undef short
+#endif
 
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
 
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
 # else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
+{
+  return i;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
 #   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
 #    endif
 #   endif
 #  endif
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
 # else
-#  if defined (__STDC__) || defined (__cplusplus)
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
 #  endif
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
 # endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
 
 
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (YYSTYPE_IS_TRIVIAL)))
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short yyss;
+  yytype_int16 yyss;
   YYSTYPE yyvs;
   };
 
@@ -247,24 +388,24 @@ union yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if 1 < __GNUC__
+#  if defined __GNUC__ && 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
 #   define YYCOPY(To, From, Count)		\
       do					\
 	{					\
-	  register YYSIZE_T yyi;		\
+	  YYSIZE_T yyi;				\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
-      while (0)
+      while (YYID (0))
 #  endif
 # endif
 
@@ -282,39 +423,33 @@ union yyalloc
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
-    while (0)
+    while (YYID (0))
 
 #endif
 
-#if defined (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short yysigned_char;
-#endif
-
-/* YYFINAL -- State number of the termination state. */
+/* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  10
 /* YYLAST -- Last index in YYTABLE.  */
 #define YYLAST   75
 
-/* YYNTOKENS -- Number of terminals. */
+/* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  41
-/* YYNNTS -- Number of nonterminals. */
+/* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  42
-/* YYNRULES -- Number of rules. */
+/* YYNRULES -- Number of rules.  */
 #define YYNRULES  70
-/* YYNRULES -- Number of states. */
+/* YYNRULES -- Number of states.  */
 #define YYNSTATES  114
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   295
 
-#define YYTRANSLATE(YYX) 						\
+#define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const unsigned char yytranslate[] =
+static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -351,7 +486,7 @@ static const unsigned char yytranslate[] =
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const unsigned char yyprhs[] =
+static const yytype_uint8 yyprhs[] =
 {
        0,     0,     3,     7,    10,    13,    16,    19,    22,    25,
       28,    31,    34,    37,    40,    43,    46,    49,    52,    53,
@@ -363,8 +498,8 @@ static const unsigned char yyprhs[] =
      189
 };
 
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yysigned_char yyrhs[] =
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
 {
       82,     0,    -1,    12,     7,     7,    -1,    13,     7,    -1,
       26,     7,    -1,    27,     7,    -1,    28,     7,    -1,    29,
@@ -389,50 +524,50 @@ static const yysigned_char yyrhs[] =
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short yyrline[] =
+static const yytype_uint16 yyrline[] =
 {
-       0,   100,   100,   111,   118,   128,   138,   148,   158,   164,
-     168,   172,   176,   180,   184,   188,   206,   210,   214,   217,
-     231,   246,   261,   275,   289,   307,   327,   327,   327,   327,
-     328,   328,   328,   331,   334,   334,   337,   337,   337,   337,
-     338,   338,   338,   338,   338,   339,   339,   339,   339,   340,
-     340,   343,   343,   346,   349,   349,   352,   356,   366,   366,
-     369,   372,   383,   383,   386,   386,   389,   392,   392,   392,
-     395
+       0,   100,   100,   111,   118,   128,   138,   148,   158,   165,
+     172,   179,   186,   193,   200,   207,   228,   235,   242,   245,
+     262,   280,   298,   315,   332,   353,   376,   376,   376,   376,
+     377,   377,   377,   380,   383,   383,   386,   386,   386,   386,
+     387,   387,   387,   387,   387,   388,   388,   388,   388,   389,
+     389,   392,   392,   395,   398,   398,   401,   405,   415,   415,
+     418,   421,   432,   432,   435,   435,   438,   441,   441,   441,
+     444
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tDIMENSION", 
-  "tBOOLEAN", "tSTRING", "tWORD", "tGSWORD", "CURRENT_PRINTER", 
-  "SHOW_ALL_PAPER_SIZES", "PRINTER", "DESTINATION", "SCALING", 
-  "ORIENTATION", "AUTOSIZE_ROLL_PAPER", "UNIT", "DRIVER", "LEFT", "TOP", 
-  "CUSTOM_PAGE_WIDTH", "CUSTOM_PAGE_HEIGHT", "OUTPUT_TYPE", "PRINTRC_HDR", 
-  "PARAMETER", "QUEUE_NAME", "OUTPUT_FILENAME", "EXTRA_PRINTER_OPTIONS", 
-  "CUSTOM_COMMAND", "COMMAND_TYPE", "GLOBAL_SETTINGS", "GLOBAL", 
-  "END_GLOBAL_SETTINGS", "pINT", "pSTRING_LIST", "pFILE", "pDOUBLE", 
-  "pDIMENSION", "pBOOLEAN", "pCURVE", "$accept", "Printer", "Destination", 
-  "Queue_Name", "Output_Filename", "Extra_Printer_Options", 
-  "Custom_Command", "Command_Type", "Scaling", "Orientation", 
-  "Autosize_Roll_Paper", "Unit", "Left", "Top", "Output_Type", 
-  "Custom_Page_Width", "Custom_Page_Height", "Empty", "Int_Param", 
-  "String_List_Param", "File_Param", "Double_Param", "Dimension_Param", 
-  "Boolean_Param", "Curve_Param", "Typed_Param", "Parameter", 
-  "Parameters", "Standard_Value", "Standard_Values", "A_Printer", 
-  "Printers", "Current_Printer", "Show_All_Paper_Sizes", "Global", 
-  "Old_Globals", "New_Global_Setting", "Global_Setting", 
-  "Global_Settings", "Global_Subblock", "Global_Block", "Thing", 0
+  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tDIMENSION",
+  "tBOOLEAN", "tSTRING", "tWORD", "tGSWORD", "CURRENT_PRINTER",
+  "SHOW_ALL_PAPER_SIZES", "PRINTER", "DESTINATION", "SCALING",
+  "ORIENTATION", "AUTOSIZE_ROLL_PAPER", "UNIT", "DRIVER", "LEFT", "TOP",
+  "CUSTOM_PAGE_WIDTH", "CUSTOM_PAGE_HEIGHT", "OUTPUT_TYPE", "PRINTRC_HDR",
+  "PARAMETER", "QUEUE_NAME", "OUTPUT_FILENAME", "EXTRA_PRINTER_OPTIONS",
+  "CUSTOM_COMMAND", "COMMAND_TYPE", "GLOBAL_SETTINGS", "GLOBAL",
+  "END_GLOBAL_SETTINGS", "pINT", "pSTRING_LIST", "pFILE", "pDOUBLE",
+  "pDIMENSION", "pBOOLEAN", "pCURVE", "$accept", "Printer", "Destination",
+  "Queue_Name", "Output_Filename", "Extra_Printer_Options",
+  "Custom_Command", "Command_Type", "Scaling", "Orientation",
+  "Autosize_Roll_Paper", "Unit", "Left", "Top", "Output_Type",
+  "Custom_Page_Width", "Custom_Page_Height", "Empty", "Int_Param",
+  "String_List_Param", "File_Param", "Double_Param", "Dimension_Param",
+  "Boolean_Param", "Curve_Param", "Typed_Param", "Parameter", "Parameters",
+  "Standard_Value", "Standard_Values", "A_Printer", "Printers",
+  "Current_Printer", "Show_All_Paper_Sizes", "Global", "Old_Globals",
+  "New_Global_Setting", "Global_Setting", "Global_Settings",
+  "Global_Subblock", "Global_Block", "Thing", 0
 };
 #endif
 
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short yytoknum[] =
+static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -443,7 +578,7 @@ static const unsigned short yytoknum[] =
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const unsigned char yyr1[] =
+static const yytype_uint8 yyr1[] =
 {
        0,    41,    42,    43,    44,    45,    46,    47,    48,    49,
       50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
@@ -456,7 +591,7 @@ static const unsigned char yyr1[] =
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const unsigned char yyr2[] =
+static const yytype_uint8 yyr2[] =
 {
        0,     2,     3,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     0,     4,
@@ -471,7 +606,7 @@ static const unsigned char yyr2[] =
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
    STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
-static const unsigned char yydefact[] =
+static const yytype_uint8 yydefact[] =
 {
        0,    18,     0,     0,    18,    69,     0,    68,    67,    18,
        1,    56,    65,     0,     0,    60,    55,    70,     0,    66,
@@ -487,8 +622,8 @@ static const unsigned char yydefact[] =
       22,    23,    24,    25
 };
 
-/* YYDEFGOTO[NTERM-NUM]. */
-static const yysigned_char yydefgoto[] =
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
 {
       -1,    27,    49,    50,    51,    52,    53,    54,    55,    56,
       57,    58,    59,    60,    61,    62,    63,     5,    85,    86,
@@ -500,7 +635,7 @@ static const yysigned_char yydefgoto[] =
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 #define YYPACT_NINF -26
-static const yysigned_char yypact[] =
+static const yytype_int8 yypact[] =
 {
      -22,    -2,     6,     0,   -26,   -26,     5,   -26,   -26,   -26,
      -26,   -26,   -26,    -7,    11,   -26,   -26,     7,    13,   -26,
@@ -517,7 +652,7 @@ static const yysigned_char yypact[] =
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const yysigned_char yypgoto[] =
+static const yytype_int8 yypgoto[] =
 {
      -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,
      -26,   -26,   -26,   -26,   -26,   -26,   -26,    -4,   -26,   -26,
@@ -531,7 +666,7 @@ static const yysigned_char yypgoto[] =
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -1
-static const unsigned char yytable[] =
+static const yytype_uint8 yytable[] =
 {
       12,    18,     1,     3,    14,    16,    10,    11,     3,    93,
       94,    95,    96,    97,    98,    99,    14,    25,    84,    26,
@@ -543,7 +678,7 @@ static const unsigned char yytable[] =
      108,   109,   110,   111,   113,   112
 };
 
-static const yysigned_char yycheck[] =
+static const yytype_int8 yycheck[] =
 {
        4,     8,    24,    10,    11,     9,     0,     7,    10,    34,
       35,    36,    37,    38,    39,    40,    11,     6,     8,    12,
@@ -557,7 +692,7 @@ static const yysigned_char yycheck[] =
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
+static const yytype_uint8 yystos[] =
 {
        0,    24,    82,    10,    31,    58,    73,    76,    80,    81,
        0,     7,    58,    79,    11,    74,    58,    72,     8,    33,
@@ -573,22 +708,6 @@ static const unsigned char yystos[] =
        4,     3,     6,     7
 };
 
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
 #define YYEMPTY		(-2)
@@ -596,7 +715,8 @@ static const unsigned char yystos[] =
 
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrlab1
+#define YYERROR		goto yyerrorlab
+
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
@@ -613,30 +733,63 @@ do								\
       yychar = (Token);						\
       yylval = (Value);						\
       yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
+      YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
   else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
-while (0)
+while (YYID (0))
+
 
 #define YYTERROR	1
 #define YYERRCODE	256
 
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).  */
 
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)         \
-  Current.first_line   = Rhs[1].first_line;      \
-  Current.first_column = Rhs[1].first_column;    \
-  Current.last_line    = Rhs[N].last_line;       \
-  Current.last_column  = Rhs[N].last_column;
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
 #endif
 
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 #ifdef YYLEX_PARAM
@@ -657,42 +810,96 @@ while (0)
 do {						\
   if (yydebug)					\
     YYFPRINTF Args;				\
-} while (0)
+} while (YYID (0))
 
-# define YYDSYMPRINT(Args)			\
-do {						\
-  if (yydebug)					\
-    yysymprint Args;				\
-} while (0)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
 
-# define YYDSYMPRINTF(Title, Token, Value, Location)		\
-do {								\
-  if (yydebug)							\
-    {								\
-      YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr, 					\
-                  Token, Value);	\
-      YYFPRINTF (stderr, "\n");					\
-    }								\
-} while (0)
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (cinluded).                                                   |
+| TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (short *bottom, short *top)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
 #else
 static void
 yy_stack_print (bottom, top)
-    short *bottom;
-    short *top;
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (/* Nothing. */; bottom <= top; ++bottom)
+  for (; bottom <= top; ++bottom)
     YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
 }
@@ -701,45 +908,52 @@ yy_stack_print (bottom, top)
 do {								\
   if (yydebug)							\
     yy_stack_print ((Bottom), (Top));				\
-} while (0)
+} while (YYID (0))
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (int yyrule)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
 #else
 static void
-yy_reduce_print (yyrule)
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
     int yyrule;
 #endif
 {
+  int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned int yylineno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-             yyrule - 1, yylineno);
-  /* Print the symbols being reduced, and their result.  */
-  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      fprintf (stderr, "\n");
+    }
 }
 
 # define YY_REDUCE_PRINT(Rule)		\
 do {					\
   if (yydebug)				\
-    yy_reduce_print (Rule);		\
-} while (0)
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
-# define YYDSYMPRINT(Args)
-# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -754,13 +968,9 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
@@ -770,45 +980,47 @@ int yydebug;
 #if YYERROR_VERBOSE
 
 # ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
+#  if defined __GLIBC__ && defined _STRING_H
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
 yystrlen (const char *yystr)
-#   else
+#else
+static YYSIZE_T
 yystrlen (yystr)
-     const char *yystr;
-#   endif
+    const char *yystr;
+#endif
 {
-  register const char *yys = yystr;
-
-  while (*yys++ != '\0')
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
     continue;
-
-  return yys - yystr - 1;
+  return yylen;
 }
 #  endif
 # endif
 
 # ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
 #   define yystpcpy stpcpy
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static char *
-#   if defined (__STDC__) || defined (__cplusplus)
 yystpcpy (char *yydest, const char *yysrc)
-#   else
+#else
+static char *
 yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
+    char *yydest;
+    const char *yysrc;
+#endif
 {
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;
@@ -818,70 +1030,192 @@ yystpcpy (yydest, yysrc)
 #  endif
 # endif
 
-#endif /* !YYERROR_VERBOSE */
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
 
-
+  if (! yyres)
+    return yystrlen (yystr);
 
-#if YYDEBUG
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
 
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yysymprint (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  int yyn = yypact[yystate];
 
-  if (yytype < YYNTOKENS)
-    {
-      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
-      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-    }
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
   else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-
-  switch (yytype)
     {
-      default:
-        break;
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
     }
-  YYFPRINTF (yyoutput, ")");
 }
+#endif /* YYERROR_VERBOSE */
+
 
-#endif /* ! YYDEBUG */
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
 #else
 static void
-yydestruct (yytype, yyvaluep)
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
     int yytype;
     YYSTYPE *yyvaluep;
 #endif
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
   switch (yytype)
     {
 
       default:
-        break;
+	break;
     }
 }
 
@@ -889,13 +1223,13 @@ yydestruct (yytype, yyvaluep)
 /* Prevent warnings from -Wmissing-prototypes.  */
 
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
+#if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
-# else
+#else
 int yyparse ();
-# endif
+#endif
 #else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#if defined __STDC__ || defined __cplusplus
 int yyparse (void);
 #else
 int yyparse ();
@@ -904,10 +1238,10 @@ int yyparse ();
 
 
 
-/* The lookahead symbol.  */
+/* The look-ahead symbol.  */
 int yychar;
 
-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
@@ -920,14 +1254,18 @@ int yynerrs;
 `----------*/
 
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM)
-# else
-int yyparse (YYPARSE_PARAM)
-  void *YYPARSE_PARAM;
-# endif
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
 #else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 int
 yyparse (void)
 #else
@@ -938,13 +1276,19 @@ yyparse ()
 #endif
 {
   
-  register int yystate;
-  register int yyn;
+  int yystate;
+  int yyn;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
+  /* Look-ahead token as an internal (translated) token number.  */
   int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
 
   /* Three stacks and their tools:
      `yyss': related to states,
@@ -955,18 +1299,18 @@ yyparse ()
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short	yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
+  YYSTYPE *yyvsp;
 
 
 
-#define YYPOPSTACK   (yyvsp--, yyssp--)
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
   YYSIZE_T yystacksize = YYINITDEPTH;
 
@@ -975,9 +1319,9 @@ yyparse ()
   YYSTYPE yyval;
 
 
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule.  */
-  int yylen;
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
 
@@ -1001,8 +1345,7 @@ yyparse ()
 `------------------------------------------------------------*/
  yynewstate:
   /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
+     have just been pushed.  So pushing a state here evens the stacks.  */
   yyssp++;
 
  yysetstate:
@@ -1015,18 +1358,18 @@ yyparse ()
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack. Use copies of
+	/* Give user a chance to reallocate the stack.  Use copies of
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 
 
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
 	   be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
+	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
 
@@ -1037,21 +1380,21 @@ yyparse ()
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
+      goto yyexhaustedlab;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyoverflowlab;
+	goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
 
       {
-	short *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyoverflowlab;
+	  goto yyexhaustedlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
 
@@ -1082,19 +1425,17 @@ yyparse ()
 `-----------*/
 yybackup:
 
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
 
+  /* First try to decide what to do without reference to look-ahead token.  */
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1109,7 +1450,7 @@ yybackup:
   else
     {
       yytoken = YYTRANSLATE (yychar);
-      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1129,22 +1470,21 @@ yybackup:
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-
-
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
   yystate = yyn;
+  *++yyvsp = yylval;
+
   goto yynewstate;
 
 
@@ -1182,27 +1522,27 @@ yyreduce:
         case 2:
 #line 101 "printrcy.y"
     {
-	  current_printer = stpui_plist_create(yyvsp[-1].sval, yyvsp[0].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  current_printer = stpui_plist_create((yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval));
+	  g_free((yyvsp[(2) - (3)].sval));
+	  g_free((yyvsp[(3) - (3)].sval));
 	}
     break;
 
   case 3:
 #line 112 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
-	    g_free(yyvsp[0].sval);
+	  if ((yyvsp[(2) - (2)].sval))
+	    g_free((yyvsp[(2) - (2)].sval));
 	}
     break;
 
   case 4:
 #line 119 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if (current_printer && (yyvsp[(2) - (2)].sval))
 	    {
-	      stpui_plist_set_queue_name(current_printer, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_plist_set_queue_name(current_printer, (yyvsp[(2) - (2)].sval));
+	      g_free((yyvsp[(2) - (2)].sval));
 	    }
 	}
     break;
@@ -1210,10 +1550,10 @@ yyreduce:
   case 5:
 #line 129 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if (current_printer && (yyvsp[(2) - (2)].sval))
 	    {
-	      stpui_plist_set_output_filename(current_printer, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_plist_set_output_filename(current_printer, (yyvsp[(2) - (2)].sval));
+	      g_free((yyvsp[(2) - (2)].sval));
 	    }
 	}
     break;
@@ -1221,10 +1561,10 @@ yyreduce:
   case 6:
 #line 139 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if (current_printer && (yyvsp[(2) - (2)].sval))
 	    {
-	      stpui_plist_set_extra_printer_options(current_printer, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_plist_set_extra_printer_options(current_printer, (yyvsp[(2) - (2)].sval));
+	      g_free((yyvsp[(2) - (2)].sval));
 	    }
 	}
     break;
@@ -1232,10 +1572,10 @@ yyreduce:
   case 7:
 #line 149 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if (current_printer && (yyvsp[(2) - (2)].sval))
 	    {
-	      stpui_plist_set_custom_command(current_printer, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_plist_set_custom_command(current_printer, (yyvsp[(2) - (2)].sval));
+	      g_free((yyvsp[(2) - (2)].sval));
 	    }
 	}
     break;
@@ -1243,224 +1583,272 @@ yyreduce:
   case 8:
 #line 159 "printrcy.y"
     {
-	  stpui_plist_set_command_type(current_printer, yyvsp[0].ival);
+	  if (current_printer)
+	    stpui_plist_set_command_type(current_printer, (yyvsp[(2) - (2)].ival));
 	}
     break;
 
   case 9:
-#line 165 "printrcy.y"
-    { current_printer->scaling = yyvsp[0].dval; }
+#line 166 "printrcy.y"
+    {
+	  if (current_printer)
+	    current_printer->scaling = (yyvsp[(2) - (2)].dval); 
+	}
     break;
 
   case 10:
-#line 169 "printrcy.y"
-    { current_printer->orientation = yyvsp[0].ival; }
+#line 173 "printrcy.y"
+    {
+	  if (current_printer)
+	    current_printer->orientation = (yyvsp[(2) - (2)].ival);
+	}
     break;
 
   case 11:
-#line 173 "printrcy.y"
-    { current_printer->auto_size_roll_feed_paper = yyvsp[0].ival; }
+#line 180 "printrcy.y"
+    {
+	  if (current_printer)
+	    current_printer->auto_size_roll_feed_paper = (yyvsp[(2) - (2)].ival);
+	}
     break;
 
   case 12:
-#line 177 "printrcy.y"
-    { current_printer->unit = yyvsp[0].ival; }
+#line 187 "printrcy.y"
+    {
+	  if (current_printer)
+	    current_printer->unit = (yyvsp[(2) - (2)].ival); 
+	}
     break;
 
   case 13:
-#line 181 "printrcy.y"
-    { stp_set_left(current_printer->v, yyvsp[0].ival); }
+#line 194 "printrcy.y"
+    {
+	  if (current_printer)
+	    stp_set_left(current_printer->v, (yyvsp[(2) - (2)].ival));
+	}
     break;
 
   case 14:
-#line 185 "printrcy.y"
-    { stp_set_top(current_printer->v, yyvsp[0].ival); }
+#line 201 "printrcy.y"
+    {
+	  if (current_printer)
+	    stp_set_top(current_printer->v, (yyvsp[(2) - (2)].ival));
+	}
     break;
 
   case 15:
-#line 189 "printrcy.y"
+#line 208 "printrcy.y"
     {
-	  switch (yyvsp[0].ival)
+	  if (current_printer)
 	    {
-	    case 0:
-	      stp_set_string_parameter
-		(current_printer->v, "PrintingMode", "BW");
-	      break;
-	    case 1:
-	    case 2:
-	    default:
-	      stp_set_string_parameter
-		(current_printer->v, "PrintingMode", "Color");
-	      break;
+	      switch ((yyvsp[(2) - (2)].ival))
+		{
+		case 0:
+		  stp_set_string_parameter
+		    (current_printer->v, "PrintingMode", "BW");
+		  break;
+		case 1:
+		case 2:
+		default:
+		  stp_set_string_parameter
+		    (current_printer->v, "PrintingMode", "Color");
+		  break;
+		}
 	    }
 	}
     break;
 
   case 16:
-#line 207 "printrcy.y"
-    { stp_set_page_width(current_printer->v, yyvsp[0].ival); }
+#line 229 "printrcy.y"
+    {
+	  if (current_printer)
+	    stp_set_page_width(current_printer->v, (yyvsp[(2) - (2)].ival));
+	}
     break;
 
   case 17:
-#line 211 "printrcy.y"
-    { stp_set_page_height(current_printer->v, yyvsp[0].ival); }
+#line 236 "printrcy.y"
+    {
+	  if (current_printer)
+	    stp_set_page_height(current_printer->v, (yyvsp[(2) - (2)].ival));
+	}
     break;
 
   case 19:
-#line 218 "printrcy.y"
+#line 246 "printrcy.y"
     {
-	  stp_set_int_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].ival);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_int_parameter_active(current_printer->v, yyvsp[-3].sval,
-					 STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_int_parameter_active(current_printer->v, yyvsp[-3].sval,
-					 STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
+	  if (current_printer)
+	    {
+	      stp_set_int_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].ival));
+	      if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0)
+		stp_set_int_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+					     STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_int_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+					     STP_PARAMETER_ACTIVE);
+	    }
+	  g_free((yyvsp[(1) - (4)].sval));
+	  g_free((yyvsp[(3) - (4)].sval));
 	}
     break;
 
   case 20:
-#line 232 "printrcy.y"
+#line 263 "printrcy.y"
     {
-	  stp_set_string_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].sval);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_string_parameter_active(current_printer->v, yyvsp[-3].sval,
-					    STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_string_parameter_active(current_printer->v, yyvsp[-3].sval,
-					    STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  if (current_printer)
+	    {
+	      stp_set_string_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].sval));
+	      if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0)
+		stp_set_string_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+						STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_string_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+						STP_PARAMETER_ACTIVE);
+	    }
+	  g_free((yyvsp[(1) - (4)].sval));
+	  g_free((yyvsp[(3) - (4)].sval));
+	  g_free((yyvsp[(4) - (4)].sval));
 	}
     break;
 
   case 21:
-#line 247 "printrcy.y"
+#line 281 "printrcy.y"
     {
-	  stp_set_file_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].sval);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_file_parameter_active(current_printer->v, yyvsp[-3].sval,
-					  STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_file_parameter_active(current_printer->v, yyvsp[-3].sval,
-					  STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  if (current_printer)
+	    {
+	      stp_set_file_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].sval));
+	      if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0)
+		stp_set_file_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+					      STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_file_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+					      STP_PARAMETER_ACTIVE);
+	    }
+	  g_free((yyvsp[(1) - (4)].sval));
+	  g_free((yyvsp[(3) - (4)].sval));
+	  g_free((yyvsp[(4) - (4)].sval));
 	}
     break;
 
   case 22:
-#line 262 "printrcy.y"
+#line 299 "printrcy.y"
     {
-	  stp_set_float_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].dval);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_float_parameter_active(current_printer->v, yyvsp[-3].sval,
-					   STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_float_parameter_active(current_printer->v, yyvsp[-3].sval,
-					   STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
+	  if (current_printer)
+	    {
+	      stp_set_float_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].dval));
+	      if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0)
+		stp_set_float_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+					       STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_float_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+					       STP_PARAMETER_ACTIVE);
+	    }
+	  g_free((yyvsp[(1) - (4)].sval));
+	  g_free((yyvsp[(3) - (4)].sval));
 	}
     break;
 
   case 23:
-#line 276 "printrcy.y"
+#line 316 "printrcy.y"
     {
-	  stp_set_dimension_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].ival);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_dimension_parameter_active(current_printer->v, yyvsp[-3].sval,
-					       STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_dimension_parameter_active(current_printer->v, yyvsp[-3].sval,
-					       STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
+	  if (current_printer)
+	    {
+	      stp_set_dimension_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), (yyvsp[(4) - (4)].ival));
+	      if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0)
+		stp_set_dimension_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+						   STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_dimension_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+						   STP_PARAMETER_ACTIVE);
+	    }
+	  g_free((yyvsp[(1) - (4)].sval));
+	  g_free((yyvsp[(3) - (4)].sval));
 	}
     break;
 
   case 24:
-#line 290 "printrcy.y"
+#line 333 "printrcy.y"
     {
-	  if (strcmp(yyvsp[0].sval, "False") == 0)
-	    stp_set_boolean_parameter(current_printer->v, yyvsp[-3].sval, 0);
-	  else
-	    stp_set_boolean_parameter(current_printer->v, yyvsp[-3].sval, 1);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_boolean_parameter_active(current_printer->v, yyvsp[-3].sval,
-					     STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_boolean_parameter_active(current_printer->v, yyvsp[-3].sval,
-					     STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  if (current_printer)
+	    {
+	      if (strcmp((yyvsp[(4) - (4)].sval), "False") == 0)
+		stp_set_boolean_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), 0);
+	      else
+		stp_set_boolean_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), 1);
+	      if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0)
+		stp_set_boolean_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+						 STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_boolean_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+						 STP_PARAMETER_ACTIVE);
+	    }
+	  g_free((yyvsp[(1) - (4)].sval));
+	  g_free((yyvsp[(3) - (4)].sval));
+	  g_free((yyvsp[(4) - (4)].sval));
 	}
     break;
 
   case 25:
-#line 308 "printrcy.y"
+#line 354 "printrcy.y"
     {
-	  stp_curve_t *curve = stp_curve_create_from_string(yyvsp[0].sval);
-	  if (curve)
+	  if (current_printer)
 	    {
-	      stp_set_curve_parameter(current_printer->v, yyvsp[-3].sval, curve);
-	      if (strcmp(yyvsp[-1].sval, "False") == 0)
-		stp_set_curve_parameter_active(current_printer->v, yyvsp[-3].sval,
-					       STP_PARAMETER_INACTIVE);
-	      else
-		stp_set_curve_parameter_active(current_printer->v, yyvsp[-3].sval,
-					       STP_PARAMETER_ACTIVE);
-	      stp_curve_destroy(curve);
+	      stp_curve_t *curve = stp_curve_create_from_string((yyvsp[(4) - (4)].sval));
+	      if (curve)
+		{
+		  stp_set_curve_parameter(current_printer->v, (yyvsp[(1) - (4)].sval), curve);
+		  if (strcmp((yyvsp[(3) - (4)].sval), "False") == 0)
+		    stp_set_curve_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+						   STP_PARAMETER_INACTIVE);
+		  else
+		    stp_set_curve_parameter_active(current_printer->v, (yyvsp[(1) - (4)].sval),
+						   STP_PARAMETER_ACTIVE);
+		  stp_curve_destroy(curve);
+		}
 	    }
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  g_free((yyvsp[(1) - (4)].sval));
+	  g_free((yyvsp[(3) - (4)].sval));
+	  g_free((yyvsp[(4) - (4)].sval));
 	}
     break;
 
   case 56:
-#line 353 "printrcy.y"
-    { stpui_printrc_current_printer = yyvsp[0].sval; }
+#line 402 "printrcy.y"
+    { stpui_printrc_current_printer = (yyvsp[(2) - (2)].sval); }
     break;
 
   case 57:
-#line 357 "printrcy.y"
+#line 406 "printrcy.y"
     {
-	  if (strcmp(yyvsp[0].sval, "True") == 0)
+	  if (strcmp((yyvsp[(2) - (2)].sval), "True") == 0)
 	    stpui_show_all_paper_sizes = 1;
 	  else
 	    stpui_show_all_paper_sizes = 0;
-	  g_free(yyvsp[0].sval);
+	  g_free((yyvsp[(2) - (2)].sval));
 	}
     break;
 
   case 61:
-#line 373 "printrcy.y"
+#line 422 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if ((yyvsp[(2) - (2)].sval))
 	    {
-	      stpui_set_global_parameter(yyvsp[-1].sval, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_set_global_parameter((yyvsp[(1) - (2)].sval), (yyvsp[(2) - (2)].sval));
+	      g_free((yyvsp[(2) - (2)].sval));
 	    }
-	  g_free(yyvsp[-1].sval);
+	  g_free((yyvsp[(1) - (2)].sval));
 	}
     break;
 
 
+/* Line 1267 of yacc.c.  */
+#line 1846 "printrcy.c"
+      default: break;
     }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
-/* Line 991 of yacc.c.  */
-#line 1458 "printrcy.c"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-
-
+  YYPOPSTACK (yylen);
+  yylen = 0;
   YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
@@ -1489,109 +1877,93 @@ yyerrlab:
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
-	{
-	  YYSIZE_T yysize = 0;
-	  int yytype = YYTRANSLATE (yychar);
-	  char *yymsg;
-	  int yyx, yycount;
-
-	  yycount = 0;
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  for (yyx = yyn < 0 ? -yyn : 0;
-	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-	  yysize += yystrlen ("syntax error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[yytype]);
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
-	    {
-	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[yytype]);
-
-	      if (yycount < 5)
-		{
-		  yycount = 0;
-		  for (yyx = yyn < 0 ? -yyn : 0;
-		       yyx < (int) (sizeof (yytname) / sizeof (char *));
-		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-		      {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
-			yyp = yystpcpy (yyp, yyq);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
-		      }
-		}
-	      yyerror (yymsg);
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
 	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    yyerror ("syntax error; also virtual memory exhausted");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror ("syntax error");
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
     }
 
 
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it.  */
 
-      /* Return failure if at end of input.  */
-      if (yychar == YYEOF)
-        {
-	  /* Pop the error token.  */
-          YYPOPSTACK;
-	  /* Pop the rest of the stack.  */
-	  while (yyss < yyssp)
-	    {
-	      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-	      yydestruct (yystos[*yyssp], yyvsp);
-	      YYPOPSTACK;
-	    }
-	  YYABORT;
-        }
-
-      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-      yydestruct (yytoken, &yylval);
-      yychar = YYEMPTY;
-
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
-  goto yyerrlab2;
+  goto yyerrlab1;
 
 
-/*----------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action.  |
-`----------------------------------------------------*/
-yyerrlab1:
-
-  /* Suppress GCC warning that yyerrlab1 is unused when no action
-     invokes YYERROR.  */
-#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) \
-    && !defined __cplusplus
-  __attribute__ ((__unused__))
-#endif
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
 
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
 
-  goto yyerrlab2;
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
 
 
-/*---------------------------------------------------------------.
-| yyerrlab2 -- pop states until the error token can be shifted.  |
-`---------------------------------------------------------------*/
-yyerrlab2:
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
   yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
   for (;;)
@@ -1612,22 +1984,23 @@ yyerrlab2:
       if (yyssp == yyss)
 	YYABORT;
 
-      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-      yydestruct (yystos[yystate], yyvsp);
-      yyvsp--;
-      yystate = *--yyssp;
 
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
   *++yyvsp = yylval;
 
 
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
   yystate = yyn;
   goto yynewstate;
 
@@ -1647,24 +2020,42 @@ yyabortlab:
   goto yyreturn;
 
 #ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here.  |
-`----------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
-  return yyresult;
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
 
 
-#line 398 "printrcy.y"
+#line 447 "printrcy.y"
 
 
diff --git a/src/gutenprintui2/printrcy.h b/src/gutenprintui2/printrcy.h
index afa662b..8a6c041 100644
--- a/src/gutenprintui2/printrcy.h
+++ b/src/gutenprintui2/printrcy.h
@@ -1,7 +1,9 @@
-/* A Bison parser, made by GNU Bison 1.875.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,13 +17,21 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
 
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -69,6 +79,7 @@
      pCURVE = 295
    };
 #endif
+/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tDIMENSION 260
@@ -111,7 +122,7 @@
 
 
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -120,5 +131,3 @@ typedef int YYSTYPE;
 
 extern YYSTYPE yylval;
 
-
-
diff --git a/src/gutenprintui2/printrcy.y b/src/gutenprintui2/printrcy.y
index 58bd36e..625d1d7 100644
--- a/src/gutenprintui2/printrcy.y
+++ b/src/gutenprintui2/printrcy.y
@@ -1,5 +1,5 @@
 /*
- * "$Id: printrcy.y,v 1.1 2004/09/17 18:38:14 rleigh Exp $"
+ * "$Id: printrcy.y,v 1.1.18.1 2007/03/02 12:01:20 rlk Exp $"
  *
  *   Test pattern generator for Gutenprint
  *
@@ -117,7 +117,7 @@ Destination: DESTINATION tSTRING
 
 Queue_Name: QUEUE_NAME tSTRING
 	{
-	  if ($2)
+	  if (current_printer && $2)
 	    {
 	      stpui_plist_set_queue_name(current_printer, $2);
 	      g_free($2);
@@ -127,7 +127,7 @@ Queue_Name: QUEUE_NAME tSTRING
 
 Output_Filename: OUTPUT_FILENAME tSTRING
 	{
-	  if ($2)
+	  if (current_printer && $2)
 	    {
 	      stpui_plist_set_output_filename(current_printer, $2);
 	      g_free($2);
@@ -137,7 +137,7 @@ Output_Filename: OUTPUT_FILENAME tSTRING
 
 Extra_Printer_Options: EXTRA_PRINTER_OPTIONS tSTRING
 	{
-	  if ($2)
+	  if (current_printer && $2)
 	    {
 	      stpui_plist_set_extra_printer_options(current_printer, $2);
 	      g_free($2);
@@ -147,7 +147,7 @@ Extra_Printer_Options: EXTRA_PRINTER_OPTIONS tSTRING
 
 Custom_Command: CUSTOM_COMMAND tSTRING
 	{
-	  if ($2)
+	  if (current_printer && $2)
 	    {
 	      stpui_plist_set_custom_command(current_printer, $2);
 	      g_free($2);
@@ -157,58 +157,86 @@ Custom_Command: CUSTOM_COMMAND tSTRING
 
 Command_Type: COMMAND_TYPE tINT
 	{
-	  stpui_plist_set_command_type(current_printer, $2);
+	  if (current_printer)
+	    stpui_plist_set_command_type(current_printer, $2);
 	}
 ;
 
 Scaling: SCALING tDOUBLE
-	{ current_printer->scaling = $2; }
+	{
+	  if (current_printer)
+	    current_printer->scaling = $2; 
+	}
 ;
 
 Orientation: ORIENTATION tINT
-	{ current_printer->orientation = $2; }
+	{
+	  if (current_printer)
+	    current_printer->orientation = $2;
+	}
 ;
 
 Autosize_Roll_Paper: AUTOSIZE_ROLL_PAPER tINT
-	{ current_printer->auto_size_roll_feed_paper = $2; }
+	{
+	  if (current_printer)
+	    current_printer->auto_size_roll_feed_paper = $2;
+	}
 ;
 
 Unit: UNIT tINT
-	{ current_printer->unit = $2; }
+	{
+	  if (current_printer)
+	    current_printer->unit = $2; 
+	}
 ;
 
 Left: LEFT tINT
-	{ stp_set_left(current_printer->v, $2); }
+	{
+	  if (current_printer)
+	    stp_set_left(current_printer->v, $2);
+	}
 ;
 
 Top: TOP tINT
-	{ stp_set_top(current_printer->v, $2); }
+	{
+	  if (current_printer)
+	    stp_set_top(current_printer->v, $2);
+	}
 ;
 
 Output_Type: OUTPUT_TYPE tINT
 	{
-	  switch ($2)
+	  if (current_printer)
 	    {
-	    case 0:
-	      stp_set_string_parameter
-		(current_printer->v, "PrintingMode", "BW");
-	      break;
-	    case 1:
-	    case 2:
-	    default:
-	      stp_set_string_parameter
-		(current_printer->v, "PrintingMode", "Color");
-	      break;
+	      switch ($2)
+		{
+		case 0:
+		  stp_set_string_parameter
+		    (current_printer->v, "PrintingMode", "BW");
+		  break;
+		case 1:
+		case 2:
+		default:
+		  stp_set_string_parameter
+		    (current_printer->v, "PrintingMode", "Color");
+		  break;
+		}
 	    }
 	}
 ;
 
 Custom_Page_Width: CUSTOM_PAGE_WIDTH tINT
-	{ stp_set_page_width(current_printer->v, $2); }
+	{
+	  if (current_printer)
+	    stp_set_page_width(current_printer->v, $2);
+	}
 ;
 
 Custom_Page_Height: CUSTOM_PAGE_HEIGHT tINT
-	{ stp_set_page_height(current_printer->v, $2); }
+	{
+	  if (current_printer)
+	    stp_set_page_height(current_printer->v, $2);
+	}
 ;
 
 Empty:
@@ -216,13 +244,16 @@ Empty:
 
 Int_Param: tWORD pINT tBOOLEAN tINT
 	{
-	  stp_set_int_parameter(current_printer->v, $1, $4);
-	  if (strcmp($3, "False") == 0)
-	    stp_set_int_parameter_active(current_printer->v, $1,
-					 STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_int_parameter_active(current_printer->v, $1,
-					 STP_PARAMETER_ACTIVE);
+	  if (current_printer)
+	    {
+	      stp_set_int_parameter(current_printer->v, $1, $4);
+	      if (strcmp($3, "False") == 0)
+		stp_set_int_parameter_active(current_printer->v, $1,
+					     STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_int_parameter_active(current_printer->v, $1,
+					     STP_PARAMETER_ACTIVE);
+	    }
 	  g_free($1);
 	  g_free($3);
 	}
@@ -230,13 +261,16 @@ Int_Param: tWORD pINT tBOOLEAN tINT
 
 String_List_Param: tWORD pSTRING_LIST tBOOLEAN tSTRING
 	{
-	  stp_set_string_parameter(current_printer->v, $1, $4);
-	  if (strcmp($3, "False") == 0)
-	    stp_set_string_parameter_active(current_printer->v, $1,
-					    STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_string_parameter_active(current_printer->v, $1,
-					    STP_PARAMETER_ACTIVE);
+	  if (current_printer)
+	    {
+	      stp_set_string_parameter(current_printer->v, $1, $4);
+	      if (strcmp($3, "False") == 0)
+		stp_set_string_parameter_active(current_printer->v, $1,
+						STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_string_parameter_active(current_printer->v, $1,
+						STP_PARAMETER_ACTIVE);
+	    }
 	  g_free($1);
 	  g_free($3);
 	  g_free($4);
@@ -245,13 +279,16 @@ String_List_Param: tWORD pSTRING_LIST tBOOLEAN tSTRING
 
 File_Param: tWORD pFILE tBOOLEAN tSTRING
 	{
-	  stp_set_file_parameter(current_printer->v, $1, $4);
-	  if (strcmp($3, "False") == 0)
-	    stp_set_file_parameter_active(current_printer->v, $1,
-					  STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_file_parameter_active(current_printer->v, $1,
-					  STP_PARAMETER_ACTIVE);
+	  if (current_printer)
+	    {
+	      stp_set_file_parameter(current_printer->v, $1, $4);
+	      if (strcmp($3, "False") == 0)
+		stp_set_file_parameter_active(current_printer->v, $1,
+					      STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_file_parameter_active(current_printer->v, $1,
+					      STP_PARAMETER_ACTIVE);
+	    }
 	  g_free($1);
 	  g_free($3);
 	  g_free($4);
@@ -260,13 +297,16 @@ File_Param: tWORD pFILE tBOOLEAN tSTRING
 
 Double_Param: tWORD pDOUBLE tBOOLEAN tDOUBLE
 	{
-	  stp_set_float_parameter(current_printer->v, $1, $4);
-	  if (strcmp($3, "False") == 0)
-	    stp_set_float_parameter_active(current_printer->v, $1,
-					   STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_float_parameter_active(current_printer->v, $1,
-					   STP_PARAMETER_ACTIVE);
+	  if (current_printer)
+	    {
+	      stp_set_float_parameter(current_printer->v, $1, $4);
+	      if (strcmp($3, "False") == 0)
+		stp_set_float_parameter_active(current_printer->v, $1,
+					       STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_float_parameter_active(current_printer->v, $1,
+					       STP_PARAMETER_ACTIVE);
+	    }
 	  g_free($1);
 	  g_free($3);
 	}
@@ -274,13 +314,16 @@ Double_Param: tWORD pDOUBLE tBOOLEAN tDOUBLE
 
 Dimension_Param: tWORD pDIMENSION tBOOLEAN tINT
 	{
-	  stp_set_dimension_parameter(current_printer->v, $1, $4);
-	  if (strcmp($3, "False") == 0)
-	    stp_set_dimension_parameter_active(current_printer->v, $1,
-					       STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_dimension_parameter_active(current_printer->v, $1,
-					       STP_PARAMETER_ACTIVE);
+	  if (current_printer)
+	    {
+	      stp_set_dimension_parameter(current_printer->v, $1, $4);
+	      if (strcmp($3, "False") == 0)
+		stp_set_dimension_parameter_active(current_printer->v, $1,
+						   STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_dimension_parameter_active(current_printer->v, $1,
+						   STP_PARAMETER_ACTIVE);
+	    }
 	  g_free($1);
 	  g_free($3);
 	}
@@ -288,16 +331,19 @@ Dimension_Param: tWORD pDIMENSION tBOOLEAN tINT
 
 Boolean_Param: tWORD pBOOLEAN tBOOLEAN tBOOLEAN
 	{
-	  if (strcmp($4, "False") == 0)
-	    stp_set_boolean_parameter(current_printer->v, $1, 0);
-	  else
-	    stp_set_boolean_parameter(current_printer->v, $1, 1);
-	  if (strcmp($3, "False") == 0)
-	    stp_set_boolean_parameter_active(current_printer->v, $1,
-					     STP_PARAMETER_INACTIVE);
-	  else
-	    stp_set_boolean_parameter_active(current_printer->v, $1,
-					     STP_PARAMETER_ACTIVE);
+	  if (current_printer)
+	    {
+	      if (strcmp($4, "False") == 0)
+		stp_set_boolean_parameter(current_printer->v, $1, 0);
+	      else
+		stp_set_boolean_parameter(current_printer->v, $1, 1);
+	      if (strcmp($3, "False") == 0)
+		stp_set_boolean_parameter_active(current_printer->v, $1,
+						 STP_PARAMETER_INACTIVE);
+	      else
+		stp_set_boolean_parameter_active(current_printer->v, $1,
+						 STP_PARAMETER_ACTIVE);
+	    }
 	  g_free($1);
 	  g_free($3);
 	  g_free($4);
@@ -306,17 +352,20 @@ Boolean_Param: tWORD pBOOLEAN tBOOLEAN tBOOLEAN
 
 Curve_Param: tWORD pCURVE tBOOLEAN tSTRING
 	{
-	  stp_curve_t *curve = stp_curve_create_from_string($4);
-	  if (curve)
+	  if (current_printer)
 	    {
-	      stp_set_curve_parameter(current_printer->v, $1, curve);
-	      if (strcmp($3, "False") == 0)
-		stp_set_curve_parameter_active(current_printer->v, $1,
-					       STP_PARAMETER_INACTIVE);
-	      else
-		stp_set_curve_parameter_active(current_printer->v, $1,
-					       STP_PARAMETER_ACTIVE);
-	      stp_curve_destroy(curve);
+	      stp_curve_t *curve = stp_curve_create_from_string($4);
+	      if (curve)
+		{
+		  stp_set_curve_parameter(current_printer->v, $1, curve);
+		  if (strcmp($3, "False") == 0)
+		    stp_set_curve_parameter_active(current_printer->v, $1,
+						   STP_PARAMETER_INACTIVE);
+		  else
+		    stp_set_curve_parameter_active(current_printer->v, $1,
+						   STP_PARAMETER_ACTIVE);
+		  stp_curve_destroy(curve);
+		}
 	    }
 	  g_free($1);
 	  g_free($3);
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index aa19a62..55b2868 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.92 2005/11/21 11:16:23 rleigh Exp $
+## $Id: Makefile.am,v 1.92.10.1 2007/03/02 12:01:20 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -50,7 +50,14 @@ color_traditional_la_SOURCES = \
 
 color_traditional_la_LDFLAGS = -module -avoid-version
 
-print_canon_la_SOURCES = print-canon.c
+print_canon_la_SOURCES = \
+	print-canon.c \
+	print-canon.h \
+	canon-inks.h \
+	canon-media.h \
+	canon-modes.h \
+	canon-printers.h
+
 print_canon_la_LDFLAGS = -module -avoid-version
 
 print_escp2_la_SOURCES = \
@@ -124,6 +131,7 @@ libgutenprint_la_SOURCES =			\
 	dither-predithered.c			\
 	generic-options.c			\
 	image.c					\
+	buffer-image.c				\
 	module.c				\
 	path.c					\
 	print-dither-matrices.c			\
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 0ef0165..1d50529 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -48,11 +48,12 @@ subdir = src/main
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
@@ -80,14 +81,16 @@ am__libgutenprint_la_SOURCES_DIST = array.c bit-ops.c channel.c \
 	color.c curve.c curve-cache.c dither-ed.c dither-eventone.c \
 	dither-inks.c dither-main.c dither-ordered.c \
 	dither-very-fast.c dither-predithered.c generic-options.c \
-	image.c module.c path.c print-dither-matrices.c print-list.c \
-	print-papers.c print-util.c print-vars.c print-version.c \
-	print-weave.c printers.c sequence.c string-list.c xml.c \
-	mxml-attr.c mxml-file.c mxml-node.c mxml-search.c \
-	dither-impl.h dither-inlined-functions.h generic-options.h \
-	gutenprint-internal.h util.h print-color.c color-conversion.h \
-	color-conversions.c print-canon.c print-escp2.c escp2-driver.c \
-	print-escp2.h print-escp2-data.c escp2-channels.c escp2-inks.c \
+	image.c buffer-image.c module.c path.c print-dither-matrices.c \
+	print-list.c print-papers.c print-util.c print-vars.c \
+	print-version.c print-weave.c printers.c sequence.c \
+	string-list.c xml.c mxml-attr.c mxml-file.c mxml-node.c \
+	mxml-search.c dither-impl.h dither-inlined-functions.h \
+	generic-options.h gutenprint-internal.h util.h print-color.c \
+	color-conversion.h color-conversions.c print-canon.c \
+	print-canon.h canon-inks.h canon-media.h canon-modes.h \
+	canon-printers.h print-escp2.c escp2-driver.c print-escp2.h \
+	print-escp2-data.c escp2-channels.c escp2-inks.c \
 	escp2-papers.c escp2-resolutions.c print-lexmark.c print-pcl.c \
 	print-ps.c print-olympus.c print-raw.c
 am__objects_1 = mxml-attr.lo mxml-file.lo mxml-node.lo mxml-search.lo
@@ -110,11 +113,11 @@ am_libgutenprint_la_OBJECTS = array.lo bit-ops.lo channel.lo color.lo \
 	curve.lo curve-cache.lo dither-ed.lo dither-eventone.lo \
 	dither-inks.lo dither-main.lo dither-ordered.lo \
 	dither-very-fast.lo dither-predithered.lo generic-options.lo \
-	image.lo module.lo path.lo print-dither-matrices.lo \
-	print-list.lo print-papers.lo print-util.lo print-vars.lo \
-	print-version.lo print-weave.lo printers.lo sequence.lo \
-	string-list.lo xml.lo $(am__objects_1) $(am__objects_2) \
-	$(am__objects_12)
+	image.lo buffer-image.lo module.lo path.lo \
+	print-dither-matrices.lo print-list.lo print-papers.lo \
+	print-util.lo print-vars.lo print-version.lo print-weave.lo \
+	printers.lo sequence.lo string-list.lo xml.lo $(am__objects_1) \
+	$(am__objects_2) $(am__objects_12)
 libgutenprint_la_OBJECTS = $(am_libgutenprint_la_OBJECTS)
 print_canon_la_LIBADD =
 am_print_canon_la_OBJECTS = print-canon.lo
@@ -147,8 +150,8 @@ am_print_raw_la_OBJECTS = print-raw.lo
 print_raw_la_OBJECTS = $(am_print_raw_la_OBJECTS)
 @BUILD_MODULES_TRUE@am_print_raw_la_rpath = -rpath $(pkgmoduledir)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp =
-am__depfiles_maybe =
+depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
+am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -175,13 +178,18 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -207,6 +215,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -214,6 +224,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -226,12 +237,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -266,6 +279,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -361,14 +375,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -385,6 +402,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -402,17 +422,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -437,7 +461,14 @@ color_traditional_la_SOURCES = \
 	color-conversions.c
 
 color_traditional_la_LDFLAGS = -module -avoid-version
-print_canon_la_SOURCES = print-canon.c
+print_canon_la_SOURCES = \
+	print-canon.c \
+	print-canon.h \
+	canon-inks.h \
+	canon-media.h \
+	canon-modes.h \
+	canon-printers.h
+
 print_canon_la_LDFLAGS = -module -avoid-version
 print_escp2_la_SOURCES = \
 	print-escp2.c \
@@ -501,6 +532,7 @@ libgutenprint_la_SOURCES = \
 	dither-predithered.c			\
 	generic-options.c			\
 	image.c					\
+	buffer-image.c				\
 	module.c				\
 	path.c					\
 	print-dither-matrices.c			\
@@ -554,9 +586,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/main/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/main/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps src/main/Makefile
+	  $(AUTOMAKE) --gnu  src/main/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -655,14 +687,75 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bit-ops.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffer-image.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channel.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color-conversions.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve-cache.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-ed.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-eventone.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-inks.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-ordered.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-predithered.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-very-fast.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-channels.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-driver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-inks.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-papers.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-resolutions.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generic-options.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mxml-attr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mxml-file.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mxml-node.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mxml-search.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/path.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-canon.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-color.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-dither-matrices.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-escp2-data.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-escp2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-lexmark.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-list.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-olympus.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-papers.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-pcl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-ps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-raw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-util.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-vars.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-version.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-weave.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printers.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sequence.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string-list.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml.Plo@am__quote@
+
 .c.o:
-	$(COMPILE) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -826,6 +919,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	clean-pkgmoduleLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -852,6 +946,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/main/bit-ops.c b/src/main/bit-ops.c
index 063348d..ab111ca 100644
--- a/src/main/bit-ops.c
+++ b/src/main/bit-ops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: bit-ops.c,v 1.9 2006/03/28 03:27:57 rlk Exp $"
+ * "$Id: bit-ops.c,v 1.9.8.2 2007/05/12 19:14:27 faust3 Exp $"
  *
  *   Softweave calculator for Gutenprint.
  *
@@ -73,6 +73,201 @@ stp_fold(const unsigned char *line,
     }
 }
 
+void
+stp_fold_3bit(const unsigned char *line,
+                int single_length,
+                unsigned char *outbuf)
+{
+  int i;
+  memset(outbuf, 0, single_length * 3);
+  for (i = 0; i < single_length; i++) {
+    outbuf[0] =
+      ((line[0] & (1 << 7)) >> 2) |
+      ((line[0] & (1 << 6)) >> 4) |
+      ((line[single_length] & (1 << 7)) >> 1) |
+      ((line[single_length] & (1 << 6)) >> 3) |
+      ((line[single_length] & (1 << 5)) >> 5) |
+      ((line[2*single_length] & (1 << 7)) << 0) |
+      ((line[2*single_length] & (1 << 6)) >> 2) |
+      ((line[2*single_length] & (1 << 5)) >> 4);
+    outbuf[1] =
+      ((line[0] & (1 << 5)) << 2) |
+      ((line[0] & (1 << 4)) << 0) |
+      ((line[0] & (1 << 3)) >> 2) |
+      ((line[single_length] & (1 << 4)) << 1) |
+      ((line[single_length] & (1 << 3)) >> 1) |
+      ((line[2*single_length] & (1 << 4)) << 2) |
+      ((line[2*single_length] & (1 << 3)) << 0) |
+      ((line[2*single_length] & (1 << 2)) >> 2);
+    outbuf[2] =
+      ((line[0] & (1 << 2)) << 4) |
+      ((line[0] & (1 << 1)) << 2) |
+      ((line[0] & (1 << 0)) << 0) |
+      ((line[single_length] & (1 << 2)) << 5) |
+      ((line[single_length] & (1 << 1)) << 3) |
+      ((line[single_length] & (1 << 0)) << 1) |
+      ((line[2*single_length] & (1 << 1)) << 4) |
+      ((line[2*single_length] & (1 << 0)) << 2);
+    line++;
+    outbuf += 3;
+  }
+}
+
+void
+stp_fold_3bit_323(const unsigned char *line,
+		int single_length,
+		unsigned char *outbuf)
+{
+  unsigned char A0,A1,A2,B0,B1,B2,C0,C1,C2;
+  const unsigned char *last= line+single_length;
+  memset(outbuf, 0, single_length * 3);
+  for (; line < last; line+=3, outbuf+=8) {
+
+    A0= line[0]; B0= line[single_length]; C0= line[2*single_length];
+
+    if (line<last-2) {
+      A1= line[1]; B1= line[single_length+1]; C1= line[2*single_length+1];
+    } else {
+      A1= 0; B1= 0; C1= 0;
+    }
+    if (line<last-1) {
+      A2= line[2]; B2= line[single_length+2]; C2= line[2*single_length+2];
+    } else {
+      A2= 0; B2= 0; C2= 0;
+    }
+
+    outbuf[0] =
+      ((C0 & 0x80) >> 0) |
+      ((B0 & 0x80) >> 1) |
+      ((A0 & 0x80) >> 2) |
+      ((B0 & 0x40) >> 2) |
+      ((A0 & 0x40) >> 3) |
+      ((C0 & 0x20) >> 3) |
+      ((B0 & 0x20) >> 4) |
+      ((A0 & 0x20) >> 5);
+    outbuf[1] =
+      ((C0 & 0x10) << 3) |
+      ((B0 & 0x10) << 2) |
+      ((A0 & 0x10) << 1) |
+      ((B0 & 0x08) << 1) |
+      ((A0 & 0x08) << 0) |
+      ((C0 & 0x04) >> 0) |
+      ((B0 & 0x04) >> 1) |
+      ((A0 & 0x04) >> 2);
+    outbuf[2] =
+      ((C0 & 0x02) << 6) |
+      ((B0 & 0x02) << 5) |
+      ((A0 & 0x02) << 4) |
+      ((B0 & 0x01) << 4) |
+      ((A0 & 0x01) << 3) |
+      ((C1 & 0x80) >> 5) |
+      ((B1 & 0x80) >> 6) |
+      ((A1 & 0x80) >> 7);
+    outbuf[3] =
+      ((C1 & 0x40) << 1) |
+      ((B1 & 0x40) << 0) |
+      ((A1 & 0x40) >> 1) |
+      ((B1 & 0x20) >> 1) |
+      ((A1 & 0x20) >> 2) |
+      ((C1 & 0x10) >> 2) |
+      ((B1 & 0x10) >> 3) |
+      ((A1 & 0x10) >> 4);
+    outbuf[4] =
+      ((C1 & 0x08) << 4) |
+      ((B1 & 0x08) << 3) |
+      ((A1 & 0x08) << 2) |
+      ((B1 & 0x04) << 2) |
+      ((A1 & 0x04) << 1) |
+      ((C1 & 0x02) << 1) |
+      ((B1 & 0x02) >> 0) |
+      ((A1 & 0x02) >> 1);
+    outbuf[5] =
+      ((C1 & 0x01) << 7) |
+      ((B1 & 0x01) << 6) |
+      ((A1 & 0x01) << 5) |
+      ((B2 & 0x80) >> 3) |
+      ((A2 & 0x80) >> 4) |
+      ((C2 & 0x40) >> 4) |
+      ((B2 & 0x40) >> 5) |
+      ((A2 & 0x40) >> 6);
+    outbuf[6] =
+      ((C2 & 0x20) << 2) |
+      ((B2 & 0x20) << 1) |
+      ((A2 & 0x20) << 0) |
+      ((B2 & 0x10) >> 0) |
+      ((A2 & 0x10) >> 1) |
+      ((C2 & 0x08) >> 1) |
+      ((B2 & 0x08) >> 2) |
+      ((A2 & 0x08) >> 3);
+    outbuf[7] =
+      ((C2 & 0x04) << 5) |
+      ((B2 & 0x04) << 4) |
+      ((A2 & 0x04) << 3) |
+      ((B2 & 0x02) << 3) |
+      ((A2 & 0x02) << 2) |
+      ((C2 & 0x01) << 2) |
+      ((B2 & 0x01) << 1) |
+      ((A2 & 0x01) << 0);
+  }
+}
+
+void
+stp_fold_4bit(const unsigned char *line,
+                int single_length,
+                unsigned char *outbuf)
+{
+  int i;
+  memset(outbuf, 0, single_length * 4);
+  for (i = 0; i < single_length; i++){
+    unsigned char l0 = line[0];
+    unsigned char l1 = line[single_length];
+    unsigned char l2 = line[single_length*2];
+    unsigned char l3 = line[single_length*3];
+    if(l0 || l1 || l2 || l3){
+      outbuf[0] =
+            ((l3 & (1<<7)) >> 0)|
+            ((l2 & (1<<7)) >> 1)|
+            ((l1 & (1<<7)) >> 2)|
+            ((l0 & (1<<7)) >> 3)|
+            ((l3 & (1<<6)) >> 3)|
+            ((l2 & (1<<6)) >> 4)|
+            ((l1 & (1<<6)) >> 5)|
+            ((l0 & (1<<6)) >> 6);
+
+      outbuf[1] =
+            ((l3 & (1<<5)) << 2)|
+            ((l2 & (1<<5)) << 1)|
+            ((l1 & (1<<5)) << 0)|
+            ((l0 & (1<<5)) >> 1)|
+            ((l3 & (1<<4)) >> 1)|
+            ((l2 & (1<<4)) >> 2)|
+            ((l1 & (1<<4)) >> 3)|
+            ((l0 & (1<<4)) >> 4);
+
+       outbuf[2] =
+            ((l3 & (1<<3)) << 4)|
+            ((l2 & (1<<3)) << 3)|
+            ((l1 & (1<<3)) << 2)|
+            ((l0 & (1<<3)) << 1)|
+            ((l3 & (1<<2)) << 1)|
+            ((l2 & (1<<2)) << 0)|
+            ((l1 & (1<<2)) >> 1)|
+            ((l0 & (1<<2)) >> 2);
+       outbuf[3] =
+            ((l3 & (1<<1)) << 6)|
+            ((l2 & (1<<1)) << 5)|
+            ((l1 & (1<<1)) << 4)|
+            ((l0 & (1<<1)) << 3)|
+            ((l3 & (1<<0)) << 3)|
+            ((l2 & (1<<0)) << 2)|
+            ((l1 & (1<<0)) << 1)|
+            ((l0 & (1<<0)) << 0);
+    }
+    line++;
+    outbuf += 4;
+  }
+}
+
 static void
 stpi_split_2_1(int length,
 	       const unsigned char *in,
@@ -950,27 +1145,30 @@ stpi_unpack_16_2(int length,
       if (tempin & 3)
         temp[7] |= ((tempin & 3) << 6) >> shift;
 
-      tempin = *in++;
-
-      if (tempin & 192)
-        temp[8] |= (tempin & 192) >> shift;
-      if (tempin & 48)
-        temp[9] |= ((tempin & 48) << 2) >> shift;
-      if (tempin & 12)
-        temp[10] |= ((tempin & 12) << 4) >> shift;
-      if (tempin & 3)
-        temp[11] |= ((tempin & 3) << 6) >> shift;
-
-      tempin = *in++;
-
-      if (tempin & 192)
-        temp[12] |= (tempin & 192) >> shift;
-      if (tempin & 48)
-        temp[13] |= ((tempin & 48) << 2) >> shift;
-      if (tempin & 12)
-        temp[14] |= ((tempin & 12) << 4) >> shift;
-      if (tempin & 3)
-        temp[15] |= ((tempin & 3) << 6) >> shift;
+      if (length-- > 0)
+	{
+	  tempin = *in++;
+
+	  if (tempin & 192)
+	    temp[8] |= (tempin & 192) >> shift;
+	  if (tempin & 48)
+	    temp[9] |= ((tempin & 48) << 2) >> shift;
+	  if (tempin & 12)
+	    temp[10] |= ((tempin & 12) << 4) >> shift;
+	  if (tempin & 3)
+	    temp[11] |= ((tempin & 3) << 6) >> shift;
+
+	  tempin = *in++;
+
+	  if (tempin & 192)
+	    temp[12] |= (tempin & 192) >> shift;
+	  if (tempin & 48)
+	    temp[13] |= ((tempin & 48) << 2) >> shift;
+	  if (tempin & 12)
+	    temp[14] |= ((tempin & 12) << 4) >> shift;
+	  if (tempin & 3)
+	    temp[15] |= ((tempin & 3) << 6) >> shift;
+	}
 
       if (shift < 6)
         shift += 2;
diff --git a/src/main/buffer-image.c b/src/main/buffer-image.c
new file mode 100644
index 0000000..030d398
--- /dev/null
+++ b/src/main/buffer-image.c
@@ -0,0 +1,153 @@
+/*
+ *   Buffer an Image
+ *
+ *   Copyright 2007 Sascha Sommer <saschasommer@freenet.de>
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <gutenprint/gutenprint.h>
+#include "gutenprint-internal.h"
+
+struct buffered_image_priv
+{
+	stp_image_t* image;
+	unsigned char** buf;
+	unsigned int flags;
+};
+
+static void
+buffered_image_init(stp_image_t* image)
+{
+	struct buffered_image_priv *priv = image->rep;
+	if(priv->image->init)
+		priv->image->init(priv->image);
+}
+
+
+static int
+buffered_image_width(stp_image_t * image)
+{
+	struct buffered_image_priv *priv = image->rep;
+	return priv->image->width(priv->image);
+}
+
+static int
+buffered_image_height(stp_image_t * image)
+{
+	struct buffered_image_priv *priv = image->rep;
+	return priv->image->height(priv->image);
+}
+
+static const char *
+buffered_image_get_appname(stp_image_t *image)
+{
+	struct buffered_image_priv *priv = image->rep;
+	return priv->image->get_appname(priv->image);
+}
+
+
+static stp_image_status_t
+buffered_image_get_row(stp_image_t* image,unsigned char *data, size_t byte_limit, int row)
+{
+	struct buffered_image_priv *priv = image->rep;
+	int width = buffered_image_width(image);
+	int height = buffered_image_height(image);
+	/* FIXME this will break with padding bytes */
+	int bytes_per_pixel = byte_limit / width;
+	int inc = bytes_per_pixel;
+	unsigned char* src;
+	int i;
+	/* fill buffer */
+	if(!priv->buf){
+		priv->buf = stp_zalloc((sizeof(unsigned short*) + 1) * height);
+		if(!priv->buf){
+			return STP_IMAGE_STATUS_ABORT;
+		}
+		for(i=0;i<height;i++){
+			priv->buf[i] = stp_malloc(byte_limit);
+			if(STP_IMAGE_STATUS_OK != priv->image->get_row(priv->image,priv->buf[i],byte_limit,i))
+				return STP_IMAGE_STATUS_ABORT;
+		}
+	}
+	if(priv->flags & BUFFER_FLAG_FLIP_Y)
+		row = height - row - 1;
+
+	src = priv->buf[row];
+
+	if(priv->flags & BUFFER_FLAG_FLIP_X){
+		src += byte_limit - bytes_per_pixel;
+		inc = -bytes_per_pixel;
+	}
+
+	/* copy data */
+	for( i = 0 ; i < width ; i++){
+		memcpy(data,src,bytes_per_pixel);
+		src += inc;
+		data += bytes_per_pixel;
+	}
+	return STP_IMAGE_STATUS_OK;
+}
+
+static void
+buffered_image_conclude(stp_image_t * image)
+{
+	struct buffered_image_priv *priv = image->rep;
+	if(priv->buf){
+		int i = 0;
+		while(priv->buf[i]){
+			stp_free(priv->buf[i]);
+			++i;
+		}
+		stp_free(priv->buf);
+		priv->buf = NULL;
+	}
+	if(priv->image->conclude)
+		priv->image->conclude(priv->image);
+
+}
+
+stp_image_t*
+stpi_buffer_image(stp_image_t* image, unsigned int flags)
+{
+	struct buffered_image_priv *priv;
+	stp_image_t* buffered_image = stp_zalloc(sizeof(stp_image_t));
+	if(!buffered_image){
+		return NULL;
+	}
+	priv = buffered_image->rep = stp_zalloc(sizeof(struct buffered_image_priv));
+	if(!priv){
+		stp_free(buffered_image);
+		return NULL;
+	}
+
+	if(image->init)
+		buffered_image->init = buffered_image_init;
+	buffered_image->width = buffered_image_width;
+	buffered_image->height = buffered_image_height;
+	buffered_image->get_row = buffered_image_get_row;
+	priv->image = image;
+	priv->flags = flags;
+	if(image->get_appname)
+		buffered_image->get_appname = buffered_image_get_appname;
+
+
+	return buffered_image;
+}
+
+ 
diff --git a/src/main/canon-inks.h b/src/main/canon-inks.h
new file mode 100644
index 0000000..458cb2a
--- /dev/null
+++ b/src/main/canon-inks.h
@@ -0,0 +1,420 @@
+/*
+ *   Print plug-in CANON BJL driver for the GIMP.
+ *
+ *   Copyright 1997-2000 Michael Sweet (mike@easysw.com),
+ *	Robert Krawitz (rlk@alum.mit.edu) and
+ *      Andy Thaller (thaller@ph.tum.de)
+ *   Copyright (c) 2006 - 2007 Sascha Sommer (saschasommer@freenet.de)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* This file contains definitions for the various inks
+*/
+
+#ifndef GUTENPRINT_INTERNAL_CANON_INKS_H
+#define GUTENPRINT_INTERNAL_CANON_INKS_H
+
+/* ink definition: 
+ *  ink dots can be printed in various sizes 
+ *  one size is called level
+ *  every level is represented by a bitcombination and a density
+ *  the density ranges from 0 (no dot is printed) to 1.0 (maximum dot size)
+ *
+ *  an ink is therefore defined by the number of bits used for the bitpattern (bitdepth) and the number of possible levels:
+ *    a 1 bit ink can have 2 possible levels 0 and 1
+ *    a 2 bit ink can have 2*2=4 possible levels with the bitpatterns 0,1,2 and 3 
+ *    a 3 bit ink can have 2*2*2=8 possible levels with the bitpatterns 0 to 7
+ *    ...
+ *  some inks use less levels than possible with the given bitdepth
+ *  some inks use special compressions to store for example 5 3 level pixels in 1 byte  
+ * naming:
+ *  dotsizes are named dotsizes_xl where x is the number of levels (number of dotsizes + 1)
+ *  inks are named canon_xb_yl_ink where x is the number of bits representing the y possible ink levels
+ *  inks that contain special (compression) flags are named canon_xb_yl_c_ink
+ * order:
+ *  dotsizes are ordered ascending by the number of dots
+ *
+*/
+
+
+typedef struct {
+  const int bits;                     /* bitdepth */
+  const int flags;                    /* flags:   */
+#define INK_FLAG_5pixel_in_1byte 0x1  /*  use special compression where 5 3level pixels get stored in 1 byte */
+  int numsizes;                       /* number of possible {bit,density} tuples */
+  const stp_dotsize_t *dot_sizes;     /* pointer to an array of {bit,density} tuples */ 
+} canon_ink_t;
+
+/* declare a standard ink */
+#define DECLARE_INK(bits,levels)      \
+static const canon_ink_t canon_##bits##b_##levels##l_ink = {              \
+  bits,0,                                  \
+  sizeof(dotsizes_##levels##l)/sizeof(stp_dotsize_t), dotsizes_##levels##l   \
+}
+
+/* declare an ink with flags */
+#define DECLARE_INK_EXTENDED(bits,levels,flags)      \
+static const canon_ink_t canon_##bits##b_##levels##l_c_ink = {              \
+  bits,flags,                                  \
+  sizeof(dotsizes_##levels##l)/sizeof(stp_dotsize_t), dotsizes_##levels##l   \
+}
+
+
+
+/* NOTE  NOTE  NOTE  NOTE  NOTE  NOTE  NOTE  NOTE  NOTE  NOTE  NOTE  NOTE
+ *
+ * Some of the bitpattern/density combinations were taken from print-escp2.c 
+ * and do NOT represent the requirements of canon inks. Feel free to play
+ * with them and send a patch to gimp-print-devel@lists.sourceforge.net
+ */
+
+
+static const stp_dotsize_t dotsizes_2l[] = {
+  { 0x1, 1.0 }
+};
+
+DECLARE_INK(1,2);
+
+
+static const stp_dotsize_t dotsizes_3l[] = {
+  { 0x1, 0.5  },
+  { 0x2, 1.0  }
+};
+
+DECLARE_INK(2,3);
+
+DECLARE_INK_EXTENDED(2,3,INK_FLAG_5pixel_in_1byte);
+
+static const stp_dotsize_t dotsizes_4l[] = {
+  { 0x1, 0.45 },
+  { 0x2, 0.68 },
+  { 0x3, 1.0 }
+};
+
+DECLARE_INK(2,4);
+
+static const stp_dotsize_t dotsizes_7l[] = {
+  { 0x1, 0.45 },
+  { 0x2, 0.55 },
+  { 0x3, 0.66 },
+  { 0x4, 0.77 },
+  { 0x5, 0.88 },
+  { 0x6, 1.0 }
+};
+
+DECLARE_INK(3,7);
+
+static const stp_dotsize_t dotsizes_8l[] = {
+  { 0x1, 0.14 },
+  { 0x2, 0.29 },
+  { 0x3, 0.43 },
+  { 0x4, 0.58 },
+  { 0x5, 0.71 },
+  { 0x6, 0.86 },
+  { 0x7, 1.00 }
+};
+
+DECLARE_INK(4,8);
+
+static const stp_dotsize_t dotsizes_16l[] = {
+  { 0x1, 0.07 },
+  { 0x2, 0.13 },
+  { 0x3, 0.20 },
+  { 0x4, 0.27 },
+  { 0x5, 0.33 },
+  { 0x6, 0.40 },
+  { 0x7, 0.47 },
+  { 0x8, 0.53 },
+  { 0x9, 0.60 },
+  { 0xA, 0.67 },
+  { 0xB, 0.73 },
+  { 0xC, 0.80 },
+  { 0xD, 0.87 },
+  { 0xE, 0.93 },
+  { 0xF, 1.00 }
+};
+
+DECLARE_INK(4,16);
+
+
+/* A inkset is a list of inks and their (relative) densities 
+ * For printers that use the extended SetImage command t)
+ * the inkset will be used to build the parameter list
+ * therefore invalid inksets will let the printer fallback
+ * to a default mode which will then lead to wrong output
+ * use {0,0.0,NULL} for undefined placeholder inks
+ * set density to 0.0 to disable certain inks
+ * the paramters will then still occure in the t) command 
+ * 
+ * names:
+ * inksets are named canon_X_ where X is the number of possible inks in the set
+ * followed by YZ combinations for every defined ink where Y is the letter
+ * representing the color and Z the maximum level of the color
+ * if an inkset contains one or more compressed inks a _c is appended
+ * the inkset name ends with _inkset
+ * see the examples below
+ * order:
+ *  inksets are ordered by ascending number of possible inks, used inks, compression
+ *
+ */
+
+
+typedef struct {
+   const int channel;
+   const double density;
+   const canon_ink_t* ink;
+} canon_inkset_t;
+
+
+/* Inkset for printing in K and 1bit/pixel */
+static const canon_inkset_t canon_1_K2_inkset[] = {
+        {'K',1.0,&canon_1b_2l_ink}
+};
+
+/* Inkset for printing in CMY and 1bit/pixel */
+static const canon_inkset_t canon_3_C2M2Y2_inkset[] = {
+        {'C',1.0,&canon_1b_2l_ink},
+        {'M',1.0,&canon_1b_2l_ink},
+        {'Y',1.0,&canon_1b_2l_ink}
+};
+
+
+/* Inkset for printing in CMY and 2bit/pixel */
+static const canon_inkset_t canon_3_C4M4Y4_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink}
+};
+
+/* Inkset for printing in CMYK and 1bit/pixel */
+static const canon_inkset_t canon_4_C2M2Y2K2_inkset[] = {
+        {'C',1.0,&canon_1b_2l_ink},
+        {'M',1.0,&canon_1b_2l_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',1.0,&canon_1b_2l_ink}
+};
+
+/* Inkset for printing in CMYK and 2bit/pixel */
+static const canon_inkset_t canon_4_C4M4Y4K4_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {'K',1.0,&canon_2b_4l_ink}
+};
+
+/*
+ * Dither ranges specifically for any Color and 3bit/pixel
+ * (see NOTE above)
+ *
+ * BIG NOTE: The bjc8200 has this kind of ink. One Byte seems to hold
+ *           drop sizes for 3 pixels in a 3/2/2 bit fashion.
+ *           Size values for 3bit-sized pixels range from 1 to 7,
+ *           size values for 2bit-sized picels from 1 to 3 (kill msb).
+ *
+ *
+ */
+
+/* Inkset for printing in CMYK and 3bit/pixel */
+static const canon_inkset_t canon_4_C7M7Y7K7_inkset[] = {
+        {'C',1.0,&canon_3b_7l_ink},
+        {'M',1.0,&canon_3b_7l_ink},
+        {'Y',1.0,&canon_3b_7l_ink},
+        {'K',1.0,&canon_3b_7l_ink}
+};
+
+/* Inkset for printing in CMYKcm and 1bit/pixel */
+/* FIXME is it really correct that the density of the CM inks is lowered? */
+static const canon_inkset_t canon_6_C2M2Y2K2c2m2_inkset[] = {
+        {'C',0.25,&canon_1b_2l_ink},
+        {'M',0.26,&canon_1b_2l_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {'c',1.0,&canon_1b_2l_ink},
+        {'m',1.0,&canon_1b_2l_ink}
+};
+
+/* Inkset for printing in CMYKcm and 2bit/pixel */
+/* FIXME is it really correct that the density of the CM inks is lowered? */
+static const canon_inkset_t canon_6_C4M4Y4K4c4m4_inkset[] = {
+        {'C',0.33,&canon_2b_4l_ink},
+        {'M',0.33,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {'K',1.0,&canon_2b_4l_ink},
+        {'c',1.0,&canon_2b_4l_ink},
+        {'m',1.0,&canon_2b_4l_ink}
+};
+
+/* Inkset for printing in CMYKcm and 3bit/pixel */
+/* FIXME is it really correct that the density of the CM inks is lowered? */
+static const canon_inkset_t canon_6_C7M7Y7K7c7m7_inkset[] = {
+        {'C',0.33,&canon_3b_7l_ink},
+        {'M',0.33,&canon_3b_7l_ink},
+        {'Y',1.0,&canon_3b_7l_ink},
+        {'K',1.0,&canon_3b_7l_ink},
+        {'c',1.0,&canon_3b_7l_ink},
+        {'m',1.0,&canon_3b_7l_ink}
+};
+
+static const canon_inkset_t canon_9_C3M3Y2K2_inkset[] = {
+        {'C',1.0,&canon_2b_3l_ink},
+        {'M',1.0,&canon_2b_3l_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_9_C3M3Y2K2_c_inkset[] = {
+        {'C',1.0,&canon_2b_3l_c_ink},
+        {'M',1.0,&canon_2b_3l_c_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C3M3Y2K2k3_c_inkset[] = {
+        {'C',1.0,&canon_2b_3l_c_ink},
+        {'M',1.0,&canon_2b_3l_c_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'k',0.0,&canon_2b_3l_c_ink},  /* even though we won't use the photo black in this mode its parameters have to be set */
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C4M4Y4K2c4m4k4_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {'c',0.5,&canon_2b_4l_ink},
+        {'m',0.5,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {'k',0.5,&canon_2b_4l_ink},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C8M8Y8c16m16k8_inkset[] = {
+        {'C',1.0,&canon_4b_8l_ink},
+        {'M',1.0,&canon_4b_8l_ink},
+        {'Y',1.0,&canon_4b_8l_ink},
+        {0,0.0,NULL},
+        {'c',0.5,&canon_4b_16l_ink},
+        {'m',0.5,&canon_4b_16l_ink},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_4b_8l_ink}, 
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_13_C3M3Y2K2_inkset[] = {
+        {'C',1.0,&canon_2b_3l_ink},
+        {'M',1.0,&canon_2b_3l_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_19_C3M3Y3k3_inkset[] = {
+        {'C',1.0,&canon_2b_3l_ink},
+        {'M',1.0,&canon_2b_3l_ink},
+        {'Y',1.0,&canon_2b_3l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_3l_ink},
+        {0,0.0,NULL}, 
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_22_C3M3Y2K2k3_c_inkset[] = {
+        {'C',1.0,&canon_2b_3l_c_ink},
+        {'M',1.0,&canon_2b_3l_c_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'k',0.0,&canon_2b_3l_c_ink},  /* even though we won't use the photo black in this mode its parameters have to be set */
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_22_C4M4Y4K2c4m4k4_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {'c',0.5,&canon_2b_4l_ink},
+        {'m',0.5,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {'k',0.0,&canon_2b_4l_ink},  /* even though we won't use the photo black in this mode its parameters have to be set */
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0xa3,0.0,&canon_2b_4l_ink},
+        {0xad,0.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+#endif
+
diff --git a/src/main/canon-media.h b/src/main/canon-media.h
new file mode 100644
index 0000000..d6ed971
--- /dev/null
+++ b/src/main/canon-media.h
@@ -0,0 +1,146 @@
+/*
+ *   Print plug-in CANON BJL driver for the GIMP.
+ *
+ *   Copyright 1997-2000 Michael Sweet (mike@easysw.com),
+ *	Robert Krawitz (rlk@alum.mit.edu) and
+ *      Andy Thaller (thaller@ph.tum.de)
+ *   Copyright (c) 2006 Sascha Sommer (saschasommer@freenet.de)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* This file contains the definitions for the possible Media Types
+   TODO: Color Correction and Density adjustment 
+*/
+
+#ifndef GUTENPRINT_INTERNAL_CANON_MEDIA_H
+#define GUTENPRINT_INTERNAL_CANON_MEDIA_H
+
+/* media related structs */
+
+
+/* media slots */
+
+typedef struct {
+  const char* name;
+  const char* text;
+  unsigned char code;
+} canon_slot_t;
+
+typedef struct {
+  const char *name;
+  short count;
+  const canon_slot_t *slots;
+} canon_slotlist_t;
+
+#define DECLARE_SLOTS(name)                           \
+static const canon_slotlist_t name##_slotlist = {     \
+  #name,                                              \
+  sizeof(name##_slots) / sizeof(canon_slot_t),        \
+  name##_slots                                        \
+}
+
+
+static const canon_slot_t canon_default_slots[] = {
+  { "Auto",       N_ ("Auto Sheet Feeder"), 4 },
+  { "Manual",     N_ ("Manual with Pause"), 0 },
+  { "ManualNP",   N_ ("Manual without Pause"), 1 },
+  { "Cassette",   N_ ("Cassette"), 8 },
+  { "CD",         N_ ("CD tray"), 10 },
+};
+DECLARE_SLOTS(canon_default);
+
+
+static const canon_slot_t canon_PIXMA_iP4000_slots[] = {
+  { "SelectKey",  N_ ("Selected by Paper Select Key"), 3 },
+  { "Auto",       N_ ("Auto Sheet Feeder"), 4 },
+  { "Cassette",   N_ ("Cassette"), 0x8 },
+  { "CD",         N_ ("CD tray"), 10 },
+  { "AutoSwitch", N_ ("Automatic Paper Source Switching"), 15 },
+};
+DECLARE_SLOTS(canon_PIXMA_iP4000);
+
+/* media types */
+
+typedef struct {
+  const char *name;                        /* Internal Name may not contain spaces */
+  const char *text;                        /* Translateable name */
+  unsigned char media_code_c;              /* Media Code used for the ESC (c (SetColor) command */
+  unsigned char media_code_l;              /* Media Code used for the ESC (l (SetTray) command */
+  unsigned int qualities;
+#define Q0        0                        /* lowest quality */
+#define Q1        1
+#define Q2        2
+#define Q3        4
+#define Q4        8                        /* highest quality */
+  double base_density;
+  double k_lower_scale;
+  double k_upper;
+  const char *hue_adjustment;
+  const char *lum_adjustment;
+  const char *sat_adjustment;
+} canon_paper_t;
+
+typedef struct {
+  const char *name;
+  short count;
+  const canon_paper_t *papers;
+} canon_paperlist_t;
+
+#define DECLARE_PAPERS(name)                            \
+static const canon_paperlist_t name##_paperlist = {     \
+  #name,                                                \
+  sizeof(name##_papers) / sizeof(canon_paper_t),        \
+  name##_papers                                         \
+}
+
+
+/* paperlists for the various printers. The first entry will be the default */
+
+static const canon_paper_t canon_default_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),		0x00, 0x00,Q2,0.50, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		0x02, 0x02,Q2,1.00, 1.00, 0.900, 0, 0, 0 },
+  { "BackPrint",	N_ ("Back Print Film"),		0x03, 0x03,Q2,1.00, 1.00, 0.900, 0, 0, 0 },
+  { "Fabric",		N_ ("Fabric Sheets"),		0x04, 0x04,Q2,0.50, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),		0x08, 0x08,Q2,0.50, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),	0x07, 0x07,Q2,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),	0x03, 0x03,Q2,0.50, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyFilm",	N_ ("High Gloss Film"),		0x06, 0x06,Q2,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),	0x05, 0x05,Q2,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "GlossyCard",	N_ ("Glossy Photo Cards"),	0x0a, 0x0a,Q2,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),		0x09, 0x09,Q2,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "Other",		N_ ("Other"),                   0x00, 0x00,Q2,0.50, 0.25, .5, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_default);
+
+static const canon_paper_t canon_PIXMA_iP4000_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,Q0|Q1|Q2|Q3,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency", 	N_ ("Transparencies"),			0x02,0x02,Q2|Q3,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,Q2,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,Q2|Q3,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,Q2|Q3,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,Q2|Q3,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,Q2|Q3|Q4,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Photo Paper Matte"),		0x0a,0x10,Q2|Q3,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,Q1|Q2|Q3,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "CD",		N_ ("CD"),				0x00,0x12,Q2|Q3|Q4,0.78, 0.25, 0.500, 0, 0, 0 }, 
+  /* FIXME media code for c) should be 0x0c for CD but this will restrict CD printing to a single, not well supported, resolution */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,Q2,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble", N_ ("Photoper Plus Double-Sided"),	0x10,0x15,Q2|Q3,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_PIXMA_iP4000);
+
+#endif
+
diff --git a/src/main/canon-modes.h b/src/main/canon-modes.h
new file mode 100644
index 0000000..42e7f8b
--- /dev/null
+++ b/src/main/canon-modes.h
@@ -0,0 +1,285 @@
+/*
+ *   Print plug-in CANON BJL driver for the GIMP.
+ *
+ *   Copyright 1997-2000 Michael Sweet (mike@easysw.com),
+ *	Robert Krawitz (rlk@alum.mit.edu) and
+ *      Andy Thaller (thaller@ph.tum.de)
+ *   Copyright (c) 2006 - 2007 Sascha Sommer (saschasommer@freenet.de)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* This file contains definitions for the various printmodes
+*/
+
+#ifndef GUTENPRINT_INTERNAL_CANON_MODES_H
+#define GUTENPRINT_INTERNAL_CANON_MODES_H
+
+/* delay settings 
+ sometimes the raster data has to be sent 
+ | K     |
+   | C     |
+     | M     |
+       | Y     |
+ instead of 
+ | K
+ | C
+ | M
+ | Y
+
+ following tables can be used to account for this
+
+*/
+
+typedef struct {
+    unsigned char color;
+    unsigned int delay;
+} canon_delay_t;
+
+/* delay settings for the different printmodes  last entry has to be {0,0} */
+static const canon_delay_t delay_1440[] = {{'C',112},{'M',224},{'Y',336},{'c',112},{'m',224},{'y',336},{0,0}};
+static const canon_delay_t delay_S200[] = {{'C',0x30},{'M',0x50},{'Y',0x70},{0,0}};
+
+
+
+/*
+ * A printmode is defined by its resolution (xdpi x ydpi), the inkset
+ * and the installed printhead.
+ *
+ * For a hereby defined printmode we specify the density and gamma multipliers
+ * and the ink definition with optional adjustments for lum, hue and sat
+ *
+ */
+typedef struct {
+  const int xdpi;                      /* horizontal resolution */
+  const int ydpi;                      /* vertical resolution   */
+  const unsigned int ink_types;        /* the used color channels */
+  const char* name;                    /* internal name do not translate, must not contain spaces */
+  const char* text;                    /* description */
+  const int num_inks;
+  const canon_inkset_t *inks;          /* ink definition        */
+  const unsigned int flags;
+#define MODE_FLAG_WEAVE 0x1            /* this mode requires weaving */
+#define MODE_FLAG_EXTENDED_T 0x2       /* this mode requires extended color settings in the esc t) command */
+#define MODE_FLAG_CD 0x4               /* this mode can be used to print to cds */
+  const canon_delay_t* delay;          /* delay settings for this printmode */
+  const double density;                /* density multiplier    */
+  const double gamma;                  /* gamma multiplier      */
+  const char *lum_adjustment;          /* optional lum adj.     */
+  const char *hue_adjustment;          /* optional hue adj.     */
+  const char *sat_adjustment;          /* optional sat adj.     */
+} canon_mode_t;
+
+#define INKSET(a) sizeof(canon_##a##_inkset)/sizeof(canon_inkset_t),canon_##a##_inkset
+
+
+typedef struct {
+  const char *name;
+  const short count;
+  const short default_mode;
+  const canon_mode_t *modes;
+} canon_modelist_t;
+
+#define DECLARE_MODES(name,default_mode)               \
+static const canon_modelist_t name##_modelist = {      \
+  #name,                                               \
+  sizeof(name##_modes) / sizeof(canon_mode_t),         \
+  default_mode,                                        \
+  name##_modes                                         \
+}
+
+
+/* modelist for every printer,modes ordered by ascending resolution ink_type and quality */
+static const canon_mode_t canon_BJC_30_modes[] = {
+  {  180, 180,CANON_INK_K,"180x180dpi",N_("180x180 DPI"),INKSET(1_K2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  360, 360,CANON_INK_K,"360x360dpi",N_("360x360 DPI"),INKSET(1_K2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  720, 360,CANON_INK_K,"720x360dpi",N_("720x360 DPI"),INKSET(1_K2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_BJC_30,0);
+
+
+static const canon_mode_t canon_BJC_85_modes[] = {
+  {  360, 360,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
+              "360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  360, 360,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
+              "360x360dmt",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  720, 360,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
+              "720x360dpi",N_("720x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_BJC_85,0);
+
+
+/* we treat the printers that can either print in K or CMY as CMYK printers here by assigning a CMYK inkset */
+static const canon_mode_t canon_BJC_210_modes[] = {
+  {   90,  90,CANON_INK_K | CANON_INK_CMY,"90x90dpi",N_("90x90 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  180, 180,CANON_INK_K | CANON_INK_CMY,"180x180dpi",N_("180x180 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  360, 360,CANON_INK_K | CANON_INK_CMY,"360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  720, 360,CANON_INK_K | CANON_INK_CMY,"720x360dpi",N_("720x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_BJC_210,0);
+
+
+static const canon_mode_t canon_BJC_240_modes[] = {
+  {   90,  90,CANON_INK_K | CANON_INK_CMY,"90x90dpi",N_("90x90 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  180, 180,CANON_INK_K | CANON_INK_CMY,"180x180dpi",N_("180x180 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  360, 360,CANON_INK_K | CANON_INK_CMY,"360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  360, 360,CANON_INK_K | CANON_INK_CMY,"360x360dmt",N_("360x360 DMT"),INKSET(4_C4M4Y4K4),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  720, 360,CANON_INK_K | CANON_INK_CMY,"720x360dpi",N_("720x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_BJC_240,0);
+
+
+static const canon_mode_t canon_BJC_2000_modes[] = {
+  {  180, 180,CANON_INK_CMYK,"180x180dpi",N_("180x180 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  360, 360,CANON_INK_CMYK,"360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_BJC_2000,0);
+
+
+static const canon_mode_t canon_BJC_3000_modes[] = {
+  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dmt",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  720, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"720x720dpi",N_("720x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  { 1440, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"1440x720dpi",N_("1440x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,delay_1440,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_BJC_3000,0);
+
+
+static const canon_mode_t canon_BJC_4300_modes[] = {
+  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dmt",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  720, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"720x720dpi",N_("720x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  { 1440, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"1440x720dpi",N_("1440x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,delay_1440,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_BJC_4300,0);
+
+
+
+static const canon_mode_t canon_BJC_4400_modes[] = {
+  {  360, 360,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
+              "360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  720, 360,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
+              "720x360dpi",N_("720x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_BJC_4400,0);
+
+
+static const canon_mode_t canon_BJC_5500_modes[] = {
+  {  180, 180,CANON_INK_CMYK | CANON_INK_CcMmYK,"180x180dpi",N_("180x180 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_BJC_5500,0);
+
+
+static const canon_mode_t canon_BJC_6000_modes[] = {
+  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.8,1.0,NULL,NULL,NULL},
+  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dmt",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.8,1.0,NULL,NULL,NULL},
+  {  720, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"720x720dpi",N_("720x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  { 1440, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"1440x720dpi",N_("1440x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,delay_1440,0.5,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_BJC_6000,0);
+
+
+static const canon_mode_t canon_BJC_7000_modes[] = {
+  {  300, 300,CANON_INK_CMYK | CANON_INK_CcMmYyK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,3.5,1.0,NULL,NULL,NULL},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.8,1.0,NULL,NULL,NULL},
+  { 1200, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"1200x600dpi",N_("1200x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_BJC_7000,0);
+
+
+static const canon_mode_t canon_BJC_7100_modes[] = {
+  {  300, 300,CANON_INK_CMYK | CANON_INK_CcMmYyK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  { 1200, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"1200x600dpi",N_("1200x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_BJC_7100,0);
+
+static const canon_mode_t canon_BJC_8200_modes[] = {
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  { 1200,1200,CANON_INK_CMYK,"1200x1200dpi",N_("1200x1200 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_BJC_8200,0);
+
+
+static const canon_mode_t canon_BJC_8500_modes[] = {
+  {  300, 300,CANON_INK_CMYK | CANON_INK_CcMmYK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_CcMmYK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_BJC_8500,0);
+
+
+static const canon_mode_t canon_S200_modes[] = {
+  {  360, 360,CANON_INK_CMYK | CANON_INK_CMY | CANON_INK_K,
+              "360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),0,delay_S200,2.0,1.0,NULL,NULL,NULL},
+  {  720, 720,CANON_INK_CMYK | CANON_INK_CMY | CANON_INK_K,
+              "720x720dpi",N_("720x720 DPI"),INKSET(4_C2M2Y2K2),MODE_FLAG_WEAVE,delay_S200,1.0,1.0,NULL,NULL,NULL},
+  { 1440, 720,CANON_INK_CMYK | CANON_INK_CMY | CANON_INK_K,
+              "1440x720dpi",N_("1440x720 DPI"),INKSET(4_C2M2Y2K2),MODE_FLAG_WEAVE,delay_S200,0.5,1.0,NULL,NULL,NULL},
+  { 1440,1440,CANON_INK_CMYK | CANON_INK_CMY | CANON_INK_K,
+              "1440x1440dpi",N_("1440x1440 DPI"),INKSET(4_C2M2Y2K2),MODE_FLAG_WEAVE,delay_S200,0.3,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_S200,0);
+
+
+static const canon_mode_t canon_PIXMA_iP2000_modes[] = {
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_PIXMA_iP2000,0);
+
+
+static const canon_mode_t canon_PIXMA_iP3000_modes[] = {
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_PIXMA_iP3000,0);
+
+
+static const canon_mode_t canon_PIXMA_iP4000_modes[] = {
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL},
+/*  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL},*/ /* this mode is used for CD printing, K is ignored by the printer then, the seperation between the small and large dot inks needs more work */
+/*  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_superphoto",N_("600x600 DPI Superphoto"),INKSET(9_C8M8Y8c16m16k8),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL}, */
+};
+DECLARE_MODES(canon_PIXMA_iP4000,2);
+
+
+static const canon_mode_t canon_PIXMA_iP4200_modes[] = {
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL},
+ /* {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(22_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL}, */
+};
+DECLARE_MODES(canon_PIXMA_iP4200,0);
+
+
+static const canon_mode_t canon_PIXMA_iP6700_modes[] = {
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(19_C3M3Y3k3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_PIXMA_iP6700,0);
+
+
+static const canon_mode_t canon_MULTIPASS_MP150_modes[] = {
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_MULTIPASS_MP150,0);
+
+
+static const canon_mode_t canon_MULTIPASS_MP830_modes[] = {
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL},
+};
+DECLARE_MODES(canon_MULTIPASS_MP830,0);
+
+#endif
+
diff --git a/src/main/canon-printers.h b/src/main/canon-printers.h
new file mode 100644
index 0000000..82a0536
--- /dev/null
+++ b/src/main/canon-printers.h
@@ -0,0 +1,519 @@
+/*
+ *   Print plug-in CANON BJL driver for the GIMP.
+ *
+ *   Copyright 1997-2000 Michael Sweet (mike@easysw.com),
+ *	Robert Krawitz (rlk@alum.mit.edu) and
+ *      Andy Thaller (thaller@ph.tum.de)
+ *   Copyright (c) 2006 Sascha Sommer (saschasommer@freenet.de)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* This file contains the capabilities of the various canon printers
+*/
+
+#ifndef GUTENPRINT_INTERNAL_CANON_PRINTERS_H
+#define GUTENPRINT_INTERNAL_CANON_PRINTERS_H
+
+
+typedef struct canon_caps {
+  int model;          /* model number as used in printers.xml */
+  int model_id;       /* model ID code for use in commands */
+  int max_width;      /* maximum printable paper size */
+  int max_height;
+  int border_left;    /* left margin, points */
+  int border_right;   /* right margin, points */
+  int border_top;     /* absolute top margin, points */
+  int border_bottom;  /* absolute bottom margin, points */
+  const canon_slotlist_t* slotlist; /*available paperslots */
+  unsigned long features;  /* special bjl settings */
+  unsigned char ESC_r_arg; /* argument used for the ESC (r command during init */
+  const char** control_cmdlist;
+  const canon_modelist_t* modelist;
+  const canon_paperlist_t* paperlist;
+  const char *lum_adjustment;
+  const char *hue_adjustment;
+  const char *sat_adjustment;
+} canon_cap_t;
+
+static const char standard_sat_adjustment[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
+/* C */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* B */
+/* B */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* M */
+/* M */  "1.00 0.95 0.90 0.90 0.90 0.90 0.90 0.90 "  /* R */
+/* R */  "0.90 0.95 0.95 1.00 1.00 1.00 1.00 1.00 "  /* Y */
+/* Y */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* G */
+/* G */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char standard_lum_adjustment[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
+/* C */  "0.65 0.67 0.70 0.72 0.77 0.80 0.82 0.85 "  /* B */
+/* B */  "0.87 0.86 0.82 0.79 0.79 0.82 0.85 0.88 "  /* M */
+/* M */  "0.92 0.95 0.96 0.97 0.97 0.97 0.96 0.96 "  /* R */
+/* R */  "0.96 0.97 0.97 0.98 0.99 1.00 1.00 1.00 "  /* Y */
+/* Y */  "1.00 0.97 0.95 0.94 0.93 0.92 0.90 0.86 "  /* G */
+/* G */  "0.79 0.76 0.71 0.68 0.68 0.68 0.68 0.66 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char standard_hue_adjustment[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
+/* C */  "0.00 0.06 0.10 0.10 0.06 -.01 -.09 -.17 "  /* B */
+/* B */  "-.25 -.33 -.38 -.38 -.36 -.34 -.34 -.34 "  /* M */
+/* M */  "-.34 -.34 -.36 -.40 -.50 -.40 -.30 -.20 "  /* R */
+/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
+/* Y */  "0.00 0.00 0.00 -.05 -.10 -.15 -.22 -.24 "  /* G */
+/* G */  "-.26 -.30 -.33 -.28 -.25 -.20 -.13 -.06 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char* control_cmd_ackshort[] = {
+  "AckTime=Short",
+  NULL
+};
+
+static const char* control_cmd_PIXMA_iP4000[] = {
+/*"SetTime=20060722092503", */         /*what is this for?*/
+  "SetSilent=OFF",
+  "PEdgeDetection=ON",
+  "SelectParallel=ECP",
+  NULL
+};
+
+
+static const char* control_cmd_MULTIPASS_MP150[] = {
+  "AckTime=Short",
+  "MediaDetection=ON",
+  NULL
+};
+
+static const canon_cap_t canon_model_capabilities[] =
+{
+  /* ******************************** */
+  /*                                  */
+  /* tested and color-adjusted models */
+  /*                                  */
+  /* ******************************** */
+
+
+
+
+  /* ************************************ */
+  /*                                      */
+  /* tested models w/out color-adjustment */
+  /*                                      */
+  /* ************************************ */
+
+  { /* Canon S200x *//* heads: BC-24 */
+    4202, 3,
+    618, 936,       /* 8.58" x 13 " */
+    10, 10, 9, 20,
+    &canon_default_slotlist,
+    CANON_CAP_STD1 | CANON_CAP_rr,0x61,NULL,
+    &canon_S200_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+
+  { /* Canon BJC S300 */
+    8201, 3,
+    842, 17*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD1 | CANON_CAP_r,0x61,control_cmd_ackshort,
+    &canon_BJC_8500_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+
+  { /* Canon  BJ 30   *//* heads: BC-10 */
+    30, 1,
+    9.5*72, 14*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD0 | CANON_CAP_a,0,NULL,
+    &canon_BJC_30_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon  BJC 85  *//* heads: BC-20 BC-21 BC-22 */
+    85, 1,
+    9.5*72, 14*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD0 | CANON_CAP_a,0,NULL,
+    &canon_BJC_85_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+
+  { /* Canon BJC 4300 *//* heads: BC-20 BC-21 BC-22 BC-29 */
+    4300, 1,
+    618, 936,      /* 8.58" x 13 " */
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD0,0,NULL,
+    &canon_BJC_4300_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+
+  { /* Canon BJC 4400 *//* heads: BC-20 BC-21 BC-22 BC-29 */
+    4400, 1,
+    9.5*72, 14*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD0 | CANON_CAP_a,0,NULL,
+    &canon_BJC_4400_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+
+  { /* Canon BJC 6000 *//* heads: BC-30/BC-31 BC-32/BC-31 */
+    6000, 3,
+    618, 936,      /* 8.58" x 13 " */
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD1,0,control_cmd_ackshort,
+    &canon_BJC_6000_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+
+  { /* Canon BJC 6200 *//* heads: BC-30/BC-31 BC-32/BC-31 */
+    6200, 3,
+    618, 936,      /* 8.58" x 13 " */
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD1,0,control_cmd_ackshort,
+    &canon_BJC_6000_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+
+  { /* Canon BJC 6500 *//* heads: BC-30/BC-31 BC-32/BC-31 */
+    6500, 3,
+    842, 17*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD1,0,NULL,
+    &canon_BJC_6000_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC 8200 *//* heads: BC-50 */
+    8200, 3,
+    842, 17*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD1 | CANON_CAP_r,0x61,control_cmd_ackshort,
+    &canon_BJC_8200_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+
+
+  /* *************** */
+  /*                 */
+  /* untested models */
+  /*                 */
+  /* *************** */
+
+  { /* Canon BJC 210 *//* heads: BC-02 BC-05 BC-06 */
+    210, 1,
+    618, 936,      /* 8.58" x 13 " */
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD0,0,NULL,
+    &canon_BJC_210_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC 240 *//* heads: BC-02 BC-05 BC-06 */
+    240, 1,
+    618, 936,      /* 8.58" x 13 " */
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD0,0,NULL,
+    &canon_BJC_240_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC 250 *//* heads: BC-02 BC-05 BC-06 */
+    250, 1,
+    618, 936,      /* 8.58" x 13 " */
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD0,0,NULL,
+    &canon_BJC_240_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC 1000 *//* heads: BC-02 BC-05 BC-06 */
+    1000, 1,
+    842, 17*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD0 | CANON_CAP_a,0,NULL,
+    &canon_BJC_240_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC 2000 *//* heads: BC-20 BC-21 BC-22 BC-29 */
+    2000, 1,
+    842, 17*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD0 | CANON_CAP_a,0,NULL,
+    &canon_BJC_2000_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC 3000 *//* heads: BC-30 BC-33 BC-34 */
+    3000, 3,
+    842, 17*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD0 | CANON_CAP_a,0,NULL, /*FIX? should have _r? */
+    &canon_BJC_3000_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC 6100 *//* heads: BC-30/BC-31 BC-32/BC-31 */
+    6100, 3,
+    842, 17*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD1 | CANON_CAP_a | CANON_CAP_r,0x61,NULL,
+    &canon_BJC_3000_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC 7000 *//* heads: BC-60/BC-61 BC-60/BC-62   ??????? */
+    7000, 3,
+    842, 17*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD1,0,NULL,
+    &canon_BJC_7000_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC 7100 *//* heads: BC-60/BC-61 BC-60/BC-62   ??????? */
+    7100, 3,
+    842, 17*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD0,0,NULL,
+    &canon_BJC_7100_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+
+  /*****************************/
+  /*                           */
+  /*  extremely fuzzy models   */
+  /* (might never work at all) */
+  /*                           */
+  /*****************************/
+
+  { /* Canon BJC 5100 *//* heads: BC-20 BC-21 BC-22 BC-23 BC-29 */
+    5100, 1,
+    17*72, 22*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD0,0,NULL,
+    &canon_BJC_3000_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC 5500 *//* heads: BC-20 BC-21 BC-29 */
+    5500, 1,
+    22*72, 34*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD0 | CANON_CAP_a,0,NULL,
+    &canon_BJC_5500_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC 6500 *//* heads: BC-30/BC-31 BC-32/BC-31 */
+    6500, 3,
+    17*72, 22*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD1 | CANON_CAP_a,0,NULL,
+    &canon_BJC_3000_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC 8500 *//* heads: BC-80/BC-81 BC-82/BC-81 */
+    8500, 3,
+    17*72, 22*72,
+    11, 9, 10, 18,
+    &canon_default_slotlist,
+    CANON_CAP_STD0,0,NULL,
+    &canon_BJC_8500_modelist,
+    &canon_default_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon PIXMA iP2000 */
+    9001, 3,          /*model, model_id*/
+    842, 17*72,       /* max paper width and height */
+    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4000_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x61,control_cmd_PIXMA_iP4000,  /*features */
+    &canon_PIXMA_iP2000_modelist,
+    &canon_PIXMA_iP4000_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon PIXMA iP3000 */
+    3999, 3,          /*model, model_id*/
+    842, 17*72,       /* max paper width and height */
+    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4000_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x61,control_cmd_PIXMA_iP4000,  /*features */
+    &canon_PIXMA_iP3000_modelist,
+    &canon_PIXMA_iP4000_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon PIXMA iP4000 */
+    4000, 3,          /*model, model_id*/
+    842, 17*72,       /* max paper width and height */
+    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4000_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px /*,|CANON_CAP_I*/,0x64,control_cmd_PIXMA_iP4000,  /*features */
+    &canon_PIXMA_iP4000_modelist,
+    &canon_PIXMA_iP4000_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon PIXMA iP4200 */
+    4200, 3,          /*model, model_id*/
+    842, 17*72,       /* max paper width and height */
+    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4000_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x64,control_cmd_PIXMA_iP4000,  /*features */
+    &canon_PIXMA_iP4200_modelist,
+    &canon_PIXMA_iP4000_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon PIXMA iP6700 */
+    4203, 3,          /*model, model_id*/
+    842, 17*72,       /* max paper width and height */
+    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4000_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x64,control_cmd_PIXMA_iP4000,  /*features */
+    &canon_PIXMA_iP6700_modelist,
+    &canon_PIXMA_iP4000_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon MULTIPASS MP150 */
+    4201, 3,          /*model, model_id*/
+    842, 17*72,       /* max paper width and height */
+    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4000_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x61,control_cmd_MULTIPASS_MP150,  /*features */
+    &canon_MULTIPASS_MP150_modelist,
+    &canon_PIXMA_iP4000_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon MULTIPASS MP830 */
+    9000, 3,          /*model, model_id*/
+    842, 17*72,       /* max paper width and height */
+    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4000_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px,0,control_cmd_MULTIPASS_MP150,  /*features */
+    &canon_MULTIPASS_MP830_modelist,
+    &canon_PIXMA_iP4000_paperlist,
+    NULL,
+    NULL,
+    NULL
+  },
+};
+
+#endif
+
diff --git a/src/main/curve.c b/src/main/curve.c
index 03c2ede..3820dea 100644
--- a/src/main/curve.c
+++ b/src/main/curve.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: curve.c,v 1.51 2005/04/10 22:57:40 rlk Exp $"
+ * "$Id: curve.c,v 1.52 2006/09/12 19:03:32 easysw Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -538,7 +538,7 @@ int
 stp_curve_set_gamma(stp_curve_t *curve, double fgamma)
 {
   check_curve(curve);
-  if (curve->wrap_mode || ! finite(fgamma) || fgamma == 0.0)
+  if (curve->wrap_mode || ! isfinite(fgamma) || fgamma == 0.0)
     return 0;
   clear_curve_data(curve);
   curve->gamma = fgamma;
@@ -570,7 +570,7 @@ stp_curve_set_data(stp_curve_t *curve, size_t count, const double *data)
   /* Validate the data before we commit to it. */
   stp_sequence_get_bounds(curve->seq, &low, &high);
   for (i = 0; i < count; i++)
-    if (! finite(data[i]) || data[i] < low || data[i] > high)
+    if (! isfinite(data[i]) || data[i] < low || data[i] > high)
       {
 	stp_deprintf(STP_DBG_CURVE_ERRORS,
 		     "stp_curve_set_data: datum out of bounds: "
@@ -620,7 +620,7 @@ stp_curve_set_data_points(stp_curve_t *curve, size_t count,
   stp_sequence_get_bounds(curve->seq, &low, &high);
   for (i = 0; i < count; i++)
     {
-      if (! finite(data[i].y) || data[i].y < low || data[i].y > high)
+      if (! isfinite(data[i].y) || data[i].y < low || data[i].y > high)
 	{
 	  stp_deprintf(STP_DBG_CURVE_ERRORS,
 		       "stp_curve_set_data_points: datum out of bounds: "
@@ -918,7 +918,7 @@ stp_curve_rescale(stp_curve_t *curve, double scale,
 	}
     }
 
-  if (! finite(nbhi) || ! finite(nblo))
+  if (! isfinite(nbhi) || ! isfinite(nblo))
     return 0;
 
   count = get_point_count(curve);
@@ -1302,7 +1302,7 @@ interpolate_points(stp_curve_t *a, stp_curve_t *b,
 	pa += pb;
       else
 	pa *= pb;
-      if (! finite(pa))
+      if (! isfinite(pa))
 	{
 	  stp_deprintf(STP_DBG_CURVE_ERRORS,
 		       "interpolate_points: interpolated point %lu is invalid\n",
diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c
index e12edbf..6b8fbfa 100644
--- a/src/main/escp2-channels.c
+++ b/src/main/escp2-channels.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-channels.c,v 1.62 2006/06/01 23:49:33 rlk Exp $"
+ * "$Id: escp2-channels.c,v 1.62.8.2 2007/05/29 01:47:28 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -768,6 +768,64 @@ static const physical_subchannel_t f360x_photo_magenta_subchannels[] =
 
 DECLARE_INK_CHANNEL(f360x_photo_magenta);
 
+static const physical_subchannel_t claria_black_subchannels[] =
+{
+  { 0, 0, 0, "BlackDensity", NULL },
+};
+
+DECLARE_INK_CHANNEL(claria_black);
+
+static const physical_subchannel_t claria_yellow_subchannels[] =
+{
+  { 4, 0, 2, "YellowDensity", NULL },
+};
+
+DECLARE_INK_CHANNEL(claria_yellow);
+
+static const physical_subchannel_t claria_cyan_subchannels[] =
+{
+  { 2, 0, 0, "CyanDensity", NULL },
+};
+
+DECLARE_INK_CHANNEL(claria_cyan);
+
+static const physical_subchannel_t claria_photo_cyan_subchannels[] =
+{
+  { 2, 0, 0, "CyanDensity", NULL },
+  { 2, 1, 2, "CyanDensity", "LightCyanTransition" },
+};
+
+DECLARE_INK_CHANNEL(claria_photo_cyan);
+
+static const physical_subchannel_t extended_claria_cyan_subchannels[] =
+{
+  { 2, 1, 2, "CyanDensity", "LightCyanTransition" },
+};
+
+DECLARE_INK_CHANNEL(extended_claria_cyan);
+
+static const physical_subchannel_t claria_magenta_subchannels[] =
+{
+  { 1, 0, 2, "MagentaDensity", NULL },
+};
+
+DECLARE_INK_CHANNEL(claria_magenta);
+
+static const physical_subchannel_t claria_photo_magenta_subchannels[] =
+{
+  { 1, 0, 2, "MagentaDensity", NULL },
+  { 1, 1, 0, "MagentaDensity", "LightMagentaTransition" },
+};
+
+DECLARE_INK_CHANNEL(claria_photo_magenta);
+
+static const physical_subchannel_t extended_claria_magenta_subchannels[] =
+{
+  { 1, 1, 0, "MagentaDensity", "LightMagentaTransition" },
+};
+
+DECLARE_INK_CHANNEL(extended_claria_magenta);
+
 
 #define DECLARE_CHANNEL_SET(name)			\
 static const channel_set_t name##_channel_set =		\
@@ -815,7 +873,7 @@ static const ink_channel_t *const standard_black_channels[] =
 
 DECLARE_CHANNEL_SET(standard_black);
 
-const escp2_inkname_t stpi_escp2_default_black_inkset =
+static const escp2_inkname_t stpi_escp2_default_black_inkset =
 {
   "Gray", N_("Grayscale"), INKSET_CMYK,
   &standard_black_channel_set
@@ -828,7 +886,7 @@ static const ink_channel_t *const standard_photo_black_channels[] =
 
 DECLARE_CHANNEL_SET(standard_photo_black);
 
-const escp2_inkname_t stpi_escp2_default_photo_black_inkset =
+static const escp2_inkname_t stpi_escp2_default_photo_black_inkset =
 {
   "Gray", N_("Grayscale"), INKSET_CMYK,
   &standard_photo_black_channel_set
@@ -842,7 +900,7 @@ static const ink_channel_t *const standard_photo_gloss_black_channels[] =
 DECLARE_CHANNEL_SET(standard_photo_gloss_black);
 DECLARE_AUX_CHANNEL_SET(standard_photo_black, standard_gloss);
 
-const escp2_inkname_t stpi_escp2_default_photo_gloss_black_inkset =
+static const escp2_inkname_t stpi_escp2_default_photo_gloss_black_inkset =
 {
   "GrayG", N_("Grayscale"), INKSET_CMYK,
   &standard_photo_black_standard_gloss_channel_set
@@ -1130,6 +1188,20 @@ static const escp2_inkname_t three_color_r2400_composite_inkset =
   &r2400_cmy_channel_set
 };
 
+static const ink_channel_t *const claria_cmy_channels[] =
+{
+  NULL, &claria_cyan_channel,
+  &claria_magenta_channel, &claria_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(claria_cmy);
+
+static const escp2_inkname_t claria_three_color_composite_inkset =
+{
+  "RGB", N_("Three Color Composite"), INKSET_CMYK,
+  &claria_cmy_channel_set
+};
+
 /*
  ****************************************************************
  *                                                              *
@@ -1288,6 +1360,20 @@ static const escp2_inkname_t cx3650_four_color_standard_inkset =
   &cx3650_cmyk_channel_set
 };
 
+static const ink_channel_t *const claria_cmyk_channels[] =
+{
+  &claria_black_channel, &claria_cyan_channel,
+  &claria_magenta_channel, &claria_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(claria_cmyk);
+
+static const escp2_inkname_t claria_four_color_standard_inkset =
+{
+  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
+  &claria_cmyk_channel_set
+};
+
 
 /*
  ****************************************************************
@@ -1339,6 +1425,20 @@ static const escp2_inkname_t five_color_photo3_inkset =
   &five_color_photo3_channel_set
 };
 
+static const ink_channel_t *const claria_ccmmy_channels[] =
+{
+  NULL, &claria_photo_cyan_channel,
+  &claria_photo_magenta_channel, &claria_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(claria_ccmmy);
+
+static const escp2_inkname_t claria_five_color_photo_composite_inkset =
+{
+  "PhotoCMY", N_("Five Color Photo Composite"), INKSET_CcMmYK,
+  &claria_ccmmy_channel_set
+};
+
 
 /*
  ****************************************************************
@@ -1390,6 +1490,20 @@ static const escp2_inkname_t six_color_photo3_inkset =
   &six_color_photo3_channel_set
 };
 
+static const ink_channel_t *const claria_ccmmyk_channels[] =
+{
+  &claria_black_channel, &claria_photo_cyan_channel,
+  &claria_photo_magenta_channel, &claria_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(claria_ccmmyk);
+
+static const escp2_inkname_t claria_six_color_photo_inkset =
+{
+  "PhotoCMYK", N_("Six Color Photo"), INKSET_CcMmYK,
+  &claria_ccmmyk_channel_set
+};
+
 /*
  ****************************************************************
  *                                                              *
@@ -1830,6 +1944,19 @@ static const escp2_inkname_t cx3650_three_color_extended_inkset =
   &cx3650_three_color_extended_channel_set
 };
 
+static const ink_channel_t *const claria_three_color_extended_channels[] =
+{
+  &claria_cyan_channel, &claria_magenta_channel, &claria_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(claria_three_color_extended);
+
+static const escp2_inkname_t claria_three_color_extended_inkset =
+{
+  "PhysicalCMY", N_("Three Color Raw"), INKSET_EXTENDED,
+  &claria_three_color_extended_channel_set
+};
+
 
 static const escp2_inkname_t four_color_extended_inkset =
 {
@@ -1873,6 +2000,12 @@ static const escp2_inkname_t cx3650_four_color_extended_inkset =
   &cx3650_cmyk_channel_set
 };
 
+static const escp2_inkname_t claria_four_color_extended_inkset =
+{
+  "PhysicalCMYK", N_("Four Color Raw"), INKSET_EXTENDED,
+  &claria_cmyk_channel_set
+};
+
 static const escp2_inkname_t four_color_r800_extended_inkset =
 {
   "PhysicalCMYKGloss", N_("Four Color Raw"), INKSET_EXTENDED,
@@ -1914,6 +2047,20 @@ static const escp2_inkname_t f360_five_color_extended_inkset =
   &f360_five_color_extended_channel_set
 };
 
+static const ink_channel_t *const claria_five_color_extended_channels[] =
+{
+  &claria_cyan_channel, &extended_claria_cyan_channel,
+  &claria_magenta_channel, &extended_claria_magenta_channel,
+  &claria_yellow_channel
+};
+DECLARE_CHANNEL_SET(claria_five_color_extended);
+
+static const escp2_inkname_t claria_five_color_extended_inkset =
+{
+  "PhysicalCcMmYK", N_("Six Color Raw"), INKSET_EXTENDED,
+  &claria_five_color_extended_channel_set
+};
+
 
 static const ink_channel_t *const six_color_extended_channels[] =
 {
@@ -1963,6 +2110,22 @@ static const escp2_inkname_t six_color_r800_photo_gloss_extended_inkset =
   &six_color_r800_photo_gloss_channel_set
 };
 
+static const ink_channel_t *const claria_six_color_extended_channels[] =
+{
+  &claria_black_channel,
+  &claria_cyan_channel, &extended_claria_cyan_channel,
+  &claria_magenta_channel, &extended_claria_magenta_channel,
+  &claria_yellow_channel
+};
+DECLARE_CHANNEL_SET(claria_six_color_extended);
+
+static const escp2_inkname_t claria_six_color_extended_inkset =
+{
+  "PhysicalCcMmYK", N_("Six Color Raw"), INKSET_EXTENDED,
+  &claria_six_color_extended_channel_set
+};
+
+
 static const ink_channel_t *const j_seven_color_extended_channels[] =
 {
   &photo_black_channel,
@@ -2176,14 +2339,26 @@ static const shade_set_t quadtone_shades =	/* Some kind of quadtone ink */
   { 1, { 1.0 }},
 };
 
+static const shade_set_t claria_shades =	/* Stylus R260 and newer */
+{
+  { 1, { 1.0 }},
+  { 2, { 1.0, 0.35 }},
+  { 2, { 1.0, 0.33 }},
+  { 1, { 1.0 }},
+  { 1, { 1.0 }},
+  { 1, { 1.0 }},
+  { 1, { 1.0 }},
+  { 1, { 1.0 }},
+};
+
 #define DECLARE_INKLIST(tname, name, inks, text, papers, adjustments, shades) \
 static const inklist_t name##_inklist =					      \
 {									      \
   tname,								      \
   text,									      \
   inks##_ink_types,							      \
-  &stpi_escp2_##papers##_paper_list,					      \
-  &stpi_escp2_##adjustments##_paper_adjustment_list,			      \
+  #papers,								      \
+  #adjustments,								      \
   &shades##_shades,							      \
   sizeof(inks##_ink_types) / sizeof(escp2_inkname_t *),			      \
 }
@@ -2209,6 +2384,8 @@ static const escp2_inkname_t *const standard_ink_types[] =
 
 DECLARE_INKLIST("None", standard, standard, N_("EPSON Standard Inks"),
 		standard, standard, standard);
+DECLARE_INKLIST("None", photo_gen3_4, standard, N_("EPSON Standard Inks"),
+		standard, photo3, standard);
 
 static const escp2_inkname_t *const quadtone_ink_types[] =
 {
@@ -2351,6 +2528,22 @@ static const escp2_inkname_t *const f360_photo_ink_types[] =
 DECLARE_INKLIST("None", f360_photo, f360_photo, N_("EPSON Standard Inks"),
 		standard, sp960, esp960);
 
+static const escp2_inkname_t *const claria_ink_types[] =
+{
+  &claria_six_color_photo_inkset,
+  &claria_five_color_photo_composite_inkset,
+  &claria_four_color_standard_inkset,
+  &claria_three_color_composite_inkset,
+  &one_color_extended_inkset,
+  &claria_three_color_extended_inkset,
+  &claria_four_color_extended_inkset,
+  &claria_five_color_extended_inkset,
+  &claria_six_color_extended_inkset,
+};
+
+DECLARE_INKLIST("None", claria, claria, N_("EPSON Standard Inks"),
+		standard, claria, claria);
+
 static const escp2_inkname_t *const f360_photo7_japan_ink_types[] =
 {
   &f360_j_seven_color_enhanced_inkset,
@@ -2483,7 +2676,7 @@ DECLARE_INKLIST("picturemate", picturemate, picturemate_photo,
 
 
 #define DECLARE_INKGROUP(name)			\
-const inkgroup_t stpi_escp2_##name##_inkgroup =	\
+static const inkgroup_t name##_inkgroup =	\
 {						\
   #name,					\
   name##_group,					\
@@ -2576,6 +2769,14 @@ static const inklist_t *const photo_gen3_group[] =
 
 DECLARE_INKGROUP(photo_gen3);
 
+static const inklist_t *const photo_gen3_4_group[] =
+{
+  &photo_gen3_4_inklist,
+  &quadtone_inklist
+};
+
+DECLARE_INKGROUP(photo_gen3_4);
+
 static const inklist_t *const photo_pigment_group[] =
 {
   &pigment_inklist
@@ -2635,3 +2836,236 @@ static const inklist_t *const picturemate_group[] =
 };
 
 DECLARE_INKGROUP(picturemate);
+
+static const inklist_t *const claria_group[] =
+{
+  &claria_inklist,
+};
+
+DECLARE_INKGROUP(claria);
+
+typedef struct
+{
+  const char *name;
+  const inkgroup_t *inkgroup;
+} ink_t;
+
+static const ink_t the_inks[] =
+{
+  { "cmy", &cmy_inkgroup },
+  { "standard", &standard_inkgroup },
+  { "c80", &c80_inkgroup },
+  { "c82", &c82_inkgroup },
+  { "c64", &c64_inkgroup },
+  { "f360", &f360_inkgroup },
+  { "cx3650", &cx3650_inkgroup },
+  { "x80", &x80_inkgroup },
+  { "photo_gen1", &photo_gen1_inkgroup },
+  { "photo_gen2", &photo_gen2_inkgroup },
+  { "photo_gen3", &photo_gen3_inkgroup },
+  { "photo_gen3_4", &photo_gen3_4_inkgroup },
+  { "photo_pigment", &photo_pigment_inkgroup },
+  { "ultrachrome", &ultrachrome_inkgroup },
+  { "f360_photo", &f360_photo_inkgroup },
+  { "f360_photo7_japan", &f360_photo7_japan_inkgroup },
+  { "f360_ultrachrome", &f360_ultrachrome_inkgroup },
+  { "f360_ultrachrome_k3", &f360_ultrachrome_k3_inkgroup },
+  { "cmykrb", &cmykrb_inkgroup },
+  { "picturemate", &picturemate_inkgroup },
+  { "claria", &claria_inkgroup },
+};
+
+const inkgroup_t *
+stpi_escp2_get_inkgroup_named(const char *n)
+{
+  int i;
+  if (n)
+    for (i = 0; i < sizeof(the_inks) / sizeof(ink_t); i++)
+      {
+	if (strcmp(n, the_inks[i].name) == 0)
+	  return the_inks[i].inkgroup;
+      }
+  return NULL;
+}
+
+const escp2_inkname_t *
+stpi_escp2_get_default_black_inkset(void)
+{
+  return &stpi_escp2_default_black_inkset;
+}
+
+
+#define DECLARE_CHANNEL_LIST(name)			\
+static const channel_name_t name##_channel_name_list =	\
+{							\
+  #name,						\
+  sizeof(name##_channel_names) / sizeof(const char *),	\
+  name##_channel_names					\
+}
+
+static const char *standard_channel_names[] =
+{
+  N_("Black"),
+  N_("Cyan"),
+  N_("Magenta"),
+  N_("Yellow")
+};
+
+DECLARE_CHANNEL_LIST(standard);
+
+static const char *cx3800_channel_names[] =
+{
+  N_("Cyan"),
+  N_("Yellow"),
+  N_("Magenta"),
+  N_("Black")
+};
+
+DECLARE_CHANNEL_LIST(cx3800);
+
+static const char *mfp2005_channel_names[] =
+{
+  N_("Cyan"),
+  N_("Magenta"),
+  N_("Yellow"),
+  N_("Black")
+};
+
+DECLARE_CHANNEL_LIST(mfp2005);
+
+static const char *photo_channel_names[] =
+{
+  N_("Black"),
+  N_("Cyan"),
+  N_("Magenta"),
+  N_("Yellow"),
+  N_("Light Cyan"),
+  N_("Light Magenta"),
+};
+
+DECLARE_CHANNEL_LIST(photo);
+
+static const char *rx700_channel_names[] =
+{
+  N_("Black"),
+  N_("Cyan"),
+  N_("Light Cyan"),
+  N_("Magenta"),
+  N_("Light Magenta"),
+  N_("Yellow"),
+};
+
+DECLARE_CHANNEL_LIST(rx700);
+
+static const char *sp2200_channel_names[] =
+{
+  N_("Black"),
+  N_("Cyan"),
+  N_("Magenta"),
+  N_("Yellow"),
+  N_("Light Cyan"),
+  N_("Light Magenta"),
+  N_("Light Black"),
+};
+
+DECLARE_CHANNEL_LIST(sp2200);
+
+static const char *pm_950c_channel_names[] =
+{
+  N_("Black"),
+  N_("Cyan"),
+  N_("Magenta"),
+  N_("Yellow"),
+  N_("Light Cyan"),
+  N_("Light Magenta"),
+  N_("Dark Yellow"),
+};
+
+DECLARE_CHANNEL_LIST(pm_950c);
+
+static const char *sp960_channel_names[] =
+{
+  N_("Black"),
+  N_("Cyan"),
+  N_("Magenta"),
+  N_("Yellow"),
+  N_("Light Cyan"),
+  N_("Light Magenta"),
+  N_("Black"),
+};
+
+DECLARE_CHANNEL_LIST(sp960);
+
+static const char *r800_channel_names[] =
+{
+  N_("Yellow"),
+  N_("Magenta"),
+  N_("Cyan"),
+  N_("Matte Black"),
+  N_("Photo Black"),
+  N_("Red"),
+  N_("Blue"),
+  N_("Gloss Optimizer"),
+};
+
+DECLARE_CHANNEL_LIST(r800);
+
+static const char *picturemate_channel_names[] =
+{
+  N_("Yellow"),
+  N_("Magenta"),
+  N_("Cyan"),
+  N_("Black"),
+  N_("Red"),
+  N_("Blue"),
+};
+
+DECLARE_CHANNEL_LIST(picturemate);
+
+static const char *r2400_channel_names[] =
+{
+  N_("Light Light Black"),
+  N_("Light Magenta"),
+  N_("Light Cyan"),
+  N_("Light Black"),
+  N_("Black"),
+  N_("Cyan"),
+  N_("Magenta"),
+  N_("Yellow"),
+};
+
+DECLARE_CHANNEL_LIST(r2400);
+
+typedef struct
+{
+  const char *name;
+  const channel_name_t *channel_name;
+} channel_t;
+
+static const channel_t the_channels[] =
+{
+  { "cx3800", &cx3800_channel_name_list },
+  { "mfp2005", &mfp2005_channel_name_list },
+  { "photo", &photo_channel_name_list },
+  { "picturemate", &picturemate_channel_name_list },
+  { "pm_950c", &pm_950c_channel_name_list },
+  { "r2400", &r2400_channel_name_list },
+  { "r800", &r800_channel_name_list },
+  { "rx700", &rx700_channel_name_list },
+  { "sp2200", &sp2200_channel_name_list },
+  { "sp960", &sp960_channel_name_list },
+  { "standard", &standard_channel_name_list },
+};
+
+const channel_name_t *
+stpi_escp2_get_channel_names_named(const char *n)
+{
+  int i;
+  if (n)
+    for (i = 0; i < sizeof(the_channels) / sizeof(channel_t); i++)
+      {
+	if (strcmp(n, the_channels[i].name) == 0)
+	  return the_channels[i].channel_name;
+      }
+  return NULL;
+}
diff --git a/src/main/escp2-driver.c b/src/main/escp2-driver.c
index 24ef1c1..2141cfc 100644
--- a/src/main/escp2-driver.c
+++ b/src/main/escp2-driver.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-driver.c,v 1.30 2006/07/22 20:28:13 rlk Exp $"
+ * "$Id: escp2-driver.c,v 1.30.6.1 2007/03/02 12:01:25 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -114,6 +114,7 @@ print_debug_params(stp_vars_t *v)
   print_remote_int_param(v, "Page_height", pd->page_height);
   print_remote_int_param(v, "Page_true_height", pd->page_true_height);
   print_remote_int_param(v, "Page_extra_height", pd->page_extra_height);
+  print_remote_int_param(v, "Paper_extra_bottom", pd->paper_extra_bottom);
   print_remote_int_param(v, "Image_left", pd->image_left);
   print_remote_int_param(v, "Image_top", pd->image_top);
   print_remote_int_param(v, "Image_width", pd->image_width);
@@ -240,22 +241,12 @@ escp2_set_remote_sequence(stp_vars_t *v)
 	  stp_send_command(v, "SN", "bccc", 0, 0, feed_sequence);
 	  if (stp_get_boolean_parameter(v, "FullBleed"))
 	    {
-	      stp_send_command(v, "FP", "bch", 0, 0xffb0);
-#if 0
-	      /* These commands do not appear to do anything on the */
-	      /* 2200.  Need to test on R800. */
-	      /* From the R1800 manual -- bottom margin borderless */
-	      stp_send_command(v, "PM", "bcc", 0, 0);
-	      stp_send_command(v, "DP", "bcc", 0, 0);
-	      stp_send_command(v, "SN", "bc", 0);
-	      stp_send_command(v, "MI", "bccc", 1, 0xb, 1);
-	      stp_send_command(v, "US", "bccc", 0, 0, 2);
-	      stp_send_command(v, "US", "bccc", 0, 1, 0);
-	      /* This command means "check paper size - no" */
-	      stp_send_command(v, "US", "bccc", 0, 2, 0);
-	      stp_send_command(v, "DR", "bcccc", 0, 0, 0, 0);
-	      stp_send_command(v, "PP", "bccc", 0, 1, 0xff);
-#endif
+	      stp_send_command(v, "FP", "bch", 0,
+			       (unsigned short) -pd->zero_margin_offset);
+	      if (pd->borderless_sequence)
+		stp_zfwrite(pd->borderless_sequence->data,
+			    pd->borderless_sequence->bytes,
+			    1, v);
 	    }
 	}
       if (pd->input_slot)
@@ -387,7 +378,8 @@ static void
 escp2_set_page_height(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
-  int l = pd->page_management_units * pd->page_true_height / 72;
+  int l = (pd->page_true_height + pd->paper_extra_bottom) *
+    pd->page_management_units / 72;
   if (pd->use_extended_commands)
     stp_send_command(v, "\033(C", "bl", l);
   else
@@ -402,6 +394,8 @@ escp2_set_margins(stp_vars_t *v)
   int top = pd->page_management_units * pd->page_top / 72;
 
   top += pd->initial_vertical_offset;
+  top -= pd->page_extra_height;
+  bot += pd->page_extra_height;
   if (pd->use_extended_commands &&
       (pd->command_set == MODEL_COMMAND_2000 ||
        pd->command_set == MODEL_COMMAND_PRO))
@@ -411,21 +405,14 @@ escp2_set_margins(stp_vars_t *v)
 }
 
 static void
-escp2_set_form_factor(stp_vars_t *v)
+escp2_set_paper_dimensions(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
   if (pd->advanced_command_set)
     {
-      int w = pd->page_width * pd->page_management_units / 72;
-      int h = (pd->page_true_height + pd->page_extra_height) *
+      int w = pd->page_true_width * pd->page_management_units / 72;
+      int h = (pd->page_true_height + pd->paper_extra_bottom) *
 	pd->page_management_units / 72;
-
-      if (stp_get_boolean_parameter(v, "FullBleed"))
-	/* Make the page 160/360" wider for full bleed printing. */
-	/* Per the Epson manual, the margin should be expanded by 80/360" */
-	/* so we need to do this on the left and the right */
-	w += 320 * pd->page_management_units / 720;
-
       stp_send_command(v, "\033(S", "bll", w, h);
     }
 }
@@ -599,7 +586,7 @@ stpi_escp2_init_printer(stp_vars_t *v)
   escp2_set_printhead_resolution(v);
   escp2_set_page_height(v);
   escp2_set_margins(v);
-  escp2_set_form_factor(v);
+  escp2_set_paper_dimensions(v);
 }
 
 void
diff --git a/src/main/escp2-inks.c b/src/main/escp2-inks.c
index 6a5ee2e..309a40e 100644
--- a/src/main/escp2-inks.c
+++ b/src/main/escp2-inks.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-inks.c,v 1.46 2006/01/07 02:43:28 rlk Exp $"
+ * "$Id: escp2-inks.c,v 1.46.10.2 2007/05/29 01:47:28 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -135,6 +135,64 @@ static const escp2_dropsize_t escp2_r300_2880_dropsizes =
 static const escp2_dropsize_t escp2_r300_2880_1440_dropsizes =
   { "r300_2880_1440", 1, { 1.0 } };
 
+/* Claria inks */
+
+/*
+ * Tested relative drop sizes:
+ *      S       M       L
+ *
+ * 0x21 3       4       5
+ * 0x23 2       3       4
+ * 0x24 1       3       5
+ * 0x25 1       2       3
+ * 0x26 2       3       5
+ * 0x33 1       3       5
+ *
+ * Therefore, there's no real point to use drop sizes other than 0x24
+ * and 0x25.  The economy settings (0x10 and 0x0) don't provide any
+ * bigger drops.  We get quite smooth output at 720x360 and 360 DPI, and
+ * even 360x180 is surprisingly smooth.
+ * Roy Harrington estimates the drop sizes are:
+ *
+ * 1  1.5 pl
+ * 2  2.4 pl
+ * 3  6.3 pl
+ * 4 12   pl (rlk estimate)
+ * 5 21   pl
+ */
+
+static const escp2_dropsize_t escp2_claria_720_dropsizes =
+  { "claria_720", 3, { 0.071, 0.3, 1.0 } };
+static const escp2_dropsize_t escp2_claria_1440_dropsizes =
+  { "claria_1440", 3, { 0.23, 0.37, 1.0 } };
+static const escp2_dropsize_t escp2_claria_2880_dropsizes =
+  { "claria_2880", 2, { 0.62, 1.0 } };
+static const escp2_dropsize_t escp2_claria_5760_dropsizes =
+  { "claria_5760", 1, { 1.0 } };
+
+/* Stylus Photo 1400 */
+
+/*
+ * Tested relative drop sizes:
+* 	S	M	L
+*
+* 0x21	3	4	5
+* 0x25	1	2	3
+* 0x33	1	3	5
+* 0x34	2	3	5
+*/
+
+static const escp2_dropsize_t escp2_claria_1400_720_dropsizes =
+  { "claria_1400_720", 3, { 0.3, 0.57, 1.0 } };
+static const escp2_dropsize_t escp2_claria_1400_1440_720_dropsizes =
+  { "claria_1400_1440_720", 3, { 0.071, 0.3, 1.0 } };
+static const escp2_dropsize_t escp2_claria_1400_1440_dropsizes =
+  { "claria_1400_1440", 3, { 0.23, 0.37, 1.0 } };
+static const escp2_dropsize_t escp2_claria_1400_2880_dropsizes =
+  { "claria_1400_2880", 2, { 0.62, 1.0 } };
+static const escp2_dropsize_t escp2_claria_1400_5760_dropsizes =
+  { "claria_1400_5760", 1, { 1.0 } };
+
 /* Stylus Photo R2400 */
 static const escp2_dropsize_t escp2_r2400_360_dropsizes =
   { "r2400_360", 1, { 1 } };
@@ -193,7 +251,7 @@ static const escp2_dropsize_t escp2_ultrachrome_2880_dropsizes =
 static const escp2_dropsize_t escp2_spro10000_dropsizes =
   { "spro10000", 2, { 0.661, 1.0 } };
 
-const escp2_drop_list_t stpi_escp2_simple_drops =
+static const escp2_drop_list_t simple_drops =
 {
   &escp2_single_dropsizes,
   &escp2_single_dropsizes,
@@ -206,7 +264,7 @@ const escp2_drop_list_t stpi_escp2_simple_drops =
   &escp2_single_dropsizes,
 };
 
-const escp2_drop_list_t stpi_escp2_variable_6pl_drops =
+static const escp2_drop_list_t variable_6pl_drops =
 {
   &escp2_6pl_dropsizes,
   &escp2_6pl_dropsizes,
@@ -219,7 +277,7 @@ const escp2_drop_list_t stpi_escp2_variable_6pl_drops =
   &escp2_6pl_2880_dropsizes,
 };
 
-const escp2_drop_list_t stpi_escp2_variable_x80_6pl_drops =
+static const escp2_drop_list_t variable_x80_6pl_drops =
 {
   &escp2_x80_low_dropsizes,
   &escp2_x80_low_dropsizes,
@@ -232,7 +290,7 @@ const escp2_drop_list_t stpi_escp2_variable_x80_6pl_drops =
   &escp2_x80_2880_6pl_dropsizes,
 };
 
-const escp2_drop_list_t stpi_escp2_variable_1440_4pl_drops =
+static const escp2_drop_list_t variable_1440_4pl_drops =
 {
   &escp2_low_dropsizes,
   &escp2_low_dropsizes,
@@ -245,7 +303,7 @@ const escp2_drop_list_t stpi_escp2_variable_1440_4pl_drops =
   &escp2_4pl_2880_dropsizes,
 };
 
-const escp2_drop_list_t stpi_escp2_variable_2880_4pl_drops =
+static const escp2_drop_list_t variable_2880_4pl_drops =
 {
   &escp2_new_low_dropsizes,
   &escp2_new_low_dropsizes,
@@ -258,7 +316,7 @@ const escp2_drop_list_t stpi_escp2_variable_2880_4pl_drops =
   &escp2_4pl_2880_dropsizes,
 };
 
-const escp2_drop_list_t stpi_escp2_variable_3pl_drops =
+static const escp2_drop_list_t variable_3pl_drops =
 {
   &escp2_low_dropsizes,
   &escp2_low_dropsizes,
@@ -271,7 +329,7 @@ const escp2_drop_list_t stpi_escp2_variable_3pl_drops =
   &escp2_3pl_2880_dropsizes,
 };
 
-const escp2_drop_list_t stpi_escp2_variable_2pl_drops =
+static const escp2_drop_list_t variable_2pl_drops =
 {
   &escp2_2pl_360_dropsizes,
   &escp2_2pl_360_dropsizes,
@@ -284,7 +342,7 @@ const escp2_drop_list_t stpi_escp2_variable_2pl_drops =
   &escp2_2pl_2880_dropsizes,
 };
 
-const escp2_drop_list_t stpi_escp2_variable_3pl_pmg_drops =
+static const escp2_drop_list_t variable_3pl_pmg_drops =
 {
   &escp2_r300_360_dropsizes,
   &escp2_r300_360_dropsizes,
@@ -297,7 +355,33 @@ const escp2_drop_list_t stpi_escp2_variable_3pl_pmg_drops =
   &escp2_r300_2880_1440_dropsizes,
 };
 
-const escp2_drop_list_t stpi_escp2_variable_r2400_drops =
+static const escp2_drop_list_t claria_drops =
+{
+  &escp2_claria_720_dropsizes,
+  &escp2_claria_720_dropsizes,
+  &escp2_claria_720_dropsizes,
+  &escp2_claria_720_dropsizes,
+  &escp2_claria_720_dropsizes,
+  &escp2_claria_1440_dropsizes,
+  &escp2_claria_1440_dropsizes,
+  &escp2_claria_2880_dropsizes,
+  &escp2_claria_5760_dropsizes,
+};
+
+static const escp2_drop_list_t claria_1400_drops =
+{
+  &escp2_claria_1400_1440_720_dropsizes,
+  &escp2_claria_1400_1440_720_dropsizes,
+  &escp2_claria_1400_720_dropsizes,
+  &escp2_claria_1400_720_dropsizes,
+  &escp2_claria_1400_1440_720_dropsizes,
+  &escp2_claria_1400_1440_dropsizes,
+  &escp2_claria_1400_1440_dropsizes,
+  &escp2_claria_1400_2880_dropsizes,
+  &escp2_claria_1400_5760_dropsizes,
+};
+
+static const escp2_drop_list_t variable_r2400_drops =
 {
   &escp2_r2400_360_dropsizes,
   &escp2_r2400_360_dropsizes,
@@ -310,7 +394,7 @@ const escp2_drop_list_t stpi_escp2_variable_r2400_drops =
   &escp2_r2400_2880_2880_dropsizes,
 };
 
-const escp2_drop_list_t stpi_escp2_variable_picturemate_drops =
+static const escp2_drop_list_t variable_picturemate_drops =
 {
   &escp2_picturemate_1440_dropsizes,
   &escp2_picturemate_1440_dropsizes,
@@ -323,7 +407,7 @@ const escp2_drop_list_t stpi_escp2_variable_picturemate_drops =
   &escp2_picturemate_5760_dropsizes,
 };
 
-const escp2_drop_list_t stpi_escp2_variable_1_5pl_drops =
+static const escp2_drop_list_t variable_1_5pl_drops =
 {
   &escp2_1_5pl_360_dropsizes,
   &escp2_1_5pl_360_dropsizes,
@@ -336,7 +420,7 @@ const escp2_drop_list_t stpi_escp2_variable_1_5pl_drops =
   &escp2_1_5pl_5760_dropsizes,
 };
 
-const escp2_drop_list_t stpi_escp2_variable_2000p_drops =
+static const escp2_drop_list_t variable_2000p_drops =
 {
   &escp2_2000p_dropsizes,
   &escp2_2000p_dropsizes,
@@ -349,7 +433,7 @@ const escp2_drop_list_t stpi_escp2_variable_2000p_drops =
   &escp2_2000p_dropsizes
 };
 
-const escp2_drop_list_t stpi_escp2_variable_ultrachrome_drops =
+static const escp2_drop_list_t variable_ultrachrome_drops =
 {
   &escp2_ultrachrome_low_dropsizes,
   &escp2_ultrachrome_low_dropsizes,
@@ -362,7 +446,7 @@ const escp2_drop_list_t stpi_escp2_variable_ultrachrome_drops =
   &escp2_ultrachrome_2880_dropsizes,
 };
 
-const escp2_drop_list_t stpi_escp2_variable_3pl_pigment_drops =
+static const escp2_drop_list_t variable_3pl_pigment_drops =
 {
   &escp2_economy_pigment_dropsizes,
   &escp2_low_pigment_dropsizes,
@@ -375,7 +459,7 @@ const escp2_drop_list_t stpi_escp2_variable_3pl_pigment_drops =
   &escp2_3pl_pigment_5760_dropsizes,
 };
 
-const escp2_drop_list_t stpi_escp2_variable_3pl_pigment_c66_drops =
+static const escp2_drop_list_t variable_3pl_pigment_c66_drops =
 {
   &escp2_economy_pigment_c66_dropsizes,
   &escp2_low_pigment_c66_dropsizes,
@@ -388,7 +472,7 @@ const escp2_drop_list_t stpi_escp2_variable_3pl_pigment_c66_drops =
   &escp2_3pl_pigment_c66_5760_dropsizes,
 };
 
-const escp2_drop_list_t stpi_escp2_spro10000_drops =
+static const escp2_drop_list_t spro10000_drops =
 {
   &escp2_spro10000_dropsizes,
   &escp2_spro10000_dropsizes,
@@ -400,3 +484,45 @@ const escp2_drop_list_t stpi_escp2_spro10000_drops =
   &escp2_spro10000_dropsizes,
   &escp2_spro10000_dropsizes
 };
+
+
+typedef struct
+{
+  const char *name;
+  const escp2_drop_list_t *const drop_list;
+} drop_list_t;
+
+static const drop_list_t the_drop_lists[] =
+{
+  { "simple", &simple_drops },
+  { "spro10000", &spro10000_drops },
+  { "variable_1_5pl", &variable_1_5pl_drops },
+  { "variable_2pl", &variable_2pl_drops },
+  { "variable_3pl", &variable_3pl_drops },
+  { "variable_3pl_pigment", &variable_3pl_pigment_drops },
+  { "variable_3pl_pigment_c66", &variable_3pl_pigment_c66_drops },
+  { "variable_3pl_pmg", &variable_3pl_pmg_drops },
+  { "variable_claria", &claria_drops },
+  { "variable_claria_1400", &claria_1400_drops },
+  { "variable_r2400", &variable_r2400_drops },
+  { "variable_picturemate", &variable_picturemate_drops },
+  { "variable_1440_4pl", &variable_1440_4pl_drops },
+  { "variable_ultrachrome", &variable_ultrachrome_drops },
+  { "variable_2880_4pl", &variable_2880_4pl_drops },
+  { "variable_6pl", &variable_6pl_drops },
+  { "variable_2000p", &variable_2000p_drops },
+  { "variable_x80_6pl", &variable_x80_6pl_drops },
+};
+
+const escp2_drop_list_t *
+stpi_escp2_get_drop_list_named(const char *n)
+{
+  int i;
+  if (n)
+    for (i = 0; i < sizeof(the_drop_lists) / sizeof(drop_list_t); i++)
+      {
+	if (strcmp(n, the_drop_lists[i].name) == 0)
+	  return the_drop_lists[i].drop_list;
+      }
+  return NULL;
+}
diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c
index c32e51f..03f9edc 100644
--- a/src/main/escp2-papers.c
+++ b/src/main/escp2-papers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-papers.c,v 1.99 2006/05/31 23:15:22 rlk Exp $"
+ * "$Id: escp2-papers.c,v 1.99.8.2 2007/05/29 01:47:28 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -167,6 +167,53 @@ static const char photo3_hue_adj[] =
 "</gutenprint>\n";
 
 
+
+static const char claria_sat_adj[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
+/* C */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* B */
+/* B */  "1.50 1.50 1.50 1.50 1.50 1.50 1.50 1.50 "  /* M */
+/* M */  "1.50 1.40 1.30 1.20 1.10 1.00 1.00 1.00 "  /* R */
+/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
+/* Y */  "1.00 1.10 1.30 1.55 1.80 1.95 2.00 2.00 "  /* G */
+/* G */  "2.00 2.00 2.00 1.95 1.80 1.55 1.30 1.10 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char claria_lum_adj[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
+/* C */  "0.66 0.67 0.69 0.73 0.77 0.83 0.87 0.89 "  /* B */
+/* B */  "0.91 0.88 0.84 0.78 0.78 0.80 0.82 0.85 "  /* M */
+/* M */  "0.87 0.90 0.94 0.97 1.00 1.00 1.00 1.00 "  /* R */
+/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
+/* Y */  "1.00 1.00 0.99 0.98 0.96 0.94 0.92 0.88 "  /* G */
+/* G */  "0.84 0.72 0.69 0.67 0.66 0.66 0.66 0.66 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char claria_hue_adj[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
+/* C */  "0.00 -.01 -.03 -.06 -.10 -.15 -.20 -.25 "  /* B */
+/* B */  "-.30 -.35 -.38 -.40 -.42 -.46 -.49 -.52 "  /* M */
+/* M */  "-.55 -.57 -.57 -.55 -.52 -.48 -.40 -.30 "  /* R */
+/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
+/* Y */  "0.00 -.00 -.00 -.00 -.02 -.04 -.08 -.13 "  /* G */
+/* G */  "-.18 -.18 -.19 -.16 -.13 -.10 -.07 -.03 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+
 static const char sp960_sat_adj[] =
 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 "<gutenprint>\n"
@@ -531,20 +578,20 @@ static const char r800_glossy_hue_adj[] =
 "</curve>\n"
 "</gutenprint>\n";
 
-#define DECLARE_PAPERS(name)				\
-const paperlist_t stpi_escp2_##name##_paper_list =	\
-{							\
-  #name,						\
-  sizeof(name##_papers) / sizeof(paper_t),		\
-  name##_papers						\
+#define DECLARE_PAPERS(name)			\
+static const paperlist_t name##_paper_list =	\
+{						\
+  #name,					\
+  sizeof(name##_papers) / sizeof(paper_t),	\
+  name##_papers					\
 }
 
-#define DECLARE_PAPER_ADJUSTMENTS(name)					  \
-const paper_adjustment_list_t stpi_escp2_##name##_paper_adjustment_list = \
-{									  \
-  #name,								  \
-  sizeof(name##_adjustments) / sizeof(paper_adjustment_t),		  \
-  name##_adjustments							  \
+#define DECLARE_PAPER_ADJUSTMENTS(name)					\
+static const paper_adjustment_list_t name##_paper_adjustment_list =	\
+{									\
+  #name,								\
+  sizeof(name##_adjustments) / sizeof(paper_adjustment_t),		\
+  name##_adjustments							\
 }
 
 static const paper_adjustment_t standard_adjustments[] =
@@ -723,6 +770,50 @@ static const paper_adjustment_t photo3_adjustments[] =
 
 DECLARE_PAPER_ADJUSTMENTS(photo3);
 
+static const paper_adjustment_t claria_adjustments[] =
+{
+  { "Plain",        0.540, .25, 0.75, .1, .5, 1, .7, .7, 1, 1, 1.0,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "PlainFast",    0.540, .25, 0.75, .1, .5, 1, .7, .7, 1, 1, 1.0,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "Postcard",     0.692, .25, 0.5, .1, .5, 1, .7, .7, 1, 1, 1.0,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "GlossyFilm",   0.833, .25, 0.75, .2, .999, 1, .7, .7, 1, 1, 1,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "Transparency", 0.833, .25, 0.75, .2, .999, 1, .7, .7, 1, 1, 1,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "Envelope",     0.540, .25, 0.75, .1, .5, 1, .7, .7, 1, 1, 1.0,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "BackFilm",     0.833, .25, 0.75, .2, .999, 1, .7, .7, 1, 1, 1,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "Matte",        0.833, .25, 0.6, .15, .999, 1, .7, .7, 1, 1, 1,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "MatteHeavy",   0.833, .25, 0.5, .25, .999, 1, .7, .7, 1, 1, 1,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "Inkjet",       0.709, .25, 0.75, .15, .75, 1, .7, .7, 1, 1, 1,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "Coated",       0.833, .25, 0.5, .25, .999, 1, .7, .7, 1, 1, 1,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "Photo",        0.833, .25, 0.5, .25, .999, 1, .7, .7, 1, 1, 1,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "GlossyPhoto",  0.75, .25, 0.3, .25, .999, 1, .7, .7, 1, 1, 0.92,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "Semigloss",    0.75, .25, 0.3, .25, .999, 1, .7, .7, 1, 1, 0.92,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "Luster",       0.75, .25, 0.3, .25, .999, 1, .7, .7, 1, 1, 0.92,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "GlossyPaper",  0.833, .25, 0.75, .2, .999, 1, .7, .7, 1, 1, 1,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "Ilford",       0.833, .25, 0.75, .2, .999, 1, .7, .7, 1, 1, 1,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj  },
+  { "ColorLife",    0.833, .25, 0.75, .2, .9, 1, .7, .7, 1, 1, 1,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+  { "Other",        0.540, .25, 0.5, .1, .5, 1, .7, .7, 1, 1, 1,
+    claria_hue_adj, claria_lum_adj, claria_sat_adj },
+};
+
+DECLARE_PAPER_ADJUSTMENTS(claria);
+
 static const paper_adjustment_t sp960_adjustments[] =
 {
   { "Plain",        0.86, .2,  0.4, .1,   .9,   .9, 1, 1, 1, 1, 1,
@@ -1440,3 +1531,471 @@ static const paper_t picturemate_papers[] =
 };
 
 DECLARE_PAPERS(picturemate);
+
+typedef struct
+{
+  const char *name;
+  const paperlist_t *paper_list;
+} paperl_t;
+
+static const paperl_t the_papers[] =
+{
+  { "standard", &standard_paper_list },
+  { "durabrite", &durabrite_paper_list },
+  { "durabrite2", &durabrite2_paper_list },
+  { "ultrachrome", &ultrachrome_paper_list },
+  { "ultrachrome_k3", &ultrachrome_k3_paper_list },
+  { "r800", &r800_paper_list },
+  { "picturemate", &picturemate_paper_list },
+};
+
+const paperlist_t *
+stpi_escp2_get_paperlist_named(const char *n)
+{
+  int i;
+  if (n)
+    for (i = 0; i < sizeof(the_papers) / sizeof(paperl_t); i++)
+      {
+	if (strcmp(n, the_papers[i].name) == 0)
+	  return the_papers[i].paper_list;
+      }
+  return NULL;
+}
+
+typedef struct
+{
+  const char *name;
+  const paper_adjustment_list_t *paper_list;
+} paperadj_t;
+
+static const paperadj_t the_adjustments[] =
+{
+  { "standard", &standard_paper_adjustment_list },
+  { "durabrite", &durabrite_paper_adjustment_list },
+  { "durabrite2", &durabrite2_paper_adjustment_list },
+  { "photo", &photo_paper_adjustment_list },
+  { "photo2", &photo2_paper_adjustment_list },
+  { "photo3", &photo3_paper_adjustment_list },
+  { "sp960", &sp960_paper_adjustment_list },
+  { "ultrachrome_photo", &ultrachrome_photo_paper_adjustment_list },
+  { "ultrachrome_matte", &ultrachrome_matte_paper_adjustment_list },
+  { "ultrachrome_k3_photo", &ultrachrome_k3_photo_paper_adjustment_list },
+  { "ultrachrome_k3_matte", &ultrachrome_k3_matte_paper_adjustment_list },
+  { "r800_photo", &r800_photo_paper_adjustment_list },
+  { "r800_matte", &r800_matte_paper_adjustment_list },
+  { "picturemate", &picturemate_paper_adjustment_list },
+  { "claria", &claria_paper_adjustment_list },
+};
+
+const paper_adjustment_list_t *
+stpi_escp2_get_paper_adjustment_list_named(const char *n)
+{
+  int i;
+  if (n)
+    for (i = 0; i < sizeof(the_adjustments) / sizeof(paperadj_t); i++)
+      {
+	if (strcmp(n, the_adjustments[i].name) == 0)
+	  return the_adjustments[i].paper_list;
+      }
+  return NULL;
+}
+
+
+#define DECLARE_INPUT_SLOT(name)				\
+static const input_slot_list_t name##_input_slot_list =		\
+{								\
+  #name,							\
+  name##_input_slots,						\
+  sizeof(name##_input_slots) / sizeof(const input_slot_t),	\
+}
+
+static const input_slot_t standard_roll_feed_input_slots[] =
+{
+  {
+    "Standard",
+    N_("Standard"),
+    0,
+    0,
+    0,
+    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Roll",
+    N_("Roll Feed"),
+    0,
+    1,
+    ROLL_FEED_DONT_EJECT,
+    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001" },
+    { 6, "IR\002\000\000\002" }
+  }
+};
+
+DECLARE_INPUT_SLOT(standard_roll_feed);
+
+static const input_slot_t cutter_roll_feed_input_slots[] =
+{
+  {
+    "Standard",
+    N_("Standard"),
+    0,
+    0,
+    0,
+    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "RollCutPage",
+    N_("Roll Feed (cut each page)"),
+    0,
+    1,
+    ROLL_FEED_CUT_ALL,
+    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001" },
+    { 6, "IR\002\000\000\002" }
+  },
+  {
+    "RollCutNone",
+    N_("Roll Feed (do not cut)"),
+    0,
+    1,
+    ROLL_FEED_DONT_EJECT,
+    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001" },
+    { 6, "IR\002\000\000\002" }
+  }
+};
+
+DECLARE_INPUT_SLOT(cutter_roll_feed);
+
+static const input_slot_t cd_cutter_roll_feed_input_slots[] =
+{
+  {
+    "Standard",
+    N_("Standard"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Manual",
+    N_("Manual Feed"),
+    0,
+    0,
+    0,
+    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "CD",
+    N_("Print to CD"),
+    1,
+    0,
+    0,
+    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "RollCutPage",
+    N_("Roll Feed (cut each page)"),
+    0,
+    1,
+    ROLL_FEED_CUT_ALL,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377" },
+    { 6, "IR\002\000\000\002" }
+  },
+  {
+    "RollCutNone",
+    N_("Roll Feed (do not cut)"),
+    0,
+    1,
+    ROLL_FEED_DONT_EJECT,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377" },
+    { 6, "IR\002\000\000\002" }
+  }
+};
+
+DECLARE_INPUT_SLOT(cd_cutter_roll_feed);
+
+static const input_slot_t cd_roll_feed_input_slots[] =
+{
+  {
+    "Standard",
+    N_("Standard"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Manual",
+    N_("Manual Feed"),
+    0,
+    0,
+    0,
+    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "CD",
+    N_("Print to CD"),
+    1,
+    0,
+    0,
+    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Roll",
+    N_("Roll Feed"),
+    0,
+    1,
+    ROLL_FEED_DONT_EJECT,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377" },
+    { 6, "IR\002\000\000\002" }
+  }
+};
+
+DECLARE_INPUT_SLOT(cd_roll_feed);
+
+static const input_slot_t r2400_input_slots[] =
+{
+  {
+    "Standard",
+    N_("Standard"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Velvet",
+    N_("Manual Sheet Guide"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\003\000" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Matte",
+    N_("Manual Feed (Front)"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Roll",
+    N_("Roll Feed"),
+    0,
+    1,
+    ROLL_FEED_DONT_EJECT,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\003\001" },
+    { 6, "IR\002\000\000\002" }
+  }
+};
+
+DECLARE_INPUT_SLOT(r2400);
+
+static const input_slot_t r1800_input_slots[] =
+{
+  {
+    "Standard",
+    N_("Standard"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Velvet",
+    N_("Manual Sheet Guide"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\003\000" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Matte",
+    N_("Manual Feed (Front)"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Roll",
+    N_("Roll Feed"),
+    0,
+    1,
+    ROLL_FEED_DONT_EJECT,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\003\001" },
+    { 6, "IR\002\000\000\002" }
+  },
+  {
+    "CD",
+    N_("Print to CD"),
+    1,
+    0,
+    0,
+    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
+    { 6, "IR\002\000\000\000"}
+  },
+};
+
+DECLARE_INPUT_SLOT(r1800);
+
+static const input_slot_t rx700_input_slots[] =
+{
+  {
+    "Rear",
+    N_("Rear Tray"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\000" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "Front",
+    N_("Front Tray"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\001" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "CD",
+    N_("Print to CD"),
+    1,
+    0,
+    0,
+    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
+    { 6, "IR\002\000\000\000"}
+  },
+  {
+    "PhotoBoard",
+    N_("Photo Board"),
+    0,
+    0,
+    0,
+    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000" },
+    { 6, "IR\002\000\000\000"}
+  },
+};
+
+DECLARE_INPUT_SLOT(rx700);
+
+static const input_slot_t pro_roll_feed_input_slots[] =
+{
+  {
+    "Standard",
+    N_("Standard"),
+    0,
+    0,
+    0,
+    { 7, "PP\003\000\000\002\000" },
+    { 0, "" }
+  },
+  {
+    "Roll",
+    N_("Roll Feed"),
+    0,
+    1,
+    0,
+    { 7, "PP\003\000\000\003\000" },
+    { 0, "" }
+  }
+};
+
+DECLARE_INPUT_SLOT(pro_roll_feed);
+
+static const input_slot_t spro5000_input_slots[] =
+{
+  {
+    "CutSheet1",
+    N_("Cut Sheet Bin 1"),
+    0,
+    0,
+    0,
+    { 7, "PP\003\000\000\001\001" },
+    { 0, "" }
+  },
+  {
+    "CutSheet2",
+    N_("Cut Sheet Bin 2"),
+    0,
+    0,
+    0,
+    { 7, "PP\003\000\000\002\001" },
+    { 0, "" }
+  },
+  {
+    "CutSheetAuto",
+    N_("Cut Sheet Autoselect"),
+    0,
+    0,
+    0,
+    { 7, "PP\003\000\000\001\377" },
+    { 0, "" }
+  },
+  {
+    "ManualSelect",
+    N_("Manual Selection"),
+    0,
+    0,
+    0,
+    { 7, "PP\003\000\000\002\001" },
+    { 0, "" }
+  }
+};
+
+DECLARE_INPUT_SLOT(spro5000);
+
+static const input_slot_list_t default_input_slot_list =
+{
+  "Standard",
+  NULL,
+  0,
+};
+
+typedef struct
+{
+  const char *name;
+  const input_slot_list_t *input_slots;
+} inslot_t;
+
+static const inslot_t the_slots[] =
+{
+  { "cd_cutter_roll_feed", &cd_cutter_roll_feed_input_slot_list },
+  { "cd_roll_feed", &cd_roll_feed_input_slot_list },
+  { "cutter_roll_feed", &cutter_roll_feed_input_slot_list },
+  { "default", &default_input_slot_list },
+  { "pro_roll_feed", &pro_roll_feed_input_slot_list },
+  { "r1800", &r1800_input_slot_list },
+  { "r2400", &r2400_input_slot_list },
+  { "rx700", &rx700_input_slot_list },
+  { "spro5000", &spro5000_input_slot_list },
+  { "standard_roll_feed", &standard_roll_feed_input_slot_list },
+};
+
+const input_slot_list_t *
+stpi_escp2_get_input_slot_list_named(const char *n)
+{
+  int i;
+  if (n)
+    for (i = 0; i < sizeof(the_slots) / sizeof(inslot_t); i++)
+      {
+	if (strcmp(n, the_slots[i].name) == 0)
+	  return the_slots[i].input_slots;
+      }
+  return NULL;
+}
diff --git a/src/main/escp2-resolutions.c b/src/main/escp2-resolutions.c
index 9dfe8e7..22db6c7 100644
--- a/src/main/escp2-resolutions.c
+++ b/src/main/escp2-resolutions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-resolutions.c,v 1.33 2006/05/06 21:30:59 rlk Exp $"
+ * "$Id: escp2-resolutions.c,v 1.33.8.2 2007/05/29 01:47:28 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -31,163 +31,154 @@
 
 static const res_t r_360x90dpi =
 { "360x90dpi",     N_("360 x 90 DPI Fast Economy"),
-  360,  90,  360,  90,   0, 0, 1 };
+  360,  90,  360,  90,  360,  90,   0, 0, 1 };
 static const res_t r_360x90sw =
 { "360x90sw",      N_("360 x 90 DPI Fast Economy"),
-  360,  90,  360,  90,   1, 0, 1 };
+  360,  90,  360,  90,  360,  90,   1, 0, 1 };
 
 static const res_t r_360x120dpi =
 { "360x120dpi",    N_("360 x 120 DPI Economy"),
-  360,  120,  360,  120,  0, 0, 1 };
+  360,  120,  360,  120,  360,  120,  0, 0, 1 };
 static const res_t r_360x120sw =
 { "360x120sw",     N_("360 x 120 DPI Economy"),
-  360,  120,  360,  120,  1, 0, 1 };
+  360,  120,  360,  120,  360,  120,  1, 0, 1 };
 
 static const res_t r_180dpi =
 { "180dpi",        N_("180 DPI Economy"),
-  180,  180,  180,  180,  0, 0, 1 };
+  180,  180,  180,  180,  180,  180,  0, 0, 1 };
 static const res_t r_180sw =
 { "180sw",         N_("180 DPI Economy"),
-  180,  180,  180,  180,  1, 0, 1 };
+  180,  180,  180,  180,  180,  180,  1, 0, 1 };
 
 static const res_t r_360x180dpi =
 { "360x180dpi",    N_("360 x 180 DPI Draft"),
-  360,  180,  360,  180,  0, 0, 1 };
+  360,  180,  360,  180,  360,  180,  0, 0, 1 };
 static const res_t r_360x180sw =
 { "360x180sw",     N_("360 x 180 DPI Draft"),
-  360,  180,  360,  180,  1, 0, 1 };
+  360,  180,  360,  180,  360,  180,  1, 0, 1 };
 
 static const res_t r_360x240dpi =
 { "360x240dpi",    N_("360 x 240 DPI Draft"),
-  360,  240,  360,  240,  0, 0, 1 };
+  360,  240,  360,  240,  360,  240,  0, 0, 1 };
 static const res_t r_360x240sw =
 { "360x240sw",     N_("360 x 240 DPI Draft"),
-  360,  240,  360,  240,  1, 0, 1 };
+  360,  240,  360,  240,  360,  240,  1, 0, 1 };
 
 static const res_t r_360mw =
 { "360mw",         N_("360 DPI High Quality"),
-  360,  360,  360,  360,  0, 1, 1 };
+  360,  360,  360,  360,  360,  360,  0, 1, 1 };
 static const res_t r_360pro =
 { "360pro",        N_("360 DPI"),
-  360,  360,  360,  360,  0, 1, 1 };
+  360,  360,  360,  360,  360,  360,  0, 1, 1 };
 static const res_t r_360 =
 { "360",           N_("360 DPI"),
-  360,  360,  360,  360,  0, 0, 1 };
+  360,  360,  360,  360,  360,  360,  0, 0, 1 };
 static const res_t r_360sw =
 { "360sw",         N_("360 DPI"),
-  360,  360,  360,  360,  1, 0, 1 };
+  360,  360,  360,  360,  360,  360,  1, 0, 1 };
 
 static const res_t r_720x360mw =
 { "720x360mw",     N_("720 x 360 DPI"),
-  720,  360,  720,  360,  0, 1, 1 };
+  720,  360,  720,  360,  720,  360,  0, 1, 1 };
 static const res_t r_720x360sw =
 { "720x360sw",     N_("720 x 360 DPI"),
-  720,  360,  720,  360,  1, 0, 1 };
+  720,  360,  720,  360,  720,  360,  1, 0, 1 };
+static const res_t r_720x360un =
+{ "720x360un",     N_("720 x 360 DPI Enhanced"),
+  720,  360, 1440,  720,  720,  360,  1, 0, 1 };
 
 static const res_t r_720mw =
 { "720mw",         N_("720 DPI"),
-  720,  720,  720,  720,  0, 1, 1 };
+  720,  720,  720,  720,  720,  720,  0, 1, 1 };
 static const res_t r_720sw =
 { "720sw",         N_("720 DPI"),
-  720,  720,  720,  720,  1, 0, 1 };
+  720,  720,  720,  720,  720,  720,  1, 0, 1 };
+static const res_t r_720un =
+{ "720un",         N_("720 DPI High Quality"),
+  720,  720, 1440,  720,  720,  720,  1, 0, 1 };
 static const res_t r_720hq =
 { "720hq",         N_("720 DPI High Quality"),
-  720,  720,  720,  720,  1, 0, 2 };
+  720,  720,  720,  720,  720,  720,  1, 0, 2 };
 static const res_t r_720hq2 =
 { "720hq2",        N_("720 DPI Highest Quality"),
-  720,  720,  720,  720,  1, 0, 4 };
+  720,  720,  720,  720,  720,  720,  1, 0, 4 };
 static const res_t r_720x720oov =
 { "720x720oov",    N_("720 x 720 DPI"),
-  2880, 720,  720, 720,  1, 0, 1 };
+  2880, 720,  2880, 720,  720, 720,  1, 0, 1 };
 
 static const res_t r_1440x720mw =
 { "1440x720mw",     N_("1440 x 720 DPI"),
-  1440, 720,  1440, 720,  0, 1, 1 };
+  1440, 720,  1440, 720,  1440, 720,  0, 1, 1 };
 static const res_t r_1440x720sw =
 { "1440x720sw",    N_("1440 x 720 DPI"),
-  1440, 720,  1440, 720,  1, 0, 1 };
+  1440, 720,  1440, 720,  1440, 720,  1, 0, 1 };
 static const res_t r_1440x720hq2 =
 { "1440x720hq2",   N_("1440 x 720 DPI Highest Quality"),
-  1440, 720,  1440, 720,  1, 0, 2 };
+  1440, 720,  1440, 720,  1440, 720,  1, 0, 2 };
 static const res_t r_720x1440sw =
 { "720x1440sw",    N_("1440 x 720 DPI Transposed"),
-  720, 1440,  720, 1440,  1, 0, 1 };
+  720, 1440,  720, 1440,  720, 1440,  1, 0, 1 };
 static const res_t r_720x1440ov =
 { "720x1440ov",   N_("1440 x 720 DPI Transposed"),
-  1440, 1440, 720, 1440, 1, 0, 1};
+  1440, 1440, 1440, 1440, 720, 1440,  1, 0, 1};
 static const res_t r_1440x720ov =
 { "1440x720ov",    N_("1440 x 720 DPI"),
-  2880, 720,  1440, 720,  1, 0, 1 };
+  2880, 720,  2880, 720,  1440, 720,  1, 0, 1 };
 
 static const res_t r_2880x720mw =
 { "2880x720mw",    N_("2880 x 720 DPI"),
-  2880, 720,  2880, 720,  0, 1, 1};
+  2880, 720,  2880, 720,  2880, 720,  0, 1, 1};
 static const res_t r_2880x720sw =
 { "2880x720sw",    N_("2880 x 720 DPI"),
-  2880, 720,  2880, 720,  1, 0, 1};
+  2880, 720,  2880, 720,  2880, 720,  1, 0, 1};
 static const res_t r_2880x720hq2 =
 { "2880x720hq2",   N_("2880 x 720 DPI Highest Quality"),
-  2880, 720,  2880, 720,  1, 0, 2 };
+  2880, 720,  2880, 720,  2880, 720,  1, 0, 2 };
 
 static const res_t r_1440x1440mw =
 { "1440x1440mw",   N_("1440 x 1440 DPI"),
-  1440, 1440,  1440, 1440, 0, 1, 1};
+  1440, 1440,  1440, 1440,  1440, 1440, 0, 1, 1};
 static const res_t r_1440x1440sw =
 { "1440x1440sw",   N_("1440 x 1440 DPI"),
-  1440, 1440,  1440, 1440, 1, 0, 1};
+  1440, 1440,  1440, 1440,  1440, 1440, 1, 0, 1};
 static const res_t r_1440x1440ov =
 { "1440x1440ov",   N_("1440 x 1440 DPI"),
-  2880, 1440,  1440, 1440, 1, 0, 1};
-static const res_t r_1440x1440sw3650 =
-{ "1440x1440ov",   N_("1440 x 1440"),
-  1440, 1440,  1440, 1440, 1, 0, 1};
-static const res_t r_1440x1440sw3650hq =
-{ "2880x1440sw",   N_("1440 x 1440 DPI High Quality"),
-  1440, 1440,  1440, 1440, 1, 0, 2};
-static const res_t r_1440x1440sw3650hq2 =
-{ "5760x1440sw",   N_("1440 x 1440 DPI Highest Quality"),
-  1440, 1440,  1440, 1440, 1, 0, 4};
+  2880, 1440,  2880, 1440,  1440, 1440, 1, 0, 1};
 
 static const res_t r_2880x1440mw =
 { "2880x1440mw",   N_("2880 x 1440 DPI"),
-  2880, 1440,  2880, 1440, 0, 1, 1};
+  2880, 1440,  2880, 1440,  2880, 1440, 0, 1, 1};
 static const res_t r_2880x1440sw =
 { "2880x1440sw",   N_("2880 x 1440 DPI"),
-  2880, 1440,  2880, 1440, 1, 0, 1};
+  2880, 1440,  2880, 1440,  2880, 1440, 1, 0, 1};
 static const res_t r_1440x2880sw =
 { "1440x2880sw",   N_("2880 x 1440 DPI Transposed"),
-  1440, 2880,  1440, 2880, 1, 0, 1};
+  1440, 2880,  1440, 2880,  1440, 2880, 1, 0, 1};
 static const res_t r_2880x1440sw2400 =
 { "2880x1440sw",   N_("2880 x 1440 DPI"),
-  1440, 2880,  1440, 2880, 1, 0, 1};
-static const res_t r_2880x1440sw2400hq =
-{ "2880x2880sw",   N_("2880 x 1440 DPI High Quality"),
-  1440, 2880,  1440, 2880, 1, 0, 2};
-static const res_t r_2880x1440sw2400hq2 =
-{ "5760x2880sw",   N_("2880 x 1440 DPI Highest Quality"),
-  1440, 2880,  1440, 2880, 1, 0, 4};
+  1440, 2880,  1440, 2880,  1440, 2880, 1, 0, 1};
 
 static const res_t r_5760x1440sw =
 { "5760x1440sw",   N_("5760 x 1440 DPI"),
-  5760, 1440,  5760, 1440, 1, 0, 1};
+  5760, 1440,  5760, 1440,  5760, 1440, 1, 0, 1};
 
 static const res_t r_2880x2880mw =
 { "2880x2880mw",   N_("2880 x 2880 DPI"),
-  2880, 2880,  2880, 2880, 0, 1, 1};
+  2880, 2880,  2880, 2880,  2880, 2880, 0, 1, 1};
 static const res_t r_2880x2880sw =
 { "2880x2880sw",   N_("2880 x 2880 DPI"),
-  2880, 2880,  2880, 2880, 1, 0, 1};
+  2880, 2880,  2880, 2880,  2880, 2880, 1, 0, 1};
 
 static const res_t r_5760x2880mw =
 { "5760x2880mw",   N_("5760 x 2880 DPI"),
-  5760, 2880,  5760, 2880, 0, 1, 1};
+  5760, 2880,  5760, 2880,  5760, 2880, 0, 1, 1};
 static const res_t r_5760x2880sw =
 { "5760x2880sw",   N_("5760 x 2880 DPI"),
-  5760, 2880,  5760, 2880, 1, 0, 1};
+  5760, 2880,  5760, 2880,  5760, 2880, 1, 0, 1};
 
 
 
-const res_t *const stpi_escp2_720dpi_reslist[] =
+static const res_t *const stpi_escp2_720dpi_reslist[] =
 {
   &r_360x90dpi,
 
@@ -209,7 +200,7 @@ const res_t *const stpi_escp2_720dpi_reslist[] =
   NULL
 };
 
-const res_t *const stpi_escp2_1440dpi_reslist[] =
+static const res_t *const stpi_escp2_1440dpi_reslist[] =
 {
   &r_360x90sw,
 
@@ -234,7 +225,7 @@ const res_t *const stpi_escp2_1440dpi_reslist[] =
   NULL
 };
 
-const res_t *const stpi_escp2_2880dpi_reslist[] =
+static const res_t *const stpi_escp2_2880dpi_reslist[] =
 {
   &r_360x90sw,
 
@@ -261,7 +252,7 @@ const res_t *const stpi_escp2_2880dpi_reslist[] =
   NULL
 };
 
-const res_t *const stpi_escp2_2880_1440dpi_reslist[] =
+static const res_t *const stpi_escp2_2880_1440dpi_reslist[] =
 {
   &r_360x90sw,
 
@@ -280,21 +271,19 @@ const res_t *const stpi_escp2_2880_1440dpi_reslist[] =
   &r_720sw,
 
   &r_1440x720sw,
-  &r_720x1440sw,
 
   &r_2880x720sw,
 
   &r_1440x1440sw,
 
   &r_2880x1440sw,
-  &r_1440x2880sw,
 
   &r_2880x2880sw,
 
   NULL
 };
 
-const res_t *const stpi_escp2_g3_reslist[] =
+static const res_t *const stpi_escp2_g3_reslist[] =
 {
   &r_360x90dpi,
 
@@ -320,8 +309,10 @@ const res_t *const stpi_escp2_g3_reslist[] =
   NULL
 };
 
-const res_t *const stpi_escp2_superfine_reslist[] =
+static const res_t *const stpi_escp2_superfine_reslist[] =
 {
+  &r_360x90sw,
+
   &r_360x120sw,
 
   &r_360x180sw,
@@ -335,12 +326,12 @@ const res_t *const stpi_escp2_superfine_reslist[] =
   &r_720sw,
 
   &r_1440x720sw,
-  &r_720x1440sw,
 
   &r_1440x1440ov,
 
   &r_2880x1440sw,
-  &r_1440x2880sw,
+
+  &r_5760x1440sw,
 
   &r_2880x2880sw,
 
@@ -349,9 +340,9 @@ const res_t *const stpi_escp2_superfine_reslist[] =
   NULL
 };
 
-const res_t *const stpi_escp2_r2400_reslist[] =
+static const res_t *const stpi_escp2_claria_1400_reslist[] =
 {
-  &r_360x120sw,
+  &r_360x90sw,
 
   &r_360x180sw,
 
@@ -361,45 +352,28 @@ const res_t *const stpi_escp2_r2400_reslist[] =
 
   &r_720x360sw,
 
-  &r_720sw,
-
-  &r_1440x720sw,
-  &r_720x1440sw,
-
-  &r_1440x1440sw,
-
-  &r_2880x1440sw2400,
-  &r_2880x1440sw2400hq,
-  &r_2880x1440sw2400hq2,
+  &r_720x360un,
 
-  NULL
-};
+  &r_720sw,
 
-const res_t *const stpi_escp2_cx3650_reslist[] =
-{
-  &r_360x120sw,
+  &r_720un,
 
-  &r_360x180sw,
-
-  &r_360x240sw,
+  &r_1440x720sw,
 
-  &r_360sw,
+  &r_1440x1440ov,
 
-  &r_720x360sw,
+  &r_2880x1440sw,
 
-  &r_720sw,
+  &r_5760x1440sw,
 
-  &r_1440x720sw,
-  &r_720x1440sw,
+  &r_2880x2880sw,
 
-  &r_1440x1440sw3650,
-  &r_1440x1440sw3650hq,
-  &r_1440x1440sw3650hq2,
+  &r_5760x2880sw,
 
   NULL
 };
 
-const res_t *const stpi_escp2_picturemate_reslist[] =
+static const res_t *const stpi_escp2_picturemate_reslist[] =
 {
 
   &r_720x720oov,
@@ -417,7 +391,7 @@ const res_t *const stpi_escp2_picturemate_reslist[] =
   NULL
 };
 
-const res_t *const stpi_escp2_sc500_reslist[] =
+static const res_t *const stpi_escp2_sc500_reslist[] =
 {
   &r_360x90dpi,
 
@@ -439,7 +413,7 @@ const res_t *const stpi_escp2_sc500_reslist[] =
   NULL
 };
 
-const res_t *const stpi_escp2_g3_720dpi_reslist[] =
+static const res_t *const stpi_escp2_g3_720dpi_reslist[] =
 {
   &r_360x90dpi,
 
@@ -463,7 +437,7 @@ const res_t *const stpi_escp2_g3_720dpi_reslist[] =
   NULL
 };
 
-const res_t *const stpi_escp2_720dpi_soft_reslist[] =
+static const res_t *const stpi_escp2_720dpi_soft_reslist[] =
 {
   &r_360x90dpi,
 
@@ -486,7 +460,7 @@ const res_t *const stpi_escp2_720dpi_soft_reslist[] =
   NULL
 };
 
-const res_t *const stpi_escp2_sc640_reslist[] =
+static const res_t *const stpi_escp2_sc640_reslist[] =
 {
   &r_360x90dpi,
 
@@ -507,7 +481,7 @@ const res_t *const stpi_escp2_sc640_reslist[] =
   NULL
 };
 
-const res_t *const stpi_escp2_pro_reslist[] =
+static const res_t *const stpi_escp2_pro_reslist[] =
 {
   &r_360x90dpi,
 
@@ -534,11 +508,47 @@ const res_t *const stpi_escp2_pro_reslist[] =
   NULL
 };
 
+typedef struct
+{
+  const char *name;
+  const res_t *const *const res_list;
+} resolution_t;
+
+static const resolution_t the_resolutions[] =
+{
+  { "superfine", stpi_escp2_superfine_reslist },
+  { "claria_1400", stpi_escp2_claria_1400_reslist },
+  { "pro", stpi_escp2_pro_reslist },
+  { "720dpi", stpi_escp2_720dpi_reslist },
+  { "720dpi_soft", stpi_escp2_720dpi_soft_reslist },
+  { "g3_720dpi", stpi_escp2_g3_720dpi_reslist },
+  { "1440dpi", stpi_escp2_1440dpi_reslist },
+  { "2880dpi", stpi_escp2_2880dpi_reslist },
+  { "2880_1440dpi", stpi_escp2_2880_1440dpi_reslist },
+  { "g3", stpi_escp2_g3_reslist },
+  { "sc500", stpi_escp2_sc500_reslist },
+  { "sc640", stpi_escp2_sc640_reslist },
+  { "picturemate", stpi_escp2_picturemate_reslist },
+};
+
+const res_t *const *
+stpi_escp2_get_reslist_named(const char *n)
+{
+  int i;
+  if (n)
+    for (i = 0; i < sizeof(the_resolutions) / sizeof(resolution_t); i++)
+      {
+	if (strcmp(n, the_resolutions[i].name) == 0)
+	  return the_resolutions[i].res_list;
+      }
+  return NULL;
+}
+
 #define DECLARE_PRINTER_WEAVES(name)				\
-const printer_weave_list_t stpi_escp2_##name##_printer_weave_list =	\
+static const printer_weave_list_t name##_printer_weave_list =	\
 {								\
   #name,							\
-  sizeof(name##_printer_weaves) / sizeof(printer_weave_t),		\
+  sizeof(name##_printer_weaves) / sizeof(printer_weave_t),	\
   name##_printer_weaves						\
 }
 
@@ -585,3 +595,108 @@ static const printer_weave_t pro7600_printer_weaves[] =
 };
 
 DECLARE_PRINTER_WEAVES(pro7600);
+
+typedef struct
+{
+  const char *name;
+  const printer_weave_list_t *weave_list;
+} weave_t;
+
+static const weave_t the_weaves[] =
+{
+  { "standard", &standard_printer_weave_list },
+  { "pro7000", &pro7000_printer_weave_list },
+  { "pro7500", &pro7500_printer_weave_list },
+  { "pro7600", &pro7600_printer_weave_list },
+};
+
+const printer_weave_list_t *
+stpi_escp2_get_printer_weaves_named(const char *n)
+{
+  int i;
+  if (n)
+    for (i = 0; i < sizeof(the_weaves) / sizeof(weave_t); i++)
+      {
+	if (strcmp(n, the_weaves[i].name) == 0)
+	  return the_weaves[i].weave_list;
+      }
+  return NULL;
+}
+
+
+#define DECLARE_QUALITY_LIST(name)			\
+static const quality_list_t name##_quality_list =	\
+{							\
+  #name,						\
+  name##_qualities,					\
+  sizeof(name##_qualities) / sizeof(const quality_t),	\
+}
+
+static const quality_t standard_qualities[] =
+{
+  { "FastEconomy", N_("Fast Economy"), 180, 90, 360, 120, 360, 90 },
+  { "Economy",     N_("Economy"),      360, 180, 360, 240, 360, 180 },
+  { "Draft",       N_("Draft"),        360, 360, 360, 360, 360, 360 },
+  { "Standard",    N_("Standard"),     0, 0, 0, 0, 720, 360 },
+  { "High",        N_("High"),         0, 0, 0, 0, 720, 720 },
+  { "Photo",       N_("Photo"),        1440, 720, 2880, 720, 1440, 720 },
+  { "HighPhoto",   N_("Super Photo"),  1440, 1440, 2880, 1440, 1440, 1440 },
+  { "UltraPhoto",  N_("Ultra Photo"),  2880, 2880, 2880, 2880, 2880, 2880 },
+  { "Best",        N_("Best"),         720, 360, 0, 0, -1, -1 },
+};
+
+DECLARE_QUALITY_LIST(standard);
+
+static const quality_t p1_5_qualities[] =
+{
+  { "FastEconomy", N_("Fast Economy"), 180, 90, 360, 120, 360, 90 },
+  { "Economy",     N_("Economy"),      360, 180, 360, 240, 360, 180 },
+  { "Draft",       N_("Draft"),        360, 360, 360, 360, 360, 360 },
+  { "Standard",    N_("Standard"),     0, 0, 0, 0, 720, 360 },
+  { "High",        N_("High"),         0, 0, 0, 0, 720, 720 },
+  { "Photo",       N_("Photo"),        1440, 720, 1440, 720, 1440, 720 },
+  { "HighPhoto",   N_("Super Photo"),  1440, 1440, 2880, 1440, 1440, 1440 },
+  { "UltraPhoto",  N_("Ultra Photo"),  2880, 2880, 2880, 2880, 2880, 2880 },
+  { "Best",        N_("Best"),         720, 360, 0, 0, -1, -1 },
+};
+
+DECLARE_QUALITY_LIST(p1_5);
+
+static const quality_t picturemate_qualities[] =
+{
+  { "Draft",       N_("Draft"),        1440,  720, 1440,  720, 1440,  720 },
+  { "Standard",    N_("Standard"),     1440, 1440, 1440, 1440, 1440, 1440 },
+  { "Photo",       N_("Photo"),        1440, 1440, 1440, 1440, 1440, 1440 },
+  { "High",        N_("High"),         2880, 1440, 2880, 1440, 2880, 1440 },
+  { "HighPhoto",   N_("Super Photo"),  2880, 1440, 2880, 1440, 2880, 1440 },
+  { "UltraPhoto",  N_("Ultra Photo"),  5760, 1440, 5760, 1440, 5760, 1440 },
+  { "Best",        N_("Best"),         5760, 1440, 5760, 1440, 5760, 1440 },
+};
+
+DECLARE_QUALITY_LIST(picturemate);
+
+typedef struct
+{
+  const char *name;
+  const quality_list_t *quality_list;
+} qual_t;
+
+static const qual_t the_qualities[] =
+{
+  { "standard", &standard_quality_list },
+  { "p1_5", &p1_5_quality_list },
+  { "picturemate", &picturemate_quality_list },
+};
+
+const quality_list_t *
+stpi_escp2_get_quality_list_named(const char *n)
+{
+  int i;
+  if (n)
+    for (i = 0; i < sizeof(the_qualities) / sizeof(qual_t); i++)
+      {
+	if (strcmp(n, the_qualities[i].name) == 0)
+	  return the_qualities[i].quality_list;
+      }
+  return NULL;
+}
diff --git a/src/main/papers.xml b/src/main/papers.xml
index 4f2bacd..c8a017b 100644
--- a/src/main/papers.xml
+++ b/src/main/papers.xml
@@ -4,7 +4,7 @@
    XML description of papers known to libgutenprint.
    It should be edited by hand.
 
-   "$Id: papers.xml,v 1.21 2006/04/20 00:33:41 rlk Exp $"
+   "$Id: papers.xml,v 1.21.8.1 2007/03/02 12:01:26 rlk Exp $"
 -->
 
 <!--
@@ -68,6 +68,13 @@
       <height value="184"/>
       <unit value="english"/>
     </paper>
+    <paper name="CDCustom">
+      <description value="CD - Custom"/>
+      <comment value="CD, custom diameter"/>
+      <width value="337"/>
+      <height value="337"/>
+      <unit value="english"/>
+    </paper>
     <paper name="w216h360">
       <description value="3x5"/>
       <width value="216"/>
@@ -940,11 +947,11 @@
       <height value="337"/>
       <unit value="metric-extended"/>
     </paper>
-    <paper name="w244h155">
+    <paper name="w155h244">
       <description value="Card"/>
       <comment value="86mm x 54mm"/>
-      <width value="244"/>
-      <height value="155"/>
+      <width value="155"/>
+      <height value="244"/>
       <unit value="metric-extended"/>
     </paper>
     <paper name="w283h566">
diff --git a/src/main/print-canon.c b/src/main/print-canon.c
index 5104c40..06e3b49 100644
--- a/src/main/print-canon.c
+++ b/src/main/print-canon.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-canon.c,v 1.174 2006/05/28 16:59:04 rlk Exp $"
+ * "$Id: print-canon.c,v 1.190.2.3 2007/05/29 01:47:28 rlk Exp $"
  *
  *   Print plug-in CANON BJL driver for the GIMP.
  *
@@ -7,6 +7,8 @@
  *	Robert Krawitz (rlk@alum.mit.edu) and
  *      Andy Thaller (thaller@ph.tum.de)
  *
+ *   Copyright (c) 2006 - 2007 Sascha Sommer (saschasommer@freenet.de)
+ *
  *   This program is free software; you can redistribute it and/or modify it
  *   under the terms of the GNU General Public License as published by the Free
  *   Software Foundation; either version 2 of the License, or (at your option)
@@ -38,7 +40,6 @@
  *   * adjust the colors of all supported models
  *
  */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -56,102 +57,22 @@
 #include <limits.h>
 #endif
 #include <math.h>
-/* Solaris with gcc has problems because gcc's limits.h doesn't #define */
-/* this */
-#ifndef CHAR_BIT
-#define CHAR_BIT 8
-#endif
 
-#if (0)
-#define EXPERIMENTAL_STUFF 0
-#endif
+#include "print-canon.h"
+
+#ifndef MIN
+#  define MIN(a,b) (((a)<(b)) ? (a) : (b))
+#endif /* !MIN */
+#ifndef MAX
+#  define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif /* !MAX */
+
+
+
+
+#define RASTER_LINES_PER_BLOCK 8   /* number of raster lines in every F) command */
 
-#define MAX_CARRIAGE_WIDTH	13 /* This really needs to go away */
 
-/*
- * We really need to get away from this silly static nonsense...
- */
-#define MAX_PHYSICAL_BPI 1440
-#define MAX_OVERSAMPLED 8
-#define MAX_BPP 4
-#define COMPBUFWIDTH (MAX_PHYSICAL_BPI * MAX_OVERSAMPLED * MAX_BPP * \
-	MAX_CARRIAGE_WIDTH / CHAR_BIT)
-
-#define MIN(a,b) (((a)<(b)) ? (a) : (b))
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-
-/* the PIXMA iP4000 and maybe other printers use following table to store
-   5 pixels with 3 levels in 1 byte, All possible pixel combinations are given
-   numbers from 0 (=00,00,00,00,00) to 242 (=10,10,10,10,10)
-   combinations where the value of one of the pixels would be 3 are skipped
-*/
-static const unsigned char tentoeight[] =
-{
-    0,  1,  2,  0,  3,  4,  5,  0,  6,  7,  8,  0,  0,  0,  0,  0,
-    9, 10, 11,  0, 12, 13, 14,  0, 15, 16, 17,  0,  0,  0,  0,  0,
-   18, 19, 20,  0, 21, 22, 23,  0, 24, 25, 26,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   27, 28, 29,  0, 30, 31, 32,  0, 33, 34, 35,  0,  0,  0,  0,  0,
-   36, 37, 38,  0, 39, 40, 41,  0, 42, 43, 44,  0,  0,  0,  0,  0,
-   45, 46, 47,  0, 48, 49, 50,  0, 51, 52, 53,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   54, 55, 56,  0, 57, 58, 59,  0, 60, 61, 62,  0,  0,  0,  0,  0,
-   63, 64, 65,  0, 66, 67, 68,  0, 69, 70, 71,  0,  0,  0,  0,  0,
-   72, 73, 74,  0, 75, 76, 77,  0, 78, 79, 80,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   81, 82, 83,  0, 84, 85, 86,  0, 87, 88, 89,  0,  0,  0,  0,  0,
-   90, 91, 92,  0, 93, 94, 95,  0, 96, 97, 98,  0,  0,  0,  0,  0,
-   99,100,101,  0,102,103,104,  0,105,106,107,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  108,109,110,  0,111,112,113,  0,114,115,116,  0,  0,  0,  0,  0,
-  117,118,119,  0,120,121,122,  0,123,124,125,  0,  0,  0,  0,  0,
-  126,127,128,  0,129,130,131,  0,132,133,134,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  135,136,137,  0,138,139,140,  0,141,142,143,  0,  0,  0,  0,  0,
-  144,145,146,  0,147,148,149,  0,150,151,152,  0,  0,  0,  0,  0,
-  153,154,155,  0,156,157,158,  0,159,160,161,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  162,163,164,  0,165,166,167,  0,168,169,170,  0,  0,  0,  0,  0,
-  171,172,173,  0,174,175,176,  0,177,178,179,  0,  0,  0,  0,  0,
-  180,181,182,  0,183,184,185,  0,186,187,188,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  189,190,191,  0,192,193,194,  0,195,196,197,  0,  0,  0,  0,  0,
-  198,199,200,  0,201,202,203,  0,204,205,206,  0,  0,  0,  0,  0,
-  207,208,209,  0,210,211,212,  0,213,214,215,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  216,217,218,  0,219,220,221,  0,222,223,224,  0,  0,  0,  0,  0,
-  225,226,227,  0,228,229,230,  0,231,232,233,  0,  0,  0,  0,  0,
-  234,235,236,  0,237,238,239,  0,240,241,242,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-};
 
 static int
 pack_pixels(unsigned char* buf,int len)
@@ -184,641 +105,7 @@ pack_pixels(unsigned char* buf,int len)
   return write_pos;
 }
 
-static const int channel_color_map[] =
-{
-  STP_ECOLOR_K, STP_ECOLOR_C, STP_ECOLOR_M, STP_ECOLOR_Y, STP_ECOLOR_C, STP_ECOLOR_M, STP_ECOLOR_Y
-};
-
-static const int subchannel_color_map[] =
-{
-  0, 0, 0, 0, 1, 1, 1
-};
-
-/* K,C,M,Y */
-static const double ink_darknesses[] =
-{
-  1.0, 0.31 / .5, 0.61 / .97, 0.08
-};
-
-#define USE_3BIT_FOLD_TYPE 323
-
-/*
- * For each printer, we can select from a variety of dot sizes.
- * For single dot size printers, the available sizes are usually 0,
- * which is the "default", and some subset of 1-4.  For simple variable
- * dot size printers (with only one kind of variable dot size), the
- * variable dot size is specified as 0x10.  For newer printers, there
- * is a choice of variable dot sizes available, 0x10, 0x11, and 0x12 in
- * order of increasing size.
- *
- * Normally, we want to specify the smallest dot size that lets us achieve
- * a density of less than .8 or thereabouts (above that we start to get
- * some dither artifacts).  This needs to be tested for each printer and
- * resolution.
- *
- * An entry of -1 in a slot means that this resolution is not available.
- *              0                      standard dot sizes are used.
- *              1                      drop modulation is used.
- */
-
-/* We know a per-model base resolution (like 180dpi or 150dpi)
- * and multipliers for the base resolution in the dotsize-, densities-
- * and inklist:
- * for 180dpi base resolution we would have
- *   s_r11_4 for 4color ink @180dpi
- *   s_r22_4 for 4color ink @360dpi
- *   s_r33_4 for 4color ink @720dpi
- *   s_r43_4 for 4color ink @1440x720dpi
- */
-
-typedef struct canon_dot_sizes
-{
-  int dot_r11;    /*  180x180  or   150x150  */
-  int dot_r22;    /*  360x360  or   300x300  */
-  int dot_r33;    /*  720x720  or   600x600  */
-  int dot_r43;    /* 1440x720  or  1200x600  */
-  int dot_r44;    /* 1440x1440 or  1200x1200 */
-  int dot_r55;    /* 2880x2880 or  2400x2400 */
-} canon_dot_size_t;
-
-/*
- * Specify the base density for each available resolution.
- *
- */
-
-typedef struct canon_densities
-{
-  double d_r11;  /*  180x180  or   150x150  */
-  double d_r22;  /*  360x360  or   300x300  */
-  double d_r33;  /*  720x720  or   600x600  */
-  double d_r43;  /* 1440x720  or  1200x600  */
-  double d_r44;  /* 1440x1440 or  1200x1200 */
-  double d_r55;  /* 2880x2880 or  2400x2400 */
-} canon_densities_t;
-
-
-
-/*
- * Definition of the multi-level inks available to a given printer.
- * Each printer may use a different kind of ink droplet for variable
- * and single drop size for each supported horizontal resolution and
- * type of ink (4 or 6 color).
- *
- * Recall that 6 color ink is treated as simply another kind of
- * multi-level ink, but the driver offers the user a choice of 4 and
- * 6 color ink, so we need to define appropriate inksets for both
- * kinds of ink.
- *
- * Stuff like the MIS 4 and 6 "color" monochrome inks doesn't fit into
- * this model very nicely, so we'll either have to special case it
- * or find some way of handling it in here.
- */
-
-typedef struct canon_variable_ink
-{
-  double density;
-  const stp_shade_t *shades;
-  int numshades;
-} canon_variable_ink_t;
-
-typedef struct canon_variable_inkset
-{
-  const canon_variable_ink_t *c;
-  const canon_variable_ink_t *m;
-  const canon_variable_ink_t *y;
-  const canon_variable_ink_t *k;
-} canon_variable_inkset_t;
-
-/*
- * currenty unaccounted for are the 7color printers and the 3color ones
- * (which use CMY only printheads)
- *
- */
-
-typedef struct canon_variable_inklist
-{
-  const int bits;
-  const int colors;
-  const canon_variable_inkset_t *r11;    /*  180x180  or   150x150  */
-  const canon_variable_inkset_t *r22;    /*  360x360  or   300x300  */
-  const canon_variable_inkset_t *r33;    /*  720x720  or   600x600  */
-  const canon_variable_inkset_t *r43;    /* 1440x720  or  1200x600  */
-  const canon_variable_inkset_t *r44;    /* 1440x1440 or  1200x1200 */
-  const canon_variable_inkset_t *r55;    /* 2880x2880 or  2400x2400 */
-} canon_variable_inklist_t;
-
-
-#ifdef EXPERIMENTAL_STUFF
-/*
- * A printmode is defined by its resolution (xdpi x ydpi), the bits per pixel
- * and the installed printhead.
- *
- * For a hereby defined printmode we specify the density and gamma multipliers
- * and the ink definition with optional adjustments for lum, hue and sat
- *
- */
-typedef struct canon_variable_printmode
-{
-  const int xdpi;                      /* horizontal resolution */
-  const int ydpi;                      /* vertical resolution   */
-  const int bits;                      /* bits per pixel        */
-  const int printhead;                 /* installed printhead   */
-  const int quality;                   /* maximum init-quality  */
-  const double density;                /* density multiplier    */
-  const double gamma;                  /* gamma multiplier      */
-  const canon_variable_inkset_t *inks; /* ink definition        */
-  const char *lum_adjustment;          /* optional lum adj.     */
-  const char *hue_adjustment;          /* optional hue adj.     */
-  const char *sat_adjustment;          /* optional sat adj.     */
-} canon_variable_printmode_t;
-#endif
-
-/* NOTE  NOTE  NOTE  NOTE  NOTE  NOTE  NOTE  NOTE  NOTE  NOTE  NOTE  NOTE
- *
- * The following dither ranges were taken from print-escp2.c and do NOT
- * represent the requirements of canon inks. Feel free to play with them
- * accoring to the escp2 part of doc/README.new-printer and send me a patch
- * if you get better results. Please send mail to thaller@ph.tum.de
- */
-
-#define DECLARE_INK(name, density)		\
-static const canon_variable_ink_t name##_ink =	\
-{						\
-  density,					\
-  name##_shades,				\
-  sizeof(name##_shades) / sizeof(stp_shade_t)	\
-}
-
-#define SHADE(density, name)				\
-{ density, sizeof(name)/sizeof(stp_dotsize_t), name }
-
-/*
- * Dither ranges specifically for Cyan/LightCyan (see NOTE above)
- *
- */
-
-static const stp_dotsize_t single_dotsize[] =
-{
-  { 0x1, 1.0 }
-};
-
-static const stp_shade_t canon_Cc_1bit_shades[] =
-{
-  SHADE(1.0, single_dotsize),
-  SHADE(0.25, single_dotsize),
-};
-
-DECLARE_INK(canon_Cc_1bit, 0.75);
-
-/*
- * Dither ranges specifically for Magenta/LightMagenta (see NOTE above)
- *
- */
-
-static const stp_shade_t canon_Mm_1bit_shades[] =
-{
-  SHADE(1.0, single_dotsize),
-  SHADE(0.26, single_dotsize),
-};
-
-DECLARE_INK(canon_Mm_1bit, 0.75);
-
-/*
- * Dither ranges specifically for any Color and 2bit/pixel (see NOTE above)
- *
- */
-static const stp_dotsize_t two_bit_dotsize[] =
-{
-  { 0x1, 0.45 },
-  { 0x2, 0.68 },
-  { 0x3, 1.0 }
-};
-
-static const stp_shade_t canon_X_2bit_shades[] =
-{
-  SHADE(1.0, two_bit_dotsize)
-};
-
-DECLARE_INK(canon_X_2bit, 1.0);
-
-static const stp_dotsize_t two_bit_3level_dotsize[] =
-{
-  { 0x1, 0.5  },
-  { 0x2, 1.0  }
-};
-
-static const stp_shade_t canon_X_2bit_3level_shades[] =
-{
-  SHADE(1.0, two_bit_3level_dotsize)
-};
-DECLARE_INK(canon_X_2bit_3level,0.75);
-
-/*
- * Dither ranges for black 1bit/pixel (even though photo black
- * is not used parameters for it have to be set in the t) command
- */
-
-static const stp_shade_t canon_K_1bit_pixma_shades[] =
-{
-  SHADE(1.0, single_dotsize),
-  SHADE(0.0, two_bit_3level_dotsize),
-};
-DECLARE_INK(canon_K_1bit_pixma,1.0);
-
-static const stp_dotsize_t two_bit_4level_dotsize[] =
-{
-  { 0x1, 0.25 },
-  { 0x2, 0.50 },
-  { 0x3, 1.00 }
-};
-
-static const stp_shade_t canon_X_2bit_4level_shades[] =
-{
-  SHADE(1.0, two_bit_4level_dotsize)
-};
-DECLARE_INK(canon_X_2bit_4level,0.75);
-
-/*
- * Dither ranges specifically for any Color/LightColor and 2bit/pixel
- * (see NOTE above)
- */
-static const stp_shade_t canon_Xx_2bit_shades[] =
-{
-  SHADE(1.0, two_bit_dotsize),
-  SHADE(0.33, two_bit_dotsize),
-};
-
-DECLARE_INK(canon_Xx_2bit, 1.0);
-
-/*
- * Dither ranges specifically for any Color and 3bit/pixel
- * (see NOTE above)
- *
- * BIG NOTE: The bjc8200 has this kind of ink. One Byte seems to hold
- *           drop sizes for 3 pixels in a 3/2/2 bit fashion.
- *           Size values for 3bit-sized pixels range from 1 to 7,
- *           size values for 2bit-sized picels from 1 to 3 (kill msb).
- *
- *
- */
-static const stp_dotsize_t three_bit_dotsize[] =
-{
-  { 0x1, 0.45 },
-  { 0x2, 0.55 },
-  { 0x3, 0.66 },
-  { 0x4, 0.77 },
-  { 0x5, 0.88 },
-  { 0x6, 1.0 }
-};
-
-static const stp_shade_t canon_X_3bit_shades[] =
-{
-  SHADE(1.0, three_bit_dotsize)
-};
-
-DECLARE_INK(canon_X_3bit, 1.0);
-
-/*
- * Dither ranges specifically for any Color/LightColor and 3bit/pixel
- * (see NOTE above)
- */
-static const stp_shade_t canon_Xx_3bit_shades[] =
-{
-  SHADE(1.0, three_bit_dotsize),
-  SHADE(0.33, three_bit_dotsize),
-};
-
-DECLARE_INK(canon_Xx_3bit, 1.0);
-
-
-/* Inkset for printing in CMY and 1bit/pixel */
-static const canon_variable_inkset_t ci_CMY_1 =
-{
-  NULL,
-  NULL,
-  NULL,
-  NULL
-};
-
-/* Inkset for printing in CMY and 2bit/pixel */
-static const canon_variable_inkset_t ci_CMY_2 =
-{
-  &canon_X_2bit_ink,
-  &canon_X_2bit_ink,
-  &canon_X_2bit_ink,
-  NULL
-};
-
-/* Inkset for printing in CMYK and 1bit/pixel */
-static const canon_variable_inkset_t ci_CMYK_1 =
-{
-  NULL,
-  NULL,
-  NULL,
-  NULL
-};
-
-/* Inkset for printing in CMYK and 3level 2bit/pixel
-   for C and M, 1bit/pixel for K and Y */
-static const canon_variable_inkset_t ci_CMYK_pixma_1 =
-{
-  &canon_X_2bit_3level_ink,
-  &canon_X_2bit_3level_ink,
-  NULL,
-  &canon_K_1bit_pixma_ink,
-};
-
-/* Inkset for printing in CcMmYK and 1bit/pixel */
-static const canon_variable_inkset_t ci_CcMmYK_1 =
-{
-  &canon_Cc_1bit_ink,
-  &canon_Mm_1bit_ink,
-  NULL,
-  NULL
-};
-
-/* Inkset for printing in CMYK and 2bit/pixel */
-static const canon_variable_inkset_t ci_CMYK_2 =
-{
-  &canon_X_2bit_ink,
-  &canon_X_2bit_ink,
-  &canon_X_2bit_ink,
-  &canon_X_2bit_ink
-};
-
-/* Inkset for printing in CcMmYK and 2bit/pixel */
-static const canon_variable_inkset_t ci_CcMmYK_2 =
-{
-  &canon_Xx_2bit_ink,
-  &canon_Xx_2bit_ink,
-  &canon_X_2bit_ink,
-  &canon_X_2bit_ink
-};
-
-/* Inkset for printing in CMYK and 3bit/pixel */
-static const canon_variable_inkset_t ci_CMYK_3 =
-{
-  &canon_X_3bit_ink,
-  &canon_X_3bit_ink,
-  &canon_X_3bit_ink,
-  &canon_X_3bit_ink
-};
-
-/* Inkset for printing in CcMmYK and 3bit/pixel */
-static const canon_variable_inkset_t ci_CcMmYK_3 =
-{
-  &canon_Xx_3bit_ink,
-  &canon_Xx_3bit_ink,
-  &canon_X_3bit_ink,
-  &canon_X_3bit_ink,
-};
-
-
-typedef canon_variable_inklist_t* canon_variable_inklist_p;
-
-/* Ink set should be applicable for any CMYK based model */
-static const canon_variable_inklist_t canon_ink_standard[] =
-{
-  {
-    1,4,
-    &ci_CMYK_1, &ci_CMYK_1, &ci_CMYK_1,
-    &ci_CMYK_1, &ci_CMYK_1, &ci_CMYK_1,
-  },
-};
-
-/* Ink set for normal quality on PIXMA iP4000 */
-static const canon_variable_inklist_t canon_ink_standard_pixma[] =
-{
-  {
-    1,4, /* FIXME we have different bit depth for different colors!! */
-    &ci_CMYK_pixma_1, &ci_CMYK_pixma_1, &ci_CMYK_pixma_1,
-    &ci_CMYK_pixma_1, &ci_CMYK_pixma_1, &ci_CMYK_pixma_1,
-  },
-};
-
-/* Ink set for printers using CMY and CMY photo printing, 1 or 2bit/pixel */
-static const canon_variable_inklist_t canon_ink_oldphoto[] =
-{
-  {
-    1,3,
-    &ci_CMY_1, &ci_CMY_1, &ci_CMY_1,
-    &ci_CMY_1, &ci_CMY_1, &ci_CMY_1,
-  },
-  {
-    2,3,
-    &ci_CMY_2, &ci_CMY_2,
-    &ci_CMY_2, &ci_CMY_2,
-    &ci_CMY_2, &ci_CMY_2,
-  },
-};
-
-/* Ink set for printers using CMYK and CcMmYK printing, 1 or 2bit/pixel */
-static const canon_variable_inklist_t canon_ink_standardphoto[] =
-{
-  {
-    1,4,
-    &ci_CMYK_1, &ci_CMYK_1, &ci_CMYK_1,
-    &ci_CMYK_1, &ci_CMYK_1, &ci_CMYK_1,
-  },
-  {
-    2,4,
-    &ci_CMYK_2, &ci_CMYK_2,
-    &ci_CMYK_2, &ci_CMYK_2,
-    &ci_CMYK_2, &ci_CMYK_2,
-  },
-  {
-    1,6,
-    &ci_CcMmYK_1, &ci_CcMmYK_1, &ci_CcMmYK_1,
-    &ci_CcMmYK_1, &ci_CcMmYK_1, &ci_CcMmYK_1,
-  },
-  {
-    2,6,
-    &ci_CcMmYK_2, &ci_CcMmYK_2, &ci_CcMmYK_2,
-    &ci_CcMmYK_2, &ci_CcMmYK_2, &ci_CcMmYK_2,
-  },
-  {
-    1,7,
-    &ci_CcMmYK_1, &ci_CcMmYK_1, &ci_CcMmYK_1,
-    &ci_CcMmYK_1, &ci_CcMmYK_1, &ci_CcMmYK_1,
-  },
-  {
-    2,7,
-    &ci_CcMmYK_2, &ci_CcMmYK_2, &ci_CcMmYK_2,
-    &ci_CcMmYK_2, &ci_CcMmYK_2, &ci_CcMmYK_2,
-  },
-};
-
-/* Ink set for printers using CMYK and CcMmYK printing, 1 or 3bit/pixel */
-static const canon_variable_inklist_t canon_ink_superphoto[] =
-{
-  {
-    1,4,
-    &ci_CMYK_1, &ci_CMYK_1, &ci_CMYK_1,
-    &ci_CMYK_1, &ci_CMYK_1, &ci_CMYK_1,
-  },
-  {
-    3,4,
-    &ci_CMYK_3, &ci_CMYK_3, &ci_CMYK_3,
-    &ci_CMYK_3, &ci_CMYK_3, &ci_CMYK_3,
-  },
-  {
-    3,6,
-    &ci_CcMmYK_3, &ci_CcMmYK_3, &ci_CcMmYK_3,
-    &ci_CcMmYK_3, &ci_CcMmYK_3, &ci_CcMmYK_3,
-  },
-  {
-    3,7,
-    &ci_CcMmYK_3, &ci_CcMmYK_3, &ci_CcMmYK_3,
-    &ci_CcMmYK_3, &ci_CcMmYK_3, &ci_CcMmYK_3,
-  },
-};
-
-
-static const char standard_sat_adjustment[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* B */
-/* B */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* M */
-/* M */  "1.00 0.95 0.90 0.90 0.90 0.90 0.90 0.90 "  /* R */
-/* R */  "0.90 0.95 0.95 1.00 1.00 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* G */
-/* G */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char standard_lum_adjustment[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.65 0.67 0.70 0.72 0.77 0.80 0.82 0.85 "  /* B */
-/* B */  "0.87 0.86 0.82 0.79 0.79 0.82 0.85 0.88 "  /* M */
-/* M */  "0.92 0.95 0.96 0.97 0.97 0.97 0.96 0.96 "  /* R */
-/* R */  "0.96 0.97 0.97 0.98 0.99 1.00 1.00 1.00 "  /* Y */
-/* Y */  "1.00 0.97 0.95 0.94 0.93 0.92 0.90 0.86 "  /* G */
-/* G */  "0.79 0.76 0.71 0.68 0.68 0.68 0.68 0.66 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-static const char standard_hue_adjustment[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
-/* C */  "0.00 0.06 0.10 0.10 0.06 -.01 -.09 -.17 "  /* B */
-/* B */  "-.25 -.33 -.38 -.38 -.36 -.34 -.34 -.34 "  /* M */
-/* M */  "-.34 -.34 -.36 -.40 -.50 -.40 -.30 -.20 "  /* R */
-/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
-/* Y */  "0.00 0.00 0.00 -.05 -.10 -.15 -.22 -.24 "  /* G */
-/* G */  "-.26 -.30 -.33 -.28 -.25 -.20 -.13 -.06 "  /* C */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
-
-typedef enum {
-  COLOR_MONOCHROME = 1,
-  COLOR_CMY = 3,
-  COLOR_CMYK = 4,
-  COLOR_CCMMYK= 6,
-  COLOR_CCMMYYK= 7
-} colormode_t;
-
-typedef struct canon_caps {
-  int model;          /* model number as used in printers.xml */
-  int model_id;       /* model ID code for use in commands */
-  int max_width;      /* maximum printable paper size */
-  int max_height;
-  int base_res;       /* base resolution - shall be 150 or 180 */
-  int max_xdpi;       /* maximum horizontal resolution */
-  int max_ydpi;       /* maximum vertical resolution */
-  int max_quality;
-  int border_left;    /* left margin, points */
-  int border_right;   /* right margin, points */
-  int border_top;     /* absolute top margin, points */
-  int border_bottom;  /* absolute bottom margin, points */
-  int inks;           /* installable cartridges (CANON_INK_*) */
-  int slots;          /* available paperslots */
-  unsigned long features;       /* special bjl settings */
-#ifdef EXPERIMENTAL_STUFF
-  const canon_variable_printmode_t *printmodes;
-  int printmodes_cnt;
-#else
-  int dummy;
-  const canon_dot_size_t dot_sizes;   /* Vector of dot sizes for resolutions */
-  const canon_densities_t densities;   /* List of densities for each printer */
-  const canon_variable_inklist_t *inxs; /* Choices of inks for this printer */
-  int inxs_cnt;                         /* number of ink definitions in inxs */
-#endif
-  const char *lum_adjustment;
-  const char *hue_adjustment;
-  const char *sat_adjustment;
-} canon_cap_t;
-
-typedef struct __attribute__((__packed__)) {
-   unsigned char info;
-   unsigned char dummy;
-   unsigned char level;
-} color_info_t;
-
-typedef struct
-{
-  const canon_cap_t *caps;
-  unsigned char *cols[7];
-  int delay[7];
-  int delay_max;
-  int buf_length;
-  int length;
-  int out_width;
-  int left;
-  int emptylines;
-  int bits;
-  int ydpi;
-  color_info_t color_info[9]; /* C,M,Y,K,c,m,y,k,? */
-  int ncolors; /* number of colors to print with */
-  int physical_xdpi, nozzle_ydpi, stepper_ydpi;
-  int nozzles;   /* count of inkjets for one pass */
-  int nozzle_separation;
-  int horizontal_passes;
-  int vertical_passes;
-  int vertical_oversample;
-  int *head_offset;
-  int last_pass_offset;
-  int bidirectional; /* tells us if we are allowed to print bidirectional */
-  int direction;     /* stores the last direction of the print head */
-
-} canon_privdata_t;
-
-static void canon_write_line(stp_vars_t *v);
-
-
-/* Codes for possible ink-tank combinations.
- * Each combo is represented by the colors that can be used with
- * the installed ink-tank(s)
- * Combinations of the codes represent the combinations allowed for a model
- * Note that only preferrable combinations should be used
- */
-#define CANON_INK_K           1
-#define CANON_INK_CMY         2
-#define CANON_INK_CMYK        4
-#define CANON_INK_CcMmYK      8
-#define CANON_INK_CcMmYyK    16
-
-#define CANON_INK_BLACK_MASK (CANON_INK_K|CANON_INK_CMYK|CANON_INK_CcMmYK)
-
-#define CANON_INK_PHOTO_MASK (CANON_INK_CcMmYK|CANON_INK_CcMmYyK)
-
-/* document feeding */
-#define CANON_SLOT_ASF1    1
-#define CANON_SLOT_ASF2    2
-#define CANON_SLOT_MAN1    4
-#define CANON_SLOT_MAN2    8
-
 /* model peculiarities */
-#define CANON_CAP_DMT       0x01ul    /* Drop Modulation Technology */
 #define CANON_CAP_MSB_FIRST 0x02ul    /* how to send data           */
 #define CANON_CAP_a         0x04ul
 #define CANON_CAP_b         0x08ul
@@ -831,12 +118,9 @@ static void canon_write_line(stp_vars_t *v);
 #define CANON_CAP_l         0x400ul
 #define CANON_CAP_r         0x800ul
 #define CANON_CAP_g         0x1000ul
-#define CANON_CAP_ACKSHORT  0x2000ul
+#define CANON_CAP_px        0x2000ul
 #define CANON_CAP_rr        0x4000ul
-#define CANON_CAP_WEAVE     0x8000ul   /* S200 has to be fed with weaved data */
-                                       /* for Resolutions above 360dpi */
-#define CANON_CAP_extended_t    0x10000ul  /* detailed level and bitdepth settings for every ink*/
-#define CANON_CAP_5pixelin1byte 0x20000ul  /* 5 pixel with 3 levels in 1 byte compression */
+#define CANON_CAP_I         0x8000ul
 #define CANON_CAP_DUPLEX    0x40000ul
 
 #define CANON_CAP_STD0 (CANON_CAP_b|CANON_CAP_c|CANON_CAP_d|\
@@ -845,623 +129,68 @@ static void canon_write_line(stp_vars_t *v);
 #define CANON_CAP_STD1 (CANON_CAP_b|CANON_CAP_c|CANON_CAP_d|CANON_CAP_l|\
                         CANON_CAP_m|CANON_CAP_p|CANON_CAP_q|CANON_CAP_t)
 
-#ifdef EXPERIMENTAL_STUFF
-#define CANON_MODES(A) A,sizeof(A)/sizeof(canon_variable_printmode_t*)
-#else
-#define CANON_MODES(A) 0
-#endif
-
-#define CANON_INK(A) A,sizeof(A)/sizeof(canon_variable_inklist_t)
-
-
-#ifdef EXPERIMENTAL_STUFF
-
-#define BC_10   CANON_INK_K       /* b/w   */
-#define BC_11   CANON_INK_CMYK    /* color */
-#define BC_12   CANON_INK_CMYK    /* photo */
-#define BC_20   CANON_INK_K       /* b/w   */
-#define BC_21   CANON_INK_CMYK    /* color */
-#define BC_22   CANON_INK_CMYK    /* photo */
-#define BC_29   0                 /* neon! */
-#define BC_3031 CANON_INK_CMYK    /* color */
-#define BC_3231 CANON_INK_CcMmYK  /* photo */
-
-
-static const canon_variable_printmode_t canon_nomodes[] =
-{
-  {0,0,0,0,0,0,0,0,0,0}
-};
-
-static const canon_variable_printmode_t canon_modes_30[] = {
-  {  180, 180, 1, BC_10, 2,  1.0, 1.0, &ci_CMYK_1,   0,0,0 },
-  {  360, 360, 1, BC_10, 2,  1.0, 1.0, &ci_CMYK_1,   0,0,0 },
-  {  720, 360, 1, BC_10, 2,  1.0, 1.0, &ci_CMYK_1,   0,0,0 },
-};
-
-static const canon_variable_printmode_t canon_modes_85[] = {
-  {  360, 360, 1, BC_10, 2,  1.0, 1.0, &ci_CMYK_1,   0,0,0 },
-  {  360, 360, 1, BC_11, 2,  1.0, 1.0, &ci_CMYK_1,   0,0,0 },
-  {  360, 360, 2, BC_11, 2,  1.0, 1.0, &ci_CMYK_2,   0,0,0 },
-  {  360, 360, 1, BC_21, 2,  1.0, 1.0, &ci_CMYK_1,   0,0,0 },
-  {  360, 360, 2, BC_21, 2,  1.0, 1.0, &ci_CMYK_2,   0,0,0 },
-};
-
-static const canon_variable_printmode_t canon_modes_2x00[] = {
-  {  360, 360, 1, BC_20, 2,  1.0, 1.0, &ci_CMYK_1,   0,0,0 },
-  {  360, 360, 1, BC_21, 2,  1.0, 1.0, &ci_CMYK_1,   0,0,0 },
-  {  360, 360, 1, BC_22, 2,  1.0, 1.0, &ci_CMYK_1,   0,0,0 },
-};
-
-static const canon_variable_printmode_t canon_modes_6x00[] = {
-  {  360, 360, 1, BC_3031, 2,  1.8, 1.0, &ci_CMYK_1,   0,0,0 },
-  {  360, 360, 2, BC_3031, 2,  1.8, 1.0, &ci_CMYK_2,   0,0,0 },
-  {  720, 720, 1, BC_3031, 2,  1.0, 1.0, &ci_CMYK_1,   0,0,0 },
-  { 1440, 720, 1, BC_3031, 2,  0.5, 1.0, &ci_CMYK_1,   0,0,0 },
-  {  360, 360, 1, BC_3231, 2,  1.8, 1.0, &ci_CcMmYK_1, 0,0,0 },
-  {  360, 360, 2, BC_3231, 2,  1.8, 1.0, &ci_CcMmYK_2, 0,0,0 },
-  {  720, 720, 1, BC_3231, 2,  1.0, 1.0, &ci_CcMmYK_1, 0,0,0 },
-  { 1440, 720, 1, BC_3231, 2,  0.5, 1.0, &ci_CcMmYK_1, 0,0,0 },
-};
-#endif
-
-static const canon_cap_t canon_model_capabilities[] =
-{
-  /* default settings for unknown models */
-
-  {   -1, 17*72/2,842,180,180,20,20,20,20, CANON_INK_K, CANON_SLOT_ASF1, 0 },
-
-  /* ******************************** */
-  /*                                  */
-  /* tested and color-adjusted models */
-  /*                                  */
-  /* ******************************** */
-
-
-
-
-  /* ************************************ */
-  /*                                      */
-  /* tested models w/out color-adjustment */
-  /*                                      */
-  /* ************************************ */
-
-  { /* Canon S200x *//* heads: BC-24 */
-    4202, 3,
-    618, 936,       /* 8.58" x 13 " */
-    180, 2880, 2880, 4,
-    10, 10, 9, 20,
-    CANON_INK_CMYK | CANON_INK_CMY | CANON_INK_K,
-    CANON_SLOT_ASF1,
-    CANON_CAP_STD1 | CANON_CAP_rr | CANON_CAP_WEAVE,
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-/*   2880dpi Resolutions: TBD */
-/* 180x180 360x360 720x720 1440x720 1440x1440 2880x2880 */
-    {-1,      0,      0,       0,       0,        -1},
-/*-------  360x360 720x720 1440x720  1440x1440 ---------*/
-    { 1,     2,       1,     0.5,     0.3,        0.2},
-    CANON_INK(canon_ink_standard),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-
-  { /* Canon  BJ 30   *//* heads: BC-10 */
-    30, 1,
-    9.5*72, 14*72,
-    90, 360, 360, 2,
-    11, 9, 10, 18,
-    CANON_INK_K,
-    CANON_SLOT_ASF1,
-    CANON_CAP_STD0 | CANON_CAP_a,
-    CANON_MODES(canon_modes_30),
-#ifndef EXPERIMENTAL_STUFF
-    {-1,0,0,0,-1,-1}, /*090x090 180x180 360x360 720x360 720x720 1440x1440*/
-    {1,1,1,1,1,1},    /*------- 180x180 360x360 720x360 ------- ---------*/
-    CANON_INK(canon_ink_standard),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-
-  { /* Canon  BJC 85  *//* heads: BC-20 BC-21 BC-22 */
-    85, 1,
-    9.5*72, 14*72,
-    90, 720, 360, 2,
-    11, 9, 10, 18,
-    CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
-    CANON_SLOT_ASF1,
-    CANON_CAP_STD0 | CANON_CAP_a | CANON_CAP_DMT,
-    CANON_MODES(canon_modes_85),
-#ifndef EXPERIMENTAL_STUFF
-    {-1,-1,1,0,-1,-1},/*090x090 180x180 360x360 720x360 720x720 1440x1440*/
-    {1,1,1,1,1,1},    /*------- ------- 360x360 720x360 ------- ---------*/
-    CANON_INK(canon_ink_standardphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
+#include "canon-inks.h"
+#include "canon-modes.h"
+#include "canon-media.h"
+#include "canon-printers.h"
 
-  { /* Canon BJC 4300 *//* heads: BC-20 BC-21 BC-22 BC-29 */
-    4300, 1,
-    618, 936,      /* 8.58" x 13 " */
-    180, 1440, 720, 2,
-    11, 9, 10, 18,
-    CANON_INK_CMYK | CANON_INK_CcMmYK,
-    CANON_SLOT_ASF1 | CANON_SLOT_MAN1,
-    CANON_CAP_STD0 | CANON_CAP_DMT,
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-    {-1,1,0,0,-1,-1}, /*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
-    {1,1,1,1,1,1},    /*------- 360x360 720x720 1440x720 --------- ---------*/
-    CANON_INK(canon_ink_standardphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-
-  { /* Canon BJC 4400 *//* heads: BC-20 BC-21 BC-22 BC-29 */
-    4400, 1,
-    9.5*72, 14*72,
-    90, 720, 360, 2,
-    11, 9, 10, 18,
-    CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
-    CANON_SLOT_ASF1,
-    CANON_CAP_STD0 | CANON_CAP_a | CANON_CAP_DMT,
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-    {-1,-1,0,0,-1,-1},/*090x090 180x180 360x360 720x360 720x720 1440x1440*/
-    {1,1,1,1,1,1},    /*------- ------- 360x360 720x360 ------- ---------*/
-    CANON_INK(canon_ink_standardphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-
-  { /* Canon BJC 6000 *//* heads: BC-30/BC-31 BC-32/BC-31 */
-    6000, 3,
-    618, 936,      /* 8.58" x 13 " */
-    180, 1440, 720, 2,
-    11, 9, 10, 18,
-    CANON_INK_CMYK | CANON_INK_CcMmYK,
-    CANON_SLOT_ASF1 | CANON_SLOT_MAN1,
-    CANON_CAP_STD1 | CANON_CAP_DMT | CANON_CAP_ACKSHORT,
-    CANON_MODES(canon_modes_6x00),
-#ifndef EXPERIMENTAL_STUFF
-    {-1,1,0,0,-1,-1}, /*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
-    {1,1.8,1,0.5,1,1},/*------- 360x360 720x720 1440x720 --------- ---------*/
-    CANON_INK(canon_ink_standardphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-
-  { /* Canon BJC 6200 *//* heads: BC-30/BC-31 BC-32/BC-31 */
-    6200, 3,
-    618, 936,      /* 8.58" x 13 " */
-    180, 1440, 720, 2,
-    11, 9, 10, 18,
-    CANON_INK_CMYK | CANON_INK_CcMmYK,
-    CANON_SLOT_ASF1 | CANON_SLOT_MAN1,
-    CANON_CAP_STD1 | CANON_CAP_DMT | CANON_CAP_ACKSHORT,
-    CANON_MODES(canon_modes_6x00),
-#ifndef EXPERIMENTAL_STUFF
-    {-1,1,0,0,-1,-1}, /*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
-    {0,1.8,1,.5,0,0}, /*------- 360x360 720x720 1440x720 --------- ---------*/
-    CANON_INK(canon_ink_standardphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-
-  { /* Canon BJC 6500 *//* heads: BC-30/BC-31 BC-32/BC-31 */
-    6500, 3,
-    842, 17*72,
-    180, 1440, 720, 2,
-    11, 9, 10, 18,
-    CANON_INK_CMYK | CANON_INK_CcMmYK,
-    CANON_SLOT_ASF1 | CANON_SLOT_MAN1,
-    CANON_CAP_STD1 | CANON_CAP_DMT,
-    CANON_MODES(canon_modes_6x00),
-#ifndef EXPERIMENTAL_STUFF
-    {-1,1,0,0,-1,-1}, /*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
-    {0,1.8,1,.5,0,0}, /*------- 360x360 720x720 1440x720 --------- ---------*/
-    CANON_INK(canon_ink_standardphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-
-  { /* Canon BJC 8200 *//* heads: BC-50 */
-    8200, 3,
-    842, 17*72,
-    150, 1200,1200, 4,
-    11, 9, 10, 18,
-    CANON_INK_CMYK, /*  | CANON_INK_CcMmYK */
-    CANON_SLOT_ASF1,
-    CANON_CAP_STD1 | CANON_CAP_r | CANON_CAP_DMT | CANON_CAP_ACKSHORT,
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-    {-1,0,0,-1,0,-1}, /*150x150 300x300 600x600 1200x600 1200x1200 2400x2400*/
-    {1,1,1,1,1,1},    /*------- 300x300 600x600 -------- 1200x1200 ---------*/
-    CANON_INK(canon_ink_superphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-
-
-  /* *************** */
-  /*                 */
-  /* untested models */
-  /*                 */
-  /* *************** */
-
-
-  { /* Canon BJC 210 *//* heads: BC-02 BC-05 BC-06 */
-    210, 1,
-    618, 936,      /* 8.58" x 13 " */
-    90, 720, 360, 2,
-    11, 9, 10, 18,
-    CANON_INK_K | CANON_INK_CMY,
-    CANON_SLOT_ASF1 | CANON_SLOT_MAN1,
-    CANON_CAP_STD0,
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-    {0,0,0,0,-1,-1},/*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
-    {1,1,1,1,1,1},    /*180x180 360x360 ------- -------- --------- ---------*/
-    CANON_INK(canon_ink_standard),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-  { /* Canon BJC 240 *//* heads: BC-02 BC-05 BC-06 */
-    240, 1,
-    618, 936,      /* 8.58" x 13 " */
-    90, 720, 360, 2,
-    11, 9, 10, 18,
-    CANON_INK_K | CANON_INK_CMY,
-    CANON_SLOT_ASF1 | CANON_SLOT_MAN1,
-    CANON_CAP_STD0 | CANON_CAP_DMT,
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-    {0,0,1,0,-1,-1},/*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
-    {1,1,1,1,1,1},    /*180x180 360x360 ------- -------- --------- ---------*/
-    CANON_INK(canon_ink_oldphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-  { /* Canon BJC 250 *//* heads: BC-02 BC-05 BC-06 */
-    250, 1,
-    618, 936,      /* 8.58" x 13 " */
-    90, 720, 360, 2,
-    11, 9, 10, 18,
-    CANON_INK_K | CANON_INK_CMY,
-    CANON_SLOT_ASF1 | CANON_SLOT_MAN1,
-    CANON_CAP_STD0 | CANON_CAP_DMT,
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-    {0,0,1,0,-1,-1},/*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
-    {1,1,1,1,1,1},    /*180x180 360x360 ------- -------- --------- ---------*/
-    CANON_INK(canon_ink_oldphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-  { /* Canon BJC 1000 *//* heads: BC-02 BC-05 BC-06 */
-    1000, 1,
-    842, 17*72,
-    90, 720, 360, 2,
-    11, 9, 10, 18,
-    CANON_INK_K | CANON_INK_CMY,
-    CANON_SLOT_ASF1,
-    CANON_CAP_STD0 | CANON_CAP_DMT | CANON_CAP_a,
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-    {0,0,1,0,-1,-1},  /*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
-    {1,1,1,1,1,1},    /*180x180 360x360 ------- -------- --------- ---------*/
-    CANON_INK(canon_ink_oldphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-  { /* Canon BJC 2000 *//* heads: BC-20 BC-21 BC-22 BC-29 */
-    2000, 1,
-    842, 17*72,
-    180, 720, 360, 2,
-    11, 9, 10, 18,
-    CANON_INK_CMYK,
-    CANON_SLOT_ASF1,
-    CANON_CAP_STD0 | CANON_CAP_a,
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-    {0,0,-1,-1,-1,-1},/*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
-    {1,1,1,1,1,1},    /*180x180 360x360 ------- -------- --------- ---------*/
-    CANON_INK(canon_ink_standard),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-  { /* Canon BJC 3000 *//* heads: BC-30 BC-33 BC-34 */
-    3000, 3,
-    842, 17*72,
-    180, 1440, 720, 2,
-    11, 9, 10, 18,
-    CANON_INK_CMYK | CANON_INK_CcMmYK,
-    CANON_SLOT_ASF1,
-    CANON_CAP_STD0 | CANON_CAP_a | CANON_CAP_DMT, /*FIX? should have _r? */
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-    {-1,1,0,0,-1,-1}, /*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
-    {1,1,1,1,1,1},    /*------- 360x360 720x720 1440x720 --------- ---------*/
-    CANON_INK(canon_ink_standardphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-  { /* Canon BJC 6100 *//* heads: BC-30/BC-31 BC-32/BC-31 */
-    6100, 3,
-    842, 17*72,
-    180, 1440, 720, 2,
-    11, 9, 10, 18,
-    CANON_INK_CMYK | CANON_INK_CcMmYK,
-    CANON_SLOT_ASF1,
-    CANON_CAP_STD1 | CANON_CAP_a | CANON_CAP_r | CANON_CAP_DMT,
-    CANON_MODES(canon_modes_6x00),
-#ifndef EXPERIMENTAL_STUFF
-    {-1,1,0,0,-1,-1}, /*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
-    {1,1,1,1,1,1},    /*------- 360x360 720x720 1440x720 --------- ---------*/
-    CANON_INK(canon_ink_standardphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-  { /* Canon BJC 7000 *//* heads: BC-60/BC-61 BC-60/BC-62   ??????? */
-    7000, 3,
-    842, 17*72,
-    150, 1200, 600, 2,
-    11, 9, 10, 18,
-    CANON_INK_CMYK | CANON_INK_CcMmYyK,
-    CANON_SLOT_ASF1,
-    CANON_CAP_STD1,
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-    {-1,0,0,0,-1,-1}, /*150x150 300x300 600x600 1200x600 1200x1200 2400x2400*/
-    {1,3.5,1.8,1,1,1},/*------- 300x300 600x600 1200x600 --------- ---------*/
-    CANON_INK(canon_ink_standardphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-  { /* Canon BJC 7100 *//* heads: BC-60/BC-61 BC-60/BC-62   ??????? */
-    7100, 3,
-    842, 17*72,
-    150, 1200, 600, 2,
-    11, 9, 10, 18,
-    CANON_INK_CMYK | CANON_INK_CcMmYyK,
-    CANON_SLOT_ASF1,
-    CANON_CAP_STD0,
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-    {-1,0,0,0,-1,-1}, /*150x150 300x300 600x600 1200x600 1200x1200 2400x2400*/
-    {1,1,1,1,1,1},    /*------- 300x300 600x600 1200x600 --------- ---------*/
-    CANON_INK(canon_ink_standardphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-
-  /*****************************/
-  /*                           */
-  /*  extremely fuzzy models   */
-  /* (might never work at all) */
-  /*                           */
-  /*****************************/
-
-  { /* Canon BJC 5100 *//* heads: BC-20 BC-21 BC-22 BC-23 BC-29 */
-    5100, 1,
-    17*72, 22*72,
-    180, 1440, 720, 2,
-    11, 9, 10, 18,
-    CANON_INK_CMYK | CANON_INK_CcMmYK,
-    CANON_SLOT_ASF1,
-    CANON_CAP_STD0 | CANON_CAP_DMT,
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-    {-1,1,0,0,-1,-1}, /*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
-    {1,1,1,1,1,1},    /*------- 360x360 720x720 1440x720 --------- ---------*/
-    CANON_INK(canon_ink_standardphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-  { /* Canon BJC 5500 *//* heads: BC-20 BC-21 BC-29 */
-    5500, 1,
-    22*72, 34*72,
-    180, 720, 360, 2,
-    11, 9, 10, 18,
-    CANON_INK_CMYK | CANON_INK_CcMmYK,
-    CANON_SLOT_ASF1,
-    CANON_CAP_STD0 | CANON_CAP_a,
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-    {0,0,-1,-1,-1,-1},/*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
-    {1,1,1,1,1,1},    /*180x180 360x360 ------- -------- --------- ---------*/
-    CANON_INK(canon_ink_standardphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-  { /* Canon BJC 6500 *//* heads: BC-30/BC-31 BC-32/BC-31 */
-    6500, 3,
-    17*72, 22*72,
-    180, 1440, 720, 2,
-    11, 9, 10, 18,
-    CANON_INK_CMYK | CANON_INK_CcMmYK,
-    CANON_SLOT_ASF1,
-    CANON_CAP_STD1 | CANON_CAP_a | CANON_CAP_DMT,
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-    {-1,1,0,0,-1,-1}, /*180x180 360x360 720x720 1440x720 1440x1440 2880x2880*/
-    {1,1,1,1,1,1},    /*------- 360x360 720x720 1440x720 --------- ---------*/
-    CANON_INK(canon_ink_standardphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-  { /* Canon BJC 8500 *//* heads: BC-80/BC-81 BC-82/BC-81 */
-    8500, 3,
-    17*72, 22*72,
-    150, 1200,1200, 2,
-    11, 9, 10, 18,
-    CANON_INK_CMYK | CANON_INK_CcMmYK,
-    CANON_SLOT_ASF1,
-    CANON_CAP_STD0,
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-    {-1,0,0,-1,0,-1}, /*150x150 300x300 600x600 1200x600 1200x1200 2400x2400*/
-    {1,1,1,1,1,1},    /*------- 300x300 600x600 -------- 1200x1200 ---------*/
-    CANON_INK(canon_ink_standardphoto),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-  { /* Canon PIXMA iP4000 */
-    4000, 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    150, 600, 600, 2, /*base resolution,max_xdpi,max_ydpi,max_quality */
-    11, 9, 10, 18,    /*border_left, border_right, border_top, border_bottom */
-    CANON_INK_CMYK /*| CANON_INK_CcMmYyK*/, /*canon inks */
-    CANON_SLOT_ASF1,  /*paper slot */
-    CANON_CAP_STD0|CANON_CAP_extended_t|CANON_CAP_5pixelin1byte|CANON_CAP_DUPLEX,  /*features */
-    CANON_MODES(canon_nomodes),
-#ifndef EXPERIMENTAL_STUFF
-    {-1,-1,0,-1,-1,-1}, /*150x150 300x300 600x600 1200x600 1200x1200 2400x2400*/
-    {1,1,1,1,1,1},    /*------- 300x300 600x600 1200x600 --------- ---------*/
-    CANON_INK(canon_ink_standard_pixma),
-#endif
-    standard_lum_adjustment,
-    standard_hue_adjustment,
-    standard_sat_adjustment
-  },
-};
 
 typedef struct {
-  int x;
-  int y;
-  const char *name;
-  const char *text;
-  const char *name_dmt;
-  const char *text_dmt;
-} canon_res_t;
-
-static const canon_res_t canon_resolutions[] = {
-  { 90, 90, "90x90dpi", N_("90x90 DPI"), "90x90dmt", N_("90x90 DPI DMT") },
-  { 180, 180, "180x180dpi", N_("180x180 DPI"), "180x180dmt", N_("180x180 DPI DMT") },
-  { 360, 360, "360x360dpi", N_("360x360 DPI"), "360x360dmt", N_("360x360 DPI DMT") },
-  { 720, 360, "720x360dpi", N_("720x360 DPI"), "720x360dmt", N_("720x360 DPI DMT") },
-  { 720, 720, "720x720dpi", N_("720x720 DPI"), "720x720dmt", N_("720x720 DPI DMT") },
-  { 1440, 720, "1440x720dpi", N_("1440x720 DPI"), "1440x720dmt", N_("1440x720 DPI DMT") },
-  { 1440, 1440, "1440x1440dpi", N_("1440x1440 DPI"), "1440x1440dmt", N_("1440x1440 DPI DMT") },
-  { 2880, 2880, "2880x2880dpi", N_("2880x2880 DPI"), "2880x2880dmt", N_("2880x2880 DPI DMT") },
-  { 150, 150, "150x150dpi", N_("150x150 DPI"), "150x150dmt", N_("150x150 DPI DMT") },
-  { 300, 300, "300x300dpi", N_("300x300 DPI"), "300x300dmt", N_("300x300 DPI DMT") },
-  { 600, 300, "600x300dpi", N_("600x300 DPI"), "600x300dmt", N_("600x300 DPI DMT") },
-  { 600, 600, "600x600dpi", N_("600x600 DPI"), "600x600dmt", N_("600x600 DPI DMT") },
-  { 1200, 600, "1200x600dpi", N_("1200x600 DPI"), "1200x600dmt", N_("1200x600 DPI DMT") },
-  { 1200, 1200, "1200x1200dpi", N_("1200x1200 DPI"), "1200x1200dmt", N_("1200x1200 DPI DMT") },
-  { 2400, 2400, "2400x2400dpi", N_("2400x2400 DPI"), "2400x2400dmt", N_("2400x2400 DPI DMT") },
-  { 0, 0, NULL, NULL, NULL, NULL }
-};
+    char name;
+    const canon_ink_t* props;
+    unsigned char* buf;
+    unsigned char* comp_buf_offset;
+    unsigned int buf_length;
+    unsigned int delay;
+} canon_channel_t;
 
-static const char plain_paper_lum_adjustment[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<gutenprint>\n"
-"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
-"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-"1.20 1.22 1.28 1.34 1.39 1.42 1.45 1.48 "  /* C */
-"1.50 1.40 1.30 1.25 1.20 1.10 1.05 1.05 "  /* B */
-"1.05 1.05 1.05 1.05 1.05 1.05 1.05 1.05 "  /* M */
-"1.05 1.05 1.05 1.10 1.10 1.10 1.10 1.10 "  /* R */
-"1.10 1.15 1.30 1.45 1.60 1.75 1.90 2.00 "  /* Y */
-"2.10 2.00 1.80 1.70 1.60 1.50 1.40 1.30 "  /* G */
-"</sequence>\n"
-"</curve>\n"
-"</gutenprint>\n";
 
-typedef struct {
-  const char *name;
-  const char *text;
-  int media_code;
-  double base_density;
-  double k_lower_scale;
-  double k_upper;
-  const char *hue_adjustment;
-  const char *lum_adjustment;
-  const char *sat_adjustment;
-} paper_t;
 
-typedef struct {
+typedef struct
+{
+  const canon_mode_t* mode; 
+  const canon_slot_t* slot;
+  const canon_paper_t *pt;
+  unsigned int used_inks;
+  int num_channels;
+  canon_channel_t* channels;
+  char* channel_order;
   const canon_cap_t *caps;
-  int printing_color;
-  int is_first_page;
-  const paper_t *pt;
-  int print_head;
-  int colormode;
-  const char *source_str;
-  const char *duplex_str;
-  int xdpi;
-  int ydpi;
+  unsigned char *comp_buf;
+  unsigned char *fold_buf;
+  int delay_max;
+  int buf_length_max;
+  int length;
+  int out_width;
+  int out_height;
   int page_width;
   int page_height;
   int top;
   int left;
-  int bits;
-  color_info_t color_info[9]; /* C,M,Y,K,c,m,y,k,? */
-} canon_init_t;
-
-static const paper_t canon_paper_list[] = {
-  { "Plain",		N_ ("Plain Paper"),                0x00, 0.50, 0.25, 0.500, 0, 0, 0 },
-  { "PlainPIXMA",	N_ ("Plain Paper PIXMA"),          0x00, 0.78, 0.25, 0.500, 0, 0, 0 },
-  { "Transparency",	N_ ("Transparencies"),             0x02, 1.00, 1.00, 0.900, 0, 0, 0 },
-  { "BackPrint",	N_ ("Back Print Film"),            0x03, 1.00, 1.00, 0.900, 0, 0, 0 },
-  { "Fabric",		N_ ("Fabric Sheets"),              0x04, 0.50, 0.25, 0.500, 0, 0, 0 },
-  { "Envelope",		N_ ("Envelope"),                   0x08, 0.50, 0.25, 0.500, 0, 0, 0 },
-  { "Coated",		N_ ("High Resolution Paper"),      0x07, 0.78, 0.25, 0.500, 0, 0, 0 },
-  { "TShirt",		N_ ("T-Shirt Transfers"),          0x03, 0.50, 0.25, 0.500, 0, 0, 0 },
-  { "GlossyFilm",	N_ ("High Gloss Film"),            0x06, 1.00, 1.00, 0.999, 0, 0, 0 },
-  { "GlossyPaper",	N_ ("Glossy Photo Paper"),         0x05, 1.00, 1.00, 0.999, 0, 0, 0 },
-  { "GlossyCard",	N_ ("Glossy Photo Cards"),         0x0a, 1.00, 1.00, 0.999, 0, 0, 0 },
-  { "GlossyPro",	N_ ("Photo Paper Pro"),            0x09, 1.00, 1.00, 0.999, 0, 0, 0 },
-  { "Other",		N_ ("Other"),                      0x00, 0.50, 0.25, .5, 0, 0, 0 },
-};
+  int emptylines;
+  int ncolors; /* number of colors to print with */
+  int physical_xdpi, nozzle_ydpi, stepper_ydpi;
+  int nozzles;   /* count of inkjets for one pass */
+  int nozzle_separation;
+  int horizontal_passes;
+  int vertical_passes;
+  int vertical_oversample;
+  int *head_offset;
+  int last_pass_offset;
+  int bidirectional; /* tells us if we are allowed to print bidirectional */
+  int direction;     /* stores the last direction of the print head */
+  int weave_bits[4];
+  const char *duplex_str;
+  int is_first_page;
+  double cd_inner_radius;
+  double cd_outer_radius;
+} canon_privdata_t;
+
+static void canon_write_line(stp_vars_t *v);
 
-static const int paper_type_count = sizeof(canon_paper_list) / sizeof(paper_t);
 static void canon_advance_paper(stp_vars_t *, int);
 static void canon_flush_pass(stp_vars_t *, int, int);
+static void canon_write_multiraster(stp_vars_t *v,canon_privdata_t* pd,int y);
 
 static const stp_parameter_t the_parameters[] =
 {
@@ -1484,6 +213,36 @@ static const stp_parameter_t the_parameters[] =
     STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
   },
   {
+    "CDInnerRadius", N_("CD Hub Size"), N_("Basic Printer Setup"),
+    N_("Print only outside of the hub of the CD, or all the way to the hole"),
+    STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+  },
+  {
+    "CDOuterDiameter", N_("CD Size (Custom)"), N_("Basic Printer Setup"),
+    N_("Variable adjustment for the outer diameter of CD"),
+    STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+  },
+  {
+    "CDInnerDiameter", N_("CD Hub Size (Custom)"), N_("Basic Printer Setup"),
+    N_("Variable adjustment to the inner hub of the CD"),
+    STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+  },
+  {
+    "CDXAdjustment", N_("CD Horizontal Fine Adjustment"), N_("Advanced Printer Setup"),
+    N_("Fine adjustment to horizontal position for CD printing"),
+    STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+  },
+  {
+    "CDYAdjustment", N_("CD Vertical Fine Adjustment"), N_("Advanced Printer Setup"),
+    N_("Fine adjustment to horizontal position for CD printing"),
+    STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+  },
+  {
     "Resolution", N_("Resolution"), N_("Basic Printer Setup"),
     N_("Resolution and quality of the print"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
@@ -1512,7 +271,7 @@ static const stp_parameter_t the_parameters[] =
     N_("Duplex/Tumble Setting"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
     STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
-  }
+  },
 };
 
 static const int the_parameter_count =
@@ -1595,32 +354,30 @@ sizeof(float_parameters) / sizeof(const float_param_t);
  * Duplex support - modes available
  * Note that the internal names MUST match those in cups/genppd.c else the
  * PPD files will not be generated correctly
- *
- * TODO: Support for DuplexNoTumble, the image has to be rotated 
  */
 
 static const stp_param_string_t duplex_types[] =
 {
   { "None",             N_ ("Off") },
-/*  { "DuplexNoTumble", N_ ("Long Edge (Standard)") } , */
+  { "DuplexNoTumble",   N_ ("Long Edge (Standard)") },
   { "DuplexTumble",     N_ ("Short Edge (Flip)") }
 };
 #define NUM_DUPLEX (sizeof (duplex_types) / sizeof (stp_param_string_t))
 
 
 
-static const paper_t *
-get_media_type(const char *name)
+static const canon_paper_t *
+get_media_type(const canon_cap_t* caps,const char *name)
 {
   int i;
-  if (name)
-    for (i = 0; i < paper_type_count; i++)
+  if (name && caps->paperlist)
+    for (i = 0; i < caps->paperlist->count; i++)
       {
 	/* translate paper_t.name */
-	if (!strcmp(name, canon_paper_list[i].name))
-	  return &(canon_paper_list[i]);
+	if (!strcmp(name, caps->paperlist->papers[i].name))
+	  return &(caps->paperlist->papers[i]);
       }
-  return NULL;
+  return &(caps->paperlist->papers[0]);
 }
 
 
@@ -1637,69 +394,81 @@ static const canon_cap_t * canon_get_model_capabilities(int model)
   return &(canon_model_capabilities[0]);
 }
 
-static int
+static const canon_slot_t *
 canon_source_type(const char *name, const canon_cap_t * caps)
 {
-  /* used internally: do not translate */
-  if (name)
-    {
-      if (!strcmp(name,"Auto"))    return 4;
-      if (!strcmp(name,"Manual"))    return 0;
-      if (!strcmp(name,"ManualNP")) return 1;
-      if (!strcmp(name,"Cassette")) return 8;
-      if (!strcmp(name,"CD")) return 10;
+    if(name){
+        int i;
+        for(i=0; i<caps->slotlist->count; i++){
+            if( !strcmp(name,caps->slotlist->slots[i].name))
+                 return &(caps->slotlist->slots[i]);
+        }
     }
-
-  stp_deprintf(STP_DBG_CANON,"canon: Unknown source type '%s' - reverting to auto\n",name);
-  return 4;
+    return &(caps->slotlist->slots[0]);
 }
 
-static int
-canon_printhead_type(const char *name, const canon_cap_t * caps)
-{
-  /* used internally: do not translate */
-  if (name)
-    {
-      if (!strcmp(name,"Gray"))             return 0;
-      if (!strcmp(name,"RGB"))             return 1;
-      if (!strcmp(name,"CMYK"))       return 2;
-      if (!strcmp(name,"PhotoCMY"))       return 3;
-      if (!strcmp(name,"Photo"))             return 4;
-      if (!strcmp(name,"PhotoCMYK")) return 5;
+
+/* function returns the current set printmode (specified by resolution) */
+/* if no mode is set the default mode will be returned */
+static const canon_mode_t* canon_get_current_mode(const stp_vars_t *v){
+    const char* input_slot = stp_get_string_parameter(v, "InputSlot");
+    const char *resolution = stp_get_string_parameter(v, "Resolution");
+    const canon_cap_t * caps = canon_get_model_capabilities(stp_get_model_id(v));
+    const canon_mode_t* mode = NULL;
+    int i;
+    if(resolution){
+        for(i=0;i<caps->modelist->count;i++){
+            if(!strcmp(resolution,caps->modelist->modes[i].name)){
+                mode = &caps->modelist->modes[i];
+                break;
+            }
+        }
     }
-  if (name && *name == 0) {
-    if (caps->inks & CANON_INK_CMYK) return 2;
-    if (caps->inks & CANON_INK_CMY)  return 1;
-    if (caps->inks & CANON_INK_K)    return 0;
-  }
+    if(!mode)
+        mode = &caps->modelist->modes[caps->modelist->default_mode];
 
-  stp_deprintf(STP_DBG_CANON,"canon: Unknown head combo '%s' - reverting to black\n",name);
-  return 0;
+#if 0
+    /* only some modes can print to cd */
+    if(input_slot && !strcmp(input_slot,"CD") && !(mode->flags & MODE_FLAG_CD)){
+        for(i=0;i<caps->modelist->count;i++){
+            if(caps->modelist->modes[i].flags & MODE_FLAG_CD){
+                mode = &caps->modelist->modes[i];
+                break;
+            }
+        }
+    }
+#endif
+
+
+
+
+
+    return mode;
 }
 
-static colormode_t
-canon_printhead_colors(const char *name, const canon_cap_t * caps)
+/* function returns the best ink_type for the current mode */
+static unsigned int
+canon_printhead_colors(const stp_vars_t*v)
 {
-  /* used internally: do not translate */
-  if (name)
-    {
-      if (!strcmp(name,"Gray"))             return COLOR_MONOCHROME;
-      if (!strcmp(name,"RGB"))             return COLOR_CMY;
-      if (!strcmp(name,"CMYK"))       return COLOR_CMYK;
-      if (!strcmp(name,"PhotoCMY"))       return COLOR_CCMMYK;
-      if (!strcmp(name,"PhotoCMYK")) return COLOR_CCMMYYK;
-    }
+  int i;
+  const canon_mode_t* mode;
+  const char *print_mode = stp_get_string_parameter(v, "PrintingMode");
+  const char *ink_type = stp_get_string_parameter(v, "InkType");
+  if(print_mode && strcmp(print_mode, "BW") == 0)
+    return CANON_INK_K;
 
-  if (caps->inks & CANON_INK_CcMmYyK)
-    return COLOR_CCMMYYK;
-  else if (caps->inks & CANON_INK_CcMmYK)
-    return COLOR_CCMMYK;
-  else if (caps->inks & CANON_INK_CMYK)
-    return COLOR_CMYK;
-  else if (caps->inks & CANON_INK_CMY)
-    return COLOR_CMY;
-  else
-    return COLOR_MONOCHROME;
+  if(ink_type){
+      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+          if(ink_type && !strcmp(canon_inktypes[i].name,ink_type))
+              return canon_inktypes[i].ink_type;
+     }
+  }
+  mode = canon_get_current_mode(v);
+  for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+    if(mode->ink_types & canon_inktypes[i].ink_type)
+        return canon_inktypes[i].ink_type;
+  }
+  return CANON_INK_K;
 }
 
 static unsigned char
@@ -1732,199 +501,26 @@ canon_size_type(const stp_vars_t *v, const canon_cap_t * caps)
   return 0;
 }
 
-#ifndef EXPERIMENTAL_STUFF
-static int canon_res_code(const canon_cap_t * caps, int xdpi, int ydpi)
-{
-  int x, y, res= 0;
-
-  for (x=1; x<6; x++) if ((xdpi/caps->base_res) == (1<<(x-1))) res= (x<<4);
-  for (y=1; y<6; y++) if ((ydpi/caps->base_res) == (1<<(y-1))) res|= y;
-
-  return res;
-}
-#else
-static const canon_variable_printmode_t *canon_printmode(const canon_cap_t * caps,
-							 int xdpi, int ydpi,
-							 int bpp, int head)
-{
-  const canon_variable_printmode_t *modes;
-  int modes_cnt;
-  int i;
-  if (!caps) return 0;
-  modes= caps->printmodes;
-  modes_cnt= caps->printmodes_cnt;
-  /* search for the right printmode: */
-  for (i=0; i<modes_cnt; i++) {
-    if ((modes[i].xdpi== xdpi) && (modes[i].ydpi== ydpi) &&
-	(modes[i].bits== bpp) && (modes[i].printhead== head))
-      {
-	return &(modes[i]);
-      }
-  }
-  /* nothing found -> either return 0 or apply some policy to
-   * get a fallback printmode
-   */
-  if (modes[0].xdpi) return modes;
-  return 0;
-}
-#endif
-
-static int
-canon_ink_type(const canon_cap_t * caps, int res_code)
-{
-#ifndef EXPERIMENTAL_STUFF
-  switch (res_code)
-    {
-    case 0x11: return caps->dot_sizes.dot_r11;
-    case 0x22: return caps->dot_sizes.dot_r22;
-    case 0x33: return caps->dot_sizes.dot_r33;
-    case 0x43: return caps->dot_sizes.dot_r43;
-    case 0x44: return caps->dot_sizes.dot_r44;
-    case 0x55: return caps->dot_sizes.dot_r55;
-    }
-  return -1;
-#else
-  return -1;
-#endif
-}
-
-static const char *
-canon_lum_adjustment(int model)
-{
-  const canon_cap_t * caps= canon_get_model_capabilities(model);
-  return (caps->lum_adjustment);
-}
-
-static const char *
-canon_hue_adjustment(int model)
-{
-  const canon_cap_t * caps= canon_get_model_capabilities(model);
-  return (caps->hue_adjustment);
-}
-
-static const char *
-canon_sat_adjustment(int model)
-{
-  const canon_cap_t * caps= canon_get_model_capabilities(model);
-  return (caps->sat_adjustment);
-}
-
-static double
-canon_density(const canon_cap_t * caps, int res_code)
-{
-#ifndef EXPERIMENTAL_STUFF
-  switch (res_code)
-    {
-    case 0x11: return caps->densities.d_r11;
-    case 0x22: return caps->densities.d_r22;
-    case 0x33: return caps->densities.d_r33;
-    case 0x43: return caps->densities.d_r43;
-    case 0x44: return caps->densities.d_r44;
-    case 0x55: return caps->densities.d_r55;
-    default:
-      stp_deprintf(STP_DBG_CANON,"no such res_code 0x%x in density of model %d\n",
-	      res_code,caps->model);
-      return 0.2;
-    }
-#else
-  return 0.2;
-#endif
-}
-
-static const canon_variable_inkset_t *
-canon_inks(const canon_cap_t * caps, int res_code, int colors, int bits)
-{
-#ifndef EXPERIMENTAL_STUFF
-  const canon_variable_inklist_t *inks = caps->inxs;
-  int i;
-
-  if (!inks)
-    return NULL;
-
-  for (i=0; i<caps->inxs_cnt; i++) {
-      stp_deprintf(STP_DBG_CANON,"hmm, trying ink for resolution code "
-	      "%x, %d bits, %d colors\n",res_code,inks[i].bits,inks[i].colors);
-    if ((inks[i].bits==bits) && (inks[i].colors==colors)) {
-      stp_deprintf(STP_DBG_CANON,"wow, found ink for resolution code "
-	      "%x, %d bits, %d colors\n",res_code,bits,colors);
-      switch (res_code)
-	{
-	case 0x11: return inks[i].r11;
-	case 0x22: return inks[i].r22;
-	case 0x33: return inks[i].r33;
-	case 0x43: return inks[i].r43;
-	case 0x44: return inks[i].r44;
-	case 0x55: return inks[i].r55;
-	}
-    }
-  }
-  stp_deprintf(STP_DBG_CANON,"ooo, found no ink for resolution code "
-	  "%x, %d bits, %d colors in all %d defs!\n",
-	  res_code,bits,colors,caps->inxs_cnt);
-  return NULL;
-#else
-  return NULL;
-#endif
-}
-
 static void
 canon_describe_resolution(const stp_vars_t *v, int *x, int *y)
 {
-  const char *resolution = stp_get_string_parameter(v, "Resolution");
-  const canon_res_t *res = canon_resolutions;
-  while (res->x > 0)
-    {
-      if (strcmp(resolution, res->name) == 0 ||
-	  strcmp(resolution, res->name_dmt) == 0)
-	{
-	  *x = res->x;
-	  *y = res->y;
-	  return;
-	}
-      res++;
-    }
-  *x = -1;
-  *y = -1;
+    const canon_mode_t* mode = canon_get_current_mode(v);
+    *x = mode->xdpi;
+    *y = mode->ydpi;
 }
 
 static const char *
 canon_describe_output(const stp_vars_t *v)
 {
-  int model = stp_get_model_id(v);
-  const canon_cap_t *caps = canon_get_model_capabilities(model);
-  const char *print_mode = stp_get_string_parameter(v, "PrintingMode");
-  const char *ink_type = stp_get_string_parameter(v, "InkType");
-  colormode_t colormode = canon_printhead_colors(ink_type,caps);
-  int printhead= canon_printhead_type(ink_type,caps);
+  unsigned int ink_type = canon_printhead_colors(v);
 
-  if ((print_mode && strcmp(print_mode, "BW") == 0) ||
-      printhead == 0 || caps->inks == CANON_INK_K)
-    colormode = COLOR_MONOCHROME;
-
-  switch (colormode)
-    {
-    case COLOR_CMY:
-      return "CMY";
-    case COLOR_CMYK:
-    case COLOR_CCMMYK:
-    case COLOR_CCMMYYK:
-      return "CMYK";
-    case COLOR_MONOCHROME:
-    default:
-      return "Grayscale";
-    }
+  if(ink_type & CANON_INK_CMYK_MASK)
+    return "CMYK";
+  if(ink_type & CANON_INK_CMY_MASK)
+    return "CMY";
+  return "Grayscale";
 }
 
-static const stp_param_string_t media_sources[] =
-              {
-                { "Auto",	N_ ("Auto Sheet Feeder") },
-                { "Manual",	N_ ("Manual with Pause") },
-                { "ManualNP",	N_ ("Manual without Pause") },
-		{ "Cassette",   N_ ("Cassette") },
-		{ "CD", N_ ("CD tray") }
-              };
-
-
 /*
  * 'canon_parameters()' - Return the parameter values for the given parameter.
  */
@@ -1957,21 +553,14 @@ canon_parameters(const stp_vars_t *v, const char *name,
   for (i = 0; i < float_parameter_count; i++)
     if (strcmp(name, float_parameters[i].param.name) == 0)
       {
-	const char *print_mode = stp_get_string_parameter(v, "PrintingMode");
-	const char *ink_type = stp_get_string_parameter(v, "InkType");
-	colormode_t colormode = canon_printhead_colors(ink_type,caps);
-	int printhead= canon_printhead_type(ink_type,caps);
-
-	if ((print_mode && strcmp(print_mode, "BW") == 0) ||
-	    printhead == 0 || caps->inks == CANON_INK_K)
-	  colormode = COLOR_MONOCHROME;
+	unsigned int ink_type = canon_printhead_colors(v);
 
 	stp_fill_parameter_settings(description,
 				    &(float_parameters[i].param));
 	description->deflt.dbl = float_parameters[i].defval;
 	description->bounds.dbl.upper = float_parameters[i].max;
 	description->bounds.dbl.lower = float_parameters[i].min;
-	if (colormode != COLOR_MONOCHROME || !float_parameters[i].color_only)
+	if (ink_type != CANON_INK_K || !float_parameters[i].color_only)
 	  description->is_active = 1;
 	else
 	  description->is_active = 0;
@@ -1985,101 +574,135 @@ canon_parameters(const stp_vars_t *v, const char *name,
 	break;
       }
   if (strcmp(name, "PageSize") == 0)
-  {
-    int height_limit, width_limit;
-    int papersizes = stp_known_papersizes();
-    description->bounds.str = stp_string_list_create();
-
-    width_limit = caps->max_width;
-    height_limit = caps->max_height;
-
-    for (i = 0; i < papersizes; i++) {
-      const stp_papersize_t *pt = stp_get_papersize_by_index(i);
-      if (strlen(pt->name) > 0 &&
-	  pt->width <= width_limit && pt->height <= height_limit)
-	{
-	  if (stp_string_list_count(description->bounds.str) == 0)
-	    description->deflt.str = pt->name;
-	  stp_string_list_add_string(description->bounds.str,
+    {
+      const char* input_slot = stp_get_string_parameter(v, "InputSlot");
+      int height_limit, width_limit;
+      int papersizes = stp_known_papersizes();
+      description->bounds.str = stp_string_list_create();
+
+      width_limit = caps->max_width;
+      height_limit = caps->max_height;
+
+      if(input_slot && !strcmp(input_slot,"CD")){
+        stp_string_list_add_string
+          (description->bounds.str, "CD5Inch", _("CD - 5 inch"));
+        stp_string_list_add_string
+          (description->bounds.str, "CD3Inch", _("CD - 3 inch"));
+        stp_string_list_add_string
+          (description->bounds.str, "CDCustom", _("CD - Custom"));
+      }else{
+        for (i = 0; i < papersizes; i++) {
+          const stp_papersize_t *pt = stp_get_papersize_by_index(i);
+          if (strlen(pt->name) > 0 &&
+	      pt->width <= width_limit && pt->height <= height_limit){
+	    stp_string_list_add_string(description->bounds.str,
 				     pt->name, gettext(pt->text));
+           }
+        }
+      }
+      description->deflt.str =
+        stp_string_list_param(description->bounds.str, 0)->name;
+  }
+  else if (strcmp(name, "CDInnerRadius") == 0 )
+    {
+      const char* input_slot = stp_get_string_parameter(v, "InputSlot");
+      description->bounds.str = stp_string_list_create();
+      if (input_slot && !strcmp(input_slot,"CD") &&
+         (!stp_get_string_parameter(v, "PageSize") ||
+          strcmp(stp_get_string_parameter(v, "PageSize"), "CDCustom") != 0))
+	{
+	  stp_string_list_add_string
+	    (description->bounds.str, "None", _("Normal"));
+	  stp_string_list_add_string
+	    (description->bounds.str, "Small", _("Print To Hub"));
+	  description->deflt.str =
+	    stp_string_list_param(description->bounds.str, 0)->name;
 	}
+      else
+	description->is_active = 0;
+    }
+  else if (strcmp(name, "CDInnerDiameter") == 0 )
+    {
+      const char* input_slot = stp_get_string_parameter(v, "InputSlot");
+      description->bounds.dimension.lower = 16 * 10 * 72 / 254;
+      description->bounds.dimension.upper = 43 * 10 * 72 / 254;
+      description->deflt.dimension = 43 * 10 * 72 / 254;
+      if (input_slot && !strcmp(input_slot,"CD") &&
+         (!stp_get_string_parameter(v, "PageSize") ||
+         strcmp(stp_get_string_parameter(v, "PageSize"), "CDCustom") == 0))
+	description->is_active = 1;
+      else
+	description->is_active = 0;
+    }
+  else if (strcmp(name, "CDOuterDiameter") == 0 )
+    {
+      const char* input_slot = stp_get_string_parameter(v, "InputSlot");
+      description->bounds.dimension.lower = 65 * 10 * 72 / 254;
+      description->bounds.dimension.upper = 120 * 10 * 72 / 254;
+      description->deflt.dimension = 329;
+      if (input_slot && !strcmp(input_slot,"CD") &&
+         (!stp_get_string_parameter(v, "PageSize") ||
+          strcmp(stp_get_string_parameter(v, "PageSize"), "CDCustom") == 0))
+	description->is_active = 1;
+      else
+	description->is_active = 0;
+    }
+  else if (strcmp(name, "CDXAdjustment") == 0 ||
+	   strcmp(name, "CDYAdjustment") == 0)
+    {
+      const char* input_slot = stp_get_string_parameter(v, "InputSlot");
+      description->bounds.dimension.lower = -15;
+      description->bounds.dimension.upper = 15;
+      description->deflt.dimension = 0;
+      if (input_slot && !strcmp(input_slot,"CD"))
+	description->is_active = 1;
+      else
+	description->is_active = 0;
     }
-  }
   else if (strcmp(name, "Resolution") == 0)
   {
-    int x,y;
-    int t;
+    const char* input_slot = stp_get_string_parameter(v, "InputSlot");
     description->bounds.str= stp_string_list_create();
     description->deflt.str = NULL;
+    for(i=0;i<caps->modelist->count;i++){
+#if 0
+	if(!(input_slot && !strcmp(input_slot,"CD") && !(caps->modelist->modes[i].flags & MODE_FLAG_CD)))
+#endif
+          stp_string_list_add_string(description->bounds.str,
+                                        caps->modelist->modes[i].name, gettext(caps->modelist->modes[i].text));
+        stp_deprintf(STP_DBG_CANON,"supports mode '%s'\n",
+                      caps->modelist->modes[i].name);
+        if(i == caps->modelist->default_mode)
+            description->deflt.str=caps->modelist->modes[i].name;
+
 
-    for (x=1; x<6; x++) {
-      for (y=x-1; y<x+1; y++) {
-	if ((t= canon_ink_type(caps,(x<<4)|y)) > -1) {
-	  int xx = (1<<x)/2*caps->base_res;
-	  int yy = (1<<y)/2*caps->base_res;
-	  const canon_res_t *res = canon_resolutions;
-	  while (res->x > 0) {
-	    if (xx == res->x && yy == res->y) {
-	      stp_string_list_add_string(description->bounds.str,
-					res->name, gettext(res->text));
-	      stp_deprintf(STP_DBG_CANON,"supports mode '%s'\n",
-			   res->name);
-	      if (xx >= 300 && yy >= 300 && description->deflt.str == NULL)
-		description->deflt.str = res->name;
-	      if (t == 1) {
-		stp_string_list_add_string(description->bounds.str,
-					  res->name_dmt, gettext(res->text_dmt));
-		stp_deprintf(STP_DBG_CANON,"supports mode '%s'\n",
-			     res->name_dmt);
-	      }
-	      break;
-	    }
-	    res++;
-	  }
-	}
-      }
     }
   }
   else if (strcmp(name, "InkType") == 0)
   {
+    const canon_mode_t* mode = canon_get_current_mode(v);
     description->bounds.str= stp_string_list_create();
-    /* used internally: do not translate */
-    if ((caps->inks & CANON_INK_CcMmYyK))
-      stp_string_list_add_string(description->bounds.str,
-			       "PhotoCMYK", _("Photo CcMmYK Color"));
-    if ((caps->inks & CANON_INK_CcMmYK))
-      stp_string_list_add_string(description->bounds.str,
-			       "PhotoCMY", _("Photo CcMmY Color"));
-    if ((caps->inks & CANON_INK_CMYK))
-      stp_string_list_add_string(description->bounds.str,
-			       "CMYK", _("CMYK Color"));
-    if ((caps->inks & CANON_INK_CMY))
-      stp_string_list_add_string(description->bounds.str,
-			       "RGB", _("CMY Color"));
-    if ((caps->inks & CANON_INK_K))
-      stp_string_list_add_string(description->bounds.str,
-			       "Gray", _("Black"));
-    description->deflt.str =
-      stp_string_list_param(description->bounds.str, 0)->name;
+    for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+      if(mode->ink_types & canon_inktypes[i].ink_type){
+          stp_string_list_add_string(description->bounds.str,canon_inktypes[i].name,_(canon_inktypes[i].text));
+      }
+    }
+    description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name;
   }
   else if (strcmp(name, "InkChannels") == 0)
     {
-      if (caps->inks & CANON_INK_CcMmYyK)
-	description->deflt.integer = 7;
-      else if (caps->inks & CANON_INK_CcMmYK)
-	description->deflt.integer = 6;
-      else if (caps->inks & CANON_INK_CMYK)
-	description->deflt.integer = 4;
-      else if (caps->inks & CANON_INK_CMY)
-	description->deflt.integer = 3;
-      else
-	description->deflt.integer = 1;
+      unsigned int ink_type = canon_printhead_colors(v);
+      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+          if(ink_type == canon_inktypes[i].ink_type)
+              description->deflt.integer = canon_inktypes[i].num_channels;
+      }
       description->bounds.integer.lower = -1;
       description->bounds.integer.upper = -1;
     }
   else if (strcmp(name, "MediaType") == 0)
   {
-    int count = sizeof(canon_paper_list) / sizeof(canon_paper_list[0]);
+    const canon_paper_t * canon_paper_list = caps->paperlist->papers;
+    int count = caps->paperlist->count;
     description->bounds.str= stp_string_list_create();
     description->deflt.str= canon_paper_list[0].name;
 
@@ -2090,18 +713,21 @@ canon_parameters(const stp_vars_t *v, const char *name,
   }
   else if (strcmp(name, "InputSlot") == 0)
   {
-    int count = sizeof(media_sources)/sizeof(media_sources[0]);
+    const canon_slot_t * canon_slot_list = caps->slotlist->slots;
+    int count = caps->slotlist->count;
     description->bounds.str= stp_string_list_create();
-    description->deflt.str= media_sources[0].name;
+    description->deflt.str= canon_slot_list[0].name;
+
     for (i = 0; i < count; i ++)
       stp_string_list_add_string(description->bounds.str,
-				media_sources[i].name,
-				gettext(media_sources[i].text));
+				canon_slot_list[i].name,
+				gettext(canon_slot_list[i].text));
   }
   else if (strcmp(name, "PrintingMode") == 0)
   {
+    const canon_mode_t* mode = canon_get_current_mode(v);
     description->bounds.str = stp_string_list_create();
-    if (caps->inks != CANON_INK_K)
+    if (mode->ink_types != CANON_INK_K)
       stp_string_list_add_string
 	(description->bounds.str, "Color", _("Color"));
     stp_string_list_add_string
@@ -2159,10 +785,15 @@ internal_imageable_area(const stp_vars_t *v,   /* I */
   int right_margin = 0;
   int bottom_margin = 0;
   int top_margin = 0;
+  int cd = 0;
 
   const canon_cap_t * caps= canon_get_model_capabilities(stp_get_model_id(v));
   const char *media_size = stp_get_string_parameter(v, "PageSize");
   const stp_papersize_t *pt = NULL;
+  const char* input_slot = stp_get_string_parameter(v, "InputSlot");
+
+  if(input_slot && !strcmp(input_slot,"CD"))
+    cd = 1;
 
   if (media_size && use_paper_margins)
     pt = stp_get_papersize_by_name(media_size);
@@ -2175,10 +806,13 @@ internal_imageable_area(const stp_vars_t *v,   /* I */
       bottom_margin = pt->bottom;
       top_margin = pt->top;
     }
-  left_margin = MAX(left_margin, caps->border_left);
-  right_margin = MAX(right_margin, caps->border_right);
-  top_margin = MAX(top_margin, caps->border_top);
-  bottom_margin = MAX(bottom_margin, caps->border_bottom);
+  /* ignore printer margins for the cd print, margins get adjusted in do_print */
+  if(!cd){
+    left_margin = MAX(left_margin, caps->border_left);
+    right_margin = MAX(right_margin, caps->border_right);
+    top_margin = MAX(top_margin, caps->border_top);
+    bottom_margin = MAX(bottom_margin, caps->border_bottom);
+  }
 
   *left =	left_margin;
   *right =	width - right_margin;
@@ -2252,26 +886,36 @@ canon_cmd(const stp_vars_t *v, /* I - the printer         */
 #define ESC5b "\033\133"
 #define ESC40 "\033\100"
 
+static void canon_control_cmd(const stp_vars_t*v,const char* cmd){
+      canon_cmd(v,ESC5b,0x4b, 2, 0x00,0x1f);
+      stp_puts("BJLSTART\nControlMode=Common\n",v);
+      stp_puts(cmd,v);
+      stp_putc('\n',v);
+      stp_puts("BJLEND\n",v);
+}
+
+
 /* ESC [K --  -- reset printer:
  */
 static void
-canon_init_resetPrinter(const stp_vars_t *v, canon_init_t *init)
+canon_init_resetPrinter(const stp_vars_t *v, const canon_privdata_t *init)
 {
-  unsigned long f=init->caps->features;
-  if (f & (CANON_CAP_ACKSHORT))
-    {
-      canon_cmd(v,ESC5b,0x4b, 2, 0x00,0x1f);
-      stp_puts("BJLSTART\nControlMode=Common\n",v);
-      if (f & CANON_CAP_ACKSHORT) stp_puts("AckTime=Short\n",v);
-      stp_puts("BJLEND\n",v);
+  if ( init->caps->control_cmdlist ){
+    int i=0;
+    while(init->caps->control_cmdlist[i]){
+      canon_control_cmd(v,init->caps->control_cmdlist[i]);
+      ++i;
     }
+  }
+  if(!strcmp(init->slot->name,"CD"))
+    canon_control_cmd(v,"MediaDetection=ON");
   canon_cmd(v,ESC5b,0x4b, 2, 0x00,0x0f);
 }
 
 /* ESC ($ -- 0x24 -- cmdSetDuplex --:
  */
 static void
-canon_init_setDuplex(const stp_vars_t *v, canon_init_t *init)
+canon_init_setDuplex(const stp_vars_t *v, const canon_privdata_t *init)
 {
   if (!(init->caps->features & CANON_CAP_DUPLEX))
     return;
@@ -2285,7 +929,7 @@ canon_init_setDuplex(const stp_vars_t *v, canon_init_t *init)
 /* ESC (a -- 0x61 -- cmdSetPageMode --:
  */
 static void
-canon_init_setPageMode(const stp_vars_t *v, canon_init_t *init)
+canon_init_setPageMode(const stp_vars_t *v, const canon_privdata_t *init)
 {
   if (!(init->caps->features & CANON_CAP_a))
     return;
@@ -2297,7 +941,7 @@ canon_init_setPageMode(const stp_vars_t *v, canon_init_t *init)
 /* ESC (b -- 0x62 -- -- set data compression:
  */
 static void
-canon_init_setDataCompression(const stp_vars_t *v, canon_init_t *init)
+canon_init_setDataCompression(const stp_vars_t *v, const canon_privdata_t *init)
 {
   if (!(init->caps->features & CANON_CAP_b))
     return;
@@ -2308,7 +952,7 @@ canon_init_setDataCompression(const stp_vars_t *v, canon_init_t *init)
 /* ESC (c -- 0x63 -- cmdSetColor --:
  */
 static void
-canon_init_setColor(const stp_vars_t *v, canon_init_t *init)
+canon_init_setColor(const stp_vars_t *v, const canon_privdata_t *init)
 {
   unsigned char
     numargs, arg_63[6];
@@ -2325,10 +969,10 @@ canon_init_setColor(const stp_vars_t *v, canon_init_t *init)
 		break;		/*	tbd */
 
   	case 1:			/* 360 dpi series - BJC-4000, BJC-210, BJC-70 and their descendants */
-		if (!init->printing_color)
+		if (init->used_inks == CANON_INK_K)
                             arg_63[0]|= 0x01;                                        /* PRINT_COLOUR */
 
-                  arg_63[1] = ((init->pt ? init->pt->media_code : 0) << 4)                /* PRINT_MEDIA */
+                  arg_63[1] = ((init->pt ? init->pt->media_code_c : 0) << 4)                /* PRINT_MEDIA */
 			+ 1;	/* hardcode to High quality for now */		/* PRINT_QUALITY */
 
                   canon_cmd(v,ESC28,0x63, 2, arg_63[0], arg_63[1]);
@@ -2338,24 +982,24 @@ canon_init_setColor(const stp_vars_t *v, canon_init_t *init)
 		break;
 
 	case 3:			/* 720 dpi series - BJC-3000 and descendants */
-		if (!init->printing_color)
+		if (init->used_inks == CANON_INK_K)
                             arg_63[0]|= 0x01;                                        /* colour mode */
 
-                  arg_63[1] = (init->pt) ? init->pt->media_code : 0;                /* print media type */
+                  arg_63[1] = (init->pt) ? init->pt->media_code_c : 0;                /* print media type */
 
                  if (init->caps->model == 4202) /* S200 */
                    {
-                     if ((init->xdpi == 720) && (init->ydpi == 720 ))
+                     if ((init->mode->xdpi == 720) && (init->mode->ydpi == 720 ))
                        arg_63[2] = 1;
                      else
                        arg_63[2] = 4; /* hardcoded: quality 3  (may be 0...4) */
                      /* bidirectional is controlled via quality: 0..2 is bidi, 3 and 4 uni */
                      /* not every combination works, no idea about the principle */
-                     if ( (init->xdpi > 360) || (init->ydpi > 360) )
+                     if ( (init->mode->xdpi > 360) || (init->mode->ydpi > 360) )
                        {
                          numargs = 6;
                          arg_63[3] = 0x10; arg_63[4] = 6; arg_63[5] = 8; /* arg5 makes a vert. offset for K */
-                         if (!init->printing_color)
+                         if (init->used_inks == CANON_INK_K)
                            arg_63[4] = 1;
                        }
                    }
@@ -2374,17 +1018,17 @@ canon_init_setColor(const stp_vars_t *v, canon_init_t *init)
 /* ESC (d -- 0x64 -- -- set raster resolution:
  */
 static void
-canon_init_setResolution(const stp_vars_t *v, canon_init_t *init)
+canon_init_setResolution(const stp_vars_t *v, const canon_privdata_t *init)
 {
   if (!(init->caps->features & CANON_CAP_d))
     return;
 
-   if (init->caps->model != 4202 || (init->xdpi <= 360))
+   if (init->caps->model != 4202 || (init->mode->xdpi <= 360))
   canon_cmd(v,ESC28,0x64, 4,
-	    (init->ydpi >> 8 ), (init->ydpi & 255),
-	    (init->xdpi >> 8 ), (init->xdpi & 255));
+	    (init->mode->ydpi >> 8 ), (init->mode->ydpi & 255),
+	    (init->mode->xdpi >> 8 ), (init->mode->xdpi & 255));
    else
-     if (init->xdpi < 2880)
+     if (init->mode->xdpi < 2880)
        canon_cmd(v,ESC28,0x64, 4,
          (720 >> 8), (720 & 255),
          (720 >> 8), (720 & 255));
@@ -2397,7 +1041,7 @@ canon_init_setResolution(const stp_vars_t *v, canon_init_t *init)
 /* ESC (g -- 0x67 -- cmdSetPageMargins --:
  */
 static void
-canon_init_setPageMargins(const stp_vars_t *v, canon_init_t *init)
+canon_init_setPageMargins(const stp_vars_t *v, const canon_privdata_t *init)
 {
   /* TOFIX: what exactly is to be sent?
    * Is it the printable length or the bottom border?
@@ -2424,35 +1068,30 @@ canon_init_setPageMargins(const stp_vars_t *v, canon_init_t *init)
 /* ESC (l -- 0x6c -- cmdSetTray --:
  */
 static void
-canon_init_setTray(const stp_vars_t *v, canon_init_t *init)
+canon_init_setTray(const stp_vars_t *v, const canon_privdata_t *init)
 {
   unsigned char
     arg_6c_1 = 0x00,
     arg_6c_2 = 0x00; /* plain paper */
 
-  /* int media= canon_media_type(media_str,caps); */
-  int source= canon_source_type(init->source_str,init->caps);
-
   if (!(init->caps->features & CANON_CAP_l))
     return;
 
   arg_6c_1 = init->caps->model_id << 4;
 
-  arg_6c_1|= (source & 0x0f);
+  arg_6c_1|= (init->slot->code & 0x0f);
 
-  if (init->pt) arg_6c_2= init->pt->media_code;
-  if (!strcmp("CD",init->source_str)) {
-    stp_deprintf(STP_DBG_CANON,"canon: sending special cd setTray command\n");
-    canon_cmd(v,ESC28,0x6c, 3, 0x3a,0x12,0);
-  } else {
+  if (init->pt) arg_6c_2= init->pt->media_code_l;
+  if(init->caps->model_id >= 3)
+    canon_cmd(v,ESC28,0x6c, 3, arg_6c_1, arg_6c_2, 0);
+  else
     canon_cmd(v,ESC28,0x6c, 2, arg_6c_1, arg_6c_2);
-  }
 }
 
 /* ESC (m -- 0x6d --  -- :
  */
 static void
-canon_init_setPrintMode(const stp_vars_t *v, canon_init_t *init)
+canon_init_setPrintMode(const stp_vars_t *v, const canon_privdata_t *init)
 {
   unsigned char
     arg_6d_1 = 0x03, /* color printhead? */
@@ -2469,13 +1108,17 @@ canon_init_setPrintMode(const stp_vars_t *v, canon_init_t *init)
   if (!arg_6d_a)
     arg_6d_b= 1;
 
-  if (init->print_head==0)
-    arg_6d_1= 0x03;
-  else if (init->print_head<=2)
-    arg_6d_1= 0x02;
-  else if (init->print_head<=4)
     arg_6d_1= 0x04;
-  if (!init->printing_color)
+  if ((init->caps->model==7000) && (init->used_inks == CANON_INK_K || init->used_inks == CANON_INK_CcMmYK || init->used_inks == CANON_INK_CcMmYyK))
+    arg_6d_1= 0x03;
+
+  if (((init->caps->model==8200 || init->caps->model==4202) && init->used_inks == CANON_INK_K) || init->used_inks == CANON_INK_CMYK)
+      arg_6d_1= 0x02;
+
+  if(init->caps->model == 4202 && init->used_inks == CANON_INK_CMY)
+      arg_6d_1= 0x02;
+
+  if (init->used_inks == CANON_INK_K)
     arg_6d_2= 0x02;
 
   if (init->caps->model==8200 || init->caps->model==4202)
@@ -2489,13 +1132,12 @@ canon_init_setPrintMode(const stp_vars_t *v, canon_init_t *init)
 /* ESC (p -- 0x70 -- cmdSetPageMargins2 --:
  */
 static void
-canon_init_setPageMargins2(const stp_vars_t *v, canon_init_t *init)
+canon_init_setPageMargins2(const stp_vars_t *v, const canon_privdata_t *init)
 {
   /* TOFIX: what exactly is to be sent?
    * Is it the printable length or the bottom border?
    * Is is the printable width or the right border?
    */
-
   int printable_width=  init->page_width*5/6;
   int printable_length= init->page_height*5/6;
 
@@ -2503,24 +1145,44 @@ canon_init_setPageMargins2(const stp_vars_t *v, canon_init_t *init)
   unsigned char arg_70_2= (printable_length) & 0xff;
   unsigned char arg_70_3= (printable_width >> 8) & 0xff;
   unsigned char arg_70_4= (printable_width) & 0xff;
+  const char* input_slot = stp_get_string_parameter(v, "InputSlot");
+
+  if (!(init->caps->features & CANON_CAP_px) && !(init->caps->features & CANON_CAP_p))
+	return;
 
-  if (!(init->caps->features & CANON_CAP_p))
+  if ((init->caps->features & CANON_CAP_px) && !(input_slot && !strcmp(input_slot,"CD")))
+  {
+    unsigned int unit = init->mode->xdpi;
+    stp_zfwrite(ESC28,2,1,v); /* ESC( */
+    stp_putc(0x70,v);         /* p    */
+    stp_put16_le(46, v);      /* len  */
+    stp_put16_be(printable_length,v);
+    stp_put16_be(0,v);
+    stp_put16_be(printable_width,v);
+    stp_put16_be(0,v);
+    stp_put32_be(0,v);
+    stp_put16_be(unit,v);
+    
+    stp_put32_be(init->caps->border_left * unit / 72,v); /* area_right */
+    stp_put32_be(init->caps->border_top * unit / 72,v);  /* area_top */
+    stp_put32_be(init->page_width  * unit / 72,v); /* area_width */
+    stp_put32_be(init->page_height * unit / 72,v); /* area_length */
+    stp_put32_be(0,v); /* paper_right */
+    stp_put32_be(0,v); /* paper_top */
+    stp_put32_be((init->page_width + init->caps->border_left + init->caps->border_right) * unit / 72,v); /* paper_width */
+    stp_put32_be((init->page_height + init->caps->border_top + init->caps->border_bottom) * unit / 72,v); /* paper_height */
     return;
-  if (!strcmp(init->source_str,"CD")) {
-    canon_cmd(v,ESC28,0x70, 8, 0x00, 0x2a, 0xb0, 0x00,
-		               0x00, 0x01, 0xe0, 0x00);
-    stp_deprintf(STP_DBG_CANON,"sending cd margins\n");
-  } else {
-    canon_cmd(v,ESC28,0x70, 8,
+  }
+
+  canon_cmd(v,ESC28,0x70, 8,
    	      arg_70_1, arg_70_2, 0x00, 0x00,
 	      arg_70_3, arg_70_4, 0x00, 0x00);
-  }
 }
 
 /* ESC (q -- 0x71 -- setPageID -- :
  */
 static void
-canon_init_setPageID(const stp_vars_t *v, canon_init_t *init)
+canon_init_setPageID(const stp_vars_t *v, const canon_privdata_t *init)
 {
   if (!(init->caps->features & CANON_CAP_q))
     return;
@@ -2531,7 +1193,7 @@ canon_init_setPageID(const stp_vars_t *v, canon_init_t *init)
 /* ESC (r -- 0x72 --  -- :
  */
 static void
-canon_init_setX72(const stp_vars_t *v, canon_init_t *init)
+canon_init_setX72(const stp_vars_t *v, const canon_privdata_t *init)
 {
   if ( !( (init->caps->features & CANON_CAP_r)
          || (init->caps->features & CANON_CAP_rr) ) )
@@ -2539,7 +1201,7 @@ canon_init_setX72(const stp_vars_t *v, canon_init_t *init)
 
   if ( (init->caps->features & CANON_CAP_r)
        || (init->caps->features & CANON_CAP_rr) )
-      canon_cmd(v,ESC28,0x72, 1, 0x61); /* whatever for - 8200/S200 need it */
+      canon_cmd(v,ESC28,0x72, 1, init->caps->ESC_r_arg); /* whatever for - 8200/S200 need it */
   if (init->caps->features & CANON_CAP_rr)
       canon_cmd(v,ESC28,0x72, 3, 0x63, 1, 0); /* whatever for - S200 needs it */
       /* probably to set the print direction of the head */
@@ -2556,7 +1218,7 @@ canon_set_X72(const stp_vars_t *v, int x72arg)
 /* ESC (t -- 0x74 -- cmdSetImage --:
  */
 static void
-canon_init_setImage(const stp_vars_t *v, canon_init_t *init)
+canon_init_setImage(const stp_vars_t *v, const canon_privdata_t *init)
 {
   unsigned char
     arg_74_1 = 0x01, /* 1 bit per pixel */
@@ -2565,6 +1227,33 @@ canon_init_setImage(const stp_vars_t *v, canon_init_t *init)
 
   if (!(init->caps->features & CANON_CAP_t))
     return;
+
+  if(init->mode->flags & MODE_FLAG_EXTENDED_T)  /*code requires extended mode settings*/
+  {
+    int i;
+    int length = init->mode->num_inks*3 + 3;
+    unsigned char* buf = stp_zalloc(length);
+    buf[0]=0x80;
+    buf[1]=0x80;
+    buf[2]=0x01;
+    for(i=0;i<init->mode->num_inks;i++){
+        if(init->mode->inks[i].ink){
+          if(init->mode->inks[i].ink->flags & INK_FLAG_5pixel_in_1byte)
+            buf[3+i*3+0]=(1<<5)|init->mode->inks[i].ink->bits; /*info*/
+          else
+            buf[3+i*3+0]=init->mode->inks[i].ink->bits;
+          buf[3+i*3+2]= init->mode->inks[i].ink->numsizes+1;/*level*/
+       }
+    }
+    stp_zfwrite(ESC28,2,1,v);
+    stp_putc(0x74,v);
+    stp_put16_le(length,v);
+    stp_zfwrite((char*)buf,length,1,v);
+    stp_free(buf);
+    return;
+  }
+
+  /* other models mostly hardcoded stuff not really understood ;( */
   if (init->caps->model==4202) /* 1 bit per pixel (arg 4,7,10,13); */
                                /* 2 level per pixel (arg 6,9,12,15) for each color */
                                /* though we print only 1bit/pixel - but this is how */
@@ -2574,50 +1263,59 @@ canon_init_setImage(const stp_vars_t *v, canon_init_t *init)
               0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
     return;
   }
-  if(init->caps->features & CANON_CAP_extended_t)
-  {
-    unsigned char buf[30] = {0x80,0x80,0x1,};
-    memcpy(buf + 3,init->color_info,sizeof(color_info_t) * 9);
-    stp_zfwrite(ESC28,2,1,v);
-    stp_putc(0x74,v);
-    stp_put16_le(30,v);
-    stp_zfwrite((char*)buf,30,1,v);
-    return;
-  }
 
-  if (init->xdpi==1440) arg_74_2= 0x04;
-  if (init->ydpi>=720)  arg_74_3= 0x09;
+  if (init->mode->xdpi==1440) arg_74_2= 0x04;
+  if (init->mode->ydpi>=720)  arg_74_3= 0x09;
 
-  if (init->bits>1) {
+  if (init->mode->inks[0].ink->bits>1) {
     arg_74_1= 0x02;
     arg_74_2= 0x80;
     arg_74_3= 0x09;
-    if (init->colormode == COLOR_CMY) arg_74_3= 0x02; /* for BC-06 cartridge!!! */
+    if (init->used_inks == CANON_INK_CMY) arg_74_3= 0x02; /* for BC-06 cartridge!!! */
   }
 
   /* workaround for the bjc8200 in 6color mode - not really understood */
   if (init->caps->model==8200) {
-    if (init->colormode==COLOR_CCMMYK) {
+    if (init->used_inks == CANON_INK_CcMmYK) {
       arg_74_1= 0xff;
       arg_74_2= 0x90;
       arg_74_3= 0x04;
-      init->bits=3;
-      if (init->ydpi>600)  arg_74_3= 0x09;
+      if (init->mode->ydpi>600)  arg_74_3= 0x09;
     } else {
       arg_74_1= 0x01;
       arg_74_2= 0x00;
       arg_74_3= 0x01;
-      if (init->ydpi>600)  arg_74_3= 0x09;
+      if (init->mode->ydpi>600)  arg_74_3= 0x09;
     }
   }
 
   canon_cmd(v,ESC28,0x74, 3, arg_74_1, arg_74_2, arg_74_3);
 }
 
+/* ESC (I (J (L 
+ */
 static void
-canon_init_printer(const stp_vars_t *v, canon_init_t *init)
+canon_init_setMultiRaster(const stp_vars_t *v, const canon_privdata_t *init){
+  
+  if(!(init->caps->features & CANON_CAP_I))
+	return;
+
+  canon_cmd(v,ESC28,0x49, 1, 0x1);  /* enable MultiLine Raster? */
+  canon_cmd(v,ESC28,0x4a, 1, RASTER_LINES_PER_BLOCK);    /* set number of lines per raster block */
+ 
+  /* set the color sequence */ 
+  stp_zfwrite("\033(L", 3, 1, v);
+  stp_put16_le(init->num_channels, v);
+  stp_zfwrite((const char *)init->channel_order,init->num_channels, 1, v);
+}
+
+
+
+
+static void
+canon_init_printer(const stp_vars_t *v, const canon_privdata_t *init)
 {
-  int mytop;
+  unsigned int mytop;
   /* init printer */
   if (init->is_first_page) {
     canon_init_resetPrinter(v,init);       /* ESC [K */
@@ -2634,15 +1332,21 @@ canon_init_printer(const stp_vars_t *v, canon_init_t *init)
   canon_init_setPageMargins2(v,init);    /* ESC (p */
   canon_init_setTray(v,init);            /* ESC (l */
   canon_init_setX72(v,init);             /* ESC (r */
+  canon_init_setMultiRaster(v,init);     /* ESC (I (J (L */
 
   /* some linefeeds */
 
-  mytop= (init->top*init->ydpi)/72;
-  canon_cmd(v,ESC28,0x65, 2, (mytop >> 8 ),(mytop & 255));
+  mytop= (init->top*init->mode->ydpi)/72;
+
+  if(init->caps->features & CANON_CAP_I)
+    mytop /= RASTER_LINES_PER_BLOCK;
+
+  if(mytop)
+    canon_cmd(v,ESC28,0x65, 2, (mytop >> 8 ),(mytop & 255));
 }
 
 static void
-canon_deinit_printer(const stp_vars_t *v, canon_init_t *init)
+canon_deinit_printer(const stp_vars_t *v, const canon_privdata_t *init)
 {
   /* eject page */
   stp_putc(0x0c,v);
@@ -2682,19 +1386,13 @@ canon_advance_buffer(unsigned char *buf, int len, int num)
 }
 
 static void
-setup_column(canon_privdata_t *privdata, int col, int buf_length)
-{
-  privdata->cols[col] = stp_zalloc(buf_length * (privdata->delay[col] + 1));
-}
-
-static void
 canon_printfunc(stp_vars_t *v)
 {
   int i;
   canon_privdata_t *pd = (canon_privdata_t *) stp_get_component_data(v, "Driver");
   canon_write_line(v);
-  for (i = 0; i < 7; i++)
-    canon_advance_buffer(pd->cols[i], pd->buf_length, pd->delay[i]);
+  for (i = 0; i < pd->num_channels ; i++)
+    canon_advance_buffer(pd->channels[i].buf, pd->length, pd->channels[i].delay);
 
 }
 
@@ -2707,62 +1405,7 @@ get_double_param(stp_vars_t *v, const char *param)
     return 1.0;
 }
 
-static void
-set_ink_ranges(stp_vars_t *v, const canon_variable_ink_t *ink, int color,
-	       const char *channel_param, const char *subchannel_param)
-{
-  int num_shades;
-  if (!ink)
-    return;
-
-  /* ignore small dot shades with zero density */
-  if(ink->numshades > 1 && ink->shades[1].value == 0.0)
-    num_shades = 1;
-  else
-    num_shades = ink->numshades;
-  stp_dither_set_inks_full(v, color, num_shades, ink->shades, 1.0,
-			   ink_darknesses[color]);
-  stp_channel_set_density_adjustment
-    (v, color, 1, (get_double_param(v, channel_param) *
-		   get_double_param(v, subchannel_param) *
-		   get_double_param(v, "Density")));
-}
-
-/* this function sets the info
-   entry in the color_info_t struct */
-static void
-set_bit_info(const canon_cap_t * caps,color_info_t* color)
-{
-  unsigned char bit_depth;
-  if(color->level < 2)
-    bit_depth = 0;
-  else if(color->level < 3)
-    bit_depth = 1;
-  else if(color->level < 5)
-    bit_depth = 2;
-  else 
-    bit_depth = 4;
-  if((color->level == 3) && (caps->features & CANON_CAP_5pixelin1byte))
-    color->info = (1 << 5) | bit_depth;
-  else
-    color->info = bit_depth;
-}
 
-/* function sets the level and bit depth in the color_info_t struct according to the ink settings */
-static void
-set_color_info(const canon_cap_t * caps,const canon_variable_ink_t* ink,color_info_t* large,color_info_t* small)
-{
-  if(ink)
-  {
-    large->level = ink->shades[0].numsizes + 1;
-    if(ink->numshades > 1)
-      small->level = ink->shades[1].numsizes + 1;
-  }
-  else  /* default to 2 level, bit depth 1*/
-    large->level = 2;
-  set_bit_info(caps,large);
-  set_bit_info(caps,small);
-}
 
 static void
 set_mask(unsigned char *cd_mask, int x_center, int scaled_x_where,
@@ -2811,10 +1454,193 @@ set_mask(unsigned char *cd_mask, int x_center, int scaled_x_where,
 }
 
 
-#define CD_X_OFFSET 0
-#define CD_Y_OFFSET 230
-#define CD_OUTER_RADIUS (329/2)
-#define CD_INNER_RADIUS 56
+/* get delay settings for the specified color and mode */
+static int canon_get_delay(canon_privdata_t* privdata,char color){
+    int i=0;
+    int delay = 0;
+    const canon_delay_t* delaylist = privdata->mode->delay;
+
+    while(delaylist && delaylist[i].color){
+        if(delaylist[i].color == color){
+           delay = delaylist[i].delay;
+           break;
+        }
+        ++i;
+    }
+    if(delay > privdata->delay_max)
+       privdata->delay_max = delay;
+    return delay;
+}
+
+
+/* add a single channel to the dither engine */
+static int canon_setup_channel(stp_vars_t *v,canon_privdata_t* privdata,int channel,int subchannel,const canon_inkset_t* ink,stp_shade_t** shades){
+    if(ink->channel && ink->density > 0.0){
+        int delay = canon_get_delay(privdata,ink->channel);
+        canon_channel_t* current;
+        /* create a new channel */
+        privdata->channels = stp_realloc(privdata->channels,sizeof(canon_channel_t) * (privdata->num_channels + 1));
+        privdata->channel_order = stp_realloc(privdata->channel_order,privdata->num_channels + 2);
+        /* update channel order */
+        privdata->channel_order[privdata->num_channels]=ink->channel;
+        privdata->channel_order[privdata->num_channels+1]='\0';
+        current = &(privdata->channels[privdata->num_channels]);
+        ++privdata->num_channels;
+        /* fill ink properties */
+        current->name = ink->channel;
+        current->props = ink->ink;
+        current->delay = delay;
+        /* calculate buffer length */
+        current->buf_length = ((privdata->length * current->props->bits)+1)*(delay + 1);      
+        /* update maximum buffer length */
+        if(current->buf_length > privdata->buf_length_max)
+             privdata->buf_length_max = current->buf_length;
+        /* allocate buffer for the raster data */
+        current->buf = stp_zalloc(current->buf_length + 1);
+        /* add channel to the dither engine */
+        stp_dither_add_channel(v, current->buf , channel , subchannel);
+
+        /* add shades to the shades array */
+        *shades = stp_realloc(*shades,(subchannel + 1) * sizeof(stp_shade_t));
+	/* move previous shades up one position as set_inks_full expects the subchannels first */
+	if(subchannel)
+		memcpy(*shades + 1,*shades,sizeof(stp_shade_t) * subchannel);
+        (*shades)[0].value = ink->density;
+        (*shades)[0].numsizes = ink->ink->numsizes;
+        (*shades)[0].dot_sizes = ink->ink->dot_sizes;
+        return 1;
+    } 
+    return 0;
+}
+
+
+
+
+
+/* setup the dither channels */
+static void canon_setup_channels(stp_vars_t *v,canon_privdata_t* privdata){
+    /* codes for the primary channels */
+    const char primary[STP_NCOLORS] = {'K','C','M','Y',};
+    /* codes for the subchannels */
+    const char secondary[STP_NCOLORS] = {'k','c','m','y'};
+    /* names of the density adjustment controls */
+    const char *primary_density_control[STP_NCOLORS] = {"BlackDensity","CyanDensity","MagentaDensity","YellowDensity"};
+    const char *secondary_density_control[STP_NCOLORS] = {NULL,"LightCyanTransition","LightMagentaTransition","LightYellowTransition"};
+    /* ink darkness for every channel */
+    const double ink_darkness[] = {1.0, 0.31 / .5, 0.61 / .97, 0.08};
+
+    int channel;
+
+
+    /* loop through the dither channels */
+    for(channel=0; channel < STP_NCOLORS ; channel++){
+        int i;
+        unsigned int subchannel = 0;
+        stp_shade_t* shades = NULL;
+        if(channel == STP_ECOLOR_K && privdata->used_inks & CANON_INK_K_MASK){ /* black channel */
+            /* find K and k inks */
+            for(i=0;i<privdata->mode->num_inks;i++){
+                const canon_inkset_t* ink = &privdata->mode->inks[i];
+                if(ink->channel == primary[channel] || ink->channel == secondary[channel])
+                    subchannel += canon_setup_channel(v,privdata,channel,subchannel,ink,&shades);
+            }
+            stp_channel_set_black_channel(v, STP_ECOLOR_K);
+        }else if(channel != STP_ECOLOR_K && privdata->used_inks & CANON_INK_CMY_MASK){  /* color channels */
+            for(i=0;i<privdata->mode->num_inks;i++){
+                const canon_inkset_t* ink = &privdata->mode->inks[i];
+                if(ink->channel == primary[channel] || ((privdata->used_inks & CANON_INK_CcMmYyKk_MASK) && (ink->channel == secondary[channel])))
+                    subchannel += canon_setup_channel(v,privdata,channel,subchannel,ink,&shades);
+            } 
+        }
+
+        /* set inks and density */
+        if(shades){
+            stp_dither_set_inks_full(v,channel, subchannel, shades, 1.0,ink_darkness[channel]);
+            for(i=0;i<subchannel;i++){
+                double density = get_double_param(v, primary_density_control[channel]) * get_double_param(v, "Density");
+                if(i > 0 && secondary_density_control[channel])
+                    density *= get_double_param(v, secondary_density_control[channel]);
+                stp_channel_set_density_adjustment(v,channel,subchannel,density);
+            }
+            stp_free(shades);
+        } 
+    }
+
+}
+
+
+
+
+
+
+
+/* FIXME move this to printercaps */
+#define CANON_CD_X 176
+#define CANON_CD_Y 405
+
+static void setup_page(stp_vars_t* v,canon_privdata_t* privdata){
+  const char    *media_source = stp_get_string_parameter(v, "InputSlot");
+  const char *cd_type = stp_get_string_parameter(v, "PageSize");
+  int print_cd= (media_source && (!strcmp(media_source, "CD")));
+  int           page_left,
+                page_top,
+                page_right,
+                page_bottom;
+  int hub_size = 0;
+
+ 
+  if (cd_type && (strcmp(cd_type, "CDCustom") == 0 ))
+     {
+	int outer_diameter = stp_get_dimension_parameter(v, "CDOuterDiameter");
+	stp_set_page_width(v, outer_diameter);
+	stp_set_page_height(v, outer_diameter);
+	stp_set_width(v, outer_diameter);
+	stp_set_height(v, outer_diameter);
+	hub_size = stp_get_dimension_parameter(v, "CDInnerDiameter");
+     }
+ else
+    {
+	const char *inner_radius_name = stp_get_string_parameter(v, "CDInnerRadius");
+  	hub_size = 43 * 10 * 72 / 254;		/* 43 mm standard CD hub */
+
+  	if (inner_radius_name && strcmp(inner_radius_name, "Small") == 0)
+   	  hub_size = 16 * 10 * 72 / 254;		/* 15 mm prints to the hole - play it
+				   safe and print 16 mm */
+    }
+
+  privdata->top = stp_get_top(v);
+  privdata->left = stp_get_left(v);
+  privdata->out_width = stp_get_width(v);
+  privdata->out_height = stp_get_height(v);
+
+  internal_imageable_area(v, 0, &page_left, &page_right,
+                          &page_bottom, &page_top);
+  if (print_cd) {
+    privdata->cd_inner_radius = hub_size / 2;
+    privdata->cd_outer_radius = stp_get_width(v) / 2;
+    privdata->left = CANON_CD_X - privdata->cd_outer_radius + stp_get_dimension_parameter(v, "CDXAdjustment");;
+    privdata->top = CANON_CD_Y - privdata->cd_outer_radius + stp_get_dimension_parameter(v, "CDYAdjustment");
+    privdata->page_width = privdata->left + privdata->out_width;
+    privdata->page_height = privdata->top + privdata->out_height;
+  } else {
+    privdata->left -= page_left;
+    privdata->top -= page_top;
+    privdata->page_width = page_right - page_left;
+    privdata->page_height = page_bottom - page_top;
+  }
+
+}
+
+
+
+
+
+
+
+
+
+
+
 /*
  * 'canon_print()' - Print an image to a CANON printer.
  */
@@ -2824,311 +1650,80 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
   int i;
   int		status = 1;
   int		model = stp_get_model_id(v);
-  const char	*resolution = stp_get_string_parameter(v, "Resolution");
   const char	*media_source = stp_get_string_parameter(v, "InputSlot");
-  const char    *print_mode = stp_get_string_parameter(v, "PrintingMode");
   const char    *duplex_mode =stp_get_string_parameter(v, "Duplex");
   int           page_number = stp_get_int_parameter(v, "PageNumber");
-
-  int printing_color = 0;
-  const char	*ink_type = stp_get_string_parameter(v, "InkType");
-  int		top = stp_get_top(v);
-  int		left = stp_get_left(v);
+  const canon_cap_t * caps= canon_get_model_capabilities(model);
   int		y;		/* Looping vars */
-  int		xdpi, ydpi;	/* Resolution */
-  int		n;		/* Output number */
   canon_privdata_t privdata;
-  int		page_width,	/* Width of page */
-		page_height,	/* Length of page */
-		page_left,
-		page_top,
-		page_right,
-		page_bottom,
-		page_true_height,	/* True length of page */
-		out_width,	/* Width of image on page */
-		out_height,	/* Length of image on page */
-		out_channels,	/* Output bytes per pixel */
-		length,		/* Length of raster data */
-		errdiv,		/* Error dividend */
+  int		errdiv,		/* Error dividend */
 		errmod,		/* Error modulus */
 		errval,		/* Current error value */
 		errline,	/* Current raster line */
-		errlast;	/* Last raster line loaded */
+		errlast,	/* Last raster line loaded */
+		out_channels;	/* Output bytes per pixel */
   unsigned	zero_mask;
-  int           bits= 1;
-  int           max_bits = 0;
+  int           print_cd= (media_source && (!strcmp(media_source, "CD")));
   int           image_height,
                 image_width;
-  int           res_code;
-  int           use_6color= 0;
-  int           print_cd= (media_source && (!strcmp(media_source, "CD")));
   double        k_upper, k_lower;
   unsigned char *cd_mask = NULL;
   double outer_r_sq = 0;
   double inner_r_sq = 0;
-
-  stp_curve_t *lum_adjustment = NULL;
-  stp_curve_t *hue_adjustment = NULL;
-  stp_curve_t *sat_adjustment = NULL;
-
-  canon_init_t  init;
-  const canon_cap_t * caps= canon_get_model_capabilities(model);
-  int printhead= canon_printhead_type(ink_type,caps);
-  colormode_t colormode = canon_printhead_colors(ink_type,caps);
-  const paper_t *pt;
-  const canon_variable_inkset_t *inks;
-  const canon_res_t *res = canon_resolutions;
+  unsigned char* weave_cols[4] ; /* TODO clean up weaving code to be more generic */
 
   if (!stp_verify(v))
     {
       stp_eprintf(v, "Print options not verified; cannot print.\n");
       return 0;
     }
-  if (strcmp(print_mode, "Color") == 0)
-    printing_color = 1;
-
-  PUT("top        ",top,72);
-  PUT("left       ",left,72);
-
   /*
   * Setup a read-only pixel region for the entire image...
   */
 
   stp_image_init(image);
 
-  /* force grayscale if image is grayscale
-   *                 or single black cartridge installed
-   */
 
-  if (printhead == 0 || caps->inks == CANON_INK_K)
-    {
-      printing_color = 0;
-      stp_set_string_parameter(v, "PrintingMode", "BW");
-    }
+  /* rotate even pages for DuplexNoTumble */
+  if((page_number & 1) && duplex_mode && !strcmp(duplex_mode,"DuplexNoTumble"))
+  	image = stpi_buffer_image(image,BUFFER_FLAG_FLIP_X | BUFFER_FLAG_FLIP_Y);
 
-  if (!printing_color)
-    colormode = COLOR_MONOCHROME;
+  memset(&privdata,0,sizeof(canon_privdata_t));
+  privdata.caps = caps;
 
- /*
-  * Figure out the output resolution...
-  */
+  /* find the wanted print mode */
+  privdata.mode = canon_get_current_mode(v);
 
-  xdpi = -1;
-  ydpi = -1;
-  while (res->x > 0) {
-    if (strcmp(resolution, res->name) == 0 ||
-	strcmp(resolution, res->name_dmt) == 0)
-      {
-	xdpi = res->x;
-	ydpi = res->y;
-	break;
-      }
-    res++;
-  }
 
-  stp_deprintf(STP_DBG_CANON,"canon: resolution=%dx%d\n",xdpi,ydpi);
-  stp_deprintf(STP_DBG_CANON,"       rescode   =0x%x\n",canon_res_code(caps,xdpi,ydpi));
-  res_code= canon_res_code(caps,xdpi,ydpi);
 
-  if (strcmp(resolution, res->name_dmt) == 0 &&
-      (caps->features & CANON_CAP_DMT)) {
-    bits= 2;
-    stp_deprintf(STP_DBG_CANON,"canon: using drop modulation technology\n");
-  }
-
- /*
-  * Compute the output size...
-  */
+  /* force grayscale if image is grayscale
+   *                 or single black cartridge installed
+   */
+  privdata.used_inks = canon_printhead_colors(v);
+  if (privdata.used_inks == CANON_INK_K)
+      stp_set_string_parameter(v, "PrintingMode", "BW");
 
-  out_width = stp_get_width(v);
-  out_height = stp_get_height(v);
+  setup_page(v,&privdata);
 
-  internal_imageable_area(v, 0, &page_left, &page_right,
-			  &page_bottom, &page_top);
-  if (print_cd) {
-    left += CD_X_OFFSET; 
-    top += CD_Y_OFFSET;
-    /*page_width = CD_OUTER_RADIUS*2;
-      page_height = CD_OUTER_RADIUS*2; */
-    stp_default_media_size(v, &page_width, &page_height); 
-    out_width = page_width;
-    out_height = page_height;
-  } else {
-    left -= page_left;
-    top -= page_top;
-    page_width = page_right - page_left;
-    page_height = page_bottom - page_top;
-  }
   image_height = stp_image_height(image);
   image_width = stp_image_width(image);
 
-  stp_default_media_size(v, &n, &page_true_height);
-  
-  PUT("top        ",top,72);
-  PUT("left       ",left,72);
-  PUT("page_true_height",page_true_height,72);
-  PUT("out_width ", out_width,xdpi);
-  PUT("out_height", out_height,ydpi);
-
-  PUT("top     ",top,72);
-  PUT("left    ",left,72);
-
-  pt = get_media_type(stp_get_string_parameter(v, "MediaType"));
-
-  init.caps = caps;
-  init.printing_color = printing_color;
-  init.pt = pt;
-  init.print_head = printhead;
-  init.colormode = colormode;
-  init.source_str = media_source;
-  init.duplex_str = duplex_mode;
-  init.is_first_page = (page_number == 0);
-  init.xdpi = xdpi;
-  init.ydpi = ydpi;
-  init.page_width = page_width;
-  init.page_height = page_height;
-  init.top = top;
-  init.left = left;
-  init.bits = bits;
-
-  if ((inks = canon_inks(caps, res_code, colormode, bits)) != 0)
-  {
-    if(caps->features & CANON_CAP_extended_t)
-    {
-      memset(init.color_info,0,sizeof(init.color_info));
-      set_color_info(caps,inks->c,&(init.color_info[0]),&(init.color_info[4]));
-      set_color_info(caps,inks->m,&(init.color_info[1]),&(init.color_info[5]));
-      set_color_info(caps,inks->y,&(init.color_info[2]),&(init.color_info[6]));
-      set_color_info(caps,inks->k,&(init.color_info[3]),&(init.color_info[7]));
-      /* duplicate the info as it is needed later, too */
-      memcpy(privdata.color_info,init.color_info,sizeof(init.color_info));
-    }
-  }
-
-  canon_init_printer(v, &init);
-
-  /* possibly changed during initialitation
-   * to enforce valid modes of operation:
-   */
-  bits= init.bits;
-  xdpi= init.xdpi;
-  ydpi= init.ydpi;
+  privdata.pt = get_media_type(caps,stp_get_string_parameter(v, "MediaType"));
+  privdata.slot = canon_source_type(media_source,caps);
+  privdata.duplex_str = duplex_mode;
+  privdata.is_first_page = (page_number == 0);
 
  /*
   * Convert image size to printer resolution...
   */
 
-  out_width  = xdpi * out_width / 72;
-  out_height = ydpi * out_height / 72;
-
-  PUT("out_width ", out_width,xdpi);
-  PUT("out_height", out_height,ydpi);
-
-  left = xdpi * left / 72;
-
-  PUT("leftskip",left,xdpi);
-
-  for (i = 0; i < 7; i++)
-    privdata.cols[i] = NULL;
-
-  if((xdpi == 1440) && (model != 4202)){
-    privdata.delay[0] = 0;
-    privdata.delay[1] = 112;
-    privdata.delay[2] = 224;
-    privdata.delay[3] = 336;
-    privdata.delay[4] = 112;
-    privdata.delay[5] = 224;
-    privdata.delay[6] = 336;
-    privdata.delay_max = 336;
-    stp_deprintf(STP_DBG_CANON,"canon: delay on!\n");
-  } else if (model ==4202 ){
-    privdata.delay[0]= 0;
-    privdata.delay[1]= 0x30;
-    privdata.delay[2]= 0x50;
-    privdata.delay[3]= 0x70;
-    privdata.delay[4]= 0;
-    privdata.delay[5]= 0;
-    privdata.delay[6]= 0;
-    privdata.delay_max= 0x70;
-    stp_deprintf(STP_DBG_CANON,"canon: delay for S200 on!\n");
-  } else {
-    for (i = 0; i < 7; i++)
-      privdata.delay[i] = 0;
-    privdata.delay_max = 0;
-    stp_deprintf(STP_DBG_CANON,"canon: delay off!\n");
-  }
-
- /*
-  * Allocate memory for the raster data...
-  */
-
-  length = (out_width + 7) / 8;
-
-  max_bits=bits;
+  privdata.out_width  = privdata.mode->xdpi * privdata.out_width / 72;
+  privdata.out_height = privdata.mode->ydpi * privdata.out_height / 72;
 
-  /* when using the extended settings in the t) command every color might have
-     its own bit depth */
-  if(caps->features & CANON_CAP_extended_t)
-  {
-    for(i = 0; i < sizeof(init.color_info) / sizeof(init.color_info[0]);i++)
-    {
-      if((init.color_info[i].info & 3) > max_bits)
-        max_bits = init.color_info[i].info & 3;
-    }
-  }
-
-  /* buffer length + 1 extra byte for offset data that might get added in canon_write */
-  privdata.buf_length = length * max_bits + 1;
-  privdata.length = length;
-  privdata.left = left;
-  privdata.bits = bits;
-  privdata.out_width = out_width;
-  privdata.caps = caps;
-  privdata.ydpi = ydpi;
-
-  stp_deprintf(STP_DBG_CANON,"canon: buflength is %d!\n",privdata.buf_length);
-
-  if (colormode==COLOR_MONOCHROME) {
-    setup_column(&privdata, 0, privdata.buf_length);
-  } else {
-    setup_column(&privdata, 1, privdata.buf_length);
-    setup_column(&privdata, 2, privdata.buf_length);
-    setup_column(&privdata, 3, privdata.buf_length);
-
-    if (colormode!=COLOR_CMY)
-      setup_column(&privdata, 0, privdata.buf_length);
-
-    if (colormode==COLOR_CCMMYK || colormode==COLOR_CCMMYYK) {
-      use_6color= 1;
-      setup_column(&privdata, 4, privdata.buf_length);
-      setup_column(&privdata, 5, privdata.buf_length);
-      if (colormode==CANON_INK_CcMmYyK)
-	setup_column(&privdata, 6, privdata.buf_length);
-    }
-  }
-
-  if (privdata.cols[0])
-    {
-      if (privdata.cols[1])
-	stp_set_string_parameter(v, "STPIOutputType", "KCMY");
-      else
-	stp_set_string_parameter(v, "STPIOutputType", "Grayscale");
-    }
-  else
-    stp_set_string_parameter(v, "STPIOutputType", "CMY");
-
-  stp_deprintf(STP_DBG_CANON,
-	       "canon: driver will use colors %s%s%s%s%s%s%s\n",
-	       privdata.cols[0] ? "K" : "",
-	       privdata.cols[1] ? "C" : "",
-	       privdata.cols[2] ? "M" : "",
-	       privdata.cols[3] ? "Y" : "",
-	       privdata.cols[4] ? "c" : "",
-	       privdata.cols[5] ? "m" : "",
-	       privdata.cols[6] ? "y" : "");
+  privdata.left = privdata.mode->xdpi * privdata.left / 72;
 
   stp_deprintf(STP_DBG_CANON,"density is %f\n",
-	       stp_get_float_parameter(v, "Density"));
+               stp_get_float_parameter(v, "Density"));
 
   /*
    * Compute the LUT.  For now, it's 8 bit, but that may eventually
@@ -3140,116 +1735,108 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
       stp_set_float_parameter_active(v, "Density", STP_PARAMETER_ACTIVE);
       stp_set_float_parameter(v, "Density", 1.0);
     }
-  if (pt)
-    stp_scale_float_parameter(v, "Density", pt->base_density);
-  else			/* Can't find paper type? Assume plain */
-    stp_scale_float_parameter(v, "Density", .5);
-  stp_scale_float_parameter(v, "Density", canon_density(caps, res_code));
+
+  stp_scale_float_parameter(v, "Density", privdata.pt->base_density);
+  stp_scale_float_parameter(v, "Density",privdata.mode->density);
+
   if (stp_get_float_parameter(v, "Density") > 1.0)
     stp_set_float_parameter(v, "Density", 1.0);
-  if (colormode == COLOR_MONOCHROME)
+
+  if (privdata.used_inks == CANON_INK_K)
     stp_scale_float_parameter(v, "Gamma", 1.25);
 
   stp_deprintf(STP_DBG_CANON,"density is %f\n",
-	       stp_get_float_parameter(v, "Density"));
+               stp_get_float_parameter(v, "Density"));
+
+  if(privdata.used_inks & CANON_INK_CMYK_MASK)
+    stp_set_string_parameter(v, "STPIOutputType", "KCMY");
+  else if(privdata.used_inks & CANON_INK_CMY_MASK)
+    stp_set_string_parameter(v, "STPIOutputType", "CMY");
+  else
+    stp_set_string_parameter(v, "STPIOutputType", "Grayscale");
+
+  privdata.length = (privdata.out_width + 7) / 8;
+
+  stp_dither_init(v, image, privdata.out_width, privdata.mode->xdpi, privdata.mode->ydpi);
+
+  canon_setup_channels(v,&privdata);
+
+
+  stp_deprintf(STP_DBG_CANON,
+	       "canon: driver will use colors %s\n",privdata.channel_order);
+
+  /* Allocate compression buffer */
+  if(caps->features & CANON_CAP_I)
+      privdata.comp_buf = stp_zalloc(privdata.buf_length_max * 2 * RASTER_LINES_PER_BLOCK * privdata.num_channels); /* for multiraster we need to buffer 8 lines for every color */
+  else
+      privdata.comp_buf = stp_zalloc(privdata.buf_length_max * 2);
+  /* Allocate fold buffer */
+  privdata.fold_buf = stp_zalloc(privdata.buf_length_max);
+
+
 
  /*
   * Output the page...
   */
 
+   /* FIXME this is probably broken, kept for backward compatibility */
+   if(privdata.num_channels > 4){
+       k_lower = 0.4 / privdata.channels[4].props->bits + .1;
+   }else 
+       k_lower = 0.25;
+
+  k_lower *= privdata.pt->k_lower_scale;
+  k_upper = privdata.pt->k_upper;
 
-  if (use_6color)
-    k_lower = .4 / bits + .1;
-  else
-    k_lower = .25 / bits;
-  if (pt)
-    {
-      k_lower *= pt->k_lower_scale;
-      k_upper = pt->k_upper;
-    }
-  else
-    {
-      k_lower *= .5;
-      k_upper = .5;
-    }
   if (!stp_check_float_parameter(v, "GCRLower", STP_PARAMETER_ACTIVE))
     stp_set_default_float_parameter(v, "GCRLower", k_lower);
   if (!stp_check_float_parameter(v, "GCRUpper", STP_PARAMETER_ACTIVE))
     stp_set_default_float_parameter(v, "GCRUpper", k_upper);
-  stp_dither_init(v, image, out_width, xdpi, ydpi);
 
-  for (i = 0; i < 7; i++)
-    {
-      if (privdata.cols[i])
-	{
-	  stp_dither_add_channel(v, privdata.cols[i], channel_color_map[i],
-				 subchannel_color_map[i]);
-	  if (channel_color_map[i] == STP_ECOLOR_K)
-	    stp_channel_set_black_channel(v, STP_ECOLOR_K);
-	}
-    }
 
-  if ((inks = canon_inks(caps, res_code, colormode, bits))!=0)
-    {
-      set_ink_ranges(v, inks->c, STP_ECOLOR_C, "CyanDensity",
-		     "LightCyanTransition");
-      set_ink_ranges(v, inks->m, STP_ECOLOR_M, "MagentaDensity",
-		     "LightMagentaTransition");
-      set_ink_ranges(v, inks->y, STP_ECOLOR_Y, "YellowDensity",
-		     "LightYellowTransition");
-      set_ink_ranges(v, inks->k, STP_ECOLOR_K, "BlackDensity", NULL);
-    }
-  stp_channel_set_density_adjustment
-    (v, STP_ECOLOR_C, 0,
-     get_double_param(v, "CyanDensity") * get_double_param(v, "Density"));
-  stp_channel_set_density_adjustment
-    (v, STP_ECOLOR_M, 0,
-     get_double_param(v, "MagentaDensity") * get_double_param(v, "Density"));
-  stp_channel_set_density_adjustment
-    (v, STP_ECOLOR_Y, 0,
-     get_double_param(v, "YellowDensity") * get_double_param(v, "Density"));
-  stp_channel_set_density_adjustment
-    (v, STP_ECOLOR_K, 0,
-     get_double_param(v, "BlackDensity") * get_double_param(v, "Density"));
-
-   /* initialize weaving for S200 for resolutions > 360dpi */
-   if ( (init.caps->features & CANON_CAP_WEAVE) && (xdpi > 360) )
+  /* init the printer */
+  canon_init_printer(v, &privdata);
+
+  /* initialize weaving for S200 for resolutions > 360dpi */
+  if (privdata.mode->flags & MODE_FLAG_WEAVE)
      {
+       char weave_color_order[] = "KCMY";
+
        privdata.stepper_ydpi = 720;
        privdata.nozzle_ydpi = 360;
-       if (xdpi == 2880)
+       if (privdata.mode->xdpi == 2880)
          privdata.physical_xdpi = 2880;
        else
          privdata.physical_xdpi = 720;
 
        stp_deprintf(STP_DBG_CANON,"canon: adjust leftskip: old=%d,\n", privdata.left);
-       privdata.left = (int)( (float)privdata.left * (float)privdata.physical_xdpi / (float)xdpi ); /* adjust left margin */
+       privdata.left = (int)( (float)privdata.left * (float)privdata.physical_xdpi / (float)privdata.mode->xdpi ); /* adjust left margin */
        stp_deprintf(STP_DBG_CANON,"canon: adjust leftskip: new=%d,\n", privdata.left);
 
        privdata.ncolors = 4;
        privdata.head_offset = stp_zalloc(sizeof(int) * privdata.ncolors);
        memset(privdata.head_offset, 0, sizeof(privdata.head_offset));
 
-       if ( colormode == COLOR_MONOCHROME )
+       if ( privdata.used_inks == CANON_INK_K )
            privdata.nozzles = 64; /* black nozzles */
        else
            privdata.nozzles = 24; /* color nozzles */
-       if (colormode == COLOR_MONOCHROME)
+       if ( privdata.used_inks == CANON_INK_K )
          {
            privdata.ncolors = 1;
            privdata.head_offset[0] = 0; /* K starts at 0 */
            privdata.head_offset[1] = 0 ;/* how far C starts after K */
            privdata.head_offset[2] = 0;/* how far M starts after K */
            privdata.head_offset[3] = 0;/* how far Y starts after K */
-           top += 11;
+           privdata.top += 11;
          }
-       else if (colormode == COLOR_CMYK)
+       else if ( privdata.used_inks == CANON_INK_CMYK )
          {
            privdata.head_offset[0] = 0; /* K starts at 0 */
            privdata.head_offset[1] = 144 ;/* how far C starts after K */
            privdata.head_offset[2] = 144 + 64;/* how far M starts after K */
            privdata.head_offset[3] = 144 + 64 + 64;/* how far Y starts after K */
-           top += 5;
+           privdata.top += 5;
          }
        else  /* colormode == CMY */
          {
@@ -3257,13 +1844,13 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
            privdata.head_offset[1] = 0 ;/* how far C starts after K */
            privdata.head_offset[2] = 64;/* how far M starts after K */
            privdata.head_offset[3] = 128;/* how far Y starts after K */
-           top += 18;
+           privdata.top += 18;
          }
 
        privdata.nozzle_separation = privdata.stepper_ydpi / privdata.nozzle_ydpi;
-       privdata.horizontal_passes = xdpi / privdata.physical_xdpi;
+       privdata.horizontal_passes = privdata.mode->xdpi / privdata.physical_xdpi;
        privdata.vertical_passes = 1;
-       privdata.vertical_oversample = privdata.ydpi / privdata.stepper_ydpi;
+       privdata.vertical_oversample = privdata.mode->ydpi / privdata.stepper_ydpi;
        privdata.bidirectional = 1; /* 1: bidirectional; 0: unidirectional  printing */
        privdata.direction = 1;
        stp_allocate_component_data(v, "Driver", NULL, NULL, &privdata);
@@ -3275,8 +1862,8 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
                                     privdata.nozzles, privdata.nozzle_separation,
                                     privdata.horizontal_passes, privdata.vertical_passes,
                                     privdata.vertical_oversample, privdata.ncolors,
-                                    out_width, out_height,
-                                    top * privdata.stepper_ydpi / 72, page_height * privdata.stepper_ydpi / 72,
+                                    privdata.out_width, privdata.out_height,
+                                    privdata.top * privdata.stepper_ydpi / 72, privdata.page_height * privdata.stepper_ydpi / 72,
                                     privdata.head_offset[0],privdata.head_offset[1],
                                     privdata.head_offset[2],privdata.head_offset[3]);
 
@@ -3284,9 +1871,9 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
                                 privdata.horizontal_passes, privdata.vertical_passes,
                                 privdata.vertical_oversample, privdata.ncolors,
                                 1,
-                                out_width, out_height,
-                                top * privdata.stepper_ydpi / 72,
-                                page_height * privdata.stepper_ydpi / 72,
+                                privdata.out_width, privdata.out_height,
+                                privdata.top * privdata.stepper_ydpi / 72,
+                                privdata.page_height * privdata.stepper_ydpi / 72,
                                 privdata.head_offset,
                                 STP_WEAVE_ZIGZAG,
                                 canon_flush_pass,
@@ -3294,41 +1881,54 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
                                 stp_pack_uncompressed,
                                 stp_compute_uncompressed_linewidth);
        privdata.last_pass_offset = 0;
-     }
 
 
-  errdiv  = image_height / out_height;
-  errmod  = image_height % out_height;
+       for(i=0;i<4;i++){
+           int x;
+           for(x=0;x<privdata.num_channels;x++){
+               if(weave_color_order[i] == privdata.channel_order[x])
+                   weave_cols[i] = privdata.channels[x].buf;
+                   privdata.weave_bits[i] = privdata.channels[x].props->bits;
+           }
+       }
+  }
+
+
+  errdiv  = image_height / privdata.out_height;
+  errmod  = image_height % privdata.out_height;
   errval  = 0;
   errlast = -1;
   errline  = 0;
-
-  if (!stp_check_curve_parameter(v, "HueMap", STP_PARAMETER_ACTIVE) &&
-      pt->hue_adjustment)
+ 
+  if (!stp_check_curve_parameter(v, "HueMap", STP_PARAMETER_ACTIVE)) 
     {
-      hue_adjustment = stp_read_and_compose_curves
-	(canon_hue_adjustment(model),
-	 pt ? pt->hue_adjustment : NULL, STP_CURVE_COMPOSE_ADD, 384);
-      stp_set_curve_parameter(v, "HueMap", hue_adjustment);
-      stp_curve_destroy(hue_adjustment);
+      stp_curve_t* hue_adjustment = stp_read_and_compose_curves
+	(caps->hue_adjustment,privdata.pt->hue_adjustment,
+	 STP_CURVE_COMPOSE_ADD, 384);
+      if(hue_adjustment){
+        stp_set_curve_parameter(v, "HueMap", hue_adjustment);
+        stp_curve_destroy(hue_adjustment);
+      }
     }
-  if (!stp_check_curve_parameter(v, "LumMap", STP_PARAMETER_ACTIVE) &&
-      pt->lum_adjustment)
+  if (!stp_check_curve_parameter(v, "LumMap", STP_PARAMETER_ACTIVE)) 
     {
-      lum_adjustment = stp_read_and_compose_curves
-	(canon_lum_adjustment(model),
-	 pt ? pt->lum_adjustment : NULL, STP_CURVE_COMPOSE_MULTIPLY, 384);
-      stp_set_curve_parameter(v, "LumMap", lum_adjustment);
-      stp_curve_destroy(lum_adjustment);
+      stp_curve_t* lum_adjustment = stp_read_and_compose_curves
+	(caps->lum_adjustment,privdata.pt->lum_adjustment,
+	 STP_CURVE_COMPOSE_MULTIPLY, 384);
+      if(lum_adjustment){
+        stp_set_curve_parameter(v, "LumMap", lum_adjustment);
+        stp_curve_destroy(lum_adjustment);
+      }
     }
-  if (!stp_check_curve_parameter(v, "SatMap", STP_PARAMETER_ACTIVE) &&
-      pt->sat_adjustment)
+  if (!stp_check_curve_parameter(v, "SatMap", STP_PARAMETER_ACTIVE)) 
     {
-      sat_adjustment = stp_read_and_compose_curves
-	(canon_sat_adjustment(model),
-	 pt ? pt->sat_adjustment : NULL, STP_CURVE_COMPOSE_MULTIPLY, 384);
-      stp_set_curve_parameter(v, "SatMap", sat_adjustment);
-      stp_curve_destroy(sat_adjustment);
+      stp_curve_t* sat_adjustment = stp_read_and_compose_curves
+	(caps->sat_adjustment,privdata.pt->sat_adjustment,
+	 STP_CURVE_COMPOSE_MULTIPLY, 384);
+      if(sat_adjustment){
+        stp_set_curve_parameter(v, "SatMap", sat_adjustment);
+        stp_curve_destroy(sat_adjustment);
+      }
     }
 
   out_channels = stp_color_init(v, image, 65536);
@@ -3336,11 +1936,11 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
 
   privdata.emptylines = 0;
   if (print_cd) {
-    cd_mask = stp_malloc(1 + (out_width + 7) / 8);
-    outer_r_sq = (double)CD_OUTER_RADIUS * (double)CD_OUTER_RADIUS;
-    inner_r_sq = (double)CD_INNER_RADIUS * (double)CD_INNER_RADIUS;
+    cd_mask = stp_malloc(1 + (privdata.out_width + 7) / 8);
+    outer_r_sq = (double)privdata.cd_outer_radius * (double)privdata.cd_outer_radius;
+    inner_r_sq = (double)privdata.cd_inner_radius * (double)privdata.cd_inner_radius;
   }
-  for (y = 0; y < out_height; y ++)
+  for (y = 0; y < privdata.out_height; y ++)
   {
     int duplicate_line = 1;
 
@@ -3356,44 +1956,46 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
     }
     if (print_cd) 
       {
-	int x_center = CD_OUTER_RADIUS * xdpi / 72;
+	int x_center = privdata.cd_outer_radius * privdata.mode->xdpi / 72;
 	int y_distance_from_center =
-	  CD_OUTER_RADIUS - (y * 72 / ydpi);
+	  privdata.cd_outer_radius - (y * 72 / privdata.mode->ydpi);
 	if (y_distance_from_center < 0)
 	  y_distance_from_center = -y_distance_from_center;
-	memset(cd_mask, 0, (out_width + 7) / 8);
-	if (y_distance_from_center < CD_OUTER_RADIUS)
+	memset(cd_mask, 0, (privdata.out_width + 7) / 8);
+	if (y_distance_from_center < privdata.cd_outer_radius)
 	  {
 	    double y_sq = (double) y_distance_from_center *
 	      (double) y_distance_from_center;
 	    int x_where = sqrt(outer_r_sq - y_sq) + .5;
-	    int scaled_x_where = x_where * xdpi / 72;
+	    int scaled_x_where = x_where * privdata.mode->xdpi / 72;
 	    set_mask(cd_mask, x_center, scaled_x_where,
-		     out_width, 1, 0);
-	    if (y_distance_from_center < CD_INNER_RADIUS)
+		     privdata.out_width, 1, 0);
+	    if (y_distance_from_center < privdata.cd_inner_radius)
 	      {
 		x_where = sqrt(inner_r_sq - y_sq) + .5;
-		scaled_x_where = x_where * ydpi / 72;
+		scaled_x_where = x_where * privdata.mode->ydpi / 72;
 		set_mask(cd_mask, x_center, scaled_x_where,
-			 out_width, 1, 1);
+			 privdata.out_width, 1, 1);
 	      }
 	  }
       }
     stp_dither(v, y, duplicate_line, zero_mask, cd_mask);
-    if ( (init.caps->features & CANON_CAP_WEAVE) && (xdpi > 360) )
-        stp_write_weave(v, privdata.cols);
+    if ( privdata.mode->flags & MODE_FLAG_WEAVE )
+        stp_write_weave(v, weave_cols);
+    else if ( caps->features & CANON_CAP_I)
+        canon_write_multiraster(v,&privdata,y);
     else
         canon_printfunc(v);
     errval += errmod;
     errline += errdiv;
-    if (errval >= out_height)
+    if (errval >= privdata.out_height)
     {
-      errval -= out_height;
+      errval -= privdata.out_height;
       errline ++;
     }
   }
 
-  if ( (init.caps->features & CANON_CAP_WEAVE) && (xdpi > 360) )
+  if ( privdata.mode->flags & MODE_FLAG_WEAVE )
   {
       stp_flush_all(v);
       canon_advance_paper(v, 5);
@@ -3411,9 +2013,9 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
     for (y= 0; y<privdata.delay_max; y++) {
 
       canon_write_line(v);
-      for (i = 0; i < 7; i++)
-	canon_advance_buffer(privdata.cols[i], privdata.buf_length,
-			     privdata.delay[i]);
+      for (i = 0; i < privdata.num_channels; i++)
+	canon_advance_buffer(privdata.channels[i].buf, privdata.length,
+			     privdata.channels[i].delay);
     }
   }
   }
@@ -3423,14 +2025,26 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
   * Cleanup...
   */
 
-  for (i = 0; i < 7; i++)
-    if (privdata.cols[i])
-      stp_free(privdata.cols[i]);
-  
+  stp_free(privdata.fold_buf);
+  stp_free(privdata.comp_buf);
+
   if(cd_mask)
       stp_free(cd_mask);
 
-  canon_deinit_printer(v, &init);
+
+  canon_deinit_printer(v, &privdata);
+
+  for(i=0;i< privdata.num_channels;i++)
+      if(privdata.channels[i].buf)
+          stp_free(privdata.channels[i].buf);
+  if(privdata.channels)
+      stp_free(privdata.channels);
+
+  stp_free(privdata.channel_order);
+  if (privdata.head_offset)
+    stp_free(privdata.head_offset);
+
+
   return status;
 }
 
@@ -3461,155 +2075,6 @@ static const stp_printfuncs_t print_canon_printfuncs =
   canon_end_job
 };
 
-#ifndef USE_3BIT_FOLD_TYPE
-#error YOU MUST CHOOSE A VALUE FOR USE_3BIT_FOLD_TYPE
-#endif
-
-#if USE_3BIT_FOLD_TYPE == 333
-
-static void
-canon_fold_3bit(const unsigned char *line,
-		int single_length,
-		unsigned char *outbuf)
-{
-  int i;
-  for (i = 0; i < single_length; i++) {
-    outbuf[0] =
-      ((line[0] & (1 << 7)) >> 2) |
-      ((line[0] & (1 << 6)) >> 4) |
-      ((line[single_length] & (1 << 7)) >> 1) |
-      ((line[single_length] & (1 << 6)) >> 3) |
-      ((line[single_length] & (1 << 5)) >> 5) |
-      ((line[2*single_length] & (1 << 7)) << 0) |
-      ((line[2*single_length] & (1 << 6)) >> 2) |
-      ((line[2*single_length] & (1 << 5)) >> 4);
-    outbuf[1] =
-      ((line[0] & (1 << 5)) << 2) |
-      ((line[0] & (1 << 4)) << 0) |
-      ((line[0] & (1 << 3)) >> 2) |
-      ((line[single_length] & (1 << 4)) << 1) |
-      ((line[single_length] & (1 << 3)) >> 1) |
-      ((line[2*single_length] & (1 << 4)) << 2) |
-      ((line[2*single_length] & (1 << 3)) << 0) |
-      ((line[2*single_length] & (1 << 2)) >> 2);
-    outbuf[2] =
-      ((line[0] & (1 << 2)) << 4) |
-      ((line[0] & (1 << 1)) << 2) |
-      ((line[0] & (1 << 0)) << 0) |
-      ((line[single_length] & (1 << 2)) << 5) |
-      ((line[single_length] & (1 << 1)) << 3) |
-      ((line[single_length] & (1 << 0)) << 1) |
-      ((line[2*single_length] & (1 << 1)) << 4) |
-      ((line[2*single_length] & (1 << 0)) << 2);
-    line++;
-    outbuf += 3;
-  }
-}
-
-#elif USE_3BIT_FOLD_TYPE == 323
-
-static void
-canon_fold_3bit(const unsigned char *line,
-		int single_length,
-		unsigned char *outbuf)
-{
-  unsigned char A0,A1,A2,B0,B1,B2,C0,C1,C2;
-  const unsigned char *last= line+single_length;
-
-  for (; line < last; line+=3, outbuf+=8) {
-
-    A0= line[0]; B0= line[single_length]; C0= line[2*single_length];
-
-    if (line<last-2) {
-      A1= line[1]; B1= line[single_length+1]; C1= line[2*single_length+1];
-    } else {
-      A1= 0; B1= 0; C1= 0;
-    }
-    if (line<last-1) {
-      A2= line[2]; B2= line[single_length+2]; C2= line[2*single_length+2];
-    } else {
-      A2= 0; B2= 0; C2= 0;
-    }
-
-    outbuf[0] =
-      ((C0 & 0x80) >> 0) |
-      ((B0 & 0x80) >> 1) |
-      ((A0 & 0x80) >> 2) |
-      ((B0 & 0x40) >> 2) |
-      ((A0 & 0x40) >> 3) |
-      ((C0 & 0x20) >> 3) |
-      ((B0 & 0x20) >> 4) |
-      ((A0 & 0x20) >> 5);
-    outbuf[1] =
-      ((C0 & 0x10) << 3) |
-      ((B0 & 0x10) << 2) |
-      ((A0 & 0x10) << 1) |
-      ((B0 & 0x08) << 1) |
-      ((A0 & 0x08) << 0) |
-      ((C0 & 0x04) >> 0) |
-      ((B0 & 0x04) >> 1) |
-      ((A0 & 0x04) >> 2);
-    outbuf[2] =
-      ((C0 & 0x02) << 6) |
-      ((B0 & 0x02) << 5) |
-      ((A0 & 0x02) << 4) |
-      ((B0 & 0x01) << 4) |
-      ((A0 & 0x01) << 3) |
-      ((C1 & 0x80) >> 5) |
-      ((B1 & 0x80) >> 6) |
-      ((A1 & 0x80) >> 7);
-    outbuf[3] =
-      ((C1 & 0x40) << 1) |
-      ((B1 & 0x40) << 0) |
-      ((A1 & 0x40) >> 1) |
-      ((B1 & 0x20) >> 1) |
-      ((A1 & 0x20) >> 2) |
-      ((C1 & 0x10) >> 2) |
-      ((B1 & 0x10) >> 3) |
-      ((A1 & 0x10) >> 4);
-    outbuf[4] =
-      ((C1 & 0x08) << 4) |
-      ((B1 & 0x08) << 3) |
-      ((A1 & 0x08) << 2) |
-      ((B1 & 0x04) << 2) |
-      ((A1 & 0x04) << 1) |
-      ((C1 & 0x02) << 1) |
-      ((B1 & 0x02) >> 0) |
-      ((A1 & 0x02) >> 1);
-    outbuf[5] =
-      ((C1 & 0x01) << 7) |
-      ((B1 & 0x01) << 6) |
-      ((A1 & 0x01) << 5) |
-      ((B2 & 0x80) >> 3) |
-      ((A2 & 0x80) >> 4) |
-      ((C2 & 0x40) >> 4) |
-      ((B2 & 0x40) >> 5) |
-      ((A2 & 0x40) >> 6);
-    outbuf[6] =
-      ((C2 & 0x20) << 2) |
-      ((B2 & 0x20) << 1) |
-      ((A2 & 0x20) << 0) |
-      ((B2 & 0x10) >> 0) |
-      ((A2 & 0x10) >> 1) |
-      ((C2 & 0x08) >> 1) |
-      ((B2 & 0x08) >> 2) |
-      ((A2 & 0x08) >> 3);
-    outbuf[7] =
-      ((C2 & 0x04) << 5) |
-      ((B2 & 0x04) << 4) |
-      ((A2 & 0x04) << 3) |
-      ((B2 & 0x02) << 3) |
-      ((A2 & 0x02) << 2) |
-      ((C2 & 0x01) << 2) |
-      ((B2 & 0x01) << 1) |
-      ((A2 & 0x01) << 0);
-  }
-}
-
-#else
-#error 3BIT FOLD TYPE NOT IMPLEMENTED
-#endif
-
 static void
 canon_shift_buffer(unsigned char *line,int length,int bits)
 {
@@ -3622,46 +2087,16 @@ canon_shift_buffer(unsigned char *line,int length,int bits)
   }
 }
 
-#if 0
-static void
-canon_shift_buffer2(unsigned char *line,int length,int bits)
-{
-  int i;
-  for (i=length-1; i>0; i--) {
-    line[i]= (line[i] >> bits) | (line[i-1] << (8-bits));
-  }
-  line[0] = line[0] >> bits;
-}
-#endif
 
-/*
- * 'canon_write()' - Send graphics using TIFF packbits compression.
- */
-
-static int
-canon_write(stp_vars_t *v,		/* I - Print file or command */
-	    const canon_cap_t *   caps,	        /* I - Printer model */
-	    unsigned char *line,	/* I - Output bitmap data */
-	    int           length,	/* I - Length of bitmap data */
-	    int           coloridx,	/* I - Which color */
-	    int           ydpi,		/* I - Vertical resolution */
-	    int           *empty,       /* IO- Preceeding empty lines */
-	    int           width,	/* I - Printed width */
-	    int           offset, 	/* I - Offset from left side */
-	    int           bits)
+/* fold, apply 5 pixel in 1 byte compression, pack tiff and return the compressed length */
+static int canon_compress(stp_vars_t *v, canon_privdata_t *pd, unsigned char* line,int length,int offset,unsigned char* comp_buf,int bits, int ink_flags)
 {
   unsigned char
-    comp_buf[COMPBUFWIDTH + COMPBUFWIDTH / 4],	/* Compression buffer */
-    in_fold[COMPBUFWIDTH],
     *in_ptr= line,
     *comp_ptr, *comp_data;
-  int newlength;
   int offset2,bitoffset;
-  unsigned char color;
-  canon_privdata_t *pd =
-    (canon_privdata_t *) stp_get_component_data(v, "Driver");
 
- /* Don't send blank lines... */
+  /* Don't send blank lines... */
 
   if (line[0] == 0 && memcmp(line, line + 1, length - 1) == 0)
     return 0;
@@ -3672,23 +2107,22 @@ canon_write(stp_vars_t *v,		/* I - Print file or command */
   /* fold lsb/msb pairs if drop modulation is active */
 
 
-
   if (bits==2) {
     int pixels_per_byte = 4;
-    if((caps->features & CANON_CAP_5pixelin1byte) && (pd->color_info[coloridx].level == 3))
+    if(ink_flags & INK_FLAG_5pixel_in_1byte)
       pixels_per_byte = 5;
-    stp_fold(line,length,in_fold);
-    in_ptr= in_fold;
+
+    stp_fold(line,length,pd->fold_buf);
+    in_ptr= pd->fold_buf;
     length= (length*8/4); /* 4 pixels in 8bit */
     /* calculate the number of compressed bytes that can be sent directly */
     offset2 = offset / pixels_per_byte;
     /* calculate the number of (uncompressed) bits that have to be added to the raster data */
     bitoffset = (offset % pixels_per_byte) * 2;
   }
-  if (bits==3) {
-    memset(in_fold,0,length);
-    canon_fold_3bit(line,length,in_fold);
-    in_ptr= in_fold;
+  else if (bits==3) {
+    stp_fold_3bit_323(line,length,pd->fold_buf);
+    in_ptr= pd->fold_buf;
     length= (length*8)/3;
     offset2 = offset/3;
 #if 0
@@ -3700,11 +2134,19 @@ canon_write(stp_vars_t *v,		/* I - Print file or command */
 #endif
     bitoffset= 0;
   }
+  else if (bits==4) {
+    stp_fold_4bit(line,length,pd->fold_buf);
+    in_ptr= pd->fold_buf;
+    length= (length*8)/2;
+    offset2 = offset / 2; 
+    bitoffset= offset % 2;
+  }
+    
   /* pack left border rounded to multiples of 8 dots */
 
   comp_data= comp_buf;
   while (offset2>0) {
-    unsigned char toffset = offset2 > 128 ? 128 : offset2;
+    unsigned char toffset = offset2 > 127 ? 127 : offset2;
     comp_data[0] = 1 - toffset;
     comp_data[1] = 0;
     comp_data += 2;
@@ -3726,13 +2168,37 @@ canon_write(stp_vars_t *v,		/* I - Print file or command */
 	      "bitoffset=%d!!\n",bitoffset);
   }
 
-
-  if((caps->features & CANON_CAP_5pixelin1byte) && (pd->color_info[coloridx].level == 3))
-    length = pack_pixels(in_ptr,length);
+    if(ink_flags & INK_FLAG_5pixel_in_1byte)
+       length = pack_pixels(in_ptr,length);
 
   stp_pack_tiff(v, in_ptr, length, comp_data, &comp_ptr, NULL, NULL);
-  newlength= comp_ptr - comp_buf;
 
+  return comp_ptr - comp_buf;
+}
+
+/*
+ * 'canon_write()' - Send graphics using TIFF packbits compression.
+ */
+
+static int
+canon_write(stp_vars_t *v,		/* I - Print file or command */
+            canon_privdata_t *pd,       /* privdata */
+	    const canon_cap_t *   caps,	        /* I - Printer model */
+	    unsigned char *line,	/* I - Output bitmap data */
+	    int           length,	/* I - Length of bitmap data */
+	    int           coloridx,	/* I - Which color */
+	    int           ydpi,		/* I - Vertical resolution */
+	    int           *empty,       /* IO- Preceeding empty lines */
+	    int           width,	/* I - Printed width */
+	    int           offset, 	/* I - Offset from left side */
+	    int           bits,
+            int           ink_flags)
+{
+
+  unsigned char color;
+  int newlength = canon_compress(v,pd,line,length,offset,pd->comp_buf,bits,ink_flags);
+  if(!newlength)
+      return 0;
   /* send packed empty lines if any */
 
   if (*empty) {
@@ -3745,10 +2211,10 @@ canon_write(stp_vars_t *v,		/* I - Print file or command */
 
   stp_zfwrite("\033\050\101", 3, 1, v);
   stp_put16_le(newlength + 1, v);
-  color= "CMYKcmy"[coloridx];
+  color= "CMYKcmyk"[coloridx];
   if (!color) color= 'K';
   stp_putc(color,v);
-  stp_zfwrite((const char *)comp_buf, newlength, 1, v);
+  stp_zfwrite((const char *)pd->comp_buf, newlength, 1, v);
   stp_putc('\015', v);
   return 1;
 }
@@ -3759,24 +2225,30 @@ canon_write_line(stp_vars_t *v)
 {
   canon_privdata_t *pd =
     (canon_privdata_t *) stp_get_component_data(v, "Driver");
-  static const int write_sequence[] = { 0, 3, 2, 1, 6, 5, 4 };
-  static const int write_number[] = { 3, 2, 1, 0, 6, 5, 4 };
+  char write_sequence[] = "KYMCymck";
+  static const int write_number[] = { 3, 2, 1, 0, 6, 5, 4, 7 };   /* KYMCymc */
   int i;
   int written= 0;
-
-  for (i = 0; i < 7; i++)
+  for (i = 0; i < strlen(write_sequence) ; i++)
     {
-      int col = write_sequence[i];
+      int x;
+      const canon_channel_t* channel=NULL;
       int num = write_number[i];
-      int bits=pd->bits;
-      if(pd->caps->features & CANON_CAP_extended_t)
-        bits = pd->color_info[num].info & 3;
-      if (pd->cols[col])
-	written += canon_write(v, pd->caps,
-			       pd->cols[col] + pd->delay[col] * pd->buf_length,
-			       pd->length, num, pd->ydpi,
-			       &(pd->emptylines), pd->out_width,
-			       pd->left, bits);
+
+      /* TODO optimize => move reorder code to do_print */
+      for(x=0;x < pd->num_channels; x++){
+          if(pd->channels[x].name == write_sequence[i]){
+              channel = &(pd->channels[x]);
+              break;
+          }
+      }
+      if(channel){
+        written += canon_write(v, pd, pd->caps,
+                               channel->buf + channel->delay * pd->length /*buf_length[i]*/,
+                               pd->length, num, pd->mode->ydpi,
+                               &(pd->emptylines), pd->out_width,
+                               pd->left, channel->props->bits, channel->props->flags);
+      } 
     }
   if (written)
     stp_zfwrite("\033\050\145\002\000\000\001", 7, 1, v);
@@ -3784,6 +2256,57 @@ canon_write_line(stp_vars_t *v)
     pd->emptylines += 1;
 }
 
+
+/* write one multiraster block */
+static void canon_write_block(stp_vars_t* v,canon_privdata_t* pd,unsigned char* start, unsigned char* end){
+    unsigned int length = end - start;
+    if(!length)
+        return;
+    stp_zfwrite("\033(F", 3, 1, v);
+    stp_put16_le(length, v);
+    stp_zfwrite((const char *)start, length, 1, v);
+}
+
+
+static void canon_write_multiraster(stp_vars_t *v,canon_privdata_t* pd,int y){
+    int i;
+    unsigned int max_length = 2*pd->buf_length_max * RASTER_LINES_PER_BLOCK;
+    /* a new raster block begins */
+    if(!(y % RASTER_LINES_PER_BLOCK)){
+        if(y != 0){
+            /* write finished blocks */
+            for(i=0;i<pd->num_channels;i++)
+                canon_write_block(v,pd,pd->comp_buf + i * max_length,pd->channels[i].comp_buf_offset);
+        }
+        /* reset start offsets */
+        for(i=0;i<pd->num_channels;i++)
+            pd->channels[i].comp_buf_offset = pd->comp_buf + i * max_length;
+    }
+    /* compress lines and add them to the buffer */
+    for(i=0;i<pd->num_channels;i++){
+       pd->channels[i].comp_buf_offset += canon_compress(v,pd, pd->channels[i].buf,pd->length,pd->left,pd->channels[i].comp_buf_offset,pd->channels[i].props->bits, pd->channels[i].props->flags);
+       *(pd->channels[i].comp_buf_offset) = 0x80; /* terminate the line */
+        ++pd->channels[i].comp_buf_offset;
+    }
+    if(y == pd->out_height - 1){
+        /* we just compressed our last line */
+        if(pd->out_height % RASTER_LINES_PER_BLOCK){
+            /* but our raster block is not finished yet */
+            int missing = RASTER_LINES_PER_BLOCK - (pd->out_height % RASTER_LINES_PER_BLOCK); /* calculate missing lines */
+            for(i=0;i<pd->num_channels;i++){
+                /* add missing empty lines and write blocks */
+                int x;
+                for(x=0;x < missing ; x++){
+                  *(pd->channels[i].comp_buf_offset) = 0x80; /* terminate the line */
+                  ++pd->channels[i].comp_buf_offset;
+                }
+                canon_write_block(v,pd,pd->comp_buf + i * max_length,pd->channels[i].comp_buf_offset);
+            }
+        }
+    }
+}
+
+
 static void
 canon_advance_paper(stp_vars_t *v, int advance)
 {
@@ -3854,11 +2377,11 @@ canon_flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
                         }
                     }
 
-                  written += canon_write(v, pd->caps,
+                  written += canon_write(v, pd, pd->caps,
                                (unsigned char *)(bufs[0].v[color] + line * linelength),
-                               linelength, idx[color], pd->ydpi,
+                               linelength, idx[color], pd->mode->ydpi,
                                &(pd->emptylines), pd->out_width,
-                               pd->left, pd->bits);
+                               pd->left, pd->weave_bits[color],0);
                   if (written) stp_deprintf(STP_DBG_CANON,"                        --written color %d,\n", color);
 
                 }
diff --git a/src/main/print-canon.h b/src/main/print-canon.h
new file mode 100644
index 0000000..812d3c1
--- /dev/null
+++ b/src/main/print-canon.h
@@ -0,0 +1,138 @@
+/*
+ *   Print plug-in CANON BJL driver for the GIMP.
+ *
+ *   Copyright 1997-2000 Michael Sweet (mike@easysw.com),
+ *      Robert Krawitz (rlk@alum.mit.edu) and
+ *      Andy Thaller (thaller@ph.tum.de)
+ *   Copyright (c) 2006 Sascha Sommer
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef GUTENPRINT_INTERNAL_CANON_H
+#define GUTENPRINT_INTERNAL_CANON_H
+
+
+
+/* Codes for possible ink-tank combinations.
+ * Each combo is represented by the colors that can be used with
+ * the installed ink-tank(s)
+ * Combinations of the codes represent the combinations allowed for a model
+ * Note that only preferrable combinations should be used
+ */
+#define CANON_INK_K           1
+#define CANON_INK_CMY         2
+#define CANON_INK_CMYK        4
+#define CANON_INK_CcMmYK      8
+#define CANON_INK_CcMmYyK    16
+
+#define CANON_INK_CcMmYyKk_MASK (CANON_INK_CcMmYK|CANON_INK_CcMmYyK)     /* Ink is CcMmYyKk */
+#define CANON_INK_CMYK_MASK     (CANON_INK_CMYK|CANON_INK_CcMmYyKk_MASK) /* Ink is CMYK */
+#define CANON_INK_CMY_MASK      (CANON_INK_CMY|CANON_INK_CMYK_MASK)      /* Ink is CMY */
+#define CANON_INK_K_MASK        (CANON_INK_K|CANON_INK_CMYK_MASK)        /* Ink is K */
+
+
+
+/* FIXME someday we will have to fix the internal names (will break the ppds ;(
+* List of possible ink settings ordered by descending ink count
+*the driver will check if the current print mode supports the ink combination before offering it
+*/
+static struct canon_inktype_s {
+    const unsigned int ink_type;
+    const unsigned int num_channels;
+    const char* name;
+    const char* text;
+} canon_inktypes[] = {
+    {CANON_INK_CcMmYyK,7,"PhotoCMYK","Photo CcMmYyK Color"},
+    {CANON_INK_CcMmYK,6,"PhotoCMY", "Photo CcMmYK Color"},
+    {CANON_INK_CMYK,4,"CMYK","CMYK Color"},
+    {CANON_INK_CMY,3,"RGB","CMY Color"},
+    {CANON_INK_K,1,"Gray","Black"}
+};
+
+/* the PIXMA iP4000 and maybe other printers use following table to store
+   5 pixels with 3 levels in 1 byte, All possible pixel combinations are given
+   numbers from 0 (=00,00,00,00,00) to 242 (=10,10,10,10,10)
+   combinations where the value of one of the pixels would be 3 are skipped
+*/
+static const unsigned char tentoeight[] =
+{
+    0,  1,  2,  0,  3,  4,  5,  0,  6,  7,  8,  0,  0,  0,  0,  0,
+    9, 10, 11,  0, 12, 13, 14,  0, 15, 16, 17,  0,  0,  0,  0,  0,
+   18, 19, 20,  0, 21, 22, 23,  0, 24, 25, 26,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   27, 28, 29,  0, 30, 31, 32,  0, 33, 34, 35,  0,  0,  0,  0,  0,
+   36, 37, 38,  0, 39, 40, 41,  0, 42, 43, 44,  0,  0,  0,  0,  0,
+   45, 46, 47,  0, 48, 49, 50,  0, 51, 52, 53,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   54, 55, 56,  0, 57, 58, 59,  0, 60, 61, 62,  0,  0,  0,  0,  0,
+   63, 64, 65,  0, 66, 67, 68,  0, 69, 70, 71,  0,  0,  0,  0,  0,
+   72, 73, 74,  0, 75, 76, 77,  0, 78, 79, 80,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   81, 82, 83,  0, 84, 85, 86,  0, 87, 88, 89,  0,  0,  0,  0,  0,
+   90, 91, 92,  0, 93, 94, 95,  0, 96, 97, 98,  0,  0,  0,  0,  0,
+   99,100,101,  0,102,103,104,  0,105,106,107,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  108,109,110,  0,111,112,113,  0,114,115,116,  0,  0,  0,  0,  0,
+  117,118,119,  0,120,121,122,  0,123,124,125,  0,  0,  0,  0,  0,
+  126,127,128,  0,129,130,131,  0,132,133,134,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  135,136,137,  0,138,139,140,  0,141,142,143,  0,  0,  0,  0,  0,
+  144,145,146,  0,147,148,149,  0,150,151,152,  0,  0,  0,  0,  0,
+  153,154,155,  0,156,157,158,  0,159,160,161,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  162,163,164,  0,165,166,167,  0,168,169,170,  0,  0,  0,  0,  0,
+  171,172,173,  0,174,175,176,  0,177,178,179,  0,  0,  0,  0,  0,
+  180,181,182,  0,183,184,185,  0,186,187,188,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  189,190,191,  0,192,193,194,  0,195,196,197,  0,  0,  0,  0,  0,
+  198,199,200,  0,201,202,203,  0,204,205,206,  0,  0,  0,  0,  0,
+  207,208,209,  0,210,211,212,  0,213,214,215,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  216,217,218,  0,219,220,221,  0,222,223,224,  0,  0,  0,  0,  0,
+  225,226,227,  0,228,229,230,  0,231,232,233,  0,  0,  0,  0,  0,
+  234,235,236,  0,237,238,239,  0,240,241,242,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
+};
+
+#endif
diff --git a/src/main/print-color.c b/src/main/print-color.c
index 733789b..592c90c 100644
--- a/src/main/print-color.c
+++ b/src/main/print-color.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-color.c,v 1.135 2006/05/28 16:59:04 rlk Exp $"
+ * "$Id: print-color.c,v 1.135.8.1 2007/05/29 01:47:29 rlk Exp $"
  *
  *   Gutenprint color management module - traditional Gutenprint algorithm.
  *
@@ -785,6 +785,8 @@ compute_gcr_curve(const stp_vars_t *vars)
     k_trans = stp_get_float_parameter(vars, "BlackTrans");
   k_upper *= lut->steps;
   k_lower *= lut->steps;
+  stp_dprintf(STP_DBG_LUT, vars, " k_lower %.3f\n", k_lower);
+  stp_dprintf(STP_DBG_LUT, vars, " k_upper %.3f\n", k_upper);
 
   if (k_lower > lut->steps)
     k_lower = lut->steps;
diff --git a/src/main/print-escp2-data.c b/src/main/print-escp2-data.c
index 43f496b..1327e7f 100644
--- a/src/main/print-escp2-data.c
+++ b/src/main/print-escp2-data.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2-data.c,v 1.202 2006/07/22 20:28:13 rlk Exp $"
+ * "$Id: print-escp2-data.c,v 1.202.6.2 2007/05/29 01:47:29 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -76,6 +76,12 @@ static const escp2_dot_size_t p3pl_dotsizes =
 static const escp2_dot_size_t p1_5pl_dotsizes =
 { 0x10, 0x10, 0x10, 0x11, 0x12, 0x13, 0x13, 0x13, 0x13 };
 
+static const escp2_dot_size_t claria_dotsizes =
+{ 0x33, 0x33, 0x24, 0x24, 0x24, 0x25, 0x25, 0x25, 0x25 };
+
+static const escp2_dot_size_t claria_1400_dotsizes =
+{ 0x33, 0x33, 0x21, 0x21, 0x33, 0x25, 0x25, 0x25, 0x25 };
+
 static const escp2_dot_size_t c2pl_dotsizes =
 { 0x12, 0x12, 0x12, 0x11, 0x13,   -1, 0x10, 0x10, 0x10 };
 
@@ -198,6 +204,9 @@ static const escp2_base_resolutions_t c1_8_base_res =
 static const escp2_base_resolutions_t c1_5_base_res =
 {  360,  360,  720,  720,  720,  720,  720,  720,  720 };
 
+static const escp2_base_resolutions_t claria_1400_base_res =
+{  360,  360,  720,  720,  360,  720,  720,  720,  720 };
+
 static const escp2_base_resolutions_t stc900_base_res =
 {  360,  360,  360,  360,  180,  180,  360,  360,  360 };
 
@@ -253,6 +262,12 @@ static const escp2_densities_t p3pl_densities =
 static const escp2_densities_t p1_5pl_densities =
 { 2.8, 1.4,  1.00, 1.000, 0.869, 0.942, 0.471, 0.500, 0.530 };
 
+static const escp2_densities_t claria_densities =
+{ 2.8, 1.4,  2.00, 1.000, 0.500, 0.812, 0.406, 0.546, 0.440 };
+
+static const escp2_densities_t claria_1400_densities =
+{ 2.8, 1.4,  2.00, 1.000, 0.500, 0.812, 0.406, 0.546, 0.440 };
+
 static const escp2_densities_t p3_5pl_densities =
 { 2.8, 1.4,  1.77, 0.886, 0.443, 0.221, 0.240, 0.293, 0.146 };
 
@@ -296,575 +311,68 @@ static const escp2_densities_t picturemate_densities =
 {   0,   0,     0,     0, 1.596, 0.798, 0.650, 0.530, 0.0   };
 
 
-#define DECLARE_INPUT_SLOT(name)				\
-static const input_slot_list_t name##_input_slot_list =		\
-{								\
-  #name,							\
-  name##_input_slots,						\
-  sizeof(name##_input_slots) / sizeof(const input_slot_t),	\
-}
-
-static const input_slot_t standard_roll_feed_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Roll",
-    N_("Roll Feed"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001" },
-    { 6, "IR\002\000\000\002" }
-  }
-};
-
-DECLARE_INPUT_SLOT(standard_roll_feed);
-
-static const input_slot_t cutter_roll_feed_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "RollCutPage",
-    N_("Roll Feed (cut each page)"),
-    0,
-    1,
-    ROLL_FEED_CUT_ALL,
-    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001" },
-    { 6, "IR\002\000\000\002" }
-  },
-  {
-    "RollCutNone",
-    N_("Roll Feed (do not cut)"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 16, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001" },
-    { 6, "IR\002\000\000\002" }
-  }
-};
-
-DECLARE_INPUT_SLOT(cutter_roll_feed);
-
-static const input_slot_t cd_cutter_roll_feed_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Manual",
-    N_("Manual Feed"),
-    0,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "CD",
-    N_("Print to CD"),
-    1,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "RollCutPage",
-    N_("Roll Feed (cut each page)"),
-    0,
-    1,
-    ROLL_FEED_CUT_ALL,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\002" }
-  },
-  {
-    "RollCutNone",
-    N_("Roll Feed (do not cut)"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\002" }
-  }
-};
-
-DECLARE_INPUT_SLOT(cd_cutter_roll_feed);
-
-static const input_slot_t cd_roll_feed_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Manual",
-    N_("Manual Feed"),
-    0,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "CD",
-    N_("Print to CD"),
-    1,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Roll",
-    N_("Roll Feed"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\002" }
-  }
-};
-
-DECLARE_INPUT_SLOT(cd_roll_feed);
-
-static const input_slot_t r2400_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Velvet",
-    N_("Manual Sheet Guide"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\003\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Matte",
-    N_("Manual Feed (Front)"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Roll",
-    N_("Roll Feed"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\003\001" },
-    { 6, "IR\002\000\000\002" }
-  }
-};
-
-DECLARE_INPUT_SLOT(r2400);
-
-static const input_slot_t r1800_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Velvet",
-    N_("Manual Sheet Guide"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\003\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Matte",
-    N_("Manual Feed (Front)"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Roll",
-    N_("Roll Feed"),
-    0,
-    1,
-    ROLL_FEED_DONT_EJECT,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\003\001" },
-    { 6, "IR\002\000\000\002" }
-  },
-  {
-    "CD",
-    N_("Print to CD"),
-    1,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-};
-
-DECLARE_INPUT_SLOT(r1800);
-
-static const input_slot_t rx700_input_slots[] =
-{
-  {
-    "Rear",
-    N_("Rear Tray"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "Front",
-    N_("Front Tray"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "CD",
-    N_("Print to CD"),
-    1,
-    0,
-    0,
-    { 36, "PM\002\000\000\000IR\002\000\000\001EX\006\000\000\000\000\000\005\000FP\003\000\000\000\000PP\003\000\000\002\001" },
-    { 6, "IR\002\000\000\000"}
-  },
-  {
-    "PhotoBoard",
-    N_("Photo Board"),
-    0,
-    0,
-    0,
-    { 23, "IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000" },
-    { 6, "IR\002\000\000\000"}
-  },
-};
-
-DECLARE_INPUT_SLOT(rx700);
-
-static const input_slot_t pro_roll_feed_input_slots[] =
-{
-  {
-    "Standard",
-    N_("Standard"),
-    0,
-    0,
-    0,
-    { 7, "PP\003\000\000\002\000" },
-    { 0, "" }
-  },
-  {
-    "Roll",
-    N_("Roll Feed"),
-    0,
-    1,
-    0,
-    { 7, "PP\003\000\000\003\000" },
-    { 0, "" }
-  }
-};
-
-DECLARE_INPUT_SLOT(pro_roll_feed);
-
-static const input_slot_t spro5000_input_slots[] =
-{
-  {
-    "CutSheet1",
-    N_("Cut Sheet Bin 1"),
-    0,
-    0,
-    0,
-    { 7, "PP\003\000\000\001\001" },
-    { 0, "" }
-  },
-  {
-    "CutSheet2",
-    N_("Cut Sheet Bin 2"),
-    0,
-    0,
-    0,
-    { 7, "PP\003\000\000\002\001" },
-    { 0, "" }
-  },
-  {
-    "CutSheetAuto",
-    N_("Cut Sheet Autoselect"),
-    0,
-    0,
-    0,
-    { 7, "PP\003\000\000\001\377" },
-    { 0, "" }
-  },
-  {
-    "ManualSelect",
-    N_("Manual Selection"),
-    0,
-    0,
-    0,
-    { 7, "PP\003\000\000\002\001" },
-    { 0, "" }
-  }
-};
-
-DECLARE_INPUT_SLOT(spro5000);
-
-static const input_slot_list_t default_input_slot_list =
-{
-  "Standard",
-  NULL,
-  0,
-};
-
-static const stp_raw_t new_init_sequence =
-{
-  29, "\0\0\0\033\001@EJL 1284.4\n@EJL     \n\033@"
-};
-
-static const stp_raw_t je_deinit_sequence =
-{
-  5, "JE\001\000\000"
-};
-
-#define INCH(x)		(72 * x)
+static const stp_raw_t new_init_sequence = STP_RAW_STRING("\0\0\0\033\001@EJL 1284.4\n@EJL     \n\033@");
 
-#define DECLARE_QUALITY_LIST(name)			\
-static const quality_list_t name##_quality_list =	\
-{							\
-  #name,						\
-  name##_qualities,					\
-  sizeof(name##_qualities) / sizeof(const quality_t),	\
-}
+static const stp_raw_t je_deinit_sequence = STP_RAW_STRING("JE\001\000\000");
 
-static const quality_t standard_qualities[] =
-{
-  { "FastEconomy", N_("Fast Economy"), 180, 90, 360, 120, 360, 90 },
-  { "Economy",     N_("Economy"),      360, 180, 360, 240, 360, 180 },
-  { "Draft",       N_("Draft"),        360, 360, 360, 360, 360, 360 },
-  { "Standard",    N_("Standard"),     0, 0, 0, 0, 720, 360 },
-  { "High",        N_("High"),         0, 0, 0, 0, 720, 720 },
-  { "Photo",       N_("Photo"),        1440, 720, 2880, 720, 1440, 720 },
-  { "HighPhoto",   N_("Super Photo"),  1440, 1440, 2880, 1440, 1440, 1440 },
-  { "UltraPhoto",  N_("Ultra Photo"),  2880, 2880, 2880, 2880, 2880, 2880 },
-  { "Best",        N_("Best"),         720, 360, 0, 0, -1, -1 },
-};
+/* These sequences provided by Epson.  No, I don't know what
+   most of them mean. */
 
-DECLARE_QUALITY_LIST(standard);
+static const stp_raw_t bsc64_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\000\260\004\352\004\064\001\016\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\020\010");
 
-static const quality_t p1_5_qualities[] =
-{
-  { "FastEconomy", N_("Fast Economy"), 180, 90, 360, 120, 360, 90 },
-  { "Economy",     N_("Economy"),      360, 180, 360, 240, 360, 180 },
-  { "Draft",       N_("Draft"),        360, 360, 360, 360, 360, 360 },
-  { "Standard",    N_("Standard"),     0, 0, 0, 0, 720, 360 },
-  { "High",        N_("High"),         0, 0, 0, 0, 720, 720 },
-  { "Photo",       N_("Photo"),        1440, 720, 1440, 720, 1440, 720 },
-  { "HighPhoto",   N_("Super Photo"),  1440, 1440, 2880, 1440, 1440, 1440 },
-  { "UltraPhoto",  N_("Ultra Photo"),  2880, 2880, 2880, 2880, 2880, 2880 },
-  { "Best",        N_("Best"),         720, 360, 0, 0, -1, -1 },
-};
+static const stp_raw_t bsc66_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\000\260\004\352\004\064\001\016\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\020\010");
 
-DECLARE_QUALITY_LIST(p1_5);
+static const stp_raw_t bsc68_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\000\260\004\352\004\064\001\016\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\020\010");
 
-static const quality_t picturemate_qualities[] =
-{
-  { "Draft",       N_("Draft"),        1440,  720, 1440,  720, 1440,  720 },
-  { "Standard",    N_("Standard"),     1440, 1440, 1440, 1440, 1440, 1440 },
-  { "Photo",       N_("Photo"),        1440, 1440, 1440, 1440, 1440, 1440 },
-  { "High",        N_("High"),         2880, 1440, 2880, 1440, 2880, 1440 },
-  { "HighPhoto",   N_("Super Photo"),  2880, 1440, 2880, 1440, 2880, 1440 },
-  { "UltraPhoto",  N_("Ultra Photo"),  5760, 1440, 5760, 1440, 5760, 1440 },
-  { "Best",        N_("Best"),         5760, 1440, 5760, 1440, 5760, 1440 },
-};
+static const stp_raw_t bsc82_borderless_sequence = STP_RAW_STRING("SN\062\000\000\006\013\000\000\000\000\000\000\000\001\002\026\003\276\000\064\007\000\000\154\007\352\011\352\011\226\000\000\000\226\000\064\007\023\020\025\031\001\021\004\021\021\021\001\001\000\000\174\005");
 
-DECLARE_QUALITY_LIST(picturemate);
+static const stp_raw_t bsc84_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\027\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\370\007");
 
-#define DECLARE_CHANNEL_LIST(name)			\
-static const channel_name_t name##_channel_name_list =	\
-{							\
-  #name,						\
-  sizeof(name##_channel_names) / sizeof(const char *),	\
-  name##_channel_names					\
-}
+static const stp_raw_t bsc86_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\027\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\370\007");
 
-static const char *standard_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow")
-};
+static const stp_raw_t bsc88_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\027\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\370\007");
 
-DECLARE_CHANNEL_LIST(standard);
+static const stp_raw_t cx6400_borderless_sequence = STP_RAW_STRING("SN\062\000\000\006\026\000\000\000\000\000\000\001\000\000\027\003\276\000\077\007\000\000\334\005\366\011\366\011\226\000\000\000\226\000\077\007\031\030\031\031\004\031\004\031\031\031\004\004\000\000\135\006");
 
-static const char *cx3800_channel_names[] =
-{
-  N_("Cyan"),
-  N_("Yellow"),
-  N_("Magenta"),
-  N_("Black")
-};
+static const stp_raw_t cx6600_borderless_sequence = STP_RAW_STRING("SN\062\000\000\006\026\000\000\000\000\000\000\001\000\000\027\003\276\000\077\007\000\000\334\005\366\011\366\011\226\000\000\000\226\000\077\007\031\030\031\031\004\031\004\031\031\031\004\004\000\000\135\006");
 
-DECLARE_CHANNEL_LIST(cx3800);
+static const stp_raw_t pm830c_borderless_sequence = STP_RAW_STRING("SN\054\000\000\001\027\000\000\000\000\000\000\001\003\000\243\156\000\223\170\220\065\002\000\000\005\277\001\270\006\144\000\164\016\032\004\042\005\310\031\000\100\000\022\143\102\007");
 
-static const char *mfp2005_channel_names[] =
-{
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-  N_("Black")
-};
+static const stp_raw_t pm930c_borderless_sequence = STP_RAW_STRING("SN\070\000\000\007\027\000\000\000\000\000\000\001\003\000\330\006\124\001\264\015\042\013\110\007\060\011\316\022\054\001\251\013\054\001\002\003\363\027\031\030\031\031\031\031\004\031\031\031\001\004\103\000\000\001\001\001\360\006");
 
-DECLARE_CHANNEL_LIST(mfp2005);
+static const stp_raw_t pm970c_borderless_sequence = STP_RAW_STRING("SN\070\000\000\007\033\000\000\000\000\000\000\001\003\000\330\006\124\001\264\015\054\013\110\007\060\011\316\022\054\001\251\013\054\001\002\003\363\027\031\030\031\031\031\031\004\031\031\031\001\004\103\000\000\001\001\001\364\006");
 
-static const char *photo_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-  N_("Light Cyan"),
-  N_("Light Magenta"),
-};
+static const stp_raw_t sp1280_borderless_sequence = STP_RAW_STRING("SN\003\000\000\011\001");
 
-DECLARE_CHANNEL_LIST(photo);
+static const stp_raw_t sp780_borderless_sequence = STP_RAW_STRING("SN\003\000\000\000\002SN\003\000\000\001\001SN\003\000\000\011\001");
 
-static const char *rx700_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Light Cyan"),
-  N_("Magenta"),
-  N_("Light Magenta"),
-  N_("Yellow"),
-};
+static const stp_raw_t sp820_borderless_sequence = STP_RAW_STRING("SN\003\000\000\011\001");
 
-DECLARE_CHANNEL_LIST(rx700);
+static const stp_raw_t sp820u_borderless_sequence = STP_RAW_STRING("SN\003\000\000\011\001");
 
-static const char *sp2200_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-  N_("Light Cyan"),
-  N_("Light Magenta"),
-  N_("Light Black"),
-};
+static const stp_raw_t sp825_borderless_sequence = STP_RAW_STRING("SN\003\000\000\011\001");
 
-DECLARE_CHANNEL_LIST(sp2200);
+static const stp_raw_t sp890_borderless_sequence = STP_RAW_STRING("SN\003\000\000\000\010SN\003\000\000\001\001SN\003\000\000\002\000SN\003\000\000\007\000SN\003\000\000\011\001");
 
-static const char *pm_950c_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-  N_("Light Cyan"),
-  N_("Light Magenta"),
-  N_("Dark Yellow"),
-};
+static const stp_raw_t sp900_borderless_sequence = STP_RAW_STRING("SN\064\000\000\003\026\000\000\000\000\000\000\001\003\000\007\144\050\002\152\215\000\063\344\000\040\120\000\207\150\020\212\003\070\002\360\001\324\100\000\001\010\001\142\141\141\140\141\024\002\025\027\061\132\011");
 
-DECLARE_CHANNEL_LIST(pm_950c);
+static const stp_raw_t sp925_borderless_sequence = STP_RAW_STRING("SN\054\000\000\001\027\000\000\000\000\000\000\001\003\000\243\156\000\223\170\220\065\002\000\000\005\277\001\270\006\144\000\024\036\032\004\042\005\310\031\000\100\000\022\143\362\006");
 
-static const char *sp960_channel_names[] =
-{
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-  N_("Light Cyan"),
-  N_("Light Magenta"),
-  N_("Black"),
-};
+static const stp_raw_t sp960_borderless_sequence = STP_RAW_STRING("SN\064\000\000\002\027\000\000\000\000\000\000\001\003\000\204\003\252\000\204\006\270\004\364\006\166\005\230\011\226\000\304\004\226\000\206\002\270\012\031\030\031\031\031\031\004\064\064\064\004\001\000\000\040\011");
 
-DECLARE_CHANNEL_LIST(sp960);
+static const stp_raw_t spr300_borderless_sequence = STP_RAW_STRING("SN\120\000\000\014\027\000\000\000\000\000\000\000\003\000\001\001\130\002\320\004\107\001\107\002\000\000\000\000\120\010\204\020\030\025\310\031\340\075\240\017\214\012\060\005\214\000\012\001\054\001\000\000\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\017\017\000\000\001\001\000\001\060\010");
 
-static const char *r800_channel_names[] =
-{
-  N_("Yellow"),
-  N_("Magenta"),
-  N_("Cyan"),
-  N_("Matte Black"),
-  N_("Photo Black"),
-  N_("Red"),
-  N_("Blue"),
-  N_("Gloss Optimizer"),
-};
+static const stp_raw_t spr320_borderless_sequence = STP_RAW_STRING("SN\120\000\000\014\027\000\000\000\000\000\000\000\003\000\001\001\130\002\320\004\107\001\107\002\000\000\000\000\120\010\204\020\030\025\310\031\340\075\240\017\214\012\060\005\214\000\012\001\054\001\000\000\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\017\017\000\000\001\001\000\001\060\010");
 
-DECLARE_CHANNEL_LIST(r800);
+static const stp_raw_t spr800_borderless_sequence = STP_RAW_STRING("SN\124\000\000\012\033\000\000\000\000\000\000\001\003\000\001\001\235\007\124\001\120\012\252\000\363\006\077\002\120\012\277\007\050\002\045\013\054\001\253\000\037\001\041\000\040\001\322\000\241\000\000\000\017\000\036\000\030\031\031\031\031\031\031\031\003\033\033\143\143\143\143\143\143\143\143\143\143\143\002\000\001\000\001\001\362\014");
 
-static const char *picturemate_channel_names[] =
-{
-  N_("Yellow"),
-  N_("Magenta"),
-  N_("Cyan"),
-  N_("Black"),
-  N_("Red"),
-  N_("Blue"),
-};
+static const stp_raw_t sprx500_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\367\007");
 
-DECLARE_CHANNEL_LIST(picturemate);
+static const stp_raw_t sprx600_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\367\007");
 
-static const char *r2400_channel_names[] =
-{
-  N_("Light Light Black"),
-  N_("Light Magenta"),
-  N_("Light Cyan"),
-  N_("Light Black"),
-  N_("Black"),
-  N_("Cyan"),
-  N_("Magenta"),
-  N_("Yellow"),
-};
+static const stp_raw_t sprx620_borderless_sequence = STP_RAW_STRING("SN\114\000\000\011\026\000\000\000\000\000\000\000\003\000\000\001\260\004\336\004\064\001\000\002\000\000\000\000\064\010\150\020\030\025\310\031\340\075\314\020\214\012\024\005\214\000\012\001\054\001\000\000\017\017\017\017\017\017\017\017\004\012\004\017\017\017\017\017\006\004\000\001\001\001\000\000\367\007");
 
-DECLARE_CHANNEL_LIST(r2400);
+#define INCH(x)		(72 * x)
 
 const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
 {
@@ -872,1332 +380,1536 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
   /* 0: Stylus Color */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     15, 1, 4, 15, 1, 4, 15, 1, 4, 4,
-    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 720, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    g1_dotsizes, g1_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_720dpi_reslist, &stpi_escp2_standard_inkgroup,
-    standard_bits, standard_base_res, &default_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &standard_channel_name_list
+    g1_dotsizes, g1_densities, "simple",
+    "720dpi", "standard",
+    standard_bits, standard_base_res, "default",
+    "standard", NULL, NULL,
+    NULL, NULL, "standard"
   },
   /* 1: Stylus Color 400/500 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
-    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 720, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    g2_dotsizes, g1_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_sc500_reslist, &stpi_escp2_standard_inkgroup,
-    standard_bits, standard_base_res, &default_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &standard_channel_name_list
+    g2_dotsizes, g1_densities, "simple",
+    "sc500", "standard",
+    standard_bits, standard_base_res, "default",
+    "standard", NULL, NULL,
+    NULL, NULL, "standard"
   },
   /* 2: Stylus Color 1500 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 4,
-    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 720, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17), INCH(44), INCH(2), INCH(2),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    g1_dotsizes, sc1500_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_sc500_reslist, &stpi_escp2_cmy_inkgroup,
-    standard_bits, standard_base_res, &standard_roll_feed_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &standard_channel_name_list
+    g1_dotsizes, sc1500_densities, "simple",
+    "sc500", "cmy",
+    standard_bits, standard_base_res, "standard_roll_feed",
+    "standard", NULL, NULL,
+    NULL, NULL, "standard"
   },
   /* 3: Stylus Color 600 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     8, 9, 0, 30, 8, 9, 0, 30, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    sc600_dotsizes, g3_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_g3_reslist, &stpi_escp2_standard_inkgroup,
-    standard_bits, g3_base_res, &default_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &standard_channel_name_list
+    sc600_dotsizes, g3_densities, "simple",
+    "g3", "standard",
+    standard_bits, g3_base_res, "default",
+    "standard", NULL, NULL,
+    NULL, NULL, "standard"
   },
   /* 4: Stylus Color 800 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 180, 180,
+    0, 1, 4, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    g3_dotsizes, g3_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_g3_reslist, &stpi_escp2_standard_inkgroup,
-    standard_bits, g3_base_res, &default_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &standard_channel_name_list
+    g3_dotsizes, g3_densities, "simple",
+    "g3", "standard",
+    standard_bits, g3_base_res, "default",
+    "standard", NULL, NULL,
+    NULL, NULL, "standard"
   },
   /* 5: Stylus Color 850 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 180, 180,
+    0, 1, 4, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    g3_dotsizes, g3_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_g3_reslist, &stpi_escp2_standard_inkgroup,
-    standard_bits, g3_base_res, &default_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &standard_channel_name_list
+    g3_dotsizes, g3_densities, "simple",
+    "g3", "standard",
+    standard_bits, g3_base_res, "default",
+    "standard", NULL, NULL,
+    NULL, NULL, "standard"
   },
   /* 6: Stylus Color 1520 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 180, 180,
+    0, 1, 4, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17), INCH(44), INCH(2), INCH(2),
     8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    g3_dotsizes, g3_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_g3_reslist, &stpi_escp2_standard_inkgroup,
-    standard_bits, g3_base_res, &standard_roll_feed_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &standard_channel_name_list
+    g3_dotsizes, g3_densities, "simple",
+    "g3", "standard",
+    standard_bits, g3_base_res, "standard_roll_feed",
+    "standard", NULL, NULL,
+    NULL, NULL, "standard"
   },
 
   /* SECOND GENERATION PRINTERS */
   /* 7: Stylus Photo 700 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 15, 0, 0,		/* Is it really 15 pairs??? */
-    sp700_dotsizes, sp700_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_g3_reslist, &stpi_escp2_photo_gen1_inkgroup,
-    standard_bits, g3_base_res, &default_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &photo_channel_name_list
+    sp700_dotsizes, sp700_densities, "simple",
+    "g3", "photo_gen1",
+    standard_bits, g3_base_res, "default",
+    "standard", NULL, NULL,
+    NULL, NULL, "photo"
   },
   /* 8: Stylus Photo EX */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_NO | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
     INCH(118 / 10), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    sp700_dotsizes, sp700_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_g3_reslist, &stpi_escp2_photo_gen1_inkgroup,
-    standard_bits, g3_base_res, &default_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &photo_channel_name_list
+    sp700_dotsizes, sp700_densities, "simple",
+    "g3", "photo_gen1",
+    standard_bits, g3_base_res, "default",
+    "standard", NULL, NULL,
+    NULL, NULL, "photo"
   },
   /* 9: Stylus Photo */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720,
+    360, 14400, -1, 720, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    sp700_dotsizes, sp700_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_g3_720dpi_reslist, &stpi_escp2_photo_gen1_inkgroup,
-    standard_bits, g3_base_res, &default_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &photo_channel_name_list
+    sp700_dotsizes, sp700_densities, "simple",
+    "g3_720dpi", "photo_gen1",
+    standard_bits, g3_base_res, "default",
+    "standard", NULL, NULL,
+    NULL, NULL, "photo"
   },
 
   /* THIRD GENERATION PRINTERS */
   /* 10: Stylus Color 440/460 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     21, 1, 4, 21, 1, 4, 21, 1, 4, 4,
-    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720,
+    360, 14400, -1, 720, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 15, 0, 0,
-    sc440_dotsizes, sc440_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_g3_720dpi_reslist, &stpi_escp2_standard_inkgroup,
-    standard_bits, standard_base_res, &default_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &standard_channel_name_list
+    sc440_dotsizes, sc440_densities, "simple",
+    "g3_720dpi", "standard",
+    standard_bits, standard_base_res, "default",
+    "standard", NULL, NULL,
+    NULL, NULL, "standard"
   },
   /* 11: Stylus Color 640 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 15, 0, 0,
-    sc640_dotsizes, sc440_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_sc640_reslist, &stpi_escp2_standard_inkgroup,
-    standard_bits, standard_base_res, &default_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &standard_channel_name_list
+    sc640_dotsizes, sc440_densities, "simple",
+    "sc640", "standard",
+    standard_bits, standard_base_res, "default",
+    "standard", NULL, NULL,
+    NULL, NULL, "standard"
   },
   /* 12: Stylus Color 740/Stylus Scan 2000/Stylus Scan 2500 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    c6pl_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &standard_channel_name_list
+    c6pl_dotsizes, c6pl_densities, "variable_6pl",
+    "1440dpi", "standard",
+    variable_bits, variable_base_res, "default",
+    "standard", NULL, NULL,
+    NULL, NULL, "standard"
   },
   /* 13: Stylus Color 900 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     96, 1, 2, 192, 1, 1, 192, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 180, 180,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    c3pl_dotsizes, c3pl_densities, &stpi_escp2_variable_3pl_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup,
-    variable_bits, stc900_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c3pl_dotsizes, c3pl_densities, "variable_3pl",
+    "1440dpi", "standard",
+    variable_bits, stc900_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 14: Stylus Photo 750 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    c6pl_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen1_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    c6pl_dotsizes, c6pl_densities, "variable_6pl",
+    "1440dpi", "photo_gen1",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "photo"
   },
   /* 15: Stylus Photo 1200 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(13), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    c6pl_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen1_inkgroup,
-    variable_bits, variable_base_res, &standard_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    c6pl_dotsizes, c6pl_densities, "variable_6pl",
+    "1440dpi", "photo_gen1",
+    variable_bits, variable_base_res, "standard_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "photo"
   },
   /* 16: Stylus Color 860 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_1440_4pl_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c4pl_dotsizes, c4pl_densities, "variable_1440_4pl",
+    "1440dpi", "standard",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 17: Stylus Color 1160 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(13), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_1440_4pl_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c4pl_dotsizes, c4pl_densities, "variable_1440_4pl",
+    "1440dpi", "standard",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 18: Stylus Color 660 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 8, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 8, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 9, 9, 9, 9, 9, 26, 9, 9, 9, 0, 9, 9, 9, 0, -1, -1, 0, 0, 0,
     1, 15, 0, 0,
-    sc660_dotsizes, sc660_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_sc640_reslist, &stpi_escp2_standard_inkgroup,
-    standard_bits, standard_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    sc660_dotsizes, sc660_densities, "simple",
+    "sc640", "standard",
+    standard_bits, standard_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 19: Stylus Color 760 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_1440_4pl_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c4pl_dotsizes, c4pl_densities, "variable_1440_4pl",
+    "1440dpi", "standard",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 20: Stylus Photo 720 (Australia) */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    sp720_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen1_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    sp720_dotsizes, c6pl_densities, "variable_6pl",
+    "1440dpi", "photo_gen1",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "photo"
   },
   /* 21: Stylus Color 480 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
      MODEL_PACKET_MODE_YES),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, 360, 720, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720,
+    360, 14400, 360, 720, 720, 90, 90,
+    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    sc480_dotsizes, sc480_densities, &stpi_escp2_variable_x80_6pl_drops,
-    stpi_escp2_720dpi_soft_reslist, &stpi_escp2_x80_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    sc480_dotsizes, sc480_densities, "variable_x80_6pl",
+    "720dpi_soft", "x80",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 22: Stylus Photo 870/875 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 97, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_1440_4pl_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen2_inkgroup,
-    variable_bits, variable_base_res, &standard_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    c4pl_dotsizes, c4pl_densities, "variable_1440_4pl",
+    "1440dpi", "photo_gen2",
+    variable_bits, variable_base_res, "standard_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "photo"
   },
   /* 23: Stylus Photo 1270 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 97, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(13), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_1440_4pl_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen2_inkgroup,
-    variable_bits, variable_base_res, &standard_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    c4pl_dotsizes, c4pl_densities, "variable_1440_4pl",
+    "1440dpi", "photo_gen2",
+    variable_bits, variable_base_res, "standard_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "photo"
   },
   /* 24: Stylus Color 3000 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     64, 1, 2, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 4, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 180, 180,
+    0, 1, 4, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17), INCH(44), INCH(2), INCH(2),
     8, 9, 9, 40, 8, 9, 9, 40, 8, 9, 0, 0, 8, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    g3_dotsizes, g3_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_g3_reslist, &stpi_escp2_standard_inkgroup,
-    standard_bits, g3_base_res, &standard_roll_feed_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &standard_channel_name_list
+    g3_dotsizes, g3_densities, "simple",
+    "g3", "standard",
+    standard_bits, g3_base_res, "standard_roll_feed",
+    "standard", NULL, NULL,
+    NULL, NULL, "standard"
   },
   /* 25: Stylus Color 670 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     32, 1, 4, 64, 1, 2, 64, 1, 2, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    sc670_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_standard_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    sc670_dotsizes, c6pl_densities, "variable_6pl",
+    "1440dpi", "standard",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 26: Stylus Photo 2000P */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(13), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     2, 15, 0, 0,
-    sp2000_dotsizes, sp2000_densities, &stpi_escp2_variable_2000p_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_pigment_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    sp2000_dotsizes, sp2000_densities, "variable_2000p",
+    "1440dpi", "photo_pigment",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "photo"
   },
   /* 27: Stylus Pro 5000 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     64, 1, 2, 64, 1, 2, 64, 1, 2, 6,
-    360, 14400, -1, 1440, 720, 180, 180, 0, 1, 0, 0, 0, 0, 4, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 180, 180,
+    0, 1, 0, 0, 0, 0, 0, 4, 1, 28800, 720 * 720,
     INCH(13), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 30, 9, 9, 0, 30, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    spro5000_dotsizes, sp700_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen1_inkgroup,
-    standard_bits, g3_base_res, &spro5000_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &photo_channel_name_list
+    spro5000_dotsizes, sp700_densities, "simple",
+    "1440dpi", "photo_gen1",
+    standard_bits, g3_base_res, "spro5000",
+    "standard", NULL, NULL,
+    NULL, NULL, "photo"
   },
   /* 28: Stylus Pro 7000 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(24), INCH(1200), INCH(7), INCH(7),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    spro_dye_dotsizes, spro_dye_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_pro_reslist, &stpi_escp2_photo_gen1_inkgroup,
-    standard_bits, pro_base_res, &pro_roll_feed_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    &stpi_escp2_pro7000_printer_weave_list, &photo_channel_name_list
+    spro_dye_dotsizes, spro_dye_densities, "simple",
+    "pro", "photo_gen1",
+    standard_bits, pro_base_res, "pro_roll_feed",
+    "standard", NULL, NULL,
+    NULL, "pro7000", "photo"
   },
   /* 29: Stylus Pro 7500 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(24), INCH(1200), INCH(7), INCH(7),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    spro_pigment_dotsizes, spro_pigment_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_pro_reslist, &stpi_escp2_photo_pigment_inkgroup,
-    standard_bits, pro_base_res, &pro_roll_feed_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    &stpi_escp2_pro7500_printer_weave_list, &photo_channel_name_list
+    spro_pigment_dotsizes, spro_pigment_densities, "simple",
+    "pro", "photo_pigment",
+    standard_bits, pro_base_res, "pro_roll_feed",
+    "standard", NULL, NULL,
+    NULL, "pro7500", "photo"
   },
   /* 30: Stylus Pro 9000 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(44), INCH(1200), INCH(7), INCH(7),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    spro_dye_dotsizes, spro_dye_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_pro_reslist, &stpi_escp2_photo_gen1_inkgroup,
-    standard_bits, pro_base_res, &pro_roll_feed_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    &stpi_escp2_pro7000_printer_weave_list, &photo_channel_name_list
+    spro_dye_dotsizes, spro_dye_densities, "simple",
+    "pro", "photo_gen1",
+    standard_bits, pro_base_res, "pro_roll_feed",
+    "standard", NULL, NULL,
+    NULL, "pro7000", "photo"
   },
   /* 31: Stylus Pro 9500 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(44), INCH(1200), INCH(7), INCH(7),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    spro_pigment_dotsizes, spro_pigment_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_pro_reslist, &stpi_escp2_photo_pigment_inkgroup,
-    standard_bits, pro_base_res, &pro_roll_feed_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    &stpi_escp2_pro7500_printer_weave_list, &photo_channel_name_list
+    spro_pigment_dotsizes, spro_pigment_densities, "simple",
+    "pro", "photo_pigment",
+    standard_bits, pro_base_res, "pro_roll_feed",
+    "standard", NULL, NULL,
+    NULL, "pro7500", "photo"
   },
   /* 32: Stylus Color 777/680 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 2880, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
-    stpi_escp2_2880dpi_reslist, &stpi_escp2_standard_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
+    "2880dpi", "standard",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 33: Stylus Color 880/83/C60 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 2880, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
-    stpi_escp2_2880dpi_reslist, &stpi_escp2_standard_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
+    "2880dpi", "standard",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 34: Stylus Color 980 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     96, 1, 2, 192, 1, 1, 192, 1, 1, 4,
-    360, 14400, -1, 2880, 720, 180, 180, 38, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 2880, 720, 180, 180,
+    38, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    c3pl_dotsizes, sc980_densities, &stpi_escp2_variable_3pl_drops,
-    stpi_escp2_2880dpi_reslist, &stpi_escp2_standard_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c3pl_dotsizes, sc980_densities, "variable_3pl",
+    "2880dpi", "standard",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
-  /* 35: Stylus Photo 780/790/810/820 */
+  /* 35: Stylus Photo 780/790 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 2880, 720, 90, 90,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
     3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
-    stpi_escp2_2880dpi_reslist, &stpi_escp2_photo_gen2_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
+    "2880dpi", "photo_gen2",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &sp780_borderless_sequence, NULL, "photo"
   },
   /* 36: Stylus Photo 785/890/895/915/935 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 2880, 720, 90, 90,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
     3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
-    stpi_escp2_2880dpi_reslist, &stpi_escp2_photo_gen2_inkgroup,
-    variable_bits, variable_base_res, &standard_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
+    "2880dpi", "photo_gen2",
+    variable_bits, variable_base_res, "standard_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &sp890_borderless_sequence, NULL, "photo"
   },
   /* 37: Stylus Photo 1280/1290 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 2880, 720, 90, 90,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(13), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
     3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
-    stpi_escp2_2880dpi_reslist, &stpi_escp2_photo_gen2_inkgroup,
-    variable_bits, variable_base_res, &standard_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
+    "2880dpi", "photo_gen2",
+    variable_bits, variable_base_res, "standard_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &sp1280_borderless_sequence, NULL, "photo"
   },
   /* 38: Stylus Color 580 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
      MODEL_PACKET_MODE_YES),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, 360, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720,
+    360, 14400, 360, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    sc480_dotsizes, sc480_densities, &stpi_escp2_variable_x80_6pl_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_x80_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    sc480_dotsizes, sc480_densities, "variable_x80_6pl",
+    "1440dpi", "x80",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 39: Stylus Color Pro XL */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     16, 1, 4, 16, 1, 4, 16, 1, 4, 4,
-    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 720, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(13), INCH(1200), INCH(2), INCH(2),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    g1_dotsizes, g1_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_720dpi_reslist, &stpi_escp2_standard_inkgroup,
-    standard_bits, standard_base_res, &default_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &standard_channel_name_list
+    g1_dotsizes, g1_densities, "simple",
+    "720dpi", "standard",
+    standard_bits, standard_base_res, "default",
+    "standard", NULL, NULL,
+    NULL, NULL, "standard"
   },
   /* 40: Stylus Pro 5500 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(13), INCH(1200), INCH(2), INCH(2),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    spro_pigment_dotsizes, spro_pigment_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_pro_reslist, &stpi_escp2_photo_pigment_inkgroup,
-    standard_bits, pro_base_res, &spro5000_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    &stpi_escp2_pro7500_printer_weave_list, &photo_channel_name_list
+    spro_pigment_dotsizes, spro_pigment_densities, "simple",
+    "pro", "photo_pigment",
+    standard_bits, pro_base_res, "spro5000",
+    "standard", NULL, NULL,
+    NULL, "pro7500", "photo"
   },
   /* 41: Stylus Pro 10000 */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_PRO | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(44), INCH(1200), INCH(7), INCH(7),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 9, 9, 9, 9, 9, 9, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    spro10000_dotsizes, spro10000_densities, &stpi_escp2_spro10000_drops,
-    stpi_escp2_pro_reslist, &stpi_escp2_photo_gen2_inkgroup,
-    variable_bits, pro_base_res, &pro_roll_feed_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    &stpi_escp2_pro7000_printer_weave_list, &photo_channel_name_list
+    spro10000_dotsizes, spro10000_densities, "spro10000",
+    "pro", "photo_gen2",
+    variable_bits, pro_base_res, "pro_roll_feed",
+    "standard", NULL, NULL,
+    NULL, "pro7000", "photo"
   },
   /* 42: Stylus C20SX/C20UX */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
      MODEL_PACKET_MODE_YES),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 720, 720, 90, 90,
+    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    sc480_dotsizes, sc480_densities, &stpi_escp2_variable_x80_6pl_drops,
-    stpi_escp2_720dpi_soft_reslist, &stpi_escp2_x80_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    sc480_dotsizes, sc480_densities, "variable_x80_6pl",
+    "720dpi_soft", "x80",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 43: Stylus C40SX/C40UX/C41SX/C41UX/C42SX/C42UX */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
      MODEL_PACKET_MODE_YES),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    sc480_dotsizes, sc480_densities, &stpi_escp2_variable_x80_6pl_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_x80_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    sc480_dotsizes, sc480_densities, "variable_x80_6pl",
+    "1440dpi", "x80",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 44: Stylus C70/C80 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     60, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 2880, 1440, 360, 180,
+    0, 1, 0, 0, 0, -240, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, &stpi_escp2_variable_3pl_pigment_drops,
-    stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c80_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
+    "2880_1440dpi", "c80",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 45: Stylus Color Pro */
   {
     (MODEL_VARIABLE_NO | MODEL_COMMAND_1998 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_NO),
     16, 1, 4, 16, 1, 4, 16, 1, 4, 4,
-    360, 14400, -1, 720, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 720, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(44), INCH(2), INCH(2),
     9, 9, 9, 40, 9, 9, 9, 40, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     1, 7, 0, 0,
-    g1_dotsizes, g1_densities, &stpi_escp2_simple_drops,
-    stpi_escp2_720dpi_reslist, &stpi_escp2_standard_inkgroup,
-    standard_bits, standard_base_res, &default_input_slot_list,
-    &standard_quality_list, NULL, NULL,
-    NULL, &standard_channel_name_list
+    g1_dotsizes, g1_densities, "simple",
+    "720dpi", "standard",
+    standard_bits, standard_base_res, "default",
+    "standard", NULL, NULL,
+    NULL, NULL, "standard"
   },
   /* 46: Stylus Photo 950/960 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     96, 96, 2, 96, 96, 2, 24, 24, 1, 6,
-    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
+    360, 14400, -1, 2880, 1440, 360, 180,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0,
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 24,
     4, 15, 0, 0,
-    c2pl_dotsizes, c2pl_densities, &stpi_escp2_variable_2pl_drops,
-    stpi_escp2_superfine_reslist, &stpi_escp2_f360_photo_inkgroup,
-    stp950_bits, stp950_base_res, &cd_cutter_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &sp960_channel_name_list
+    c2pl_dotsizes, c2pl_densities, "variable_2pl",
+    "superfine", "f360_photo",
+    stp950_bits, stp950_base_res, "cd_cutter_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &sp960_borderless_sequence, NULL, "sp960"
   },
   /* 47: Stylus Photo 2100/2200 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     96, 96, 2, 96, 96, 2, 192, 192, 1, 7,
-    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
+    360, 14400, -1, 2880, 1440, 360, 180,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
     INCH(13), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0,
     4, 15, 0, 0,
-    c4pl_pigment_dotsizes, c4pl_pigment_densities, &stpi_escp2_variable_ultrachrome_drops,
-    stpi_escp2_superfine_reslist, &stpi_escp2_f360_ultrachrome_inkgroup,
-    ultrachrome_bits, ultrachrome_base_res, &cd_cutter_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &sp2200_channel_name_list
+    c4pl_pigment_dotsizes, c4pl_pigment_densities, "variable_ultrachrome",
+    "superfine", "f360_ultrachrome",
+    ultrachrome_bits, ultrachrome_base_res, "cd_cutter_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "sp2200"
   },
   /* 48: Stylus Pro 7600 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_PRO | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 7,
-    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, 0, 0, 0, 1, 1440 * 1440,
+    360, 14400, -1, 2880, 1440, 360, 180,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 1440 * 1440,
     INCH(24), INCH(1200), INCH(7), INCH(7),
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    spro_c4pl_pigment_dotsizes, c4pl_pigment_densities, &stpi_escp2_variable_ultrachrome_drops,
-    stpi_escp2_pro_reslist, &stpi_escp2_ultrachrome_inkgroup,
-    ultrachrome_bits, pro_base_res, &pro_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    &stpi_escp2_pro7600_printer_weave_list, &photo_channel_name_list
+    spro_c4pl_pigment_dotsizes, c4pl_pigment_densities, "variable_ultrachrome",
+    "pro", "ultrachrome",
+    ultrachrome_bits, pro_base_res, "pro_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, "pro7600", "photo"
   },
   /* 49: Stylus Pro 9600 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_PRO | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_YES | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     1, 1, 1, 1, 1, 1, 1, 1, 1, 7,
-    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, 0, 0, 0, 1, 1440 * 1440,
+    360, 14400, -1, 2880, 1440, 360, 180,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 1440 * 1440,
     INCH(44), INCH(1200), INCH(7), INCH(7),
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    spro_c4pl_pigment_dotsizes, c4pl_pigment_densities, &stpi_escp2_variable_ultrachrome_drops,
-    stpi_escp2_pro_reslist, &stpi_escp2_ultrachrome_inkgroup,
-    ultrachrome_bits, pro_base_res, &pro_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    &stpi_escp2_pro7600_printer_weave_list, &photo_channel_name_list
+    spro_c4pl_pigment_dotsizes, c4pl_pigment_densities, "variable_ultrachrome",
+    "pro", "ultrachrome",
+    ultrachrome_bits, pro_base_res, "pro_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, "pro7600", "photo"
   },
   /* 50: Stylus Photo 825/830 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 2880, 1440, 90, 90,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
     3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
-    stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_photo_gen2_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
+    "2880_1440dpi", "photo_gen2",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &sp1280_borderless_sequence, NULL, "photo"
   },
   /* 51: Stylus Photo 925 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 2880, 1440, 90, 90,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
     3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
-    stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_photo_gen2_inkgroup,
-    variable_bits, variable_base_res, &cutter_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
+    "2880_1440dpi", "photo_gen2",
+    variable_bits, variable_base_res, "cutter_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &sp925_borderless_sequence, NULL, "photo"
   },
   /* 52: Stylus Color C62 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 144, 1, 1, 144, 1, 1, 4,
-    360, 14400, -1, 2880, 1440, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 2880, 1440, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
-    stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_standard_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
+    "2880_1440dpi", "standard",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 53: Japanese PM-950C */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     96, 96, 2, 96, 96, 2, 24, 24, 1, 6,
-    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
+    360, 14400, -1, 2880, 1440, 360, 180,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0,
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 24,
     4, 15, 0, 0,
-    c2pl_dotsizes, c2pl_densities, &stpi_escp2_variable_2pl_drops,
-    stpi_escp2_superfine_reslist, &stpi_escp2_f360_photo7_japan_inkgroup,
-    stp950_bits, stp950_base_res, &cd_cutter_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &pm_950c_channel_name_list
+    c2pl_dotsizes, c2pl_densities, "variable_2pl",
+    "superfine", "f360_photo7_japan",
+    stp950_bits, stp950_base_res, "cd_cutter_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &sp960_borderless_sequence, NULL, "pm_950c"
   },
   /* 54: Stylus Photo EX3 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_1999 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     32, 1, 4, 32, 1, 4, 32, 1, 4, 6,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(13), INCH(44), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    sp720_dotsizes, c6pl_densities, &stpi_escp2_variable_6pl_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_photo_gen1_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    sp720_dotsizes, c6pl_densities, "variable_6pl",
+    "1440dpi", "photo_gen1",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "photo"
   },
   /* 55: Stylus C82/CX-5200 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 2880, 1440, 360, 180,
+    0, 1, 0, 0, 0, -240, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, &stpi_escp2_variable_3pl_pigment_drops,
-    stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c82_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
+    "2880_1440dpi", "c82",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 56: Stylus C50 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, -1, 1440, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 1440, 720, 90, 90,
+    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_x80_6pl_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_x80_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c4pl_dotsizes, c4pl_densities, "variable_x80_6pl",
+    "1440dpi", "x80",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 57: Japanese PM-970C */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     180, 180, 2, 360, 360, 1, 360, 360, 1, 7,
-    360, 14400, -1, 2880, 2880, 720, 360, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
+    360, 14400, -1, 2880, 2880, 720, 360,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
     4, 15, 0, 0,
-    c1_8pl_dotsizes, c1_8pl_densities, &stpi_escp2_variable_2pl_drops,
-    stpi_escp2_superfine_reslist, &stpi_escp2_f360_photo7_japan_inkgroup,
-    c1_8_bits, c1_8_base_res, &cutter_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &pm_950c_channel_name_list
+    c1_8pl_dotsizes, c1_8pl_densities, "variable_2pl",
+    "superfine", "f360_photo7_japan",
+    c1_8_bits, c1_8_base_res, "cutter_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &pm970c_borderless_sequence, NULL, "pm_950c"
   },
   /* 58: Japanese PM-930C */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     90, 90, 2, 90, 90, 2, 90, 90, 2, 6,
-    360, 14400, -1, 2880, 2880, 720, 360, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
+    360, 14400, -1, 2880, 2880, 720, 360,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
     4, 15, 0, 0,
-    c1_8pl_dotsizes, c1_8pl_densities, &stpi_escp2_variable_2pl_drops,
-    stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen2_inkgroup,
-    c1_8_bits, c1_8_base_res, &cutter_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    c1_8pl_dotsizes, c1_8pl_densities, "variable_2pl",
+    "superfine", "photo_gen2",
+    c1_8_bits, c1_8_base_res, "cutter_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &pm930c_borderless_sequence, NULL, "photo"
   },
   /* 59: Stylus C43SX/C43UX/C44SX/C44UX (WRONG -- see 43!) */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_NO | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_YES |
      MODEL_PACKET_MODE_YES),
     15, 15, 3, 48, 48, 3, 48, 48, 3, 4,
-    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 0, -99, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 2880, 720, 90, 90,
+    0, 1, 0, 0, 0, -99, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 9, 9, 9, 9, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_densities, &stpi_escp2_variable_x80_6pl_drops,
-    stpi_escp2_1440dpi_reslist, &stpi_escp2_x80_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c4pl_dotsizes, c4pl_densities, "variable_x80_6pl",
+    "1440dpi", "x80",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 60: Stylus C84 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 1440, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 2880, 1440, 360, 180,
+    0, 1, 0, 80, 42, -240, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
     4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, &stpi_escp2_variable_3pl_pigment_drops,
-    stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c82_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
+    "2880_1440dpi", "c82",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &bsc84_borderless_sequence, NULL, "standard"
   },
   /* 61: Stylus Color C63/C64 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1, 1440 * 720,
+    360, 14400, -1, 2880, 1440, 360, 120,
+    0, 1, 0, 80, 42, -180, 0, 0, 1, 28800, 1440 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
     4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, &stpi_escp2_variable_3pl_pigment_drops,
-    stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c64_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
+    "2880_1440dpi", "c64",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &bsc64_borderless_sequence, NULL, "standard"
   },
   /* 62: Stylus Photo 900 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
-    360, 14400, -1, 2880, 720, 90, 90, 0, 1, 0, 55, 0, 0, 0, 1, 720 * 720,
+    360, 14400, -1, 2880, 720, 90, 90,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 399, 394, 595, 842, 0,
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 399, 394, 595, 842, 24,
     3, 15, 0, 0,
-    c4pl_dotsizes, c4pl_2880_densities, &stpi_escp2_variable_2880_4pl_drops,
-    stpi_escp2_2880dpi_reslist, &stpi_escp2_photo_gen2_inkgroup,
-    variable_bits, variable_base_res, &cd_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
+    "2880dpi", "photo_gen2",
+    variable_bits, variable_base_res, "cd_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &sp900_borderless_sequence, NULL, "photo"
   },
   /* 63: Stylus Photo R300 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     90, 1, 3, 90, 1, 3, 90, 1, 3, 6,
-    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
+    360, 14400, -1, 2880, 1440, 360, 120,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
     4, 15, 0, 0,
-    p3pl_dotsizes, p3pl_densities, &stpi_escp2_variable_3pl_pmg_drops,
-    stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen3_inkgroup,
-    variable_bits, variable_base_res, &cd_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    p3pl_dotsizes, p3pl_densities, "variable_3pl_pmg",
+    "superfine", "photo_gen3",
+    variable_bits, variable_base_res, "cd_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &spr300_borderless_sequence, NULL, "photo"
   },
   /* 64: PM-G800/Stylus Photo R800 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 28800, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8, 2880 * 1440,
+    360, 28800, -1, 5760, 2880, 360, 180,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 180, 5760 * 2880,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 11,
+    9, 9, 0, 11, 9, 9, 0, 11, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
     4, 15, 0, 0,
-    p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops,
-    stpi_escp2_r2400_reslist, &stpi_escp2_cmykrb_inkgroup,
-    variable_bits, c1_5_base_res, &cd_roll_feed_input_slot_list,
-    &p1_5_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &r800_channel_name_list
+    p1_5pl_dotsizes, p1_5pl_densities, "variable_1_5pl",
+    "superfine", "cmykrb",
+    variable_bits, c1_5_base_res, "r1800",
+    "p1_5", &new_init_sequence, &je_deinit_sequence,
+    &spr800_borderless_sequence, NULL, "r800"
   },
   /* 65: Stylus Photo CX4600 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     90, 1, 3, 90, 1, 3, 90, 1, 3, 4,
-    360, 14400, -1, 1440, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 8, 1440 * 1440,
+    360, 14400, -1, 5760, 1440, 360, 120,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 180, 1440 * 1440,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
     4, 15, 0, 0,
-    p3pl_dotsizes, p3pl_densities, &stpi_escp2_variable_3pl_pmg_drops,
-    stpi_escp2_cx3650_reslist, &stpi_escp2_cx3650_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &mfp2005_channel_name_list
+    p3pl_dotsizes, p3pl_densities, "variable_3pl_pmg",
+    "superfine", "cx3650",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "mfp2005"
   },
   /* 66: Stylus Color C65/C66 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1, 1440 * 720,
+    360, 14400, -1, 2880, 1440, 360, 120,
+    0, 1, 0, 80, 42, -180, 0, 0, 1, 28800, 1440 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
     4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, &stpi_escp2_variable_3pl_pigment_c66_drops,
-    stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c64_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, "variable_3pl_pigment_c66",
+    "2880_1440dpi", "c64",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &bsc66_borderless_sequence, NULL, "standard"
   },
   /* 67: Stylus Photo R1800 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 28800, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8, 2880 * 1440,
+    360, 28800, -1, 5760, 2880, 360, 180,
+    0, 1, 0, 96, 42, 0, 0, 0, 1, 180, 5760 * 2880,
     INCH(13), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 11,
+    9, 9, 0, 11, 9, 9, 0, 11, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
     4, 15, 0, 0,
-    p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops,
-    stpi_escp2_r2400_reslist, &stpi_escp2_cmykrb_inkgroup,
-    variable_bits, c1_5_base_res, &r1800_input_slot_list,
-    &p1_5_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &r800_channel_name_list
+    p1_5pl_dotsizes, p1_5pl_densities, "variable_1_5pl",
+    "superfine", "cmykrb",
+    variable_bits, c1_5_base_res, "r1800",
+    "p1_5", &new_init_sequence, &je_deinit_sequence,
+    &spr800_borderless_sequence, NULL, "r800"
   },
   /* 68: PM-G820 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 14400, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8, 2880 * 1440,
+    360, 14400, -1, 5760, 2880, 360, 180,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 180, 5760 * 2880,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 11,
+    9, 9, 0, 11, 9, 9, 0, 11, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
     4, 15, 0, 0,
-    p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops,
-    stpi_escp2_r2400_reslist, &stpi_escp2_photo_gen3_inkgroup,
-    variable_bits, c1_5_base_res, &cd_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &r800_channel_name_list
+    p1_5pl_dotsizes, p1_5pl_densities, "variable_1_5pl",
+    "superfine", "photo_gen3",
+    variable_bits, c1_5_base_res, "cd_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &spr800_borderless_sequence, NULL, "r800"
   },
   /* 69: Stylus C86 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
-    360, 14400, -1, 2880, 2880, 360, 180, 0, 1, 0, 0, -240, 0, 0, 1, 1440 * 720,
+    360, 14400, -1, 2880, 2880, 360, 180,
+    0, 1, 0, 80, 42, -240, 0, 0, 1, 28800, 1440 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
-    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
     4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_densities, &stpi_escp2_variable_3pl_pigment_drops,
-    stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c82_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
+    "2880_1440dpi", "c82",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &bsc86_borderless_sequence, NULL, "standard"
   },
   /* 70: Stylus Photo RX700 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 6,
-    360, 28800, -1, 5760, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
+    360, 28800, -1, 5760, 2880, 360, 180,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 263, 595, 842, 0,
     4, 15, 0, 0,
-    p1_5pl_dotsizes, p1_5pl_densities, &stpi_escp2_variable_1_5pl_drops,
-    stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen3_inkgroup,
-    variable_bits, c1_5_base_res, &rx700_input_slot_list,
-    &p1_5_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &rx700_channel_name_list
+    p1_5pl_dotsizes, p1_5pl_densities, "variable_1_5pl",
+    "superfine", "photo_gen3",
+    variable_bits, c1_5_base_res, "rx700",
+    "p1_5", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "rx700"
   },
   /* 71: Stylus Photo R2400 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
-    360, 14400, -1, 1440, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0, 8, 1440 * 1440,
+    360, 14400, -1, 5760, 2880, 360, 180,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 180, 1440 * 1440,
     INCH(13), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
     4, 15, 0, 0,
-    p3_5pl_dotsizes, p3_5pl_densities, &stpi_escp2_variable_r2400_drops,
-    stpi_escp2_r2400_reslist, &stpi_escp2_f360_ultrachrome_k3_inkgroup,
-    variable_bits, c1_5_base_res, &r2400_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &r2400_channel_name_list
+    p3_5pl_dotsizes, p3_5pl_densities, "variable_r2400",
+    "superfine", "f360_ultrachrome_k3",
+    variable_bits, c1_5_base_res, "r2400",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "r2400"
   },
   /* 72: Stylus CX3700/3800/3810 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     29, 30, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 0, -180, 0, 0, 1, 1440 * 720,
+    360, 14400, -1, 2880, 1440, 360, 120,
+    0, 1, 0, 80, 42, -180, 0, 0, 1, 28800, 1440 * 720,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, &stpi_escp2_variable_3pl_pigment_c66_drops,
-    stpi_escp2_2880_1440dpi_reslist, &stpi_escp2_c64_inkgroup,
-    variable_bits, variable_base_res, &default_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &cx3800_channel_name_list
+    c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, "variable_3pl_pigment_c66",
+    "2880_1440dpi", "c64",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "cx3800"
   },
   /* 73: E-100/PictureMate */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     90, 1, 3, 90, 1, 3, 90, 1, 3, 6,
-    360, 28800, -1, 5760, 1440, 1440, 720, 0, 1, 0, 0, 0, 0, 0, 1, 1440 * 1440,
+    360, 28800, -1, 5760, 1440, 1440, 720,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
     INCH(4), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
     4, 15, 0, 0,
-    picturemate_dotsizes, picturemate_densities, &stpi_escp2_variable_picturemate_drops,
-    stpi_escp2_picturemate_reslist, &stpi_escp2_picturemate_inkgroup,
-    variable_bits, c1_5_base_res, &default_input_slot_list,
-    &picturemate_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &picturemate_channel_name_list
+    picturemate_dotsizes, picturemate_densities, "variable_picturemate",
+    "picturemate", "picturemate",
+    variable_bits, c1_5_base_res, "default",
+    "picturemate", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "picturemate"
   },
   /* 74: PM-A650 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     90, 90, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
+    360, 14400, -1, 5760, 1440, 360, 120,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 0,
     4, 15, 0, 0,
-    c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, &stpi_escp2_variable_3pl_pigment_c66_drops,
-    stpi_escp2_superfine_reslist, &stpi_escp2_c64_inkgroup,
-    variable_bits, variable_base_res, &cd_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c3pl_pigment_dotsizes, c3pl_pigment_c66_densities, "variable_3pl_pigment_c66",
+    "superfine", "c64",
+    variable_bits, variable_base_res, "cd_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 75: Japanese PM-A750 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     90, 90, 3, 90, 90, 3, 90, 90, 3, 4,
-    360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
+    360, 14400, -1, 5760, 1440, 360, 120,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0,
     4, 15, 0, 0,
-    c2pl_dotsizes, c2pl_densities, &stpi_escp2_variable_2pl_drops,
-    stpi_escp2_superfine_reslist, &stpi_escp2_c64_inkgroup,
-    variable_bits, variable_base_res, &cd_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c2pl_dotsizes, c2pl_densities, "variable_2pl",
+    "superfine", "c64",
+    variable_bits, variable_base_res, "cd_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 76: Japanese PM-A890 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_NO |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_YES |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     90, 90, 3, 90, 90, 3, 90, 90, 3, 6,
-    360, 14400, -1, 5760, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
+    360, 14400, -1, 5760, 1440, 360, 120,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 0, 0, 0,
     4, 15, 0, 0,
-    c2pl_dotsizes, c2pl_densities, &stpi_escp2_variable_2pl_drops,
-    stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen3_inkgroup,
-    variable_bits, variable_base_res, &cd_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &standard_channel_name_list
+    c2pl_dotsizes, c2pl_densities, "variable_2pl",
+    "superfine", "photo_gen3",
+    variable_bits, variable_base_res, "cd_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "standard"
   },
   /* 77: Japanese PM-D600 */
   {
     (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
-     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
      MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
      MODEL_PACKET_MODE_YES),
     90, 1, 3, 90, 1, 3, 90, 1, 3, 4,
-    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0, 1, 1440 * 1440,
+    360, 14400, -1, 2880, 1440, 360, 120,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
     INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
     9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 0,
     4, 15, 0, 0,
-    p3pl_dotsizes, p3pl_densities, &stpi_escp2_variable_3pl_pmg_drops,
-    stpi_escp2_superfine_reslist, &stpi_escp2_c64_inkgroup,
-    variable_bits, variable_base_res, &cd_roll_feed_input_slot_list,
-    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
-    NULL, &photo_channel_name_list
+    p3pl_dotsizes, p3pl_densities, "variable_3pl_pmg",
+    "superfine", "c64",
+    variable_bits, variable_base_res, "cd_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "photo"
+  },
+  /* 78: Stylus Photo 810/820 */
+  {
+    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
+     MODEL_PACKET_MODE_YES),
+    48, 1, 3, 48, 1, 3, 48, 1, 3, 6,
+    360, 14400, -1, 2880, 720, 90, 90,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 720 * 720,
+    INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
+    3, 15, 0, 0,
+    c4pl_dotsizes, c4pl_2880_densities, "variable_2880_4pl",
+    "2880dpi", "photo_gen2",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &sp1280_borderless_sequence, NULL, "photo"
+  },
+  /* 79: Stylus CX6400 */
+  {
+    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
+     MODEL_PACKET_MODE_YES),
+    59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
+    360, 14400, -1, 2880, 1440, 360, 180,
+    0, 1, 0, 80, 42, -240, 0, 0, 1, 28800, 720 * 720,
+    INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
+    4, 15, 0, 0,
+    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
+    "2880_1440dpi", "c82",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &cx6400_borderless_sequence, NULL, "standard"
+  },
+  /* 80: Stylus CX6600 */
+  {
+    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
+     MODEL_PACKET_MODE_YES),
+    59, 60, 2, 180, 180, 2, 180, 180, 2, 4,
+    360, 14400, -1, 2880, 2880, 360, 180,
+    0, 1, 0, 80, 42, -240, 0, 0, 1, 28800, 1440 * 720,
+    INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, -1, -1, 0, 0, 24,
+    4, 15, 0, 0,
+    c3pl_pigment_dotsizes, c3pl_pigment_densities, "variable_3pl_pigment",
+    "2880_1440dpi", "c82",
+    variable_bits, variable_base_res, "default",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &cx6600_borderless_sequence, NULL, "standard"
+  },
+  /* 81: Stylus Photo R260 */
+  {
+    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
+     MODEL_PACKET_MODE_YES),
+    90, 1, 4, 90, 1, 4, 90, 1, 4, 6,
+    360, 14400, -1, 5760, 2880, 360, 90,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 5760 * 2880,
+    INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 189, 595, 842, 24,
+    4, 15, 0, 0,
+    claria_dotsizes, claria_densities, "variable_claria",
+    "superfine", "claria",
+    variable_bits, c1_5_base_res, "cd_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "photo"
+  },
+  /* 82: Stylus Photo 1400 */
+  {
+    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
+     MODEL_ZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
+     MODEL_PACKET_MODE_YES),
+    90, 1, 4, 90, 1, 4, 90, 1, 4, 6,
+    360, 14400, -1, 5760, 2880, 360, 90,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 5760 * 2880,
+    INCH(13), INCH(1200), INCH(2), INCH(2),
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 263, 595, 842, 24,
+    4, 15, 0, 0,
+    claria_1400_dotsizes, claria_1400_densities, "variable_claria_1400",
+    "claria_1400", "claria",
+    variable_bits, claria_1400_base_res, "cd_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    NULL, NULL, "photo"
+  },
+  /* 83: Stylus Photo R240 */
+  {
+    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
+     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
+     MODEL_PACKET_MODE_YES),
+    90, 1, 3, 90, 1, 3, 90, 1, 3, 4,
+    360, 14400, -1, 5760, 1440, 360, 120,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
+    INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
+    4, 15, 0, 0,
+    p3pl_dotsizes, p3pl_densities, "variable_3pl_pmg",
+    "superfine", "photo_gen3_4",
+    variable_bits, variable_base_res, "cd_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &spr300_borderless_sequence, NULL, "standard"
+  },
+  /* 84: Stylus Photo RX500 */
+  {
+    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
+     MODEL_ZEROMARGIN_FULL | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
+     MODEL_PACKET_MODE_YES),
+    90, 1, 3, 90, 1, 3, 90, 1, 3, 6,
+    360, 14400, -1, 2880, 1440, 360, 120,
+    0, 1, 0, 80, 42, 0, 0, 0, 1, 28800, 1440 * 1440,
+    INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
+    9, 9, 0, 9, 9, 9, 0, 9, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842, 24,
+    4, 15, 0, 0,
+    p3pl_dotsizes, p3pl_densities, "variable_3pl_pmg",
+    "superfine", "photo_gen3",
+    variable_bits, variable_base_res, "cd_roll_feed",
+    "standard", &new_init_sequence, &je_deinit_sequence,
+    &sprx500_borderless_sequence, NULL, "photo"
   },
 };
 
diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c
index d97634b..191fa34 100644
--- a/src/main/print-escp2.c
+++ b/src/main/print-escp2.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.c,v 1.354 2006/07/22 20:28:14 rlk Exp $"
+ * "$Id: print-escp2.c,v 1.355.2.2 2007/05/29 01:47:29 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -45,7 +45,9 @@
 #define OP_JOB_PRINT 2
 #define OP_JOB_END   4
 
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#ifndef MAX
+#  define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif /* !MAX */
 
 typedef struct
 {
@@ -57,14 +59,14 @@ typedef struct
 static const escp2_printer_attr_t escp2_printer_attrs[] =
 {
   { "command_mode",		0, 4 },
-  { "horizontal_zero_margin",	4, 1 },
-  { "variable_mode",		5, 1 },
-  { "graymode",		 	6, 1 },
-  { "vacuum",			7, 1 },
-  { "fast_360",			8, 1 },
-  { "send_zero_advance",        9, 1 },
-  { "supports_ink_change",     10, 1 },
-  { "packet_mode",             11, 1 },
+  { "zero_margin",		4, 2 },
+  { "variable_mode",		6, 1 },
+  { "graymode",		 	7, 1 },
+  { "vacuum",			8, 1 },
+  { "fast_360",			9, 1 },
+  { "send_zero_advance",       10, 1 },
+  { "supports_ink_change",     11, 1 },
+  { "packet_mode",             12, 1 },
 };
 
 typedef struct
@@ -198,6 +200,18 @@ static const stp_parameter_t the_parameters[] =
     STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
   },
   {
+    "CDOuterDiameter", N_("CD Size (Custom)"), N_("Basic Printer Setup"),
+    N_("Variable adjustment for the outer diameter of CD"),
+    STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+  },
+  {
+    "CDInnerDiameter", N_("CD Hub Size (Custom)"), N_("Basic Printer Setup"),
+    N_("Variable adjustment to the inner hub of the CD"),
+    STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
+  },
+  {
     "CDXAdjustment", N_("CD Horizontal Fine Adjustment"), N_("Advanced Printer Setup"),
     N_("Fine adjustment to horizontal position for CD printing"),
     STP_PARAMETER_TYPE_DIMENSION, STP_PARAMETER_CLASS_FEATURE,
@@ -385,7 +399,9 @@ static const stp_parameter_t the_parameters[] =
   PARAMETER_INT(max_black_resolution),
   PARAMETER_INT(zero_margin_offset),
   PARAMETER_INT(extra_720dpi_separation),
-  PARAMETER_INT(horizontal_position_alignment),
+  PARAMETER_INT(micro_left_margin),
+  PARAMETER_INT(min_horizontal_position_alignment),
+  PARAMETER_INT(base_horizontal_position_alignment),
   PARAMETER_INT(bidirectional_upper_limit),
   PARAMETER_INT(physical_channels),
   PARAMETER_INT(left_margin),
@@ -400,9 +416,10 @@ static const stp_parameter_t the_parameters[] =
   PARAMETER_INT(cd_y_offset),
   PARAMETER_INT(cd_page_width),
   PARAMETER_INT(cd_page_height),
-  PARAMETER_INT(page_extra_height),
+  PARAMETER_INT(paper_extra_bottom),
   PARAMETER_RAW(preinit_sequence),
-  PARAMETER_RAW(postinit_remote_sequence)
+  PARAMETER_RAW(postinit_remote_sequence),
+  PARAMETER_RAW(vertical_borderless_sequence)
 };
 
 static const int the_parameter_count =
@@ -610,14 +627,6 @@ escp2_##f(const stp_vars_t *v)						\
     }									\
 }
 
-#define DEF_COMPOSITE_ACCESSOR(f, t)			\
-static inline t						\
-escp2_##f(const stp_vars_t *v)				\
-{							\
-  int model = stp_get_model_id(v);			\
-  return (stpi_escp2_model_capabilities[model].f);	\
-}
-
 #define DEF_ROLL_ACCESSOR(f, t)						\
 static inline t								\
 escp2_##f(const stp_vars_t *v, int rollfeed)				\
@@ -667,7 +676,7 @@ DEF_SIMPLE_ACCESSOR(cd_x_offset, int)
 DEF_SIMPLE_ACCESSOR(cd_y_offset, int)
 DEF_SIMPLE_ACCESSOR(cd_page_width, int)
 DEF_SIMPLE_ACCESSOR(cd_page_height, int)
-DEF_SIMPLE_ACCESSOR(page_extra_height, int)
+DEF_SIMPLE_ACCESSOR(paper_extra_bottom, int)
 DEF_SIMPLE_ACCESSOR(extra_feed, unsigned)
 DEF_SIMPLE_ACCESSOR(pseudo_separation_rows, int)
 DEF_SIMPLE_ACCESSOR(base_separation, int)
@@ -677,14 +686,15 @@ DEF_SIMPLE_ACCESSOR(black_initial_vertical_offset, int)
 DEF_SIMPLE_ACCESSOR(max_black_resolution, int)
 DEF_SIMPLE_ACCESSOR(zero_margin_offset, int)
 DEF_SIMPLE_ACCESSOR(extra_720dpi_separation, int)
-DEF_SIMPLE_ACCESSOR(horizontal_position_alignment, unsigned)
+DEF_SIMPLE_ACCESSOR(micro_left_margin, int)
+DEF_SIMPLE_ACCESSOR(min_horizontal_position_alignment, unsigned)
+DEF_SIMPLE_ACCESSOR(base_horizontal_position_alignment, unsigned)
 DEF_SIMPLE_ACCESSOR(bidirectional_upper_limit, int)
 DEF_SIMPLE_ACCESSOR(physical_channels, int)
 DEF_SIMPLE_ACCESSOR(alignment_passes, int)
 DEF_SIMPLE_ACCESSOR(alignment_choices, int)
 DEF_SIMPLE_ACCESSOR(alternate_alignment_passes, int)
 DEF_SIMPLE_ACCESSOR(alternate_alignment_choices, int)
-DEF_COMPOSITE_ACCESSOR(printer_weaves, const printer_weave_list_t *)
 
 DEF_ROLL_ACCESSOR(left_margin, unsigned)
 DEF_ROLL_ACCESSOR(right_margin, unsigned)
@@ -694,11 +704,55 @@ DEF_ROLL_ACCESSOR(bottom_margin, unsigned)
 DEF_RAW_ACCESSOR(preinit_sequence, const stp_raw_t *)
 DEF_RAW_ACCESSOR(postinit_remote_sequence, const stp_raw_t *)
 
-DEF_COMPOSITE_ACCESSOR(reslist, const res_t *const *)
-DEF_COMPOSITE_ACCESSOR(inkgroup, const inkgroup_t *)
-DEF_COMPOSITE_ACCESSOR(input_slots, const input_slot_list_t *)
-DEF_COMPOSITE_ACCESSOR(quality_list, const quality_list_t *)
-DEF_COMPOSITE_ACCESSOR(channel_names, const channel_name_t *)
+DEF_RAW_ACCESSOR(vertical_borderless_sequence, const stp_raw_t *)
+
+static inline const res_t *const *
+escp2_reslist(const stp_vars_t *v)
+{
+  int model = stp_get_model_id(v);
+  return (stpi_escp2_get_reslist_named
+	  (stpi_escp2_model_capabilities[model].reslist));
+}
+
+static inline const printer_weave_list_t *
+escp2_printer_weaves(const stp_vars_t *v)
+{
+  int model = stp_get_model_id(v);
+  return (stpi_escp2_get_printer_weaves_named
+	  (stpi_escp2_model_capabilities[model].printer_weaves));
+}
+
+static inline const channel_name_t *
+escp2_channel_names(const stp_vars_t *v)
+{
+  int model = stp_get_model_id(v);
+  return (stpi_escp2_get_channel_names_named
+	  (stpi_escp2_model_capabilities[model].channel_names));
+}
+
+static inline const inkgroup_t *
+escp2_inkgroup(const stp_vars_t *v)
+{
+  int model = stp_get_model_id(v);
+  return (stpi_escp2_get_inkgroup_named
+	  (stpi_escp2_model_capabilities[model].inkgroup));
+}
+
+static inline const quality_list_t *
+escp2_quality_list(const stp_vars_t *v)
+{
+  int model = stp_get_model_id(v);
+  return (stpi_escp2_get_quality_list_named
+	  (stpi_escp2_model_capabilities[model].quality_list));
+}
+
+static inline const input_slot_list_t *
+escp2_input_slots(const stp_vars_t *v)
+{
+  int model = stp_get_model_id(v);
+  return (stpi_escp2_get_input_slot_list_named
+	  (stpi_escp2_model_capabilities[model].input_slots));
+}
 
 static const channel_count_t *
 get_channel_count_by_name(const char *name)
@@ -772,17 +826,17 @@ static const escp2_dropsize_t *
 escp2_dropsizes(const stp_vars_t *v, int resid)
 {
   int model = stp_get_model_id(v);
-  const escp2_drop_list_t *drops = stpi_escp2_model_capabilities[model].drops;
+  const escp2_drop_list_t *drops =
+    stpi_escp2_get_drop_list_named(stpi_escp2_model_capabilities[model].drops);
   return (*drops)[resid];
 }
 
 static const inklist_t *
 escp2_inklist(const stp_vars_t *v)
 {
-  int model = stp_get_model_id(v);
   int i;
   const char *ink_list_name = NULL;
-  const inkgroup_t *inkgroup = stpi_escp2_model_capabilities[model].inkgroup;
+  const inkgroup_t *inkgroup = escp2_inkgroup(v);
 
   if (stp_check_string_parameter(v, "InkSet", STP_PARAMETER_ACTIVE))
     ink_list_name = stp_get_string_parameter(v, "InkSet");
@@ -809,12 +863,19 @@ escp2_paperlist(const stp_vars_t *v)
 {
   const inklist_t *inklist = escp2_inklist(v);
   if (inklist)
-    return inklist->papers;
+    return stpi_escp2_get_paperlist_named(inklist->papers);
   else
     return NULL;
 }
 
 static int
+supports_borderless(const stp_vars_t *v)
+{
+  return (escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_YES) ||
+	  escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_FULL));
+}
+
+static int
 compute_internal_resid(int hres, int vres)
 {
   static const int resolutions[RES_N] =
@@ -851,6 +912,31 @@ compute_printed_resid(const res_t *res)
   return compute_internal_resid(res->printed_hres, res->printed_vres);
 }
 
+static int
+compute_virtual_resid(const res_t *res)
+{
+  int virtual = compute_internal_resid(res->virtual_hres, res->virtual_vres);
+  int normal = compute_internal_resid(res->hres, res->vres);
+  if (normal == virtual)
+    return compute_internal_resid(res->printed_hres, res->printed_vres);
+  else
+    return virtual;
+}
+
+static int
+max_nozzle_span(const stp_vars_t *v)
+{
+  int nozzle_count = escp2_nozzles(v);
+  int nozzle_separation = escp2_nozzle_separation(v);
+  int black_nozzle_count = escp2_black_nozzles(v);
+  int black_nozzle_separation = escp2_black_nozzle_separation(v);
+  int nozzle_span = nozzle_count * nozzle_separation;
+  int black_nozzle_span = black_nozzle_count * black_nozzle_separation;
+  if (black_nozzle_span > nozzle_span)
+    return black_nozzle_span;
+  else
+    return nozzle_span;
+}
 
 static const input_slot_t *
 get_input_slot(const stp_vars_t *v)
@@ -1033,7 +1119,7 @@ verify_resolution(const stp_vars_t *v, const res_t *res)
        ((res->vres / nozzle_width) * nozzle_width) == res->vres))
     {
       int xdpi = res->hres;
-      int physical_xdpi = escp2_base_res(v, compute_resid(res));
+      int physical_xdpi = escp2_base_res(v, compute_virtual_resid(res));
       int horizontal_passes, oversample;
       if (physical_xdpi > xdpi)
 	physical_xdpi = xdpi;
@@ -1209,13 +1295,17 @@ get_media_adjustment(const stp_vars_t *v)
   const inklist_t *ink_list = escp2_inklist(v);
   if (pt && ink_list && ink_list->paper_adjustments)
     {
-      const paper_adjustment_list_t *adjlist = ink_list->paper_adjustments;
-      const char *paper_name = pt->name;
-      int i;
-      for (i = 0; i < adjlist->paper_count; i++)
+      const paper_adjustment_list_t *adjlist =
+	stpi_escp2_get_paper_adjustment_list_named(ink_list->paper_adjustments);
+      if (adjlist)
 	{
-	  if (strcmp(paper_name, adjlist->papers[i].name) == 0)
-	    return &(adjlist->papers[i]);
+	  const char *paper_name = pt->name;
+	  int i;
+	  for (i = 0; i < adjlist->paper_count; i++)
+	    {
+	      if (strcmp(paper_name, adjlist->papers[i].name) == 0)
+		return &(adjlist->papers[i]);
+	    }
 	}
     }
   return NULL;
@@ -1260,7 +1350,12 @@ set_density_parameter(const stp_vars_t *v,
       if (ink_name &&
 	  ink_name->channel_set->channel_count > color &&
 	  ink_name->channel_set->channels[color])
-	description->is_active = 1;
+	{
+	  description->is_active = 1;
+	  description->bounds.dbl.lower = 0;
+	  description->bounds.dbl.upper = 2.0;
+	  description->deflt.dbl = 1.0;
+	}
     }
 }
 
@@ -1538,6 +1633,8 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	    (description->bounds.str, "CD5Inch", _("CD - 5 inch"));
 	  stp_string_list_add_string
 	    (description->bounds.str, "CD3Inch", _("CD - 3 inch"));
+	  stp_string_list_add_string
+	    (description->bounds.str, "CDCustom", _("CD - Custom"));
 	}
       else
 	{
@@ -1552,11 +1649,14 @@ escp2_parameters(const stp_vars_t *v, const char *name,
       description->deflt.str =
 	stp_string_list_param(description->bounds.str, 0)->name;
     }
-  else if (strcmp(name, "CDInnerRadius") == 0)
+  else if (strcmp(name, "CDInnerRadius") == 0 )
     {
       const input_slot_t *slot = get_input_slot(v);
       description->bounds.str = stp_string_list_create();
-      if (printer_supports_print_to_cd(v) && (!slot || (slot && slot->is_cd)))
+      if (printer_supports_print_to_cd(v) &&
+	  (!slot || slot->is_cd) &&
+	  (!stp_get_string_parameter(v, "PageSize") ||
+	   strcmp(stp_get_string_parameter(v, "PageSize"), "CDCustom") != 0))
 	{
 	  stp_string_list_add_string
 	    (description->bounds.str, "None", _("Normal"));
@@ -1568,6 +1668,34 @@ escp2_parameters(const stp_vars_t *v, const char *name,
       else
 	description->is_active = 0;
     }
+  else if (strcmp(name, "CDInnerDiameter") == 0 )
+    {
+      const input_slot_t *slot = get_input_slot(v);
+      description->bounds.dimension.lower = 16 * 10 * 72 / 254;
+      description->bounds.dimension.upper = 43 * 10 * 72 / 254;
+      description->deflt.dimension = 43 * 10 * 72 / 254;
+      if (printer_supports_print_to_cd(v) &&
+	  (!slot || slot->is_cd) &&
+	  (!stp_get_string_parameter(v, "PageSize") ||
+	   strcmp(stp_get_string_parameter(v, "PageSize"), "CDCustom") == 0))
+	description->is_active = 1;
+      else
+	description->is_active = 0;
+    }
+  else if (strcmp(name, "CDOuterDiameter") == 0 )
+    {
+      const input_slot_t *slot = get_input_slot(v);
+      description->bounds.dimension.lower = 65 * 10 * 72 / 254;
+      description->bounds.dimension.upper = 120 * 10 * 72 / 254;
+      description->deflt.dimension = 329;
+      if (printer_supports_print_to_cd(v) &&
+	  (!slot || slot->is_cd) &&
+	  (!stp_get_string_parameter(v, "PageSize") ||
+	   strcmp(stp_get_string_parameter(v, "PageSize"), "CDCustom") == 0))
+	description->is_active = 1;
+      else
+	description->is_active = 0;
+    }
   else if (strcmp(name, "CDXAdjustment") == 0 ||
 	   strcmp(name, "CDYAdjustment") == 0)
     {
@@ -1575,7 +1703,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
       description->bounds.dimension.lower = -15;
       description->bounds.dimension.upper = 15;
       description->deflt.dimension = 0;
-      if (printer_supports_print_to_cd(v) && (!slot || (slot && slot->is_cd)))
+      if (printer_supports_print_to_cd(v) && (!slot || slot->is_cd))
 	description->is_active = 1;
       else
 	description->is_active = 0;
@@ -1755,7 +1883,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
       const input_slot_t *slot = get_input_slot(v);
       if (slot && slot->is_cd)
 	description->is_active = 0;
-      else if (escp2_has_cap(v, MODEL_XZEROMARGIN, MODEL_XZEROMARGIN_YES))
+      else if (supports_borderless(v))
 	description->deflt.boolean = 0;
       else
 	description->is_active = 0;
@@ -2012,11 +2140,7 @@ internal_imageable_area(const stp_vars_t *v, int use_paper_margins,
       bottom_margin = imax(bottom_margin, escp2_bottom_margin(v, rollfeed));
       top_margin = imax(top_margin, escp2_top_margin(v, rollfeed));
     }
-  *left =	left_margin;
-  *right =	width - right_margin;
-  *top =	top_margin;
-  *bottom =	height - bottom_margin;
-  if (escp2_has_cap(v, MODEL_XZEROMARGIN, MODEL_XZEROMARGIN_YES) &&
+  if (supports_borderless(v) &&
       (use_maximum_area ||
        (!cd && stp_get_boolean_parameter(v, "FullBleed"))))
     {
@@ -2025,13 +2149,34 @@ internal_imageable_area(const stp_vars_t *v, int use_paper_margins,
 	  if (pt->left <= 0 && pt->right <= 0 && pt->top <= 0 &&
 	      pt->bottom <= 0)
 	    {
-	      *left -= 80 / (360 / 72);		/* 80 per the Epson manual */
-	      *right += 80 / (360 / 72);	/* 80 per the Epson manual */
-	      *bottom += escp2_nozzles(v) * escp2_nozzle_separation(v) * 72 /
-		escp2_base_separation(v);
+	      if (use_paper_margins)
+		{
+		  unsigned width_limit = escp2_max_paper_width(v);
+		  int offset = escp2_zero_margin_offset(v);
+		  int margin = escp2_micro_left_margin(v);
+		  int sep = escp2_base_separation(v);
+		  int delta = -((offset - margin) * 72 / sep);
+		  left_margin = delta; /* Allow some overlap if paper isn't */
+		  right_margin = delta; /* positioned correctly */
+		  if (width - right_margin - 3 > width_limit)
+		    right_margin = width - width_limit - 3;
+		  top_margin = -7;
+		  bottom_margin = -7;
+		}
+	      else
+		{
+		  left_margin = 0;
+		  right_margin = 0;
+		  top_margin = 0;
+		  bottom_margin = 0;
+		}
 	    }
 	}
     }
+  *left =	left_margin;
+  *right =	width - right_margin;
+  *top =	top_margin;
+  *bottom =	height - bottom_margin;
 }
 
 /*
@@ -2176,7 +2321,9 @@ adjust_density_and_ink_type(stp_vars_t *v, stp_image_t *image)
   escp2_privdata_t *pd = get_privdata(v);
   const paper_adjustment_t *pt = pd->paper_adjustment;
   double paper_density = .8;
-  int o_resid = compute_printed_resid(pd->res);
+  int o_resid = compute_virtual_resid(pd->res);
+  int n_resid = compute_printed_resid(pd->res);
+  double virtual_scale = 1;
 
   if (pt)
     paper_density = pt->base_density;
@@ -2187,8 +2334,18 @@ adjust_density_and_ink_type(stp_vars_t *v, stp_image_t *image)
       stp_set_float_parameter(v, "Density", 1.0);
     }
 
+  while (n_resid > o_resid)
+    {
+      virtual_scale /= 2.0;
+      n_resid--;
+    }
+  while (n_resid < o_resid)
+    {
+      virtual_scale *= 2.0;
+      n_resid++;
+    }
   stp_scale_float_parameter
-    (v, "Density", paper_density * escp2_density(v, o_resid));
+    (v, "Density", virtual_scale * paper_density * escp2_density(v, o_resid));
   pd->drop_size = escp2_ink_type(v, o_resid);
   pd->ink_resid = o_resid;
 
@@ -2202,6 +2359,7 @@ adjust_density_and_ink_type(stp_vars_t *v, stp_image_t *image)
       if (stp_check_int_parameter(v, "escp2_ink_type", STP_PARAMETER_ACTIVE) ||
 	  stp_check_int_parameter(v, "escp2_density", STP_PARAMETER_ACTIVE) ||
 	  stp_check_int_parameter(v, "escp2_bits", STP_PARAMETER_ACTIVE) ||
+	  virtual_scale != 1.0 ||
 	  (stp_check_boolean_parameter(v, "AdjustDotsize",
 				       STP_PARAMETER_ACTIVE) &&
 	   ! stp_get_boolean_parameter(v, "AdjustDotsize")))
@@ -2217,8 +2375,10 @@ adjust_density_and_ink_type(stp_vars_t *v, stp_image_t *image)
 	  while (density > 1.0 && resid >= RES_360)
 	    {
 	      int tresid = xresid - 1;
+	      int base_res_now = escp2_base_res(v, resid);
 	      int bits_now = escp2_bits(v, resid);
 	      double density_now = escp2_density(v, resid);
+	      int base_res_then = escp2_base_res(v, tresid);
 	      int bits_then = escp2_bits(v, tresid);
 	      double density_then = escp2_density(v, tresid);
 	      int drop_size_then = escp2_ink_type(v, tresid);
@@ -2230,7 +2390,7 @@ adjust_density_and_ink_type(stp_vars_t *v, stp_image_t *image)
 	       */
 
 	      if (bits_now != bits_then || density_then <= 0.0 ||
-		  drop_size_then == -1)
+		  base_res_now != base_res_then || drop_size_then == -1)
 		break;
 	      xdensity = density * density_then / density_now / 2;
 	      xresid = tresid;
@@ -2564,24 +2724,29 @@ setup_head_offset(stp_vars_t *v)
 }
 
 static void
-setup_misc(stp_vars_t *v)
+setup_basic(stp_vars_t *v)
 {
   escp2_privdata_t *pd = get_privdata(v);
-  pd->input_slot = get_input_slot(v);
-  pd->paper_type = get_media_type(v);
-  pd->paper_adjustment = get_media_adjustment(v);
-  pd->ink_group = escp2_inkgroup(v);
-  pd->init_sequence = escp2_preinit_sequence(v);
-  pd->deinit_sequence = escp2_postinit_remote_sequence(v);
   pd->advanced_command_set = escp2_has_advanced_command_set(v);
   pd->command_set = escp2_get_cap(v, MODEL_COMMAND);
   pd->variable_dots = escp2_has_cap(v, MODEL_VARIABLE_DOT, MODEL_VARIABLE_YES);
   pd->has_vacuum = escp2_has_cap(v, MODEL_VACUUM, MODEL_VACUUM_YES);
   pd->has_graymode = escp2_has_cap(v, MODEL_GRAYMODE, MODEL_GRAYMODE_YES);
+  pd->init_sequence = escp2_preinit_sequence(v);
+  pd->deinit_sequence = escp2_postinit_remote_sequence(v);
+  pd->borderless_sequence = escp2_vertical_borderless_sequence(v);
   pd->base_separation = escp2_base_separation(v);
   pd->resolution_scale = escp2_resolution_scale(v);
-  pd->use_extended_commands =
-    escp2_use_extended_commands(v, pd->res->softweave);
+}
+
+static void
+setup_misc(stp_vars_t *v)
+{
+  escp2_privdata_t *pd = get_privdata(v);
+  pd->input_slot = get_input_slot(v);
+  pd->paper_type = get_media_type(v);
+  pd->paper_adjustment = get_media_adjustment(v);
+  pd->ink_group = escp2_inkgroup(v);
 }
 
 static void
@@ -2692,7 +2857,9 @@ setup_resolution(stp_vars_t *v)
   int horizontal = adjusted_horizontal_resolution(res);
 
   pd->res = res;
-  pd->physical_xdpi = escp2_base_res(v, resid);
+  pd->use_extended_commands =
+    escp2_use_extended_commands(v, pd->res->softweave);
+  pd->physical_xdpi = escp2_base_res(v, compute_virtual_resid(res));
   if (pd->physical_xdpi > pd->res->hres)
     pd->physical_xdpi = pd->res->hres;
 
@@ -2782,7 +2949,7 @@ setup_head_parameters(stp_vars_t *v)
 			  pd->use_aux_channels);
   if (pd->physical_channels == 0)
     {
-      pd->inkname = &stpi_escp2_default_black_inkset;
+      pd->inkname = stpi_escp2_get_default_black_inkset();
       pd->physical_channels =
 	compute_channel_count(pd->inkname, pd->logical_channels,
 			      pd->use_aux_channels);
@@ -2845,31 +3012,68 @@ setup_head_parameters(stp_vars_t *v)
 static void
 setup_page(stp_vars_t *v)
 {
-  int n;
   escp2_privdata_t *pd = get_privdata(v);
   const input_slot_t *input_slot = get_input_slot(v);
   int extra_left = 0;
   int extra_top = 0;
-  const char *inner_radius_name = stp_get_string_parameter(v, "CDInnerRadius");
-  int hub_size = 43;		/* 43 mm standard CD hub */
-
-  if (inner_radius_name && strcmp(inner_radius_name, "Small") == 0)
-    hub_size = 16;		/* 15 mm prints to the hole - play it
+  int hub_size = 0;
+  int min_horizontal_alignment = escp2_min_horizontal_position_alignment(v);
+  int base_horizontal_alignment =
+    pd->res->hres / escp2_base_horizontal_position_alignment(v);
+  int required_horizontal_alignment =
+    MAX(min_horizontal_alignment, base_horizontal_alignment);
+
+  const char *cd_type = stp_get_string_parameter(v, "PageSize");
+  if (cd_type && (strcmp(cd_type, "CDCustom") == 0 ))
+     {
+	int outer_diameter = stp_get_dimension_parameter(v, "CDOuterDiameter");
+	stp_set_page_width(v, outer_diameter);
+	stp_set_page_height(v, outer_diameter);
+	stp_set_width(v, outer_diameter);
+	stp_set_height(v, outer_diameter);
+	hub_size = stp_get_dimension_parameter(v, "CDInnerDiameter");
+     }
+ else
+    {
+	const char *inner_radius_name = stp_get_string_parameter(v, "CDInnerRadius");
+  	hub_size = 43 * 10 * 72 / 254;	/* 43 mm standard CD hub */
+
+  	if (inner_radius_name && strcmp(inner_radius_name, "Small") == 0)
+   	  hub_size = 16 * 10 * 72 / 254;	/* 15 mm prints to the hole - play it
 				   safe and print 16 mm */
+    }
 
-  stp_default_media_size(v, &n, &(pd->page_true_height));
-  pd->page_extra_height = escp2_page_extra_height(v);
-  if (pd->page_extra_height > 0 &&
-      escp2_has_cap(v, MODEL_XZEROMARGIN, MODEL_XZEROMARGIN_YES) &&
-      (!(input_slot->is_cd) && stp_get_boolean_parameter(v, "FullBleed")))
-    pd->page_extra_height +=
-      escp2_nozzles(v) * escp2_nozzle_separation(v) * 72 /
-      escp2_base_separation(v);
-  internal_imageable_area(v, 0, 0, &pd->page_left, &pd->page_right,
-			  &pd->page_bottom, &pd->page_top);
+  stp_default_media_size(v, &(pd->page_true_width), &(pd->page_true_height));
   /* Don't use full bleed mode if the paper itself has a margin */
   if (pd->page_left > 0 || pd->page_top > 0)
     stp_set_boolean_parameter(v, "FullBleed", 0);
+  if (escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_FULL) &&
+      ((!input_slot || !(input_slot->is_cd))))
+    {
+      pd->page_extra_height =
+	max_nozzle_span(v) * pd->page_management_units /
+	escp2_base_separation(v);
+      if (stp_get_boolean_parameter(v, "FullBleed"))
+	pd->paper_extra_bottom = 0;
+      else
+	pd->paper_extra_bottom = escp2_paper_extra_bottom(v);
+    }
+  else if (escp2_has_cap(v, MODEL_ZEROMARGIN, MODEL_ZEROMARGIN_YES) &&
+	   (stp_get_boolean_parameter(v, "FullBleed")) &&
+	   ((!input_slot || !(input_slot->is_cd))))
+    {
+      pd->paper_extra_bottom = 0;
+      pd->page_extra_height =
+	escp2_zero_margin_offset(v) * pd->page_management_units /
+	escp2_base_separation(v);
+    }
+  else
+    {
+      pd->page_extra_height = 0;
+      pd->paper_extra_bottom = escp2_paper_extra_bottom(v);
+    }
+  internal_imageable_area(v, 0, 0, &pd->page_left, &pd->page_right,
+			  &pd->page_bottom, &pd->page_top);
 
   if (input_slot && input_slot->is_cd && escp2_cd_x_offset(v) > 0)
     {
@@ -2878,6 +3082,8 @@ setup_page(stp_vars_t *v)
       int top_center = escp2_cd_y_offset(v) +
 	stp_get_dimension_parameter(v, "CDYAdjustment");
       pd->page_true_height = pd->page_bottom - pd->page_top;
+      pd->page_true_width = pd->page_right - pd->page_left;
+      pd->paper_extra_bottom = 0;
       pd->page_extra_height = 0;
       stp_set_left(v, stp_get_left(v) - pd->page_left);
       stp_set_top(v, stp_get_top(v) - pd->page_top);
@@ -2887,17 +3093,17 @@ setup_page(stp_vars_t *v)
       pd->page_left = 0;
       extra_top = top_center - (pd->page_bottom / 2);
       extra_left = left_center - (pd->page_right / 2);
-      pd->cd_inner_radius = hub_size * pd->micro_units * 10 / 254 / 2;
+      pd->cd_inner_radius = hub_size * pd->micro_units / 72 / 2;
       pd->cd_outer_radius = pd->page_right * pd->micro_units / 72 / 2;
       pd->cd_x_offset =
 	((pd->page_right / 2) - stp_get_left(v)) * pd->micro_units / 72;
-      pd->cd_y_offset =
-	((pd->page_bottom / 2) - stp_get_top(v)) * pd->micro_units / 72;
+      pd->cd_y_offset = stp_get_top(v) * pd->res->printed_vres / 72;
       if (escp2_cd_page_height(v))
 	{
 	  pd->page_right = escp2_cd_page_width(v);
 	  pd->page_bottom = escp2_cd_page_height(v);
 	  pd->page_true_height = escp2_cd_page_height(v);
+	  pd->page_true_width = escp2_cd_page_width(v);
 	}
     }
 
@@ -2908,18 +3114,28 @@ setup_page(stp_vars_t *v)
   pd->image_scaled_width = pd->image_width * pd->res->hres / 72;
   pd->image_printed_width = pd->image_width * pd->res->printed_hres / 72;
   pd->image_left_position = pd->image_left * pd->micro_units / 72;
+  pd->zero_margin_offset = escp2_zero_margin_offset(v);
+  if (supports_borderless(v) &&
+      pd->advanced_command_set && pd->command_set != MODEL_COMMAND_PRO &&
+      ((!input_slot || !(input_slot->is_cd)) &&
+       stp_get_boolean_parameter(v, "FullBleed")))
+    {
+      int margin = escp2_micro_left_margin(v);
+      int sep = escp2_base_separation(v);
+      pd->image_left_position +=
+	(pd->zero_margin_offset - margin) * pd->micro_units / sep;
+    }
   /*
    * Many printers print extremely slowly if the starting position
-   * is not a multiple of 8
+   * is not aligned to 1/180"
    */
-  if (escp2_horizontal_position_alignment(v) > 1)
+  if (required_horizontal_alignment > 1)
     pd->image_left_position =
-      (pd->image_left_position / escp2_horizontal_position_alignment(v)) *
-      escp2_horizontal_position_alignment(v);
+      (pd->image_left_position / required_horizontal_alignment) *
+      required_horizontal_alignment;
 
 
   pd->page_bottom += extra_top + 1;
-  pd->page_true_height += extra_top + 1;
   pd->page_height = pd->page_bottom - pd->page_top;
   pd->image_top = stp_get_top(v) - pd->page_top + extra_top;
   pd->image_height = stp_get_height(v);
@@ -3018,7 +3234,8 @@ escp2_print_data(stp_vars_t *v, stp_image_t *image)
       if (cd_mask)
 	{
 	  int y_distance_from_center =
-	    pd->cd_outer_radius - (y * pd->micro_units / pd->res->printed_vres);
+	    pd->cd_outer_radius -
+	    ((y + pd->cd_y_offset) * pd->micro_units / pd->res->printed_vres);
 	  if (y_distance_from_center < 0)
 	    y_distance_from_center = -y_distance_from_center;
 	  memset(cd_mask, 0, (pd->image_printed_width + 7) / 8);
@@ -3091,8 +3308,10 @@ escp2_print_page(stp_vars_t *v, stp_image_t *image)
      pd->bitwidth,
      pd->image_printed_width,
      pd->image_printed_height,
-     pd->image_top * pd->res->vres / 72,
-     (pd->page_height + escp2_extra_feed(v)) * pd->res->vres / 72,
+     ((pd->page_extra_height * pd->res->vres / pd->vertical_units) +
+      (pd->image_top * pd->res->vres / 72)),
+     (pd->page_extra_height +
+      (pd->page_height + escp2_extra_feed(v)) * pd->res->vres / 72),
      pd->head_offset,
      weave_pattern,
      stpi_escp2_flush_pass,
@@ -3165,6 +3384,7 @@ escp2_do_print(stp_vars_t *v, stp_image_t *image, int print_op)
     pd->use_aux_channels = 0;
   pd->channels_in_use = count_channels(pd->inkname, pd->use_aux_channels);
 
+  setup_basic(v);
   setup_resolution(v);
   setup_head_parameters(v);
   setup_page(v);
diff --git a/src/main/print-escp2.h b/src/main/print-escp2.h
index 1fd76b3..f75354a 100644
--- a/src/main/print-escp2.h
+++ b/src/main/print-escp2.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.h,v 1.105 2006/07/22 20:28:14 rlk Exp $"
+ * "$Id: print-escp2.h,v 1.105.6.2 2007/05/29 01:47:29 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -152,6 +152,8 @@ typedef struct
   const char *text;
   short hres;
   short vres;
+  short virtual_hres;
+  short virtual_vres;
   short printed_hres;
   short printed_vres;
   short softweave;
@@ -233,8 +235,8 @@ typedef struct
   const char *name;
   const char *text;
   const escp2_inkname_t *const *inknames;
-  const paperlist_t *papers;
-  const paper_adjustment_list_t *paper_adjustments;
+  const char *papers;
+  const char *paper_adjustments;
   const shade_set_t *shades;
   short n_inks;
 } inklist_t;
@@ -367,42 +369,43 @@ typedef struct
 #define MODEL_COMMAND_2000	0x2ul /* The 2000 series printers */
 #define MODEL_COMMAND_PRO	0x3ul /* Stylus Pro printers */
 
-#define MODEL_XZEROMARGIN_MASK	0x10ul /* Does this printer support */
-#define MODEL_XZEROMARGIN_NO	0x00ul /* zero margin mode? */
-#define MODEL_XZEROMARGIN_YES	0x10ul /* (print to edge of the paper) */
+#define MODEL_ZEROMARGIN_MASK	0x30ul /* Does this printer support */
+#define MODEL_ZEROMARGIN_NO	0x00ul /* zero margin mode? */
+#define MODEL_ZEROMARGIN_YES	0x10ul /* (print to edge of the paper) */
+#define MODEL_ZEROMARGIN_FULL	0x20ul /* (print to edge of the paper) */
 
-#define MODEL_VARIABLE_DOT_MASK	0x20ul /* Does this printer support var */
+#define MODEL_VARIABLE_DOT_MASK	0x40ul /* Does this printer support var */
 #define MODEL_VARIABLE_NO	0x00ul /* dot size printing? The newest */
-#define MODEL_VARIABLE_YES	0x20ul /* printers support multiple modes */
+#define MODEL_VARIABLE_YES	0x40ul /* printers support multiple modes */
 
-#define MODEL_GRAYMODE_MASK	0x40ul /* Does this printer support special */
+#define MODEL_GRAYMODE_MASK	0x80ul /* Does this printer support special */
 #define MODEL_GRAYMODE_NO	0x00ul /* fast black printing? */
-#define MODEL_GRAYMODE_YES	0x40ul
+#define MODEL_GRAYMODE_YES	0x80ul
 
-#define MODEL_VACUUM_MASK	0x80ul
-#define MODEL_VACUUM_NO		0x00ul
-#define MODEL_VACUUM_YES	0x80ul
+#define MODEL_VACUUM_MASK	0x100ul
+#define MODEL_VACUUM_NO		0x000ul
+#define MODEL_VACUUM_YES	0x100ul
 
-#define MODEL_FAST_360_MASK	0x100ul
+#define MODEL_FAST_360_MASK	0x200ul
 #define MODEL_FAST_360_NO	0x000ul
-#define MODEL_FAST_360_YES	0x100ul
+#define MODEL_FAST_360_YES	0x200ul
 
-#define MODEL_SEND_ZERO_ADVANCE_MASK	0x200ul
+#define MODEL_SEND_ZERO_ADVANCE_MASK	0x400ul
 #define MODEL_SEND_ZERO_ADVANCE_NO	0x000ul
-#define MODEL_SEND_ZERO_ADVANCE_YES	0x200ul
+#define MODEL_SEND_ZERO_ADVANCE_YES	0x400ul
 
-#define MODEL_SUPPORTS_INK_CHANGE_MASK	0x400ul
+#define MODEL_SUPPORTS_INK_CHANGE_MASK	0x800ul
 #define MODEL_SUPPORTS_INK_CHANGE_NO	0x000ul
-#define MODEL_SUPPORTS_INK_CHANGE_YES	0x400ul
+#define MODEL_SUPPORTS_INK_CHANGE_YES	0x800ul
 
-#define MODEL_PACKET_MODE_MASK	0x800ul
-#define MODEL_PACKET_MODE_NO	0x000ul
-#define MODEL_PACKET_MODE_YES	0x800ul
+#define MODEL_PACKET_MODE_MASK	0x1000ul
+#define MODEL_PACKET_MODE_NO	0x0000ul
+#define MODEL_PACKET_MODE_YES	0x1000ul
 
 typedef enum
 {
   MODEL_COMMAND,
-  MODEL_XZEROMARGIN,
+  MODEL_ZEROMARGIN,
   MODEL_VARIABLE_DOT,
   MODEL_GRAYMODE,
   MODEL_VACUUM,
@@ -440,6 +443,7 @@ typedef struct escp2_printer
   short		max_vres;
   short		min_hres;
   short		min_vres;
+/*****************************************************************************/
   /* Miscellaneous printer-specific data */
   short		extra_feed;	/* Extra distance the paper can be spaced */
 				/* beyond the bottom margin, in 1/360". */
@@ -452,10 +456,13 @@ typedef struct escp2_printer
 
   short         zero_margin_offset;   /* Offset to use to achieve */
 				      /* zero-margin printing */
+  short		micro_left_margin; /* Precise left margin (base separation) */
   short		initial_vertical_offset;
   short		black_initial_vertical_offset;
   short		extra_720dpi_separation;
-  short		horizontal_position_alignment; /* Horizontal alignment */
+  short		min_horizontal_position_alignment; /* Horizontal alignment */
+					       /* for good performance */
+  short		base_horizontal_position_alignment; /* Horizontal alignment */
 					       /* for good performance */
   int		bidirectional_upper_limit;     /* Highest total resolution */
 					       /* for bidirectional printing */
@@ -496,7 +503,7 @@ typedef struct escp2_printer
   short		cd_page_width;	/* Width of "page" when printing to CD */
   short		cd_page_height;	/* Height of "page" when printing to CD */
 				/* Extra height for form factor command */
-  short		page_extra_height; /* Extra height (lie to set form factor) */
+  short		paper_extra_bottom; /* Extra space on the bottom of the page */
 /*****************************************************************************/
   /* Parameters for escputil */
   short		alignment_passes;
@@ -506,111 +513,37 @@ typedef struct escp2_printer
 /*****************************************************************************/
   const short *dot_sizes;	/* Vector of dot sizes for resolutions */
   const float *densities;	/* List of densities for each printer */
-  const escp2_drop_list_t *drops; /* Drop sizes */
+  const char *drops; /* Drop sizes */
 /*****************************************************************************/
-  const res_t *const *reslist;
-  const inkgroup_t *inkgroup;
+  const char *reslist;
+  const char *inkgroup;
 /*****************************************************************************/
   const short *bits;
   const short *base_resolutions;
-  const input_slot_list_t *input_slots;
+  const char *input_slots;
 /*****************************************************************************/
-  const quality_list_t *quality_list;
+  const char *quality_list;
   const stp_raw_t *preinit_sequence;
   const stp_raw_t *postinit_remote_sequence;
 /*****************************************************************************/
-  const printer_weave_list_t *const printer_weaves;
-  const channel_name_t *channel_names;
+  const stp_raw_t *vertical_borderless_sequence;
+  const char *const printer_weaves;
+  const char *channel_names;
 } stpi_escp2_printer_t;
 
 extern const stpi_escp2_printer_t stpi_escp2_model_capabilities[];
 extern const int stpi_escp2_model_limit;
 
-extern const escp2_drop_list_t stpi_escp2_simple_drops;
-extern const escp2_drop_list_t stpi_escp2_spro10000_drops;
-extern const escp2_drop_list_t stpi_escp2_variable_1_5pl_drops;
-extern const escp2_drop_list_t stpi_escp2_variable_2pl_drops;
-extern const escp2_drop_list_t stpi_escp2_variable_3pl_drops;
-extern const escp2_drop_list_t stpi_escp2_variable_3pl_pigment_drops;
-extern const escp2_drop_list_t stpi_escp2_variable_3pl_pigment_c66_drops;
-extern const escp2_drop_list_t stpi_escp2_variable_3pl_pmg_drops;
-extern const escp2_drop_list_t stpi_escp2_variable_r2400_drops;
-extern const escp2_drop_list_t stpi_escp2_variable_picturemate_drops;
-extern const escp2_drop_list_t stpi_escp2_variable_1440_4pl_drops;
-extern const escp2_drop_list_t stpi_escp2_variable_ultrachrome_drops;
-extern const escp2_drop_list_t stpi_escp2_variable_2880_4pl_drops;
-extern const escp2_drop_list_t stpi_escp2_variable_6pl_drops;
-extern const escp2_drop_list_t stpi_escp2_variable_2000p_drops;
-extern const escp2_drop_list_t stpi_escp2_variable_x80_6pl_drops;
-
-extern const paperlist_t stpi_escp2_standard_paper_list;
-extern const paperlist_t stpi_escp2_durabrite_paper_list;
-extern const paperlist_t stpi_escp2_durabrite2_paper_list;
-extern const paperlist_t stpi_escp2_ultrachrome_paper_list;
-extern const paperlist_t stpi_escp2_ultrachrome_k3_paper_list;
-extern const paperlist_t stpi_escp2_r800_paper_list;
-extern const paperlist_t stpi_escp2_picturemate_paper_list;
-
-extern const paper_adjustment_list_t stpi_escp2_standard_paper_adjustment_list;
-extern const paper_adjustment_list_t stpi_escp2_durabrite_paper_adjustment_list;
-extern const paper_adjustment_list_t stpi_escp2_durabrite2_paper_adjustment_list;
-extern const paper_adjustment_list_t stpi_escp2_photo_paper_adjustment_list;
-extern const paper_adjustment_list_t stpi_escp2_photo2_paper_adjustment_list;
-extern const paper_adjustment_list_t stpi_escp2_photo3_paper_adjustment_list;
-extern const paper_adjustment_list_t stpi_escp2_sp960_paper_adjustment_list;
-extern const paper_adjustment_list_t stpi_escp2_ultrachrome_photo_paper_adjustment_list;
-extern const paper_adjustment_list_t stpi_escp2_ultrachrome_matte_paper_adjustment_list;
-extern const paper_adjustment_list_t stpi_escp2_ultrachrome_k3_photo_paper_adjustment_list;
-extern const paper_adjustment_list_t stpi_escp2_ultrachrome_k3_matte_paper_adjustment_list;
-extern const paper_adjustment_list_t stpi_escp2_r800_photo_paper_adjustment_list;
-extern const paper_adjustment_list_t stpi_escp2_r800_matte_paper_adjustment_list;
-extern const paper_adjustment_list_t stpi_escp2_picturemate_paper_adjustment_list;
-
-extern const res_t *const stpi_escp2_superfine_reslist[];
-extern const res_t *const stpi_escp2_r2400_reslist[];
-extern const res_t *const stpi_escp2_cx3650_reslist[];
-extern const res_t *const stpi_escp2_no_printer_weave_reslist[];
-extern const res_t *const stpi_escp2_pro_reslist[];
-extern const res_t *const stpi_escp2_sp5000_reslist[];
-extern const res_t *const stpi_escp2_720dpi_reslist[];
-extern const res_t *const stpi_escp2_720dpi_soft_reslist[];
-extern const res_t *const stpi_escp2_g3_720dpi_reslist[];
-extern const res_t *const stpi_escp2_1440dpi_reslist[];
-extern const res_t *const stpi_escp2_2880dpi_reslist[];
-extern const res_t *const stpi_escp2_2880_1440dpi_reslist[];
-extern const res_t *const stpi_escp2_g3_reslist[];
-extern const res_t *const stpi_escp2_sc500_reslist[];
-extern const res_t *const stpi_escp2_sc640_reslist[];
-extern const res_t *const stpi_escp2_picturemate_reslist[];
-
-extern const inkgroup_t stpi_escp2_cmy_inkgroup;
-extern const inkgroup_t stpi_escp2_standard_inkgroup;
-extern const inkgroup_t stpi_escp2_c80_inkgroup;
-extern const inkgroup_t stpi_escp2_c82_inkgroup;
-extern const inkgroup_t stpi_escp2_c64_inkgroup;
-extern const inkgroup_t stpi_escp2_f360_inkgroup;
-extern const inkgroup_t stpi_escp2_cx3650_inkgroup;
-extern const inkgroup_t stpi_escp2_x80_inkgroup;
-extern const inkgroup_t stpi_escp2_photo_gen1_inkgroup;
-extern const inkgroup_t stpi_escp2_photo_gen2_inkgroup;
-extern const inkgroup_t stpi_escp2_photo_gen3_inkgroup;
-extern const inkgroup_t stpi_escp2_photo_pigment_inkgroup;
-extern const inkgroup_t stpi_escp2_photo7_japan_inkgroup;
-extern const inkgroup_t stpi_escp2_ultrachrome_inkgroup;
-extern const inkgroup_t stpi_escp2_f360_photo_inkgroup;
-extern const inkgroup_t stpi_escp2_f360_photo7_japan_inkgroup;
-extern const inkgroup_t stpi_escp2_f360_ultrachrome_inkgroup;
-extern const inkgroup_t stpi_escp2_f360_ultrachrome_k3_inkgroup;
-extern const inkgroup_t stpi_escp2_cmykrb_inkgroup;
-extern const inkgroup_t stpi_escp2_picturemate_inkgroup;
-
-extern const escp2_inkname_t stpi_escp2_default_black_inkset;
-
-extern const printer_weave_list_t stpi_escp2_standard_printer_weave_list;
-extern const printer_weave_list_t stpi_escp2_sp2200_printer_weave_list;
-extern const printer_weave_list_t stpi_escp2_pro7000_printer_weave_list;
-extern const printer_weave_list_t stpi_escp2_pro7500_printer_weave_list;
-extern const printer_weave_list_t stpi_escp2_pro7600_printer_weave_list;
+extern const paper_adjustment_list_t *stpi_escp2_get_paper_adjustment_list_named(const char *);
+extern const paperlist_t *stpi_escp2_get_paperlist_named(const char *);
+extern const quality_list_t *stpi_escp2_get_quality_list_named(const char *);
+extern const escp2_inkname_t *stpi_escp2_get_default_black_inkset(void);
+extern const inkgroup_t *stpi_escp2_get_inkgroup_named(const char *);
+extern const input_slot_list_t *stpi_escp2_get_input_slot_list_named(const char *);
+extern const res_t *const *stpi_escp2_get_reslist_named(const char *);
+extern const escp2_drop_list_t *stpi_escp2_get_drop_list_named(const char *);
+extern const printer_weave_list_t *stpi_escp2_get_printer_weaves_named(const char *);
+extern const channel_name_t *stpi_escp2_get_channel_names_named(const char *);
 
 typedef struct
 {
@@ -626,6 +559,7 @@ typedef struct
   int micro_units;		/* Micro-units for horizontal positioning */
   int unit_scale;		/* Scale factor for units */
   int send_zero_pass_advance;	/* Send explicit command for zero advance */
+  int zero_margin_offset;	/* Zero margin offset */
 
   /* Ink parameters */
   int bitwidth;			/* Number of bits per ink drop */
@@ -653,6 +587,7 @@ typedef struct
   const inkgroup_t *ink_group;	/* Which set of inks */
   const stp_raw_t *init_sequence; /* Initialization sequence */
   const stp_raw_t *deinit_sequence; /* De-initialization sequence */
+  const stp_raw_t *borderless_sequence; /* Vertical borderless sequence */
   model_featureset_t command_set; /* Which command set this printer supports */
   int variable_dots;		/* Print supports variable dot sizes */
   int has_vacuum;		/* Printer supports vacuum command */
@@ -681,7 +616,9 @@ typedef struct
   int page_width;		/* Page width (points) */
   int page_height;		/* Page height (points) */
   int page_true_height;		/* Physical page height (points) */
-  int page_extra_height;	/* Extra height for set_form_factor */
+  int page_extra_height;	/* Extra height for set_form_factor (rows) */
+  int paper_extra_bottom;	/* Extra bottom for set_page_size (rows) */
+  int page_true_width;		/* Physical page height (points) */
   int cd_x_offset;		/* CD X offset (micro units) */
   int cd_y_offset;		/* CD Y offset (micro units) */
   int cd_outer_radius;		/* CD radius (micro units) */
@@ -728,5 +665,5 @@ extern void stpi_escp2_terminate_page(stp_vars_t *v);
 
 #endif /* GUTENPRINT_INTERNAL_ESCP2_H */
 /*
- * End of "$Id: print-escp2.h,v 1.105 2006/07/22 20:28:14 rlk Exp $".
+ * End of "$Id: print-escp2.h,v 1.105.6.2 2007/05/29 01:47:29 rlk Exp $".
  */
diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c
index c5ad531..7c02b15 100644
--- a/src/main/print-olympus.c
+++ b/src/main/print-olympus.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: print-olympus.c,v 1.59 2006/05/28 16:59:05 rlk Exp $"
+ * "$Id: print-olympus.c,v 1.61.2.1 2007/03/02 12:01:30 rlk Exp $"
  *
- *   Print plug-in Olympus driver for the GIMP.
+ *   Print plug-in DyeSub driver (formerly Olympus driver) for the GIMP.
  *
- *   Copyright 2003 - 2005
+ *   Copyright 2003 - 2006
  *   Michael Mraka (Michael.Mraka@linux.cz)
  *
  *   The plug-in is based on the code of the RAW plugin for the GIMP of
@@ -37,26 +37,42 @@
 #include <gutenprint/gutenprint-intl-internal.h>
 #include <string.h>
 #include <stdio.h>
+#include <limits.h>
+
+#define STP_DBG_DYESUB STP_DBG_OLYMPUS
 
 #ifdef __GNUC__
 #define inline __inline__
 #endif
 
-#define OLYMPUS_INTERLACE_NONE	0
-#define OLYMPUS_INTERLACE_LINE	1
-#define OLYMPUS_INTERLACE_PLANE	2
-
-#define OLYMPUS_FEATURE_NONE		0x00000000
-#define OLYMPUS_FEATURE_FULL_WIDTH	0x00000001
-#define OLYMPUS_FEATURE_FULL_HEIGHT	0x00000002
-#define OLYMPUS_FEATURE_BLOCK_ALIGN	0x00000004
-#define OLYMPUS_FEATURE_BORDERLESS	0x00000008
-#define OLYMPUS_FEATURE_WHITE_BORDER	0x00000010
-
-#define MIN(a,b)	(((a) < (b)) ? (a) : (b))
-#define MAX(a,b)	(((a) > (b)) ? (a) : (b))
+#define DYESUB_FEATURE_NONE		0x00000000
+#define DYESUB_FEATURE_FULL_WIDTH	0x00000001
+#define DYESUB_FEATURE_FULL_HEIGHT	0x00000002
+#define DYESUB_FEATURE_BLOCK_ALIGN	0x00000004
+#define DYESUB_FEATURE_BORDERLESS	0x00000008
+#define DYESUB_FEATURE_WHITE_BORDER	0x00000010
+#define DYESUB_FEATURE_PLANE_INTERLACE	0x00000020
+
+#define DYESUB_PORTRAIT	0
+#define DYESUB_LANDSCAPE	1
+
+#ifndef MIN
+#  define MIN(a,b)	(((a) < (b)) ? (a) : (b))
+#endif /* !MIN */
+#ifndef MAX
+#  define MAX(a, b)	(((a) > (b)) ? (a) : (b))
+#endif /* !MAX */
+#define PX(pt,dpi)	((pt) * (dpi) / 72)
+#define PT(px,dpi)	((px) * 72 / (dpi))
+#define LIST(list_t, list_name, items_t, items_name) \
+	static const list_t list_name = \
+	{ \
+	  items_name, sizeof(items_name) / sizeof(items_t) \
+	}
 
-static const char *zero = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+#define MAX_INK_CHANNELS	3
+#define MAX_BYTES_PER_CHANNEL	2
+#define SIZE_THRESHOLD		6
 
 typedef struct
 {
@@ -75,12 +91,12 @@ typedef struct {
   const char* name;
   int xdpi;
   int ydpi;
-} olymp_resolution_t;
+} dyesub_resolution_t;
 
 typedef struct {
-  const olymp_resolution_t *item;
+  const dyesub_resolution_t *item;
   size_t n_items;
-} olymp_resolution_list_t;
+} dyesub_resolution_list_t;
 
 typedef struct {
   const char* name;
@@ -91,24 +107,25 @@ typedef struct {
   int border_pt_right;
   int border_pt_top;
   int border_pt_bottom;
-} olymp_pagesize_t;
+  int print_mode;
+} dyesub_pagesize_t;
 
 typedef struct {
-  const olymp_pagesize_t *item;
+  const dyesub_pagesize_t *item;
   size_t n_items;
-} olymp_pagesize_list_t;
+} dyesub_pagesize_list_t;
 
 typedef struct {
   const char* res_name;
   const char* pagesize_name;
   int width_px;
   int height_px;
-} olymp_printsize_t;
+} dyesub_printsize_t;
 
 typedef struct {
-  const olymp_printsize_t *item;
+  const dyesub_printsize_t *item;
   size_t n_items;
-} olymp_printsize_list_t;
+} dyesub_printsize_list_t;
 
 
 typedef struct {
@@ -131,18 +148,32 @@ typedef struct
   int block_max_x, block_max_y;
   const char* pagesize;
   const laminate_t* laminate;
-} olympus_privdata_t;
+} dyesub_privdata_t;
 
-static olympus_privdata_t privdata;
+static dyesub_privdata_t privdata;
+
+typedef struct {
+  int out_channels;
+  int ink_channels;
+  const char *ink_order;
+  int bytes_per_out_channel;
+  int bytes_per_ink_channel;
+  int plane_interlacing;
+  char empty_byte;
+  unsigned short **image_data;
+  int outh_px, outw_px, outt_px, outb_px, outl_px, outr_px;
+  int imgh_px, imgw_px;
+  int prnh_px, prnw_px, prnt_px, prnb_px, prnl_px, prnr_px;
+  int print_mode;	/* portrait or landscape */
+} dyesub_print_vars_t;
 
 typedef struct /* printer specific parameters */
 {
   int model;		/* printer model number from printers.xml*/
   const ink_list_t *inks;
-  const olymp_resolution_list_t *resolution;
-  const olymp_pagesize_list_t *pages;
-  const olymp_printsize_list_t *printsize;
-  int interlacing;	/* color interlacing scheme */
+  const dyesub_resolution_list_t *resolution;
+  const dyesub_pagesize_list_t *pages;
+  const dyesub_printsize_list_t *printsize;
   int block_size;
   int features;		
   void (*printer_init_func)(stp_vars_t *);
@@ -155,11 +186,12 @@ typedef struct /* printer specific parameters */
   const char *adj_magenta;
   const char *adj_yellow;
   const laminate_list_t *laminate;
-} olympus_cap_t;
+} dyesub_cap_t;
 
 
-static const olympus_cap_t* olympus_get_model_capabilities(int model);
-static const laminate_t* olympus_get_laminate_pattern(stp_vars_t *v);
+static const dyesub_cap_t* dyesub_get_model_capabilities(int model);
+static const laminate_t* dyesub_get_laminate_pattern(stp_vars_t *v);
+static void  dyesub_nputc(stp_vars_t *v, char byte, int count);
 
 
 static const ink_t cmy_inks[] =
@@ -167,76 +199,55 @@ static const ink_t cmy_inks[] =
   { "CMY", 3, "CMY", "\1\2\3" },
 };
 
-static const ink_list_t cmy_ink_list =
-{
-  cmy_inks, sizeof(cmy_inks) / sizeof(ink_t)
-};
+LIST(ink_list_t, cmy_ink_list, ink_t, cmy_inks);
 
 static const ink_t ymc_inks[] =
 {
   { "CMY", 3, "CMY", "\3\2\1" },
 };
 
-static const ink_list_t ymc_ink_list =
-{
-  ymc_inks, sizeof(ymc_inks) / sizeof(ink_t)
-};
+LIST(ink_list_t, ymc_ink_list, ink_t, ymc_inks);
 
 static const ink_t rgb_inks[] =
 {
   { "RGB", 3, "RGB", "\1\2\3" },
 };
 
-static const ink_list_t rgb_ink_list =
-{
-  rgb_inks, sizeof(rgb_inks) / sizeof(ink_t)
-};
+LIST(ink_list_t, rgb_ink_list, ink_t, rgb_inks);
 
 static const ink_t bgr_inks[] =
 {
   { "RGB", 3, "RGB", "\3\2\1" },
 };
 
-static const ink_list_t bgr_ink_list =
-{
-  bgr_inks, sizeof(bgr_inks) / sizeof(ink_t)
-};
+LIST(ink_list_t, bgr_ink_list, ink_t, bgr_inks);
 
 
 /* Olympus P-10 */
-static const olymp_resolution_t res_320dpi[] =
+static const dyesub_resolution_t res_310dpi[] =
 {
-  { "320x320", 320, 320},
+  { "310x310", 310, 310},
 };
 
-static const olymp_resolution_list_t res_320dpi_list =
-{
-  res_320dpi, sizeof(res_320dpi) / sizeof(olymp_resolution_t)
-};
+LIST(dyesub_resolution_list_t, res_310dpi_list, dyesub_resolution_t, res_310dpi);
 
-static const olymp_pagesize_t p10_page[] =
+static const dyesub_pagesize_t p10_page[] =
 {
-  { "w288h432", "4 x 6", -1, -1, 0, 0, 16, 0},	/* 4x6" */
-  { "B7", "3.5 x 5", -1, -1, 0, 0, 4, 0},	/* 3.5x5" */
-  { "Custom", NULL, -1, -1, 28, 28, 48, 48},
+  { "w288h432", "4 x 6", 298, 430, 0, 0, 0, 0, DYESUB_PORTRAIT}, /* 4x6" */
+  { "B7", "3.5 x 5", 266, 370, 0, 0, 0, 0, DYESUB_PORTRAIT},	 /* 3.5x5" */
+  { "Custom", NULL, 298, 430, 28, 28, 48, 48, DYESUB_PORTRAIT},
 };
 
-static const olymp_pagesize_list_t p10_page_list =
-{
-  p10_page, sizeof(p10_page) / sizeof(olymp_pagesize_t)
-};
+LIST(dyesub_pagesize_list_t, p10_page_list, dyesub_pagesize_t, p10_page);
 
-static const olymp_printsize_t p10_printsize[] =
+static const dyesub_printsize_t p10_printsize[] =
 {
-  { "320x320", "w288h432", 1280, 1848},
-  { "320x320", "B7",  1144,  1591},
-  { "320x320", "Custom", 1280, 1848},
+  { "310x310", "w288h432", 1280, 1848},
+  { "310x310", "B7",  1144,  1591},
+  { "310x310", "Custom", 1280, 1848},
 };
 
-static const olymp_printsize_list_t p10_printsize_list =
-{
-  p10_printsize, sizeof(p10_printsize) / sizeof(olymp_printsize_t)
-};
+LIST(dyesub_printsize_list_t, p10_printsize_list, dyesub_printsize_t, p10_printsize);
 
 static void p10_printer_init_func(stp_vars_t *v)
 {
@@ -266,34 +277,32 @@ static const laminate_t p10_laminate[] =
   {"None",    N_("None"),    {1, "\x02"}},
 };
 
-static const laminate_list_t p10_laminate_list =
-{
-  p10_laminate, sizeof(p10_laminate) / sizeof(laminate_t)
-};
+LIST(laminate_list_t, p10_laminate_list, laminate_t, p10_laminate);
 
 
 /* Olympus P-200 series */
-static const olymp_pagesize_t p200_page[] =
+static const dyesub_resolution_t res_320dpi[] =
 {
-  { "ISOB7", "80x125mm", -1, -1, 16, 17, 33, 33},
-  { "Custom", NULL, -1, -1, 16, 17, 33, 33},
+  { "320x320", 320, 320},
 };
 
-static const olymp_pagesize_list_t p200_page_list =
+LIST(dyesub_resolution_list_t, res_320dpi_list, dyesub_resolution_t, res_320dpi);
+
+static const dyesub_pagesize_t p200_page[] =
 {
-  p200_page, sizeof(p200_page) / sizeof(olymp_pagesize_t)
+  { "ISOB7", "80x125mm", -1, -1, 16, 17, 33, 33, DYESUB_PORTRAIT},
+  { "Custom", NULL, -1, -1, 16, 17, 33, 33, DYESUB_PORTRAIT},
 };
 
-static const olymp_printsize_t p200_printsize[] =
+LIST(dyesub_pagesize_list_t, p200_page_list, dyesub_pagesize_t, p200_page);
+
+static const dyesub_printsize_t p200_printsize[] =
 {
   { "320x320", "ISOB7", 960, 1280},
   { "320x320", "Custom", 960, 1280},
 };
 
-static const olymp_printsize_list_t p200_printsize_list =
-{
-  p200_printsize, sizeof(p200_printsize) / sizeof(olymp_printsize_t)
-};
+LIST(dyesub_printsize_list_t, p200_printsize_list, dyesub_printsize_t, p200_printsize);
 
 static void p200_printer_init_func(stp_vars_t *v)
 {
@@ -327,40 +336,31 @@ static const char p200_adj_any[] =
 
 
 /* Olympus P-300 series */
-static const olymp_resolution_t p300_res[] =
+static const dyesub_resolution_t p300_res[] =
 {
   { "306x306", 306, 306},
   { "153x153", 153, 153},
 };
 
-static const olymp_resolution_list_t p300_res_list =
-{
-  p300_res, sizeof(p300_res) / sizeof(olymp_resolution_t)
-};
+LIST(dyesub_resolution_list_t, p300_res_list, dyesub_resolution_t, p300_res);
 
-static const olymp_pagesize_t p300_page[] =
+static const dyesub_pagesize_t p300_page[] =
 {
-  { "A6", NULL, -1, -1, 28, 28, 48, 48},
-  { "Custom", NULL, -1, -1, 28, 28, 48, 48},
+  { "A6", NULL, -1, -1, 28, 28, 48, 48, DYESUB_PORTRAIT},
+  { "Custom", NULL, -1, -1, 28, 28, 48, 48, DYESUB_PORTRAIT},
 };
 
-static const olymp_pagesize_list_t p300_page_list =
-{
-  p300_page, sizeof(p300_page) / sizeof(olymp_pagesize_t)
-};
+LIST(dyesub_pagesize_list_t, p300_page_list, dyesub_pagesize_t, p300_page);
 
-static const olymp_printsize_t p300_printsize[] =
+static const dyesub_printsize_t p300_printsize[] =
 {
   { "306x306", "A6", 1024, 1376},
   { "153x153", "A6",  512,  688},
   { "306x306", "Custom", 1024, 1376},
-  { "153x153", "Custom", 1024, 1376},
+  { "153x153", "Custom", 512, 688},
 };
 
-static const olymp_printsize_list_t p300_printsize_list =
-{
-  p300_printsize, sizeof(p300_printsize) / sizeof(olymp_printsize_t)
-};
+LIST(dyesub_printsize_list_t, p300_printsize_list, dyesub_printsize_t, p300_printsize);
 
 static void p300_printer_init_func(stp_vars_t *v)
 {
@@ -374,7 +374,7 @@ static void p300_plane_end_func(stp_vars_t *v)
 {
   const char *c = "CMY";
   stp_zprintf(v, "\033\033\033P%cS", c[privdata.plane-1]);
-  stp_deprintf(STP_DBG_OLYMPUS, "olympus: p300_plane_end_func: %c\n",
+  stp_deprintf(STP_DBG_DYESUB, "dyesub: p300_plane_end_func: %c\n",
 	c[privdata.plane-1]);
 }
 
@@ -387,7 +387,7 @@ static void p300_block_init_func(stp_vars_t *v)
   stp_put16_be(privdata.block_max_y, v);
   stp_put16_be(privdata.block_max_x, v);
 
-  stp_deprintf(STP_DBG_OLYMPUS, "olympus: p300_block_init_func: %d-%dx%d-%d\n",
+  stp_deprintf(STP_DBG_DYESUB, "dyesub: p300_block_init_func: %d-%dx%d-%d\n",
 	privdata.block_min_x, privdata.block_max_x,
 	privdata.block_min_y, privdata.block_max_y);
 }
@@ -433,30 +433,24 @@ static const char p300_adj_yellow[] =
 
 
 /* Olympus P-400 series */
-static const olymp_resolution_t res_314dpi[] =
+static const dyesub_resolution_t res_314dpi[] =
 {
   { "314x314", 314, 314},
 };
 
-static const olymp_resolution_list_t res_314dpi_list =
-{
-  res_314dpi, sizeof(res_314dpi) / sizeof(olymp_resolution_t)
-};
+LIST(dyesub_resolution_list_t, res_314dpi_list, dyesub_resolution_t, res_314dpi);
 
-static const olymp_pagesize_t p400_page[] =
+static const dyesub_pagesize_t p400_page[] =
 {
-  { "A4", NULL, -1, -1, 22, 22, 54, 54},
-  { "c8x10", "A5 wide", -1, -1, 58, 59, 84, 85},
-  { "C6", "2 Postcards (A4)", -1, -1, 9, 9, 9, 9},
-  { "Custom", NULL, -1, -1, 22, 22, 54, 54},
+  { "A4", NULL, -1, -1, 22, 22, 54, 54, DYESUB_PORTRAIT},
+  { "c8x10", "A5 wide", -1, -1, 58, 59, 84, 85, DYESUB_PORTRAIT},
+  { "C6", "2 Postcards (A4)", -1, -1, 9, 9, 9, 9, DYESUB_PORTRAIT},
+  { "Custom", NULL, -1, -1, 22, 22, 54, 54, DYESUB_PORTRAIT},
 };
 
-static const olymp_pagesize_list_t p400_page_list =
-{
-  p400_page, sizeof(p400_page) / sizeof(olymp_pagesize_t)
-};
+LIST(dyesub_pagesize_list_t, p400_page_list, dyesub_pagesize_t, p400_page);
 
-static const olymp_printsize_t p400_printsize[] =
+static const dyesub_printsize_t p400_printsize[] =
 {
   { "314x314", "A4", 2400, 3200},
   { "314x314", "c8x10", 2000, 2400},
@@ -464,20 +458,17 @@ static const olymp_printsize_t p400_printsize[] =
   { "314x314", "Custom", 2400, 3200},
 };
 
-static const olymp_printsize_list_t p400_printsize_list =
-{
-  p400_printsize, sizeof(p400_printsize) / sizeof(olymp_printsize_t)
-};
+LIST(dyesub_printsize_list_t, p400_printsize_list, dyesub_printsize_t, p400_printsize);
 
 static void p400_printer_init_func(stp_vars_t *v)
 {
   int wide = (strcmp(privdata.pagesize, "c8x10") == 0
 		  || strcmp(privdata.pagesize, "C6") == 0);
 
-  stp_zprintf(v, "\033ZQ"); stp_zfwrite(zero, 1, 61, v);
-  stp_zprintf(v, "\033FP"); stp_zfwrite(zero, 1, 61, v);
+  stp_zprintf(v, "\033ZQ"); dyesub_nputc(v, '\0', 61);
+  stp_zprintf(v, "\033FP"); dyesub_nputc(v, '\0', 61);
   stp_zprintf(v, "\033ZF");
-  stp_putc((wide ? '\x40' : '\x00'), v); stp_zfwrite(zero, 1, 60, v);
+  stp_putc((wide ? '\x40' : '\x00'), v); dyesub_nputc(v, '\0', 60);
   stp_zprintf(v, "\033ZS");
   if (wide)
     {
@@ -489,18 +480,18 @@ static void p400_printer_init_func(stp_vars_t *v)
       stp_put16_be(privdata.xsize, v);
       stp_put16_be(privdata.ysize, v);
     }
-  stp_zfwrite(zero, 1, 57, v);
-  stp_zprintf(v, "\033ZP"); stp_zfwrite(zero, 1, 61, v);
+  dyesub_nputc(v, '\0', 57);
+  stp_zprintf(v, "\033ZP"); dyesub_nputc(v, '\0', 61);
 }
 
 static void p400_plane_init_func(stp_vars_t *v)
 {
-  stp_zprintf(v, "\033ZC"); stp_zfwrite(zero, 1, 61, v);
+  stp_zprintf(v, "\033ZC"); dyesub_nputc(v, '\0', 61);
 }
 
 static void p400_plane_end_func(stp_vars_t *v)
 {
-  stp_zprintf(v, "\033P"); stp_zfwrite(zero, 1, 62, v);
+  stp_zprintf(v, "\033P"); dyesub_nputc(v, '\0', 62);
 }
 
 static void p400_block_init_func(stp_vars_t *v)
@@ -523,7 +514,7 @@ static void p400_block_init_func(stp_vars_t *v)
       stp_put16_be(privdata.block_max_x - privdata.block_min_x + 1, v);
       stp_put16_be(privdata.block_max_y - privdata.block_min_y + 1, v);
     }
-  stp_zfwrite(zero, 1, 53, v);
+  dyesub_nputc(v, '\0', 53);
 }
 
 static const char p400_adj_cyan[] =
@@ -567,21 +558,19 @@ static const char p400_adj_yellow[] =
 
 
 /* Olympus P-440 series */
-static const olymp_pagesize_t p440_page[] =
+/* FIXME: colors - BGR instead of RGB ?!? */
+static const dyesub_pagesize_t p440_page[] =
 {
-  { "A4", NULL, -1, -1, 10, 9, 54, 54},
-  { "c8x10", "A5 wide", -1, -1, 58, 59, 72, 72},
-  { "C6", "2 Postcards (A4)", -1, -1, 9, 9, 9, 9},
-  { "w255h581", "A6 wide", -1, -1, 25, 25, 25, 24},
-  { "Custom", NULL, -1, -1, 22, 22, 54, 54},
+  { "A4", NULL, -1, -1, 10, 9, 54, 54, DYESUB_PORTRAIT},
+  { "c8x10", "A5 wide", -1, -1, 58, 59, 72, 72, DYESUB_PORTRAIT},
+  { "C6", "2 Postcards (A4)", -1, -1, 9, 9, 9, 9, DYESUB_PORTRAIT},
+  { "w255h581", "A6 wide", -1, -1, 25, 25, 25, 24, DYESUB_PORTRAIT},
+  { "Custom", NULL, -1, -1, 22, 22, 54, 54, DYESUB_PORTRAIT},
 };
 
-static const olymp_pagesize_list_t p440_page_list =
-{
-  p440_page, sizeof(p440_page) / sizeof(olymp_pagesize_t)
-};
+LIST(dyesub_pagesize_list_t, p440_page_list, dyesub_pagesize_t, p440_page);
 
-static const olymp_printsize_t p440_printsize[] =
+static const dyesub_printsize_t p440_printsize[] =
 {
   { "314x314", "A4", 2508, 3200},
   { "314x314", "c8x10", 2000, 2508},
@@ -590,25 +579,22 @@ static const olymp_printsize_t p440_printsize[] =
   { "314x314", "Custom", 2508, 3200},
 };
 
-static const olymp_printsize_list_t p440_printsize_list =
-{
-  p440_printsize, sizeof(p440_printsize) / sizeof(olymp_printsize_t)
-};
+LIST(dyesub_printsize_list_t, p440_printsize_list, dyesub_printsize_t, p440_printsize);
 
 static void p440_printer_init_func(stp_vars_t *v)
 {
   int wide = ! (strcmp(privdata.pagesize, "A4") == 0
 		  || strcmp(privdata.pagesize, "Custom") == 0);
 
-  stp_zprintf(v, "\033FP"); stp_zfwrite(zero, 1, 61, v);
+  stp_zprintf(v, "\033FP"); dyesub_nputc(v, '\0', 61);
   stp_zprintf(v, "\033Y");
   stp_zfwrite((privdata.laminate->seq).data, 1,
 		  (privdata.laminate->seq).bytes, v); /* laminate */ 
-  stp_zfwrite(zero, 1, 61, v);
-  stp_zprintf(v, "\033FC"); stp_zfwrite(zero, 1, 61, v);
+  dyesub_nputc(v, '\0', 61);
+  stp_zprintf(v, "\033FC"); dyesub_nputc(v, '\0', 61);
   stp_zprintf(v, "\033ZF");
-  stp_putc((wide ? '\x40' : '\x00'), v); stp_zfwrite(zero, 1, 60, v);
-  stp_zprintf(v, "\033N\1"); stp_zfwrite(zero, 1, 61, v);
+  stp_putc((wide ? '\x40' : '\x00'), v); dyesub_nputc(v, '\0', 60);
+  stp_zprintf(v, "\033N\1"); dyesub_nputc(v, '\0', 61);
   stp_zprintf(v, "\033ZS");
   if (wide)
     {
@@ -620,16 +606,16 @@ static void p440_printer_init_func(stp_vars_t *v)
       stp_put16_be(privdata.xsize, v);
       stp_put16_be(privdata.ysize, v);
     }
-  stp_zfwrite(zero, 1, 57, v);
+  dyesub_nputc(v, '\0', 57);
   if (strcmp(privdata.pagesize, "C6") == 0)
     {
-      stp_zprintf(v, "\033ZC"); stp_zfwrite(zero, 1, 61, v);
+      stp_zprintf(v, "\033ZC"); dyesub_nputc(v, '\0', 61);
     }
 }
 
 static void p440_printer_end_func(stp_vars_t *v)
 {
-  stp_zprintf(v, "\033P"); stp_zfwrite(zero, 1, 62, v);
+  stp_zprintf(v, "\033P"); dyesub_nputc(v, '\0', 62);
 }
 
 static void p440_block_init_func(stp_vars_t *v)
@@ -652,61 +638,145 @@ static void p440_block_init_func(stp_vars_t *v)
       stp_put16_be(privdata.block_max_x - privdata.block_min_x + 1, v);
       stp_put16_be(privdata.block_max_y - privdata.block_min_y + 1, v);
     }
-  stp_zfwrite(zero, 1, 53, v);
+  dyesub_nputc(v, '\0', 53);
 }
 
 static void p440_block_end_func(stp_vars_t *v)
 {
   int pad = (64 - (((privdata.block_max_x - privdata.block_min_x + 1)
 	  * (privdata.block_max_y - privdata.block_min_y + 1) * 3) % 64)) % 64;
-  stp_deprintf(STP_DBG_OLYMPUS,
-		  "olympus: max_x %d min_x %d max_y %d min_y %d\n",
+  stp_deprintf(STP_DBG_DYESUB,
+		  "dyesub: max_x %d min_x %d max_y %d min_y %d\n",
   		  privdata.block_max_x, privdata.block_min_x,
 	  	  privdata.block_max_y, privdata.block_min_y);
-  stp_deprintf(STP_DBG_OLYMPUS, "olympus: olympus-p440 padding=%d\n", pad);
-  stp_zfwrite(zero, 1, pad, v);
+  stp_deprintf(STP_DBG_DYESUB, "dyesub: olympus-p440 padding=%d\n", pad);
+  dyesub_nputc(v, '\0', pad);
 }
 
 
-/* Canon CP-100 series */
-static const olymp_pagesize_t cpx00_page[] =
+/* Olympus P-S100 */
+/* FIXME: colors - BGR instead of RGB ?!? */
+static const dyesub_pagesize_t ps100_page[] =
 {
-  { "Postcard", "Postcard 148x100mm", -1, -1, 13, 13, 16, 18},
-  { "w253h337", "CP_L 89x119mm", -1, -1, 13, 13, 15, 15},
-  { "w244h155", "Card 54x86mm", -1, -1, 15, 15, 13, 13},
-  { "Custom", NULL, -1, -1, 13, 13, 16, 18},
+  { "w288h432", "4 x 6", 296, 426, 0, 0, 0, 0, DYESUB_PORTRAIT},/* 4x6" */
+  { "B7", "3.5 x 5", 264, 366, 0, 0, 0, 0, DYESUB_PORTRAIT},	/* 3.5x5" */
+  { "Custom", NULL, 296, 426, 0, 0, 0, 0, DYESUB_PORTRAIT},
 };
 
-static const olymp_pagesize_list_t cpx00_page_list =
+LIST(dyesub_pagesize_list_t, ps100_page_list, dyesub_pagesize_t, ps100_page);
+
+static const dyesub_printsize_t ps100_printsize[] =
 {
-  cpx00_page, sizeof(cpx00_page) / sizeof(olymp_pagesize_t)
+  { "306x306", "w288h432", 1254, 1808},
+  { "306x306", "B7", 1120, 1554},
+  { "306x306", "Custom", 1254, 1808},
 };
 
-static const olymp_printsize_t cpx00_printsize[] =
+LIST(dyesub_printsize_list_t, ps100_printsize_list, dyesub_printsize_t, ps100_printsize);
+
+static void ps100_printer_init_func(stp_vars_t *v)
 {
-  { "314x314", "Postcard", 1232, 1808},
-  { "314x314", "w253h337", 1100, 1456},
-  { "314x314", "w244h155", 1040, 672},
-  { "314x314", "Custom", 1232, 1808},
+  stp_zprintf(v, "\033U"); dyesub_nputc(v, '\0', 62);
+  
+  /* stp_zprintf(v, "\033ZC"); dyesub_nputc(v, '\0', 61); */
+  
+  stp_zprintf(v, "\033W"); dyesub_nputc(v, '\0', 62);
+  
+  stp_zfwrite("\x30\x2e\x00\xa2\x00\xa0\x00\xa0", 1, 8, v);
+  stp_put16_be(privdata.ysize, v);	/* paper height (px) */
+  stp_put16_be(privdata.xsize, v);	/* paper width (px) */
+  dyesub_nputc(v, '\0', 3);
+  stp_putc('\1', v);	/* number of copies */
+  dyesub_nputc(v, '\0', 8);
+  stp_putc('\1', v);
+  dyesub_nputc(v, '\0', 15);
+  stp_putc('\6', v);
+  dyesub_nputc(v, '\0', 23);
+
+  stp_zfwrite("\033ZT\0", 1, 4, v);
+  stp_put16_be(0, v);			/* image width offset (px) */
+  stp_put16_be(0, v);			/* image height offset (px) */
+  stp_put16_be(privdata.xsize, v);	/* image width (px) */
+  stp_put16_be(privdata.ysize, v);	/* image height (px) */
+  dyesub_nputc(v, '\0', 52);
+}
+
+static void ps100_printer_end_func(stp_vars_t *v)
+{
+  int pad = (64 - (((privdata.block_max_x - privdata.block_min_x + 1)
+	  * (privdata.block_max_y - privdata.block_min_y + 1) * 3) % 64)) % 64;
+  stp_deprintf(STP_DBG_DYESUB,
+		  "dyesub: max_x %d min_x %d max_y %d min_y %d\n",
+  		  privdata.block_max_x, privdata.block_min_x,
+	  	  privdata.block_max_y, privdata.block_min_y);
+  stp_deprintf(STP_DBG_DYESUB, "dyesub: olympus-ps100 padding=%d\n", pad);
+  dyesub_nputc(v, '\0', pad);		/* padding to 64B blocks */
+
+  stp_zprintf(v, "\033PY"); dyesub_nputc(v, '\0', 61);
+  stp_zprintf(v, "\033u"); dyesub_nputc(v, '\0', 62);
+}
+
+
+/* Canon CP-10 */
+static const dyesub_resolution_t res_300dpi[] =
+{
+  { "300x300", 300, 300},
+};
+
+LIST(dyesub_resolution_list_t, res_300dpi_list, dyesub_resolution_t, res_300dpi);
+
+static const dyesub_pagesize_t cp10_page[] =
+{
+  { "w155h244", "Card 54x86mm", 159, 250, 6, 6, 29, 29, DYESUB_PORTRAIT},
+  { "Custom", NULL, -1, -1, 6, 6, 29, 29, DYESUB_PORTRAIT},
 };
 
-static const olymp_printsize_list_t cpx00_printsize_list =
+LIST(dyesub_pagesize_list_t, cp10_page_list, dyesub_pagesize_t, cp10_page);
+
+static const dyesub_printsize_t cp10_printsize[] =
+{
+  { "300x300", "w155h244", 662, 1040},
+  { "300x300", "Custom", 662, 1040},
+};
+
+LIST(dyesub_printsize_list_t, cp10_printsize_list, dyesub_printsize_t, cp10_printsize);
+
+
+/* Canon CP-100 series */
+static const dyesub_pagesize_t cpx00_page[] =
+{
+  { "Postcard", "Postcard 100x148mm", 296, 434, 13, 13, 16, 19, DYESUB_PORTRAIT},
+  { "w253h337", "CP_L 89x119mm", 264, 350, 13, 13, 15, 15, DYESUB_PORTRAIT},
+  { "w155h244", "Card 54x86mm", 162, 250, 13, 13, 15, 15, DYESUB_LANDSCAPE},
+  { "Custom", NULL, 296, 434, 13, 13, 16, 19, DYESUB_PORTRAIT},
+};
+
+LIST(dyesub_pagesize_list_t, cpx00_page_list, dyesub_pagesize_t, cpx00_page);
+
+static const dyesub_printsize_t cpx00_printsize[] =
 {
-  cpx00_printsize, sizeof(cpx00_printsize) / sizeof(olymp_printsize_t)
+  { "300x300", "Postcard", 1232, 1808},
+  { "300x300", "w253h337", 1100, 1456},
+  { "300x300", "w155h244", 672, 1040},
+  { "300x300", "Custom", 1232, 1808},
 };
 
+LIST(dyesub_printsize_list_t, cpx00_printsize_list, dyesub_printsize_t, cpx00_printsize);
+
 static void cpx00_printer_init_func(stp_vars_t *v)
 {
   char pg = (strcmp(privdata.pagesize, "Postcard") == 0 ? '\1' :
 		(strcmp(privdata.pagesize, "w253h337") == 0 ? '\2' :
-		(strcmp(privdata.pagesize, "w244h155") == 0 ? '\3' :
+		(strcmp(privdata.pagesize, "w155h244") == 0 ? 
+			(strcmp(stp_get_driver(v),"canon-cp10") == 0 ?
+				'\0' : '\3' ) :
 		(strcmp(privdata.pagesize, "w283h566") == 0 ? '\4' : 
 		 '\1' ))));
 
   stp_put16_be(0x4000, v);
   stp_putc('\0', v);
   stp_putc(pg, v);
-  stp_zfwrite(zero, 1, 8, v);
+  dyesub_nputc(v, '\0', 8);
 }
 
 static void cpx00_plane_init_func(stp_vars_t *v)
@@ -714,7 +784,7 @@ static void cpx00_plane_init_func(stp_vars_t *v)
   stp_put16_be(0x4001, v);
   stp_put16_le(3 - privdata.plane, v);
   stp_put32_le(privdata.xsize * privdata.ysize, v);
-  stp_zfwrite(zero, 1, 4, v);
+  dyesub_nputc(v, '\0', 4);
 }
 
 static const char cpx00_adj_cyan[] =
@@ -758,79 +828,139 @@ static const char cpx00_adj_yellow[] =
 
 
 /* Canon CP-220 series */
-static const olymp_pagesize_t cp220_page[] =
+static const dyesub_pagesize_t cp220_page[] =
 {
-  { "Postcard", "Postcard 148x100mm", -1, -1, 13, 13, 16, 18},
-  { "w253h337", "CP_L 89x119mm", -1, -1, 13, 13, 15, 15},
-  { "w244h155", "Card 54x86mm", -1, -1, 15, 15, 13, 13},
-  { "w283h566", "Wide 200x100mm", -1, -1, 13, 13, 20, 20},
-  { "Custom", NULL, -1, -1, 13, 13, 16, 18},
+  { "Postcard", "Postcard 100x148mm", 296, 434, 13, 13, 16, 19, DYESUB_PORTRAIT},
+  { "w253h337", "CP_L 89x119mm", 264, 350, 13, 13, 15, 15, DYESUB_PORTRAIT},
+  { "w155h244", "Card 54x86mm", 162, 250, 13, 13, 15, 15, DYESUB_LANDSCAPE},
+  { "w283h566", "Wide 100x200mm", 296, 580, 13, 13, 20, 20, DYESUB_PORTRAIT},
+  { "Custom", NULL, 296, 434, 13, 13, 16, 19, DYESUB_PORTRAIT},
 };
 
-static const olymp_pagesize_list_t cp220_page_list =
+LIST(dyesub_pagesize_list_t, cp220_page_list, dyesub_pagesize_t, cp220_page);
+
+static const dyesub_printsize_t cp220_printsize[] =
 {
-  cp220_page, sizeof(cp220_page) / sizeof(olymp_pagesize_t)
+  { "300x300", "Postcard", 1232, 1808},
+  { "300x300", "w253h337", 1100, 1456},
+  { "300x300", "w155h244", 672, 1040},
+  { "300x300", "w283h566", 1232, 2416},
+  { "300x300", "Custom", 1232, 1808},
 };
 
-static const olymp_printsize_t cp220_printsize[] =
+LIST(dyesub_printsize_list_t, cp220_printsize_list, dyesub_printsize_t, cp220_printsize);
+
+
+/* Sony DPP-EX5, DPP-EX7 */
+static const dyesub_resolution_t res_403dpi[] =
 {
-  { "314x314", "Postcard", 1232, 1808},
-  { "314x314", "w253h337", 1100, 1456},
-  { "314x314", "w244h155", 1040, 672},
-  { "314x314", "w283h566", 1232, 2416},
-  { "314x314", "Custom", 1232, 1808},
+  { "403x403", 403, 403},
 };
 
-static const olymp_printsize_list_t cp220_printsize_list =
+LIST(dyesub_resolution_list_t, res_403dpi_list, dyesub_resolution_t, res_403dpi);
+
+/* only Postcard pagesize is supported */
+static const dyesub_pagesize_t dppex5_page[] =
 {
-  cp220_printsize, sizeof(cp220_printsize) / sizeof(olymp_printsize_t)
+  { "w288h432", "Postcard", PT(1664,403)+1, PT(2466,403)+1, 13, 14, 18, 17,
+  							DYESUB_PORTRAIT},
+  { "Custom", NULL, PT(1664,403)+1, PT(2466,403)+1, 13, 14, 18, 17,
+  							DYESUB_PORTRAIT},
 };
 
+LIST(dyesub_pagesize_list_t, dppex5_page_list, dyesub_pagesize_t, dppex5_page);
 
-/* Sony UP-DP10 */
-static const olymp_resolution_t updp10_res[] =
+static const dyesub_printsize_t dppex5_printsize[] =
 {
-  { "300x300", 300, 300},
+  { "403x403", "w288h432", 1664, 2466},
+  { "403x403", "Custom", 1664, 2466},
 };
 
-static const olymp_resolution_list_t updp10_res_list =
+LIST(dyesub_printsize_list_t, dppex5_printsize_list, dyesub_printsize_t, dppex5_printsize);
+
+static void dppex5_printer_init(stp_vars_t *v)
 {
-  updp10_res, sizeof(updp10_res) / sizeof(olymp_resolution_t)
-};
+  stp_zfwrite("DPEX\0\0\0\x80", 1, 8, v);
+  stp_zfwrite("DPEX\0\0\0\x82", 1, 8, v);
+  stp_zfwrite("DPEX\0\0\0\x84", 1, 8, v);
+  stp_put32_be(privdata.xsize, v);
+  stp_put32_be(privdata.ysize, v);
+  stp_zfwrite("S\0o\0n\0y\0 \0D\0P\0P\0-\0E\0X\0\x35\0", 1, 24, v);
+  dyesub_nputc(v, '\0', 40);
+  stp_zfwrite("\1\4\0\4\xdc\0\x24\0\3\3\1\0\1\0\x82\0", 1, 16, v);
+  stp_zfwrite("\xf4\5\xf8\3\x64\0\1\0\x0e\0\x93\1\2\0\1\0", 1, 16, v);
+  stp_zfwrite("\x93\1\1\0\0\0", 1, 6, v);
+  stp_zfwrite("P\0o\0s\0t\0 \0c\0a\0r\0d\0", 1, 18, v);
+  dyesub_nputc(v, '\0', 46);
+  stp_zfwrite("\x93\1\x18", 1, 3, v);
+  dyesub_nputc(v, '\0', 19);
+  stp_zfwrite("\2\0\0\0\3\0\0\0\1\0\0\0\1", 1, 13, v);
+  dyesub_nputc(v, '\0', 19);
+  stp_zprintf(v, "5EPD");
+  dyesub_nputc(v, '\0', 4);
+  stp_zfwrite((privdata.laminate->seq).data, 1,
+			(privdata.laminate->seq).bytes, v); /*laminate pattern*/
+  stp_zfwrite("\0d\0d\0d", 1, 6, v);
+  dyesub_nputc(v, '\0', 21);
+}
+
+static void dppex5_block_init(stp_vars_t *v)
+{
+  stp_zfwrite("DPEX\0\0\0\x85", 1, 8, v);
+  stp_put32_be((privdata.block_max_x - privdata.block_min_x + 1)
+  		* (privdata.block_max_y - privdata.block_min_y + 1) * 3, v);
+}
 
-static const olymp_pagesize_t updp10_page[] =
+static void dppex5_printer_end(stp_vars_t *v)
 {
-  { "w288h432", "UPC-10P23 (2:3)", -1, -1, 12, 12, 18, 18},
-  { "w288h387", "UPC-10P34 (3:4)", -1, -1, 12, 12, 16, 16},
-  { "w288h432", "UPC-10S01 (Sticker)", -1, -1, 12, 12, 18, 18},
-  { "Custom", NULL, -1, -1, 12, 12, 0, 0},
+  stp_zfwrite("DPEX\0\0\0\x83", 1, 8, v);
+  stp_zfwrite("DPEX\0\0\0\x81", 1, 8, v);
+}
+
+static const laminate_t dppex5_laminate[] =
+{
+  {"Glossy",  N_("Glossy"),  {1, "\x00"}},
+  {"Texture", N_("Texture"), {1, "\x01"}},
 };
 
-static const olymp_pagesize_list_t updp10_page_list =
+LIST(laminate_list_t, dppex5_laminate_list, laminate_t, dppex5_laminate);
+
+
+/* Sony UP-DP10 */
+static const dyesub_pagesize_t updp10_page[] =
 {
-  updp10_page, sizeof(updp10_page) / sizeof(olymp_pagesize_t)
+  { "w288h432", "UPC-10P23 (2:3)", -1, -1, 12, 12, 18, 18, DYESUB_LANDSCAPE},
+  { "w288h387", "UPC-10P34 (3:4)", -1, 384, 12, 12, 16, 16, DYESUB_LANDSCAPE},
+  { "w288h432", "UPC-10S01 (Sticker)", -1, -1, 12, 12, 18, 18, DYESUB_LANDSCAPE},
+  { "Custom", NULL, -1, -1, 12, 12, 0, 0, DYESUB_LANDSCAPE},
 };
 
-static const olymp_printsize_t updp10_printsize[] =
+LIST(dyesub_pagesize_list_t, updp10_page_list, dyesub_pagesize_t, updp10_page);
+
+static const dyesub_printsize_t updp10_printsize[] =
 {
   { "300x300", "w288h432", 1200, 1800},
   { "300x300", "w288h387", 1200, 1600},
   { "300x300", "Custom", 1200, 1800},
 };
 
-static const olymp_printsize_list_t updp10_printsize_list =
-{
-  updp10_printsize, sizeof(updp10_printsize) / sizeof(olymp_printsize_t)
-};
+LIST(dyesub_printsize_list_t, updp10_printsize_list, dyesub_printsize_t, updp10_printsize);
 
 static void updp10_printer_init_func(stp_vars_t *v)
 {
   stp_zfwrite("\x98\xff\xff\xff\xff\xff\xff\xff"
-	      "\x14\x00\x00\x00\x1b\x15\x00\x00"
-	      "\x00\x0d\x00\x00\x00\x00\x00\xc7"
-	      "\x00\x00\x00\x00", 1, 28, v);
+	      "\x09\x00\x00\x00\x1b\xee\x00\x00"
+	      "\x00\x04", 1, 34, v);
+  stp_zfwrite((privdata.laminate->seq).data, 1,
+			(privdata.laminate->seq).bytes, v); /*laminate pattern*/
+  stp_zfwrite("\x00\x00\x00\x00", 1, 4, v);
+  stp_put16_be(privdata.ysize, v);
   stp_put16_be(privdata.xsize, v);
+  stp_zfwrite("\x14\x00\x00\x00\x1b\x15\x00\x00"
+	      "\x00\x0d\x00\x00\x00\x00\x00\x07"
+	      "\x00\x00\x00\x00", 1, 20, v);
   stp_put16_be(privdata.ysize, v);
+  stp_put16_be(privdata.xsize, v);
   stp_put32_le(privdata.xsize*privdata.ysize*3+11, v);
   stp_zfwrite("\x1b\xea\x00\x00\x00\x00", 1, 6, v);
   stp_put32_be(privdata.xsize*privdata.ysize*3, v);
@@ -839,19 +969,10 @@ static void updp10_printer_init_func(stp_vars_t *v)
 
 static void updp10_printer_end_func(stp_vars_t *v)
 {
-	stp_zfwrite("\x12\x00\x00\x00\x1b\xe1\x00\x00"
-		    "\x00\xb0\x00\x00\04", 1, 13, v);
-	stp_zfwrite((privdata.laminate->seq).data, 1,
-			(privdata.laminate->seq).bytes, v); /*laminate pattern*/
-	stp_zfwrite("\x00\x00\x00\x00" , 1, 4, v);
-        stp_put16_be(privdata.ysize, v);
-        stp_put16_be(privdata.xsize, v);
-	stp_zfwrite("\xff\xff\xff\xff\x09\x00\x00\x00"
-		    "\x1b\xee\x00\x00\x00\x02\x00\x00"
-		    "\x01\x07\x00\x00\x00\x1b\x0a\x00"
-		    "\x00\x00\x00\x00\xfd\xff\xff\xff"
-		    "\xff\xff\xff\xff\xf8\xff\xff\xff"
-		    , 1, 40, v);
+	stp_zfwrite("\xff\xff\xff\xff\x07\x00\x00\x00"
+		    "\x1b\x0a\x00\x00\x00\x00\x00\xfd"
+		    "\xff\xff\xff\xff\xff\xff\xff"
+		    , 1, 23, v);
 }
 
 static const laminate_t updp10_laminate[] =
@@ -861,10 +982,7 @@ static const laminate_t updp10_laminate[] =
   {"Matte",   N_("Matte"),   {1, "\x0c"}},
 };
 
-static const laminate_list_t updp10_laminate_list =
-{
-  updp10_laminate, sizeof(updp10_laminate) / sizeof(laminate_t)
-};
+LIST(laminate_list_t, updp10_laminate_list, laminate_t, updp10_laminate);
 
 static const char updp10_adj_cyan[] =
   "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@ -909,45 +1027,94 @@ static const char updp10_adj_yellow[] =
   "</gutenprint>\n";
 
 
-/* Sony UP-DR150 */
-static const olymp_resolution_t updr150_res[] =
+/* Sony UP-DR100 */
+static const dyesub_pagesize_t updr100_page[] =
 {
-  { "346x346", 346, 346},
+  { "w288h432",	"4x6", 298, 442, 0, 0, 0, 0, DYESUB_LANDSCAPE},
+  { "B7",	"3.5x5", 261, 369, 0, 0, 0, 0, DYESUB_LANDSCAPE},
+  { "w360h504",	"5x7", 369, 514, 0, 0, 0, 0, DYESUB_PORTRAIT},
+  { "w432h576",	"6x8", 442, 588, 0, 0, 0, 0, DYESUB_PORTRAIT},
+  { "Custom", NULL, 298, 442, 0, 0, 0, 0, DYESUB_LANDSCAPE},
 };
 
-static const olymp_resolution_list_t updr150_res_list =
+LIST(dyesub_pagesize_list_t, updr100_page_list, dyesub_pagesize_t, updr100_page);
+
+static const dyesub_printsize_t updr100_printsize[] =
 {
-  updr150_res, sizeof(updr150_res) / sizeof(olymp_resolution_t)
+  { "334x334", "w288h432", 1382, 2048},
+  { "334x334", "B7", 1210, 1710},
+  { "334x334", "w360h504", 1710, 2380},
+  { "334x334", "w432h576", 2048, 2724},
+  { "334x334", "Custom", 1382, 2048},
 };
 
-static const olymp_pagesize_t updr150_page[] =
+LIST(dyesub_printsize_list_t, updr100_printsize_list, dyesub_printsize_t, updr100_printsize);
+
+static void updr100_printer_init_func(stp_vars_t *v)
+{
+
+  stp_zfwrite("UPD8D\x00\x00\x00\x10\x03\x00\x00", 1, 12, v);
+  stp_put32_le(privdata.xsize, v);
+  stp_put32_le(privdata.ysize, v);
+  stp_zfwrite("\x1e\x00\x03\x00\x01\x00\x4e\x01\x00\x00", 1, 10, v);
+  stp_zfwrite((privdata.laminate->seq).data, 1,
+		(privdata.laminate->seq).bytes, v); /* laminate pattern */
+  dyesub_nputc(v, '\0', 13);
+  stp_zfwrite("\x01\x00\x01\x00\x03", 1, 5, v);
+  dyesub_nputc(v, '\0', 19);
+}
+
+static void updr100_printer_end_func(stp_vars_t *v)
+{
+  stp_zfwrite("UPD8D\x00\x00\x00\x02", 1, 9, v);
+  dyesub_nputc(v, '\0', 25);
+  stp_zfwrite("\x9d\x02\x00\x04\x00\x00\xc0\xe7"
+  	      "\x9d\x02\x54\xe9\x9d\x02\x9d\x71"
+	      "\x00\x73\xfa\x71\x00\x73\xf4\xea"
+	      "\x9d\x02\xa8\x3e\x00\x73\x9c\xeb\x9d\x02"
+	      , 1, 34, v);
+}
+
+static const laminate_t updr100_laminate[] =
 {
-  { "w288h432",	"2UPC-153 (4x6)", -1, -1, 0, 0, 3, 2},
-  { "B7",	"2UPC-154 (3.5x5)", -1, -1, 3, 2, 0, 0},
-  { "w360h504",	"2UPC-155 (5x7)", -1, -1, 0, 0, 4, 4},
-  { "w432h576",	"2UPC-156 (6x8)", -1, -1, 3, 2, 5, 4},
-  { "Custom", NULL, -1, -1, 0, 0, 3, 2},
+  {"Glossy",  N_("Glossy"),  {1, "\x01"}},
+  {"Texture", N_("Texture"), {1, "\x03"}},
+  {"Matte",   N_("Matte"),   {1, "\x04"}},
 };
 
-static const olymp_pagesize_list_t updr150_page_list =
+LIST(laminate_list_t, updr100_laminate_list, laminate_t, updr100_laminate);
+
+
+/* Sony UP-DR150 */
+static const dyesub_resolution_t res_334dpi[] =
 {
-  updr150_page, sizeof(updr150_page) / sizeof(olymp_pagesize_t)
+  { "334x334", 334, 334},
 };
 
-static const olymp_printsize_t updr150_printsize[] =
+LIST(dyesub_resolution_list_t, res_334dpi_list, dyesub_resolution_t, res_334dpi);
+
+static const dyesub_pagesize_t updr150_page[] =
 {
-  { "346x346", "w288h432", 1382, 2048},
-  { "346x346", "B7", 1210, 1728},
-  { "346x346", "w360h504", 1728, 2380},
-  { "346x346", "w432h576", 2048, 2724},
-  { "346x346", "Custom", 1382, 2048},
+  { "w288h432",	"2UPC-153 (4x6)", 298, 442, 0, 0, 0, 0, DYESUB_LANDSCAPE},
+  { "B7",	"2UPC-154 (3.5x5)", 261, 373, 0, 0, 0, 0, DYESUB_LANDSCAPE},
+  { "w360h504",	"2UPC-155 (5x7)", 373, 514, 0, 0, 0, 0, DYESUB_PORTRAIT},
+  { "w432h576",	"2UPC-156 (6x8)", 442, 588, 0, 0, 0, 0, DYESUB_PORTRAIT},
+  { "Custom", NULL, 298, 442, 0, 0, 0, 0, DYESUB_LANDSCAPE},
 };
 
-static const olymp_printsize_list_t updr150_printsize_list =
+LIST(dyesub_pagesize_list_t, updr150_page_list, dyesub_pagesize_t, updr150_page);
+
+static const dyesub_printsize_t updr150_printsize[] =
 {
-  updr150_printsize, sizeof(updr150_printsize) / sizeof(olymp_printsize_t)
+  { "334x334", "w288h432", 1382, 2048},
+  { "334x334", "B7", 1210, 1728},
+  { "334x334", "w360h504", 1728, 2380},
+  { "334x334", "w432h576", 2048, 2724},
+  { "334x334", "Custom", 1382, 2048},
 };
 
+LIST(dyesub_printsize_list_t, updr150_printsize_list, dyesub_printsize_t, updr150_printsize);
+
 static void updr150_printer_init_func(stp_vars_t *v)
 {
   char pg = '\0';
@@ -975,14 +1142,14 @@ static void updr150_printer_init_func(stp_vars_t *v)
 	      "\x1b\x15\x00\x00\x00\x0d\x00\x0d"
 	      "\x00\x00\x00\x00\x00\x00\x00\x07"
 	      "\x00\x00\x00\x00", 1, 91, v);
-  stp_put16_be(privdata.xsize, v);
   stp_put16_be(privdata.ysize, v);
+  stp_put16_be(privdata.xsize, v);
   stp_zfwrite("\xf9\xff\xff\xff\x07\x00\x00\x00"
 	      "\x1b\xe1\x00\x00\x00\x0b\x00\x0b"
 	      "\x00\x00\x00\x00\x80\x00\x00\x00"
 	      "\x00\x00", 1, 26, v);
-  stp_put16_be(privdata.xsize, v);
   stp_put16_be(privdata.ysize, v);
+  stp_put16_be(privdata.xsize, v);
   stp_zfwrite("\xf8\xff\xff\xff\x0b\x00\x00\x00\x1b\xea"
 	      "\x00\x00\x00\x00", 1, 14, v);
   stp_put32_be(privdata.xsize*privdata.ysize*3, v);
@@ -1000,50 +1167,35 @@ static void updr150_printer_end_func(stp_vars_t *v)
 		    , 1, 34, v);
 }
 
-/* Fujifilm CX-400 */
-static const olymp_resolution_t cx400_res[] =
-{
-  { "317x316", 317, 316},
-};
-
-static const olymp_resolution_list_t cx400_res_list =
-{
-  cx400_res, sizeof(cx400_res) / sizeof(olymp_resolution_t)
-};
 
-static const olymp_pagesize_t cx400_page[] =
+/* Fujifilm CX-400 */
+static const dyesub_pagesize_t cx400_page[] =
 {
-  { "w288h432", NULL, -1, -1, 23, 23, 28, 28},
-  { "w288h387", "4x5 3/8 (Digital Camera 3:4)", -1, -1, 23, 23, 27, 26},
-  { "w288h504", NULL, -1, -1, 23, 23, 23, 22},
-  { "Custom", NULL, -1, -1, 0, 0, 0, 0},
+  { "w288h432", NULL, 295, 428, 24, 24, 23, 22, DYESUB_PORTRAIT},
+  { "w288h387", "4x5 3/8 (Digital Camera 3:4)", 295, 386, 24, 24, 23, 23, DYESUB_PORTRAIT},
+  { "w288h504", NULL, 295, 513, 24, 24, 23, 22, DYESUB_PORTRAIT},
+  { "Custom", NULL, 295, 428, 0, 0, 0, 0, DYESUB_PORTRAIT},
 };
 
-static const olymp_pagesize_list_t cx400_page_list =
-{
-  cx400_page, sizeof(cx400_page) / sizeof(olymp_pagesize_t)
-};
+LIST(dyesub_pagesize_list_t, cx400_page_list, dyesub_pagesize_t, cx400_page);
 
-static const olymp_printsize_t cx400_printsize[] =
+static const dyesub_printsize_t cx400_printsize[] =
 {
-  { "317x316", "w288h387", 1268, 1658},
-  { "317x316", "w288h432", 1268, 1842},
-  { "317x316", "w288h504", 1268, 2208},
-  { "317x316", "Custom", 1268, 1842},
+  { "310x310", "w288h387", 1268, 1658},
+  { "310x310", "w288h432", 1268, 1842},
+  { "310x310", "w288h504", 1268, 2208},
+  { "310x310", "Custom", 1268, 1842},
 };
 
-static const olymp_printsize_list_t cx400_printsize_list =
-{
-  cx400_printsize, sizeof(cx400_printsize) / sizeof(olymp_printsize_t)
-};
+LIST(dyesub_printsize_list_t, cx400_printsize_list, dyesub_printsize_t, cx400_printsize);
 
 static void cx400_printer_init_func(stp_vars_t *v)
 {
   char pg = '\0';
   const char *pname = "XXXXXX";		  				
 
-  stp_deprintf(STP_DBG_OLYMPUS,
-	"olympus: fuji driver %s\n", stp_get_driver(v));
+  stp_deprintf(STP_DBG_DYESUB,
+	"dyesub: fuji driver %s\n", stp_get_driver(v));
   if (strcmp(stp_get_driver(v),"fujifilm-cx400") == 0)
     pname = "NX1000";
   else if (strcmp(stp_get_driver(v),"fujifilm-cx550") == 0)
@@ -1068,33 +1220,94 @@ static void cx400_printer_init_func(stp_vars_t *v)
   stp_putc('\1', v);
 }
   
-static const olymp_resolution_t all_resolutions[] =
+
+/* Fujifilm NX-500 */
+static const dyesub_resolution_t res_306dpi[] =
 {
   { "306x306", 306, 306},
-  { "153x153", 153, 153},
-  { "314x314", 314, 314},
-  { "300x300", 300, 300},
-  { "317x316", 317, 316},
-  { "320x320", 320, 320},
-  { "346x346", 346, 346},
 };
 
-static const olymp_resolution_list_t all_res_list =
+LIST(dyesub_resolution_list_t, res_306dpi_list, dyesub_resolution_t, res_306dpi);
+
+static const dyesub_pagesize_t nx500_page[] =
+{
+  { "Postcard", NULL, -1, -1, 21, 21, 29, 29, DYESUB_PORTRAIT},
+  { "Custom", NULL, -1, -1, 21, 21, 29, 29, DYESUB_PORTRAIT},
+};
+
+LIST(dyesub_pagesize_list_t, nx500_page_list, dyesub_pagesize_t, nx500_page);
+
+static const dyesub_printsize_t nx500_printsize[] =
+{
+  { "306x306", "Postcard", 1024, 1518},
+  { "306x306", "Custom", 1024, 1518},
+};
+
+LIST(dyesub_printsize_list_t, nx500_printsize_list, dyesub_printsize_t, nx500_printsize);
+
+static void nx500_printer_init_func(stp_vars_t *v)
+{
+  stp_zfwrite("INFO-QX-20--MKS\x00\x00\x00M\x00W\00A\x00R\00E", 1, 27, v);
+  dyesub_nputc(v, '\0', 21);
+  stp_zfwrite("\x80\x00\x02", 1, 3, v);
+  dyesub_nputc(v, '\0', 20);
+  stp_zfwrite("\x02\x01\x01", 1, 3, v);
+  dyesub_nputc(v, '\0', 2);
+  stp_put16_le(privdata.ysize, v);
+  stp_put16_le(privdata.xsize, v);
+  stp_zfwrite("\x00\x02\x00\x70\x2f", 1, 5, v);
+  dyesub_nputc(v, '\0', 43);
+}
+  
+
+/* Kodak Easyshare Dock family */
+static const dyesub_pagesize_t kodak_dock_page[] =
+{
+  { "w288h432", NULL, PT(1248,300)+1, PT(1856,300)+1, 0, 0, 0, 0,
+  						DYESUB_PORTRAIT}, /* 4x6 */
+  { "Custom", NULL, PT(1248,300)+1, PT(1856,300)+1, 0, 0, 0, 0,
+  						DYESUB_PORTRAIT}, /* 4x6 */
+};
+
+LIST(dyesub_pagesize_list_t, kodak_dock_page_list, dyesub_pagesize_t, kodak_dock_page);
+
+static const dyesub_printsize_t kodak_dock_printsize[] =
 {
-  all_resolutions, sizeof(all_resolutions) / sizeof(olymp_resolution_t)
+  { "300x300", "w288h432", 1248, 1856},
+  { "300x300", "Custom", 1248, 1856},
 };
 
-static const olympus_cap_t olympus_model_capabilities[] =
+LIST(dyesub_printsize_list_t, kodak_dock_printsize_list, dyesub_printsize_t, kodak_dock_printsize);
+
+static void kodak_dock_printer_init(stp_vars_t *v)
+{
+  stp_put16_be(0x3000, v);
+  dyesub_nputc(v, '\0', 10);
+}
+
+static void kodak_dock_plane_init(stp_vars_t *v)
+{
+  stp_put16_be(0x3001, v);
+  stp_put16_le(3 - privdata.plane, v);
+  stp_put32_le(privdata.xsize*privdata.ysize, v);
+  dyesub_nputc(v, '\0', 4);
+}
+
+
+
+/* Model capabilities */
+
+static const dyesub_cap_t dyesub_model_capabilities[] =
 {
   { /* Olympus P-10, P-11 */
     2, 		
     &rgb_ink_list,
-    &res_320dpi_list,
+    &res_310dpi_list,
     &p10_page_list,
     &p10_printsize_list,
-    OLYMPUS_INTERLACE_PLANE,
-    1848,
-    OLYMPUS_FEATURE_FULL_WIDTH | OLYMPUS_FEATURE_FULL_HEIGHT,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_PLANE_INTERLACE,
     &p10_printer_init_func, &p10_printer_end_func,
     NULL, NULL, 
     &p10_block_init_func, NULL,
@@ -1107,9 +1320,9 @@ static const olympus_cap_t olympus_model_capabilities[] =
     &res_320dpi_list,
     &p200_page_list,
     &p200_printsize_list,
-    OLYMPUS_INTERLACE_PLANE,
-    1280,
-    OLYMPUS_FEATURE_FULL_WIDTH | OLYMPUS_FEATURE_BLOCK_ALIGN,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_BLOCK_ALIGN
+      | DYESUB_FEATURE_PLANE_INTERLACE,
     &p200_printer_init_func, &p200_printer_end_func,
     &p200_plane_init_func, NULL,
     NULL, NULL,
@@ -1122,9 +1335,9 @@ static const olympus_cap_t olympus_model_capabilities[] =
     &p300_res_list,
     &p300_page_list,
     &p300_printsize_list,
-    OLYMPUS_INTERLACE_PLANE,
     16,
-    OLYMPUS_FEATURE_FULL_WIDTH | OLYMPUS_FEATURE_BLOCK_ALIGN,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_BLOCK_ALIGN
+      | DYESUB_FEATURE_PLANE_INTERLACE,
     &p300_printer_init_func, NULL,
     NULL, &p300_plane_end_func,
     &p300_block_init_func, NULL,
@@ -1137,9 +1350,9 @@ static const olympus_cap_t olympus_model_capabilities[] =
     &res_314dpi_list,
     &p400_page_list,
     &p400_printsize_list,
-    OLYMPUS_INTERLACE_PLANE,
     180,
-    OLYMPUS_FEATURE_FULL_WIDTH | OLYMPUS_FEATURE_FULL_HEIGHT,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_PLANE_INTERLACE,
     &p400_printer_init_func, NULL,
     &p400_plane_init_func, &p400_plane_end_func,
     &p400_block_init_func, NULL,
@@ -1152,25 +1365,54 @@ static const olympus_cap_t olympus_model_capabilities[] =
     &res_314dpi_list,
     &p440_page_list,
     &p440_printsize_list,
-    OLYMPUS_INTERLACE_NONE,
     128,
-    OLYMPUS_FEATURE_FULL_WIDTH | OLYMPUS_FEATURE_FULL_HEIGHT,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT,
     &p440_printer_init_func, &p440_printer_end_func,
     NULL, NULL,
     &p440_block_init_func, &p440_block_end_func,
     NULL, NULL, NULL,	/* color profile/adjustment is built into printer */
     &p10_laminate_list,
   },
+  { /* Olympus P-S100 */
+    20,
+    &rgb_ink_list,
+    &res_306dpi_list,
+    &ps100_page_list,
+    &ps100_printsize_list,
+    1808,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT,
+    &ps100_printer_init_func, &ps100_printer_end_func,
+    NULL, NULL,
+    NULL, NULL,
+    NULL, NULL, NULL,	/* color profile/adjustment is built into printer */
+    NULL,
+  },
+  { /* Canon CP-10 */
+    1002,
+    &ymc_ink_list,
+    &res_300dpi_list,
+    &cp10_page_list,
+    &cp10_printsize_list,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_BORDERLESS | DYESUB_FEATURE_WHITE_BORDER
+      | DYESUB_FEATURE_PLANE_INTERLACE,
+    &cpx00_printer_init_func, NULL,
+    &cpx00_plane_init_func, NULL,
+    NULL, NULL,
+    cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
+    NULL,
+  },
   { /* Canon CP-100, CP-200, CP-300 */
     1000,
     &ymc_ink_list,
-    &res_314dpi_list,
+    &res_300dpi_list,
     &cpx00_page_list,
     &cpx00_printsize_list,
-    OLYMPUS_INTERLACE_PLANE,
-    1808,
-    OLYMPUS_FEATURE_FULL_WIDTH | OLYMPUS_FEATURE_FULL_HEIGHT
-      | OLYMPUS_FEATURE_BORDERLESS | OLYMPUS_FEATURE_WHITE_BORDER,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_BORDERLESS | DYESUB_FEATURE_WHITE_BORDER
+      | DYESUB_FEATURE_PLANE_INTERLACE,
     &cpx00_printer_init_func, NULL,
     &cpx00_plane_init_func, NULL,
     NULL, NULL,
@@ -1181,44 +1423,71 @@ static const olympus_cap_t olympus_model_capabilities[] =
        SELPHY CP-600, SELPHY CP-710 */
     1001,
     &ymc_ink_list,
-    &res_314dpi_list,
+    &res_300dpi_list,
     &cp220_page_list,
     &cp220_printsize_list,
-    OLYMPUS_INTERLACE_PLANE,
-    1808,
-    OLYMPUS_FEATURE_FULL_WIDTH | OLYMPUS_FEATURE_FULL_HEIGHT
-      | OLYMPUS_FEATURE_BORDERLESS | OLYMPUS_FEATURE_WHITE_BORDER,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_BORDERLESS | DYESUB_FEATURE_WHITE_BORDER
+      | DYESUB_FEATURE_PLANE_INTERLACE,
     &cpx00_printer_init_func, NULL,
     &cpx00_plane_init_func, NULL,
     NULL, NULL,
     cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
     NULL,
   },
+  { /* Sony DPP-EX5, DPP-EX7 */
+    2002,
+    &rgb_ink_list,
+    &res_403dpi_list,
+    &dppex5_page_list,
+    &dppex5_printsize_list,
+    100,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_BORDERLESS,
+    &dppex5_printer_init, &dppex5_printer_end,
+    NULL, NULL,
+    &dppex5_block_init, NULL,
+    NULL, NULL, NULL,
+    &dppex5_laminate_list,
+  },
   { /* Sony UP-DP10  */
     2000,
     &cmy_ink_list,
-    &updp10_res_list,
+    &res_300dpi_list,
     &updp10_page_list,
     &updp10_printsize_list,
-    OLYMPUS_INTERLACE_NONE,
-    1800,
-    OLYMPUS_FEATURE_FULL_WIDTH | OLYMPUS_FEATURE_FULL_HEIGHT
-      | OLYMPUS_FEATURE_BORDERLESS,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_BORDERLESS,
     &updp10_printer_init_func, &updp10_printer_end_func,
     NULL, NULL,
     NULL, NULL,
     updp10_adj_cyan, updp10_adj_magenta, updp10_adj_yellow,
     &updp10_laminate_list,
   },
+  { /* Sony UP-DR100 */
+    2003,
+    &rgb_ink_list,
+    &res_334dpi_list,
+    &updr100_page_list,
+    &updr100_printsize_list,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT,
+    &updr100_printer_init_func, &updr100_printer_end_func,
+    NULL, NULL,
+    NULL, NULL,
+    NULL, NULL, NULL, 
+    &updr100_laminate_list,
+  },
   { /* Sony UP-DR150 */
     2001,
     &rgb_ink_list,
-    &updr150_res_list,
+    &res_334dpi_list,
     &updr150_page_list,
     &updr150_printsize_list,
-    OLYMPUS_INTERLACE_NONE,
-    1800,
-    OLYMPUS_FEATURE_FULL_WIDTH | OLYMPUS_FEATURE_FULL_HEIGHT,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT,
     &updr150_printer_init_func, &updr150_printer_end_func,
     NULL, NULL,
     NULL, NULL,
@@ -1228,13 +1497,12 @@ static const olympus_cap_t olympus_model_capabilities[] =
   { /* Fujifilm Printpix CX-400  */
     3000,
     &rgb_ink_list,
-    &cx400_res_list,
+    &res_310dpi_list,
     &cx400_page_list,
     &cx400_printsize_list,
-    OLYMPUS_INTERLACE_NONE,
-    2208,
-    OLYMPUS_FEATURE_FULL_WIDTH | OLYMPUS_FEATURE_FULL_HEIGHT
-      | OLYMPUS_FEATURE_BORDERLESS,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_BORDERLESS,
     &cx400_printer_init_func, NULL,
     NULL, NULL,
     NULL, NULL,
@@ -1244,19 +1512,47 @@ static const olympus_cap_t olympus_model_capabilities[] =
   { /* Fujifilm Printpix CX-550  */
     3001,
     &rgb_ink_list,
-    &cx400_res_list,
+    &res_310dpi_list,
     &cx400_page_list,
     &cx400_printsize_list,
-    OLYMPUS_INTERLACE_NONE,
-    2208,
-    OLYMPUS_FEATURE_FULL_WIDTH | OLYMPUS_FEATURE_FULL_HEIGHT
-      | OLYMPUS_FEATURE_BORDERLESS,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_BORDERLESS,
     &cx400_printer_init_func, NULL,
     NULL, NULL,
     NULL, NULL,
     NULL, NULL, NULL,	/* color profile/adjustment is built into printer */
     NULL,
   },
+  { /* Fujifilm FinePix NX-500  */
+    3002,
+    &rgb_ink_list,
+    &res_306dpi_list,
+    &nx500_page_list,
+    &nx500_printsize_list,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT,
+    &nx500_printer_init_func, NULL,
+    NULL, NULL,
+    NULL, NULL,
+    NULL, NULL, NULL,	/* color profile/adjustment is built into printer */
+    NULL,
+  },
+  { /* Kodak Easyshare Dock family */
+    4000, 		
+    &ymc_ink_list,
+    &res_300dpi_list,
+    &kodak_dock_page_list,
+    &kodak_dock_printsize_list,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_PLANE_INTERLACE,
+    &kodak_dock_printer_init, NULL,
+    &kodak_dock_plane_init, NULL,
+    NULL, NULL,
+    NULL, NULL, NULL,
+    NULL,
+  },
 };
 
 static const stp_parameter_t the_parameters[] =
@@ -1362,25 +1658,25 @@ static const float_param_t float_parameters[] =
 static const int float_parameter_count =
 sizeof(float_parameters) / sizeof(const float_param_t);
 
-static const olympus_cap_t* olympus_get_model_capabilities(int model)
+static const dyesub_cap_t* dyesub_get_model_capabilities(int model)
 {
   int i;
-  int models = sizeof(olympus_model_capabilities) / sizeof(olympus_cap_t);
+  int models = sizeof(dyesub_model_capabilities) / sizeof(dyesub_cap_t);
 
   for (i=0; i<models; i++)
     {
-      if (olympus_model_capabilities[i].model == model)
-        return &(olympus_model_capabilities[i]);
+      if (dyesub_model_capabilities[i].model == model)
+        return &(dyesub_model_capabilities[i]);
     }
-  stp_deprintf(STP_DBG_OLYMPUS,
-  	"olympus: model %d not found in capabilities list.\n", model);
-  return &(olympus_model_capabilities[0]);
+  stp_deprintf(STP_DBG_DYESUB,
+  	"dyesub: model %d not found in capabilities list.\n", model);
+  return &(dyesub_model_capabilities[0]);
 }
 
-static const laminate_t* olympus_get_laminate_pattern(stp_vars_t *v)
+static const laminate_t* dyesub_get_laminate_pattern(stp_vars_t *v)
 {
   const char *lpar = stp_get_string_parameter(v, "Laminate");
-  const olympus_cap_t *caps = olympus_get_model_capabilities(
+  const dyesub_cap_t *caps = dyesub_get_model_capabilities(
 		  				stp_get_model_id(v));
   const laminate_list_t *llist = caps->laminate;
   const laminate_t *l = NULL;
@@ -1396,16 +1692,16 @@ static const laminate_t* olympus_get_laminate_pattern(stp_vars_t *v)
 }
   
 static void
-olympus_printsize(const stp_vars_t *v,
+dyesub_printsize(const stp_vars_t *v,
 		   int  *width,
 		   int  *height)
 {
   int i;
   const char *page = stp_get_string_parameter(v, "PageSize");
   const char *resolution = stp_get_string_parameter(v, "Resolution");
-  const olympus_cap_t *caps = olympus_get_model_capabilities(
+  const dyesub_cap_t *caps = dyesub_get_model_capabilities(
 		  				stp_get_model_id(v));
-  const olymp_printsize_list_t *p = caps->printsize;
+  const dyesub_printsize_list_t *p = caps->printsize;
 
   for (i = 0; i < p->n_items; i++)
     {
@@ -1417,18 +1713,18 @@ olympus_printsize(const stp_vars_t *v,
           return;
         }
     }
-  stp_erprintf("olympus_printsize: printsize not found (%s, %s)\n",
+  stp_erprintf("dyesub_printsize: printsize not found (%s, %s)\n",
 	       page, resolution);
 }
 
 static int
-olympus_feature(const olympus_cap_t *caps, int feature)
+dyesub_feature(const dyesub_cap_t *caps, int feature)
 {
   return ((caps->features & feature) == feature);
 }
 
 static stp_parameter_list_t
-olympus_list_parameters(const stp_vars_t *v)
+dyesub_list_parameters(const stp_vars_t *v)
 {
   stp_parameter_list_t *ret = stp_parameter_list_create();
   int i;
@@ -1441,11 +1737,11 @@ olympus_list_parameters(const stp_vars_t *v)
 }
 
 static void
-olympus_parameters(const stp_vars_t *v, const char *name,
+dyesub_parameters(const stp_vars_t *v, const char *name,
 	       stp_parameter_t *description)
 {
   int	i;
-  const olympus_cap_t *caps = olympus_get_model_capabilities(
+  const dyesub_cap_t *caps = dyesub_get_model_capabilities(
 		  				stp_get_model_id(v));
 
   description->p_type = STP_PARAMETER_TYPE_INVALID;
@@ -1472,7 +1768,7 @@ olympus_parameters(const stp_vars_t *v, const char *name,
   if (strcmp(name, "PageSize") == 0)
     {
       int default_specified = 0;
-      const olymp_pagesize_list_t *p = caps->pages;
+      const dyesub_pagesize_list_t *p = caps->pages;
       const char* text;
 
       description->bounds.str = stp_string_list_create();
@@ -1507,7 +1803,7 @@ olympus_parameters(const stp_vars_t *v, const char *name,
   else if (strcmp(name, "Resolution") == 0)
     {
       char res_text[24];
-      const olymp_resolution_list_t *r = caps->resolution;
+      const dyesub_resolution_list_t *r = caps->resolution;
 
       description->bounds.str = stp_string_list_create();
       for (i = 0; i < r->n_items; i++)
@@ -1552,7 +1848,7 @@ olympus_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "Borderless") == 0)
     {
-      if (olympus_feature(caps, OLYMPUS_FEATURE_BORDERLESS)) 
+      if (dyesub_feature(caps, DYESUB_FEATURE_BORDERLESS)) 
         description->is_active = 1;
     }
   else if (strcmp(name, "PrintingMode") == 0)
@@ -1568,104 +1864,129 @@ olympus_parameters(const stp_vars_t *v, const char *name,
 }
 
 
+static const dyesub_pagesize_t*
+dyesub_current_pagesize(const stp_vars_t *v)
+{
+  const char *page = stp_get_string_parameter(v, "PageSize");
+  const stp_papersize_t *pt = stp_get_papersize_by_name(page);
+  const dyesub_cap_t *caps = dyesub_get_model_capabilities(
+		  				stp_get_model_id(v));
+  const dyesub_pagesize_list_t *p = caps->pages;
+  int i;
+
+  for (i = 0; i < p->n_items; i++)
+    {
+      if (strcmp(p->item[i].name,pt->name) == 0)
+          return &(p->item[i]);
+    }
+  return NULL;
+}
+
 static void
-olympus_imageable_area_internal(const stp_vars_t *v,
+dyesub_media_size(const stp_vars_t *v,
+		int *width,
+		int *height)
+{
+  const dyesub_pagesize_t *p = dyesub_current_pagesize(v);
+  stp_default_media_size(v, width, height);
+
+  if (p && p->width_pt > 0)
+    *width = p->width_pt;
+  if (p && p->height_pt > 0)
+    *height = p->height_pt;
+}
+
+static void
+dyesub_imageable_area_internal(const stp_vars_t *v,
 				int  use_maximum_area,
 				int  *left,
 				int  *right,
 				int  *bottom,
-				int  *top)
+				int  *top,
+				int  *print_mode)
 {
   int width, height;
-  int i;
-  const char *page = stp_get_string_parameter(v, "PageSize");
-  const stp_papersize_t *pt = stp_get_papersize_by_name(page);
-  const olympus_cap_t *caps = olympus_get_model_capabilities(
+  const dyesub_pagesize_t *p = dyesub_current_pagesize(v);
+  const dyesub_cap_t *caps = dyesub_get_model_capabilities(
 		  				stp_get_model_id(v));
-  const olymp_pagesize_list_t *p = caps->pages;
 
-  for (i = 0; i < p->n_items; i++)
+  dyesub_media_size(v, &width, &height);
+  if (use_maximum_area
+      || (dyesub_feature(caps, DYESUB_FEATURE_BORDERLESS) &&
+          stp_get_boolean_parameter(v, "Borderless"))
+      || !p)
     {
-      if (strcmp(p->item[i].name,pt->name) == 0)
-        {
-/*
-    	  if (p->item[i].width_pt >= 0)
-    		  stp_set_page_width(v, p->item[i].width_pt);
-    	  if (p->item[i].height_pt >= 0)
-    		  stp_set_page_height(v, p->item[i].height_pt);
-*/
-
-          stp_default_media_size(v, &width, &height);
-    
-          
-	  if (use_maximum_area ||
-	      (olympus_feature(caps, OLYMPUS_FEATURE_BORDERLESS) &&
-	       stp_get_boolean_parameter(v, "Borderless")))
-            {
-              *left = 0;
-              *top  = 0;
-              *right  = width;
-              *bottom = height;
-            }
-	  else
-	    {
-              *left = p->item[i].border_pt_left;
-              *top  = p->item[i].border_pt_top;
-              *right  = width  - p->item[i].border_pt_right;
-              *bottom = height - p->item[i].border_pt_bottom;
-	    }
-          break;
-        }
+      *left = 0;
+      *top  = 0;
+      *right  = width;
+      *bottom = height;
     }
+  else
+    {
+      *left = p->border_pt_left;
+      *top  = p->border_pt_top;
+      *right  = width  - p->border_pt_right;
+      *bottom = height - p->border_pt_bottom;
+    }
+  if (p)
+    *print_mode = p->print_mode;
+  else
+    *print_mode = DYESUB_PORTRAIT;
 }
 
 static void
-olympus_imageable_area(const stp_vars_t *v,
+dyesub_imageable_area(const stp_vars_t *v,
 		       int  *left,
 		       int  *right,
 		       int  *bottom,
 		       int  *top)
 {
-  olympus_imageable_area_internal(v, 0, left, right, bottom, top);
+  int not_used;
+  dyesub_imageable_area_internal(v, 0, left, right, bottom, top, &not_used);
 }
 
 static void
-olympus_maximum_imageable_area(const stp_vars_t *v,
+dyesub_maximum_imageable_area(const stp_vars_t *v,
 			       int  *left,
 			       int  *right,
 			       int  *bottom,
 			       int  *top)
 {
-  olympus_imageable_area_internal(v, 1, left, right, bottom, top);
+  int not_used;
+  dyesub_imageable_area_internal(v, 1, left, right, bottom, top, &not_used);
 }
 
 static void
-olympus_limit(const stp_vars_t *v,			/* I */
+dyesub_limit(const stp_vars_t *v,			/* I */
 	    int *width, int *height,
 	    int *min_width, int *min_height)
 {
-  *width = 65535;
-  *height = 65535;
-  *min_width = 1;
+  *width  = SHRT_MAX;
+  *height = SHRT_MAX;
+  *min_width  = 1;
   *min_height =	1;
 }
 
 static void
-olympus_describe_resolution(const stp_vars_t *v, int *x, int *y)
+dyesub_describe_resolution(const stp_vars_t *v, int *x, int *y)
 {
   const char *resolution = stp_get_string_parameter(v, "Resolution");
+  const dyesub_cap_t *caps = dyesub_get_model_capabilities(
+  							stp_get_model_id(v));
+  const dyesub_resolution_list_t *r = caps->resolution;
   int i;
 
   *x = -1;
   *y = -1;
   if (resolution)
     {
-      for (i = 0; i < all_res_list.n_items; i++)
+      for (i = 0; i < r->n_items; i++)
 	{
-	  if (strcmp(resolution, all_res_list.item[i].name) == 0)
+	  if (strcmp(resolution, r->item[i].name) == 0)
 	    {
-	      *x = all_res_list.item[i].xdpi;
-	      *y = all_res_list.item[i].ydpi;
+	      *x = r->item[i].xdpi;
+	      *y = r->item[i].ydpi;
+	      break;
 	    }
 	}
     }  
@@ -1673,87 +1994,304 @@ olympus_describe_resolution(const stp_vars_t *v, int *x, int *y)
 }
 
 static const char *
-olympus_describe_output(const stp_vars_t *v)
+dyesub_describe_output_internal(const stp_vars_t *v, dyesub_print_vars_t *pv)
 {
-  return "CMY";
+  const char *ink_type      = stp_get_string_parameter(v, "InkType");
+  const dyesub_cap_t *caps = dyesub_get_model_capabilities(
+  							stp_get_model_id(v));
+  const char *output_type;
+  int i;
+
+  pv->ink_channels = 1;
+  pv->ink_order = NULL;
+  output_type = "CMY";
+
+  if (ink_type)
+    {
+      for (i = 0; i < caps->inks->n_items; i++)
+	if (strcmp(ink_type, caps->inks->item[i].name) == 0)
+	  {
+	    output_type = caps->inks->item[i].output_type;
+	    pv->ink_channels = caps->inks->item[i].output_channels;
+	    pv->ink_order = caps->inks->item[i].channel_order;
+	    break;
+	  }
+    }
+  
+  return output_type;
 }
 
-static unsigned short *
-olympus_get_cached_output(stp_vars_t *v,
-             stp_image_t *image,
-	     unsigned short **cache,
-             int line, int size)
+static const char *
+dyesub_describe_output(const stp_vars_t *v)
+{
+  dyesub_print_vars_t ipv;
+  return dyesub_describe_output_internal(v, &ipv);
+}
+
+static void
+dyesub_nputc(stp_vars_t *v, char byte, int count)
+{
+  int i;
+  for (i = 0; i < count; i++)
+    stp_putc(byte, v);
+}
+
+static void
+dyesub_swap_ints(int *a, int *b)
+{
+  int t = *a;
+  *a = *b; 
+  *b = t;
+}
+
+static void
+dyesub_adjust_curve(stp_vars_t *v,
+		const char *color_adj,
+		const char *color_curve)
+{
+  stp_curve_t   *adjustment = NULL;
+
+  if (color_adj &&
+        !stp_check_curve_parameter(v, color_curve, STP_PARAMETER_ACTIVE))
+    {
+      adjustment = stp_curve_create_from_string(color_adj);
+      stp_set_curve_parameter(v, color_curve, adjustment);
+      stp_set_curve_parameter_active(v, color_curve, STP_PARAMETER_ACTIVE);
+      stp_curve_destroy(adjustment);
+    }
+}
+
+static void
+dyesub_exec(stp_vars_t *v,
+		void (*func)(stp_vars_t *),
+		const char *debug_string)
+{
+  if (func)
+    {
+      stp_deprintf(STP_DBG_DYESUB, "dyesub: %s\n", debug_string);
+      (*func)(v);
+    }
+}
+
+static int
+dyesub_interpolate(int oldval, int oldsize, int newsize)
+{
+  /* 
+   * This is simple linear interpolation algorithm.
+   * When imagesize <> printsize I need rescale image somehow... :-/ 
+   */
+  return (int)(oldval * newsize / oldsize);
+}
+
+static void
+dyesub_free_image(unsigned short** image_data, stp_image_t *image)
 {
-  unsigned zero_mask;
+  int image_px_height = stp_image_height(image);
+  int i;
+
+  for (i = 0; i< image_px_height; i++)
+    if (image_data[i])
+      stp_free(image_data[i]);
+  if (image_data)
+    stp_free(image_data);
+}
+
+static unsigned short **
+dyesub_read_image(stp_vars_t *v,
+		dyesub_print_vars_t *pv,
+		stp_image_t *image)
+{
+  int image_px_width  = stp_image_width(image);
+  int image_px_height = stp_image_height(image);
+  int row_size = image_px_width * pv->ink_channels * pv->bytes_per_out_channel;
+  unsigned short **image_data;
+  unsigned int zero_mask;
+  int i;
 
-  stp_deprintf(STP_DBG_OLYMPUS, "olympus: get row %d", line);
-  if (cache[line] == NULL)
+  image_data = stp_zalloc(image_px_height * sizeof(unsigned short *));
+  if (!image_data)
+    return NULL;	/* ? out of memory ? */
+
+  for (i = 0; i < image_px_height; i++)
     {
-      stp_deprintf(STP_DBG_OLYMPUS, " (calling stp_color_get_row())\n");
-      if (!stp_color_get_row(v, image, line, &zero_mask))
+      if (stp_color_get_row(v, image, i, &zero_mask))
+        {
+	  stp_deprintf(STP_DBG_DYESUB,
+	  	"dyesub_read_image: "
+		"stp_color_get_row(..., %d, ...) == 0\n", i);
+	  dyesub_free_image(image_data, image);
+	  return NULL;
+	}	
+      image_data[i] = stp_malloc(row_size);
+      if (!image_data[i])
         {
-          cache[line] = stp_malloc(size);
-          memcpy(cache[line], stp_channel_get_output(v), size);
+	  stp_deprintf(STP_DBG_DYESUB,
+	  	"dyesub_read_image: "
+		"(image_data[%d] = stp_malloc()) == NULL\n", i);
+	  dyesub_free_image(image_data, image);
+	  return NULL;
+	}	
+      memcpy(image_data[i], stp_channel_get_output(v), row_size);
+    }
+  stp_image_conclude(image);
+
+  return image_data;
+}
+
+static int
+dyesub_print_pixel(stp_vars_t *v,
+		dyesub_print_vars_t *pv,
+		int row,
+		int col,
+		int plane)
+{
+  unsigned short ink[MAX_INK_CHANNELS * MAX_BYTES_PER_CHANNEL], *out;
+  unsigned char *ink_u8;
+  int i, j;
+  
+  if (pv->print_mode == DYESUB_LANDSCAPE)
+    { /* "rotate" image */
+      dyesub_swap_ints(&col, &row);
+      row = (pv->imgw_px - 1) - row;
+    }
+
+  out = &(pv->image_data[row][col * pv->out_channels]);
+
+  for (i = 0; i < pv->ink_channels; i++)
+    {
+      if (pv->out_channels == pv->ink_channels)
+        { /* copy out_channel (image) to equiv ink_channel (printer) */
+          ink[i] = out[i];
+        }
+      else if (pv->out_channels < pv->ink_channels)
+        { /* several ink_channels (printer) "share" same out_channel (image) */
+          ink[i] = out[i * pv->out_channels / pv->ink_channels];
         }
+      else /* (pv->out_channels > pv->ink_channels) */
+        { /* merge several out_channels (image) into ink_channel (printer) */
+          int avg = 0;
+          for (j = 0; j < pv->out_channels / pv->ink_channels; j++)
+            avg += out[j + i * pv->out_channels / pv->ink_channels];
+	  ink[i] = avg * pv->ink_channels / pv->out_channels;
+	}
     }
+   
+  if (pv->bytes_per_ink_channel == 1) /* convert 16bits to 8bit */
+    {
+      ink_u8 = (unsigned char *) ink;
+      for (i = 0; i < pv->ink_channels; i++)
+        ink_u8[i] = ink[i] / 257;
+    }
+	
+  if (pv->plane_interlacing)
+    stp_zfwrite((char *) ink + plane, pv->bytes_per_ink_channel, 1, v);
   else
+    stp_zfwrite((char *) ink, pv->bytes_per_ink_channel, pv->ink_channels, v);
+
+  return 1;
+}
+
+static int
+dyesub_print_row(stp_vars_t *v,
+		dyesub_print_vars_t *pv,
+		int row,
+		int plane)
+{
+  int ret = 0;
+  int w, col;
+  
+  for (w = 0; w < pv->outw_px; w++)
+    {
+      col = dyesub_interpolate(w, pv->outw_px, pv->imgw_px);
+      ret = dyesub_print_pixel(v, pv, row, col, plane);
+      if (ret > 1)
+      	break;
+    }
+  return ret;
+}
+
+static int
+dyesub_print_plane(stp_vars_t *v,
+		dyesub_print_vars_t *pv,
+		const dyesub_cap_t *caps,
+		int plane)
+{
+  int ret = 0;
+  int h, row;
+  int out_bytes = (pv->plane_interlacing ? 1 : pv->ink_channels)
+  					* pv->bytes_per_ink_channel;
+
+
+  for (h = 0; h <= pv->prnb_px - pv->prnt_px; h++)
     {
-      stp_deprintf(STP_DBG_OLYMPUS, " (cached)\n");
+      if (h % caps->block_size == 0)
+        { /* block init */
+	  privdata.block_min_y = h + pv->prnt_px;
+	  privdata.block_min_x = pv->prnl_px;
+	  privdata.block_max_y = MIN(h + pv->prnt_px + caps->block_size - 1,
+	  					pv->prnb_px);
+	  privdata.block_max_x = pv->prnr_px;
+
+	  dyesub_exec(v, caps->block_init_func, "caps->block_init");
+	}
+
+      if (h + pv->prnt_px < pv->outt_px || h + pv->prnt_px >= pv->outb_px)
+        { /* empty part above or below image area */
+          dyesub_nputc(v, pv->empty_byte, out_bytes * pv->prnw_px);
+	}
+      else
+        {
+	  if (dyesub_feature(caps, DYESUB_FEATURE_FULL_WIDTH)
+	  	&& pv->outl_px > 0)
+	    { /* empty part left of image area */
+              dyesub_nputc(v, pv->empty_byte, out_bytes * pv->outl_px);
+	    }
+
+	  row = dyesub_interpolate(h + pv->prnt_px - pv->outt_px,
+	  					pv->outh_px, pv->imgh_px);
+	  stp_deprintf(STP_DBG_DYESUB,
+	  	"dyesub_print_plane: h = %d, row = %d\n", h, row);
+	  ret = dyesub_print_row(v, pv, row, plane);
+
+	  if (dyesub_feature(caps, DYESUB_FEATURE_FULL_WIDTH)
+	  	&& pv->outr_px < pv->prnw_px)
+	    { /* empty part right of image area */
+              dyesub_nputc(v, pv->empty_byte, out_bytes
+	      				* (pv->prnw_px - pv->outr_px));
+	    }
+	}
+
+      if (h + pv->prnt_px == privdata.block_max_y)
+        { /* block end */
+	  dyesub_exec(v, caps->block_end_func, "caps->block_end");
+	}
     }
-  return cache[line];
+  return ret;
 }
 
 /*
- * olympus_print()
+ * dyesub_print()
  */
 static int
-olympus_do_print(stp_vars_t *v, stp_image_t *image)
+dyesub_do_print(stp_vars_t *v, stp_image_t *image)
 {
-  int i, j;
-  int y, min_y, max_y;			/* Looping vars */
-  int min_x, max_x;
-  int out_channels, out_bytes;
-  unsigned short *final_out = NULL;
-  unsigned char  *char_out = NULL;
-  unsigned short *real_out = NULL;
-  unsigned short *err_out = NULL;
-  unsigned short **rows = NULL;		/* "cache" of rows read from image */
-  int char_out_width;
+  int i;
+  dyesub_print_vars_t pv;
   int status = 1;
-  int ink_channels = 1;
-  const char *ink_order = NULL;
-  stp_curve_t   *adjustment = NULL;
-
-  int r_errdiv, r_errmod;
-  int r_errval  = 0;
-  int r_errlast = -1;
-  int r_errline = 0;
-  int c_errdiv, c_errmod;
-  int c_errval  = 0;
-  int c_errlast = -1;
-  int c_errcol = 0;
 
   const int model           = stp_get_model_id(v); 
-  const char *ink_type      = stp_get_string_parameter(v, "InkType");
-  const olympus_cap_t *caps = olympus_get_model_capabilities(model);
+  const char *ink_type;
+  const dyesub_cap_t *caps = dyesub_get_model_capabilities(model);
   int max_print_px_width = 0;
   int max_print_px_height = 0;
   int xdpi, ydpi;	/* Resolution */
 
-  /* image in pixels */
-  int image_px_width;
-  int image_px_height;
-
   /* output in 1/72" */
   int out_pt_width  = stp_get_width(v);
   int out_pt_height = stp_get_height(v);
   int out_pt_left   = stp_get_left(v);
   int out_pt_top    = stp_get_top(v);
 
-  /* output in pixels */
-  int out_px_width, out_px_height;
-  int out_px_left, out_px_right, out_px_top, out_px_bottom;
-
   /* page in 1/72" */
   int page_pt_width  = stp_get_page_width(v);
   int page_pt_height = stp_get_page_height(v);
@@ -1761,13 +2299,11 @@ olympus_do_print(stp_vars_t *v, stp_image_t *image)
   int page_pt_right = 0;
   int page_pt_top = 0;
   int page_pt_bottom = 0;
+  int page_mode;	
 
-  /* page w/out borders in pixels (according to selected dpi) */
-  int print_px_width;
-  int print_px_height;
-  
   int pl;
-  unsigned char *zeros = NULL;
+
+
 
   if (!stp_verify(v))
     {
@@ -1776,51 +2312,46 @@ olympus_do_print(stp_vars_t *v, stp_image_t *image)
     }
 
   stp_image_init(image);
-  image_px_width  = stp_image_width(image);
-  image_px_height = stp_image_height(image);
+  pv.imgw_px = stp_image_width(image);
+  pv.imgh_px = stp_image_height(image);
 
   stp_describe_resolution(v, &xdpi, &ydpi);
-  olympus_printsize(v, &max_print_px_width, &max_print_px_height);
+  dyesub_printsize(v, &max_print_px_width, &max_print_px_height);
 
   privdata.pagesize = stp_get_string_parameter(v, "PageSize");
   if (caps->laminate)
-	  privdata.laminate = olympus_get_laminate_pattern(v);
+	  privdata.laminate = dyesub_get_laminate_pattern(v);
 
-  if (olympus_feature(caps, OLYMPUS_FEATURE_WHITE_BORDER))
-    stp_default_media_size(v, &page_pt_right, &page_pt_bottom);
-  else
-    olympus_imageable_area(v, &page_pt_left, &page_pt_right,
-	&page_pt_bottom, &page_pt_top);
+  dyesub_imageable_area_internal(v, 
+  	(dyesub_feature(caps, DYESUB_FEATURE_WHITE_BORDER) ? 1 : 0),
+	&page_pt_left, &page_pt_right, &page_pt_bottom, &page_pt_top,
+	&page_mode);
   
-  print_px_width  = MIN(max_print_px_width,
-		  	(page_pt_right - page_pt_left) * xdpi / 72);
-  print_px_height = MIN(max_print_px_height,
-			(page_pt_bottom - page_pt_top) * ydpi / 72);
-  out_px_width  = out_pt_width  * xdpi / 72;
-  out_px_height = out_pt_height * ydpi / 72;
+  pv.prnw_px = MIN(max_print_px_width,
+		  	PX(page_pt_right - page_pt_left, xdpi));
+  pv.prnh_px = MIN(max_print_px_height,
+			PX(page_pt_bottom - page_pt_top, ydpi));
+  pv.outw_px = PX(out_pt_width, xdpi);
+  pv.outh_px = PX(out_pt_height, ydpi);
 
 
   /* if image size is close enough to output size send out original size */
-  if (out_px_width - image_px_width > -5
-      && out_px_width - image_px_width < 5
-      && out_px_height - image_px_height > -5
-      && out_px_height - image_px_height < 5)
-    {
-      out_px_width  = image_px_width;
-      out_px_height = image_px_height;
-    }
-
-  out_px_width  = MIN(out_px_width, print_px_width);
-  out_px_height = MIN(out_px_height, print_px_height);
-  out_px_left   = MIN(((out_pt_left - page_pt_left) * xdpi / 72),
-			print_px_width - out_px_width);
-  out_px_top    = MIN(((out_pt_top  - page_pt_top)  * ydpi / 72),
-			print_px_height - out_px_height);
-  out_px_right  = out_px_left + out_px_width;
-  out_px_bottom = out_px_top  + out_px_height;
+  if (abs(pv.outw_px - pv.imgw_px) < SIZE_THRESHOLD)
+      pv.outw_px  = pv.imgw_px;
+  if (abs(pv.outh_px - pv.imgh_px) < SIZE_THRESHOLD)
+      pv.outh_px = pv.imgh_px;
+
+  pv.outw_px = MIN(pv.outw_px, pv.prnw_px);
+  pv.outh_px = MIN(pv.outh_px, pv.prnh_px);
+  pv.outl_px = MIN(PX(out_pt_left - page_pt_left, xdpi),
+			pv.prnw_px - pv.outw_px);
+  pv.outt_px = MIN(PX(out_pt_top  - page_pt_top, ydpi),
+			pv.prnh_px - pv.outh_px);
+  pv.outr_px = pv.outl_px + pv.outw_px;
+  pv.outb_px = pv.outt_px  + pv.outh_px;
   
 
-  stp_deprintf(STP_DBG_OLYMPUS,
+  stp_deprintf(STP_DBG_DYESUB,
 	      "paper (pt)   %d x %d\n"
 	      "image (px)   %d x %d\n"
 	      "image (pt)   %d x %d\n"
@@ -1832,357 +2363,139 @@ olympus_do_print(stp_vars_t *v, stp_image_t *image)
 	      "printable pixels (px)   %d x %d\n"
 	      "res (dpi)               %d x %d\n",
 	      page_pt_width, page_pt_height,
-	      image_px_width, image_px_height,
-	      image_px_width * 72 / xdpi, image_px_height * 72 / ydpi,
+	      pv.imgw_px, pv.imgh_px,
+	      PT(pv.imgw_px, xdpi), PT(pv.imgh_px, ydpi),
 	      out_pt_width, out_pt_height,
-	      out_px_width, out_px_height,
+	      pv.outw_px, pv.outh_px,
 	      out_pt_left, out_pt_top,
-	      out_px_left, out_px_top,
+	      pv.outl_px, pv.outt_px,
 	      page_pt_right, page_pt_left, page_pt_right - page_pt_left,
 	      page_pt_bottom, page_pt_top, page_pt_bottom - page_pt_top,
-	      print_px_width, print_px_height,
+	      pv.prnw_px, pv.prnh_px,
 	      xdpi, ydpi
 	      );	
 
   privdata.xdpi = xdpi;
   privdata.ydpi = ydpi;
-  privdata.xsize = print_px_width;
-  privdata.ysize = print_px_height;
-
-  stp_set_string_parameter(v, "STPIOutputType", "CMY");
-  
-  if (caps->adj_cyan &&
-        !stp_check_curve_parameter(v, "CyanCurve", STP_PARAMETER_ACTIVE))
-    {
-      adjustment = stp_curve_create_from_string(caps->adj_cyan);
-      stp_set_curve_parameter(v, "CyanCurve", adjustment);
-      stp_set_curve_parameter_active(v, "CyanCurve", STP_PARAMETER_ACTIVE);
-      stp_curve_destroy(adjustment);
-    }
-  if (caps->adj_magenta &&
-        !stp_check_curve_parameter(v, "MagentaCurve", STP_PARAMETER_ACTIVE))
-    {
-      adjustment = stp_curve_create_from_string(caps->adj_magenta);
-      stp_set_curve_parameter(v, "MagentaCurve", adjustment);
-      stp_set_curve_parameter_active(v, "MagentaCurve", STP_PARAMETER_ACTIVE);
-      stp_curve_destroy(adjustment);
-    }
-  if (caps->adj_yellow &&
-        !stp_check_curve_parameter(v, "YellowCurve", STP_PARAMETER_ACTIVE))
-    {
-      adjustment = stp_curve_create_from_string(caps->adj_yellow);
-      stp_set_curve_parameter(v, "YellowCurve", adjustment);
-      stp_set_curve_parameter_active(v, "YellowCurve", STP_PARAMETER_ACTIVE);
-      stp_curve_destroy(adjustment);
-    }
+  privdata.xsize = pv.prnw_px;
+  privdata.ysize = pv.prnh_px;
 
-  if (ink_type)
-    {
-      for (i = 0; i < caps->inks->n_items; i++)
-	if (strcmp(ink_type, caps->inks->item[i].name) == 0)
-	  {
-	    stp_set_string_parameter(v, "STPIOutputType",
-				     caps->inks->item[i].output_type);
-	    ink_channels = caps->inks->item[i].output_channels;
-	    ink_order = caps->inks->item[i].channel_order;
-	    break;
-	  }
-    }
 
+  /* FIXME: move this into print_init_drv */
+  ink_type = dyesub_describe_output_internal(v, &pv);
+  stp_set_string_parameter(v, "STPIOutputType", ink_type);
   stp_channel_reset(v);
-  for (i = 0; i < ink_channels; i++)
+  for (i = 0; i < pv.ink_channels; i++)
     stp_channel_add(v, i, 0, 1.0);
-
-  out_channels = stp_color_init(v, image, 65536);
-
-#if 0
-  if (out_channels != ink_channels && out_channels != 1 && ink_channels != 1)
-    {
-      stp_eprintf(v, "Internal error!  Output channels or input channels must be 1\n");
-      return 0;
-    }
-#endif
-
-  rows = stp_zalloc(image_px_height * sizeof(unsigned short *));
-  err_out = stp_malloc(print_px_width * ink_channels * 2);
-  if (out_channels != ink_channels)
-    final_out = stp_malloc(print_px_width * ink_channels * 2);
-
+  pv.out_channels = stp_color_init(v, image, 65536);
+  pv.bytes_per_ink_channel = 1;		/* FIXME: this is printer dependent */
+  pv.bytes_per_out_channel = 2;		/* FIXME: this is ??? */
+  pv.image_data = dyesub_read_image(v, &pv, image);
+  pv.empty_byte = (ink_type &&
+ 		(strcmp(ink_type, "RGB") == 0 || strcmp(ink_type, "BGR") == 0)
+		? '\xff' : '\0');
+  pv.plane_interlacing = dyesub_feature(caps, DYESUB_FEATURE_PLANE_INTERLACE);
+  pv.print_mode = page_mode;
+  if (!pv.image_data)
+      return 2;	
+  /* /FIXME */
+
+
+  dyesub_adjust_curve(v, caps->adj_cyan, "CyanCurve");
+  dyesub_adjust_curve(v, caps->adj_magenta, "MagentaCurve");
+  dyesub_adjust_curve(v, caps->adj_yellow, "YellowCurve");
   stp_set_float_parameter(v, "Density", 1.0);
 
-  if (ink_type && 
-  	(strcmp(ink_type, "RGB") == 0 || strcmp(ink_type, "BGR") == 0))
-    {
-      zeros = stp_malloc(ink_channels * print_px_width + 1);
-      (void) memset(zeros, '\xff', ink_channels * print_px_width + 1);
-    }
-  else
-    zeros = stp_zalloc(ink_channels * print_px_width + 1);
-  
-  out_bytes = (caps->interlacing == OLYMPUS_INTERLACE_PLANE ? 1 : ink_channels);
-
-  /* printer init */
-  if (caps->printer_init_func)
-    {
-      stp_deprintf(STP_DBG_OLYMPUS, "olympus: caps->printer_init\n");
-      (*(caps->printer_init_func))(v);
-    }
 
-  if (olympus_feature(caps, OLYMPUS_FEATURE_FULL_HEIGHT))
+  if (dyesub_feature(caps, DYESUB_FEATURE_FULL_HEIGHT))
     {
-      min_y = 0;
-      max_y = print_px_height - 1;
+      pv.prnt_px = 0;
+      pv.prnb_px = pv.prnh_px - 1;
     }
-  else if (olympus_feature(caps, OLYMPUS_FEATURE_BLOCK_ALIGN))
+  else if (dyesub_feature(caps, DYESUB_FEATURE_BLOCK_ALIGN))
     {
-      min_y = out_px_top - (out_px_top % caps->block_size);
+      pv.prnt_px = pv.outt_px - (pv.outt_px % caps->block_size);
       				/* floor to multiple of block_size */
-      max_y = (out_px_bottom - 1) + (caps->block_size - 1)
-      		- ((out_px_bottom - 1) % caps->block_size);
+      pv.prnb_px = (pv.outb_px - 1) + (caps->block_size - 1)
+      		- ((pv.outb_px - 1) % caps->block_size);
 				/* ceil to multiple of block_size */
     }
   else
     {
-      min_y = out_px_top;
-      max_y = out_px_bottom - 1;
+      pv.prnt_px = pv.outt_px;
+      pv.prnb_px = pv.outb_px - 1;
     }
   
-  if (olympus_feature(caps, OLYMPUS_FEATURE_FULL_WIDTH))
+  if (dyesub_feature(caps, DYESUB_FEATURE_FULL_WIDTH))
     {
-      min_x = 0;
-      max_x = print_px_width - 1;
+      pv.prnl_px = 0;
+      pv.prnr_px = pv.prnw_px - 1;
     }
   else
     {
-      min_x = out_px_left;
-      max_x = out_px_right;
+      pv.prnl_px = pv.outl_px;
+      pv.prnr_px = pv.outr_px;
     }
       
-  r_errdiv  = image_px_height / out_px_height;
-  r_errmod  = image_px_height % out_px_height; 
-  c_errdiv = image_px_width / out_px_width;
-  c_errmod = image_px_width % out_px_width;
-
-  for (pl = 0; pl < (caps->interlacing == OLYMPUS_INTERLACE_PLANE
-			? ink_channels : 1); pl++)
+  if (pv.print_mode == DYESUB_LANDSCAPE)
     {
-      r_errval  = 0;
-      r_errlast = -1;
-      r_errline = 0;
+      dyesub_swap_ints(&pv.outh_px, &pv.outw_px);
+      dyesub_swap_ints(&pv.outt_px, &pv.outl_px);
+      dyesub_swap_ints(&pv.outb_px, &pv.outr_px);
+      
+      dyesub_swap_ints(&pv.prnh_px, &pv.prnw_px);
+      dyesub_swap_ints(&pv.prnt_px, &pv.prnl_px);
+      dyesub_swap_ints(&pv.prnb_px, &pv.prnr_px);
+      
+      dyesub_swap_ints(&pv.imgh_px, &pv.imgw_px);
+    }
 
-      privdata.plane = ink_order[pl];
-      stp_deprintf(STP_DBG_OLYMPUS, "olympus: plane %d\n", privdata.plane);
+  /* printer init */
+  dyesub_exec(v, caps->printer_init_func, "caps->printer_init");
+
+  for (pl = 0; pl < (pv.plane_interlacing ? pv.ink_channels : 1); pl++)
+    {
+      privdata.plane = pv.ink_order[pl];
+      stp_deprintf(STP_DBG_DYESUB, "dyesub: plane %d\n", privdata.plane);
 
       /* plane init */
-      if (caps->plane_init_func)
-        {
-          stp_deprintf(STP_DBG_OLYMPUS, "olympus: caps->plane_init\n");
-          (*(caps->plane_init_func))(v);
-        }
-  
-      for (y = min_y; y <= max_y; y++)
-        {
-          unsigned short *out;
-          int duplicate_line = 1;
-/*          unsigned zero_mask; */
-    
-          if (((y - min_y) % caps->block_size) == 0)
-	    {
-              /* block init */
-              privdata.block_min_y = y;
-              privdata.block_min_x = min_x;
-              privdata.block_max_y = MIN(y + caps->block_size - 1, max_y);
-              privdata.block_max_x = max_x;
-    
-              if (caps->block_init_func)
-	        {
-                  stp_deprintf(STP_DBG_OLYMPUS,
-			       "olympus: caps->block_init\n");
-                  (*(caps->block_init_func))(v);
-                }
-            }
-        
-          if (y < out_px_top || y >= out_px_bottom)
-  	    stp_zfwrite((char *) zeros, out_bytes, print_px_width, v);
-          else
-            {
-              if (olympus_feature(caps, OLYMPUS_FEATURE_FULL_WIDTH)
-	        && out_px_left > 0)
-  	        {
-                  stp_zfwrite((char *) zeros, out_bytes, out_px_left, v);
-                  /* stp_erprintf("left %d ", out_px_left); */
-  	        }
-  
-#if 0
-              if (r_errline != r_errlast)
-                {
-  	          r_errlast = r_errline;
-  	          duplicate_line = 0;
-
-                  /* stp_erprintf("r_errline %d, ", r_errline); */
-                  if (stp_color_get_row(v, image, r_errline, &zero_mask))
-                    {
-    	              status = 2;
-                      break;
-                    }
-                }
-
-              out = stp_channel_get_output(v);
-#endif
-              if (r_errline != r_errlast)
-                {
-  	          r_errlast = r_errline;
-  	          duplicate_line = 0;
-		}
-
-	      out = olympus_get_cached_output(v, image, rows, r_errline,
-	                                  image_px_width * ink_channels * 2);
-	      if (out == NULL)
-	        {
-		  status = 2;
-		  break;
-		}
-
-              c_errval  = 0;
-              c_errlast = -1;
-              c_errcol  = 0;
-              for (i = 0; i < out_px_width; i++)
-                {
-                  if (c_errcol != c_errlast)
-        	    c_errlast = c_errcol;
-        	  for (j = 0; j < ink_channels; j++)
-          	    err_out[i * ink_channels + j] =
-      				out[c_errcol * ink_channels + ink_order[j]-1];
-
-                  c_errval += c_errmod;
-                  c_errcol += c_errdiv;
-                  if (c_errval >= out_px_width)
-                    {
-                      c_errval -= out_px_width;
-        	      c_errcol ++;
-                    }
-                }
-
-              real_out = err_out;
-              if (out_channels != ink_channels)
-                {
-                  real_out = final_out;
-                  if (out_channels < ink_channels)
-                    {
-        	      for (i = 0; i < out_px_width; i++)
-         		{
-    	        	  for (j = 0; j < ink_channels; j++)
-    		            final_out[i * ink_channels + j] = err_out[i];
-    		        }
-    	            }
-          	  else
-    	            {
-    	              for (i = 0; i < out_px_width; i++)
-    		        {
-    		          int avg = 0;
-    		          for (j = 0; j < out_channels; j++)
-    		            avg += err_out[i * out_channels + j];
-    		          final_out[i] = avg / out_channels;
-    		        }
-    	            }
-    	        }
-              char_out = (unsigned char *) real_out;
-     	      char_out_width = (caps->interlacing == OLYMPUS_INTERLACE_PLANE ?
-  				out_px_width : out_px_width * out_channels);
-    	      for (i = 0; i < char_out_width; i++)
-	        {
-                  if (caps->interlacing == OLYMPUS_INTERLACE_PLANE)
-  	            j = i * ink_channels + pl;
-  	          else if (caps->interlacing == OLYMPUS_INTERLACE_LINE)
-  	            j = (i % out_px_width) + (i / out_px_width);
-  	          else  /* OLYMPUS_INTERLACE_NONE */
-  	            j = i;
-    	  
-  	          char_out[i] = real_out[j] / 257;
-                }
-	      
-  	      stp_zfwrite((char *) real_out, 1, char_out_width, v);
-              /* stp_erprintf("data %d ", out_px_width); */
-              if (olympus_feature(caps, OLYMPUS_FEATURE_FULL_WIDTH)
-	        && out_px_right < print_px_width)
-  	        {
-                  stp_zfwrite((char *) zeros, out_bytes,
-				  print_px_width - out_px_right, v);
-                  /* stp_erprintf("right %d ", print_px_width-out_px_right); */
-  	        }
-              /* stp_erprintf("\n"); */
+      dyesub_exec(v, caps->plane_init_func, "caps->plane_init");
   
-  	      r_errval += r_errmod;
-  	      r_errline += r_errdiv;
-  	      if (r_errval >= out_px_height)
-  	        {
-  	          r_errval -= out_px_height;
-  	          r_errline ++;
-  	        }
-  	    }
-        
-          if (y == privdata.block_max_y)
-	    {
-              /* block end */
-              if (caps->block_end_func)
-	        {
-                  stp_deprintf(STP_DBG_OLYMPUS, "olympus: caps->block_end\n");
-                  (*(caps->block_end_func))(v);
-  	        }
-            }
-        }
+      dyesub_print_plane(v, &pv, caps, (int) pv.ink_order[pl] - 1);
 
       /* plane end */
-      if (caps->plane_end_func) {
-        stp_deprintf(STP_DBG_OLYMPUS, "olympus: caps->plane_end\n");
-        (*(caps->plane_end_func))(v);
-      }
+      dyesub_exec(v, caps->plane_end_func, "caps->plane_end");
     }
 
   /* printer end */
-  if (caps->printer_end_func)
-    {
-      stp_deprintf(STP_DBG_OLYMPUS, "olympus: caps->printer_end\n");
-      (*(caps->printer_end_func))(v);
-    }
-  stp_image_conclude(image);
-  if (final_out)
-    stp_free(final_out);
-  if (err_out)
-    stp_free(err_out);
-  if (zeros)
-    stp_free(zeros);
-  if (rows)
-    {
-      for (i = 0; i <image_px_height; i++)
-        stp_free(rows[i]);
-      stp_free(rows);
-    }
+  dyesub_exec(v, caps->printer_end_func, "caps->printer_end");
+
+  dyesub_free_image(pv.image_data, image);
   return status;
 }
 
 static int
-olympus_print(const stp_vars_t *v, stp_image_t *image)
+dyesub_print(const stp_vars_t *v, stp_image_t *image)
 {
   int status;
   stp_vars_t *nv = stp_vars_create_copy(v);
   stp_prune_inactive_options(nv);
-  status = olympus_do_print(nv, image);
+  status = dyesub_do_print(nv, image);
   stp_vars_destroy(nv);
   return status;
 }
 
-static const stp_printfuncs_t print_olympus_printfuncs =
-{
-  olympus_list_parameters,
-  olympus_parameters,
-  stp_default_media_size,
-  olympus_imageable_area,
-  olympus_maximum_imageable_area,
-  olympus_limit,
-  olympus_print,
-  olympus_describe_resolution,
-  olympus_describe_output,
+static const stp_printfuncs_t print_dyesub_printfuncs =
+{
+  dyesub_list_parameters,
+  dyesub_parameters,
+  dyesub_media_size,
+  dyesub_imageable_area,
+  dyesub_maximum_imageable_area,
+  dyesub_limit,
+  dyesub_print,
+  dyesub_describe_resolution,
+  dyesub_describe_output,
   stp_verify_printer_params,
   NULL,
   NULL
@@ -2191,24 +2504,24 @@ static const stp_printfuncs_t print_olympus_printfuncs =
 
 
 
-static stp_family_t print_olympus_module_data =
+static stp_family_t print_dyesub_module_data =
   {
-    &print_olympus_printfuncs,
+    &print_dyesub_printfuncs,
     NULL
   };
 
 
 static int
-print_olympus_module_init(void)
+print_dyesub_module_init(void)
 {
-  return stp_family_register(print_olympus_module_data.printer_list);
+  return stp_family_register(print_dyesub_module_data.printer_list);
 }
 
 
 static int
-print_olympus_module_exit(void)
+print_dyesub_module_exit(void)
 {
-  return stp_family_unregister(print_olympus_module_data.printer_list);
+  return stp_family_unregister(print_dyesub_module_data.printer_list);
 }
 
 
@@ -2225,8 +2538,8 @@ stp_module_t stp_module_data =
     "Olympus family driver",
     STP_MODULE_CLASS_FAMILY,
     NULL,
-    print_olympus_module_init,
-    print_olympus_module_exit,
-    (void *) &print_olympus_module_data
+    print_dyesub_module_init,
+    print_dyesub_module_exit,
+    (void *) &print_dyesub_module_data
   };
 
diff --git a/src/main/print-pcl.c b/src/main/print-pcl.c
index f1afc25..c428310 100644
--- a/src/main/print-pcl.c
+++ b/src/main/print-pcl.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-pcl.c,v 1.144 2006/07/07 13:11:42 rlk Exp $"
+ * "$Id: print-pcl.c,v 1.145 2006/09/12 19:03:33 easysw Exp $"
  *
  *   Print plug-in HP PCL driver for the GIMP.
  *
@@ -45,7 +45,10 @@
  */
 static void	pcl_mode0(stp_vars_t *, unsigned char *, int, int);
 static void	pcl_mode2(stp_vars_t *, unsigned char *, int, int);
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
+
+#ifndef MAX
+#  define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif /* !MAX */
 
 typedef struct
 {
diff --git a/src/main/print-ps.c b/src/main/print-ps.c
index 702d2d7..62b5437 100644
--- a/src/main/print-ps.c
+++ b/src/main/print-ps.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-ps.c,v 1.87 2006/06/04 18:06:34 rleigh Exp $"
+ * "$Id: print-ps.c,v 1.87.8.1 2007/05/29 01:47:29 rlk Exp $"
  *
  *   Print plug-in Adobe PostScript driver for the GIMP.
  *
@@ -233,9 +233,15 @@ static void
 ps_parameters(const stp_vars_t *v, const char *name,
 	      stp_parameter_t *description)
 {
-  char *locale = setlocale(LC_ALL, "C");
+#ifdef HAVE_LOCALE_H
+  char *locale = stp_strdup(setlocale(LC_ALL, NULL));
+  setlocale(LC_ALL, "C");
+#endif
   ps_parameters_internal(v, name, description);
+#ifdef HAVE_LOCALE_H
   setlocale(LC_ALL, locale);
+  stp_free(locale);
+#endif
 }
 
 /*
@@ -275,9 +281,15 @@ ps_media_size_internal(const stp_vars_t *v,		/* I */
 static void
 ps_media_size(const stp_vars_t *v, int *width, int *height)
 {
-  char *locale = setlocale(LC_ALL, "C");
+#ifdef HAVE_LOCALE_H
+  char *locale = stp_strdup(setlocale(LC_ALL, NULL));
+  setlocale(LC_ALL, "C");
+#endif
   ps_media_size_internal(v, width, height);
+#ifdef HAVE_LOCALE_H
   setlocale(LC_ALL, locale);
+  stp_free(locale);
+#endif
 }
 
 /*
@@ -350,9 +362,15 @@ ps_imageable_area(const stp_vars_t *v,      /* I */
                   int  *bottom,		/* O - Bottom position in points */
                   int  *top)		/* O - Top position in points */
 {
-  char *locale = setlocale(LC_ALL, "C");
+#ifdef HAVE_LOCALE_H
+  char *locale = stp_strdup(setlocale(LC_ALL, NULL));
+  setlocale(LC_ALL, "C");
+#endif
   ps_imageable_area_internal(v, 0, left, right, bottom, top);
+#ifdef HAVE_LOCALE_H
   setlocale(LC_ALL, locale);
+  stp_free(locale);
+#endif
 }
 
 static void
@@ -362,9 +380,15 @@ ps_maximum_imageable_area(const stp_vars_t *v,      /* I */
 			  int  *bottom,	/* O - Bottom position in points */
 			  int  *top)	/* O - Top position in points */
 {
-  char *locale = setlocale(LC_ALL, "C");
+#ifdef HAVE_LOCALE_H
+  char *locale = stp_strdup(setlocale(LC_ALL, NULL));
+  setlocale(LC_ALL, "C");
+#endif
   ps_imageable_area_internal(v, 1, left, right, bottom, top);
+#ifdef HAVE_LOCALE_H
   setlocale(LC_ALL, locale);
+  stp_free(locale);
+#endif
 }
 
 static void
@@ -397,17 +421,30 @@ ps_describe_resolution_internal(const stp_vars_t *v, int *x, int *y)
 static void
 ps_describe_resolution(const stp_vars_t *v, int *x, int *y)
 {
-  char *locale = setlocale(LC_ALL, "C");
+#ifdef HAVE_LOCALE_H
+  char *locale = stp_strdup(setlocale(LC_ALL, NULL));
+  setlocale(LC_ALL, "C");
+#endif
   ps_describe_resolution_internal(v, x, y);
+#ifdef HAVE_LOCALE_H
   setlocale(LC_ALL, locale);
+  stp_free(locale);
+#endif
 }
 
 static const char *
 ps_describe_output(const stp_vars_t *v)
 {
   const char *print_mode = stp_get_string_parameter(v, "PrintingMode");
+  const char *input_image_type = stp_get_string_parameter(v, "InputImageType");
   if (print_mode && strcmp(print_mode, "Color") == 0)
-    return "RGB";
+    {
+      if (input_image_type && (strcmp(input_image_type, "CMYK") == 0 ||
+			       strcmp(input_image_type, "KCMY") == 0))
+	return "CMYK";
+      else
+	return "RGB";
+    }
   else
     return "Whitescale";
 }
@@ -417,7 +454,7 @@ ps_describe_output(const stp_vars_t *v)
  */
 
 static int
-ps_print_internal(const stp_vars_t *v, stp_image_t *image)
+ps_print_internal(stp_vars_t *v, stp_image_t *image)
 {
   int		status = 1;
   int		model = stp_get_model_id(v);
@@ -427,6 +464,7 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
   const char	*media_type = stp_get_string_parameter(v, "MediaType");
   const char	*media_source = stp_get_string_parameter(v, "InputSlot");
   const char    *print_mode = stp_get_string_parameter(v, "PrintingMode");
+  const char *input_image_type = stp_get_string_parameter(v, "InputImageType");
   unsigned short *out = NULL;
   int		top = stp_get_top(v);
   int		left = stp_get_left(v);
@@ -459,8 +497,9 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
   }		commands[4];
   int           image_height,
 		image_width;
-  stp_vars_t	*nv = stp_vars_create_copy(v);
-  char		*locale;
+  int		color_out = 0;
+  int		cmyk_out = 0;
+
   if (!resolution)
     resolution = "";
   if (!media_size)
@@ -470,12 +509,12 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
   if (!media_source)
     media_source = "";
 
-  stp_prune_inactive_options(nv);
-  if (!stp_verify(nv))
-    {
-      stp_eprintf(nv, "Print options not verified; cannot print.\n");
-      return 0;
-    }
+  if (print_mode && strcmp(print_mode, "Color") == 0)
+    color_out = 1;
+  if (color_out &&
+      input_image_type && (strcmp(input_image_type, "CMYK") == 0 ||
+			   strcmp(input_image_type, "KCMY") == 0))
+    cmyk_out = 1;
 
   stp_image_init(image);
 
@@ -486,8 +525,8 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
   out_width = stp_get_width(v);
   out_height = stp_get_height(v);
 
-  ps_imageable_area(nv, &page_left, &page_right, &page_bottom, &page_top);
-  ps_media_size(v, &paper_width, &paper_height);
+  ps_imageable_area_internal(v, 0, &page_left, &page_right, &page_bottom, &page_top);
+  ps_media_size_internal(v, &paper_width, &paper_height);
   page_width = page_right - page_left;
   page_height = page_bottom - page_top;
 
@@ -523,7 +562,6 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
   stp_zprintf(v, "%%%%Creator: %s/Gutenprint\n", stp_image_get_appname(image));
 #endif
   stp_zprintf(v, "%%%%CreationDate: %s", ctime(&curtime));
-  stp_puts("%Copyright: 1997-2002 by Michael Sweet (mike@easysw.com) and Robert Krawitz (rlk@alum.mit.edu)\n", v);
   stp_zprintf(v, "%%%%BoundingBox: %d %d %d %d\n",
 	      page_left, paper_height - page_bottom,
 	      page_right, paper_height - page_top);
@@ -645,26 +683,30 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
      always be printed with a decimal point rather than the
      locale-specific setting. */
 
-  locale = setlocale(LC_ALL, "C");
   stp_zprintf(v, "%.3f %.3f scale\n",
 	      (double)out_width / ((double)image_width),
 	      (double)out_height / ((double)image_height));
-  setlocale(LC_ALL, locale);
 
-  stp_channel_reset(nv);
-  stp_channel_add(nv, 0, 0, 1.0);
-  if (strcmp(print_mode, "Color") == 0)
+  stp_channel_reset(v);
+  stp_channel_add(v, 0, 0, 1.0);
+  if (color_out)
     {
-      stp_channel_add(nv, 1, 0, 1.0);
-      stp_channel_add(nv, 2, 0, 1.0);
-      stp_set_string_parameter(nv, "STPIOutputType", "RGB");
+      stp_channel_add(v, 1, 0, 1.0);
+      stp_channel_add(v, 2, 0, 1.0);
+      if (cmyk_out)
+	{
+	  stp_channel_add(v, 3, 0, 1.0);
+	  stp_set_string_parameter(v, "STPIOutputType", "CMYK");
+	}
+      else
+	stp_set_string_parameter(v, "STPIOutputType", "RGB");
     }
   else
-    stp_set_string_parameter(nv, "STPIOutputType", "Whitescale");
+    stp_set_string_parameter(v, "STPIOutputType", "Whitescale");
 
-  stp_set_boolean_parameter(nv, "SimpleGamma", 1);
+  stp_set_boolean_parameter(v, "SimpleGamma", 1);
 
-  out_channels = stp_color_init(nv, image, 256);
+  out_channels = stp_color_init(v, image, 256);
 
   if (model == 0)
   {
@@ -674,28 +716,47 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
 
     stp_puts("[ 1 0 0 -1 0 1 ]\n", v);
 
-    if (strcmp(print_mode, "Color") == 0)
+    if (cmyk_out)
+      stp_puts("{currentfile picture readhexstring pop} false 4 colorimage\n", v);
+    else if (color_out)
       stp_puts("{currentfile picture readhexstring pop} false 3 colorimage\n", v);
     else
       stp_puts("{currentfile picture readhexstring pop} image\n", v);
 
     for (y = 0; y < image_height; y ++)
     {
-      if (stp_color_get_row(nv, image, y, &zero_mask))
+      if (stp_color_get_row(v, image, y, &zero_mask))
 	{
 	  status = 2;
 	  break;
 	}
 
-      out = stp_channel_get_input(nv);
+      out = stp_channel_get_input(v);
+
+      /* Convert from KCMY to CMYK */
+      if (cmyk_out)
+	{
+	  int x;
+	  unsigned short *pos = out;
+	  for (x = 0; x < image_width; x++, pos += 4)
+	    {
+	      unsigned short p0 = pos[0];
+	      pos[0] = pos[1];
+	      pos[1] = pos[2];
+	      pos[2] = pos[3];
+	      pos[3] = p0;
+	    }
+	}
       ps_hex(v, out, image_width * out_channels);
     }
   }
   else
   {
     unsigned short *tmp_buf =
-      stp_malloc(sizeof(unsigned short) * (image_width * out_channels + 3));
-    if (strcmp(print_mode, "Color") == 0)
+      stp_malloc(sizeof(unsigned short) * (image_width * out_channels + 4));
+    if (cmyk_out)
+      stp_puts("/DeviceCMYK setcolorspace\n", v);
+    else if (color_out)
       stp_puts("/DeviceRGB setcolorspace\n", v);
     else
       stp_puts("/DeviceGray setcolorspace\n", v);
@@ -707,7 +768,9 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
     stp_zprintf(v, "\t/Height %d\n", image_height);
     stp_puts("\t/BitsPerComponent 8\n", v);
 
-    if (strcmp(print_mode, "Color") == 0)
+    if (cmyk_out)
+      stp_puts("\t/Decode [ 0 1 0 1 0 1 0 1 ]\n", v);
+    else if (color_out)
       stp_puts("\t/Decode [ 0 1 0 1 0 1 ]\n", v);
     else
       stp_puts("\t/Decode [ 0 1 ]\n", v);
@@ -726,12 +789,12 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
     {
       unsigned short *where;
       /* FIXME!!! */
-      if (stp_color_get_row(nv, image, y /*, out + out_offset */ , &zero_mask))
+      if (stp_color_get_row(v, image, y /*, out + out_offset */ , &zero_mask))
 	{
 	  status = 2;
 	  break;
 	}
-      out = stp_channel_get_input(nv);
+      out = stp_channel_get_input(v);
       if (out_offset > 0)
 	{
 	  memcpy(tmp_buf + out_offset, out,
@@ -741,6 +804,21 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
       else
 	where = out;
 
+      /* Convert from KCMY to CMYK */
+      if (cmyk_out)
+	{
+	  int x;
+	  unsigned short *pos = where;
+	  for (x = 0; x < image_width; x++, pos += 4)
+	    {
+	      unsigned short p0 = pos[0];
+	      pos[0] = pos[1];
+	      pos[1] = pos[2];
+	      pos[2] = pos[3];
+	      pos[3] = p0;
+	    }
+	}
+
       out_ps_height = out_offset + image_width * out_channels;
 
       if (y < (image_height - 1))
@@ -766,16 +844,33 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
   stp_puts("showpage\n", v);
   stp_puts("%%Trailer\n", v);
   stp_puts("%%EOF\n", v);
-  stp_vars_destroy(nv);
   return status;
 }
 
 static int
 ps_print(const stp_vars_t *v, stp_image_t *image)
 {
-  char *locale = setlocale(LC_ALL, "C");
-  int status = ps_print_internal(v, image);
+  int status;
+#ifdef HAVE_LOCALE_H
+  char *locale;
+#endif
+  stp_vars_t *nv = stp_vars_create_copy(v);
+  stp_prune_inactive_options(nv);
+  if (!stp_verify(nv))
+    {
+      stp_eprintf(nv, "Print options not verified; cannot print.\n");
+      return 0;
+    }
+#ifdef HAVE_LOCALE_H
+  locale = stp_strdup(setlocale(LC_ALL, NULL));
+  setlocale(LC_ALL, "C");
+#endif
+  status = ps_print_internal(nv, image);
+#ifdef HAVE_LOCALE_H
   setlocale(LC_ALL, locale);
+  stp_free(locale);
+#endif
+  stp_vars_destroy(nv);
   return status;
 }
 
diff --git a/src/main/print-util.c b/src/main/print-util.c
index 1138781..975ec65 100644
--- a/src/main/print-util.c
+++ b/src/main/print-util.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-util.c,v 1.108 2004/09/17 18:38:26 rleigh Exp $"
+ * "$Id: print-util.c,v 1.109.4.3 2007/06/04 00:25:16 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -172,12 +172,19 @@ stp_puts(const char *s, const stp_vars_t *v)
 }
 
 void
+stp_putraw(const stp_raw_t *r, const stp_vars_t *v)
+{
+  (stp_get_outfunc(v))((void *)(stp_get_outdata(v)), r->data, r->bytes);
+}
+
+void
 stp_send_command(const stp_vars_t *v, const char *command,
 		 const char *format, ...)
 {
   int i = 0;
   char fchar;
   const char *out_str;
+  const stp_raw_t *out_raw;
   unsigned short byte_count = 0;
   va_list args;
 
@@ -208,6 +215,10 @@ stp_send_command(const stp_vars_t *v, const char *command,
 	      (void) va_arg(args, unsigned int);
 	      byte_count += 4;
 	      break;
+	    case 'r':
+	      out_raw = va_arg(args, const stp_raw_t *);
+	      byte_count += out_raw->bytes;
+	      break;
 	    case 's':
 	      out_str = va_arg(args, const char *);
 	      byte_count += strlen(out_str);
@@ -257,6 +268,9 @@ stp_send_command(const stp_vars_t *v, const char *command,
 	case 's':
 	  stp_puts(va_arg(args, const char *), v);
 	  break;
+	case 'r':
+	  stp_putraw(va_arg(args, const stp_raw_t *), v);
+	  break;
 	}
       format++;
     }
@@ -445,10 +459,16 @@ stp_init(void)
     {
       /* Things that are only initialised once */
       /* Set up gettext */
+#ifdef HAVE_LOCALE_H
+      char *locale = stp_strdup(setlocale (LC_ALL, ""));
+#endif
 #ifdef ENABLE_NLS
-      setlocale (LC_ALL, "");
       bindtextdomain (PACKAGE, PACKAGE_LOCALE_DIR);
 #endif
+#ifdef HAVE_LOCALE_H
+      setlocale(LC_ALL, locale);
+      stp_free(locale);
+#endif
       stpi_init_debug();
       stp_xml_preinit();
       stpi_init_printer();
@@ -549,7 +569,8 @@ stp_read_and_compose_curves(const char *s1, const char *s2,
     }
   else if (t1)
     {
-      stp_curve_destroy(t2);
+      if(t2)
+        stp_curve_destroy(t2);
       return t1;
     }
   else
@@ -562,6 +583,8 @@ stp_merge_printvars(stp_vars_t *user, const stp_vars_t *print)
   int i;
   stp_parameter_list_t params = stp_get_parameter_list(print);
   int count = stp_parameter_list_count(params);
+  stp_deprintf(STP_DBG_VARS, "Merging printvars from %s\n",
+	       stp_get_driver(print));
   for (i = 0; i < count; i++)
     {
       const stp_parameter_t *p = stp_parameter_list_param(params, i);
@@ -595,6 +618,7 @@ stp_merge_printvars(stp_vars_t *user, const stp_vars_t *print)
 	  stp_parameter_description_destroy(&desc);
 	}
     }
+  stp_deprintf(STP_DBG_VARS, "Exiting merge printvars\n");
   stp_parameter_list_destroy(params);
 }
 
diff --git a/src/main/print-vars.c b/src/main/print-vars.c
index c2b1d27..e3d4195 100644
--- a/src/main/print-vars.c
+++ b/src/main/print-vars.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-vars.c,v 1.75 2006/06/25 00:25:14 rlk Exp $"
+ * "$Id: print-vars.c,v 1.75.8.1 2007/05/29 01:47:29 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -86,18 +86,14 @@ static int standard_vars_initialized = 0;
 
 static stp_vars_t default_vars;
 
-static void
-null_vars(void)
-{
-  stp_erprintf("Null stp_vars_t! Please report this bug.\n");
-  stp_abort();
-}
-
 static inline void
 check_vars(const stp_vars_t *v)
 {
   if (v == NULL)
-    null_vars();
+    {
+      stp_erprintf("Null stp_vars_t! Please report this bug.\n");
+      stp_abort();
+    }
 }
 
 static const char *
@@ -345,38 +341,40 @@ stp_vars_destroy(stp_vars_t *v)
   stp_free(v);
 }
 
-#define DEF_STRING_FUNCS(s, pre)				\
-void								\
-pre##_set_##s(stp_vars_t *v, const char *val)			\
-{								\
-  check_vars(v);                                                \
-  if (val)							\
-    stp_dprintf(STP_DBG_VARS, v, "set %s to %s\n", #s, val);	\
-  else								\
-    stp_dprintf(STP_DBG_VARS, v, "clear %s\n", #s);		\
-  if (v->s == val)						\
-    return;							\
-  STP_SAFE_FREE(v->s);						\
-  v->s = stp_strdup(val);					\
-  v->verified = 0;						\
-}								\
-								\
-void								\
-pre##_set_##s##_n(stp_vars_t *v, const char *val, int n)	\
-{								\
-  check_vars(v);                                                \
-  if (v->s == val)						\
-    return;							\
-  STP_SAFE_FREE(v->s);						\
-  v->s = stp_strndup(val, n);					\
-  v->verified = 0;						\
-}								\
-								\
-const char *							\
-pre##_get_##s(const stp_vars_t *v)				\
-{								\
-  check_vars(v);                                                \
-  return v->s;							\
+#define DEF_STRING_FUNCS(s, pre)					\
+void									\
+pre##_set_##s(stp_vars_t *v, const char *val)				\
+{									\
+  check_vars(v);							\
+  if (val)								\
+    stp_deprintf(STP_DBG_VARS, "set %s to %s (0x%p)\n", #s, val,	\
+                 (const void *) v);					\
+  else									\
+    stp_deprintf(STP_DBG_VARS, "clear %s (0x%p)\n", #s,			\
+                 (const void *) v);					\
+  if (v->s == val)							\
+    return;								\
+  STP_SAFE_FREE(v->s);							\
+  v->s = stp_strdup(val);						\
+  v->verified = 0;							\
+}									\
+									\
+void									\
+pre##_set_##s##_n(stp_vars_t *v, const char *val, int n)		\
+{									\
+  check_vars(v);							\
+  if (v->s == val)							\
+    return;								\
+  STP_SAFE_FREE(v->s);							\
+  v->s = stp_strndup(val, n);						\
+  v->verified = 0;							\
+}									\
+									\
+const char *								\
+pre##_get_##s(const stp_vars_t *v)					\
+{									\
+  check_vars(v);							\
+  return v->s;								\
 }
 
 #define DEF_FUNCS(s, t, pre)				\
@@ -473,11 +471,11 @@ stp_set_string_parameter_n(stp_vars_t *v, const char *parameter,
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_STRING_LIST];
   if (value)
-    stp_dprintf(STP_DBG_VARS, v, "stp_set_string_parameter(%s, %s)\n",
-		parameter, value);
+    stp_deprintf(STP_DBG_VARS, "stp_set_string_parameter(0x%p, %s, %s)\n",
+		 (const void *) v, parameter, value);
   else
-    stp_dprintf(STP_DBG_VARS, v, "stp_set_string_parameter(%s)\n",
-		parameter);
+    stp_deprintf(STP_DBG_VARS, "stp_set_string_parameter(0x%p, %s)\n",
+		 (const void *) v, parameter);
   set_raw_parameter(list, parameter, value, bytes,
 		    STP_PARAMETER_TYPE_STRING_LIST);
   stp_set_verified(v, 0);
@@ -489,14 +487,9 @@ stp_set_string_parameter(stp_vars_t *v, const char *parameter,
 {
   int byte_count = 0;
   if (value)
-    {
       byte_count = strlen(value);
-      stp_dprintf(STP_DBG_VARS, v, "stp_set_string_parameter(%s, %s)\n",
-		  parameter, value);
-    }
-  else
-    stp_dprintf(STP_DBG_VARS, v, "stp_set_string_parameter(%s)\n",
-		parameter);
+  stp_deprintf(STP_DBG_VARS, "stp_set_string_parameter(0x%p, %s, %s)\n",
+	       (const void *) v, parameter, value ? value : "NULL");
   stp_set_string_parameter_n(v, parameter, value, byte_count);
   stp_set_verified(v, 0);
 }
@@ -506,12 +499,8 @@ stp_set_default_string_parameter_n(stp_vars_t *v, const char *parameter,
 				   const char *value, size_t bytes)
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_STRING_LIST];
-  if (value)
-    stp_dprintf(STP_DBG_VARS, v, "stp_set_default_string_parameter(%s, %s)\n",
-		parameter, value);
-  else
-    stp_dprintf(STP_DBG_VARS, v, "stp_set_default_string_parameter(%s)\n",
-		parameter);
+  stp_deprintf(STP_DBG_VARS, "stp_set_default_string_parameter(0x%p, %s, %s)\n",
+	       (const void *) v, parameter, value ? value : "NULL");
   set_default_raw_parameter(list, parameter, value, bytes,
 			    STP_PARAMETER_TYPE_STRING_LIST);
   stp_set_verified(v, 0);
@@ -597,12 +586,8 @@ stp_set_file_parameter(stp_vars_t *v, const char *parameter,
   size_t byte_count = 0;
   if (value)
     byte_count = strlen(value);
-  if (value)
-    stp_dprintf(STP_DBG_VARS, v, "stp_set_file_parameter(%s, %s)\n",
-		parameter, value);
-  else
-    stp_dprintf(STP_DBG_VARS, v, "stp_set_file_parameter(%s)\n",
-		parameter);
+  stp_deprintf(STP_DBG_VARS, "stp_set_file_parameter(0x%p, %s, %s)\n",
+	       (const void *) v, parameter, value ? value : "NULL");
   set_raw_parameter(list, parameter, value, byte_count,
 		    STP_PARAMETER_TYPE_FILE);
   stp_set_verified(v, 0);
@@ -613,12 +598,8 @@ stp_set_file_parameter_n(stp_vars_t *v, const char *parameter,
 			 const char *value, size_t byte_count)
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_FILE];
-  if (value)
-    stp_dprintf(STP_DBG_VARS, v, "stp_set_file_parameter(%s, %s)\n",
-		parameter, value);
-  else
-    stp_dprintf(STP_DBG_VARS, v, "stp_set_file_parameter(%s)\n",
-		parameter);
+  stp_deprintf(STP_DBG_VARS, "stp_set_file_parameter(0x%p, %s, %s)\n",
+	       (const void *) v, parameter, value ? value : "NULL");
   set_raw_parameter(list, parameter, value, byte_count,
 		    STP_PARAMETER_TYPE_FILE);
   stp_set_verified(v, 0);
@@ -632,12 +613,8 @@ stp_set_default_file_parameter(stp_vars_t *v, const char *parameter,
   size_t byte_count = 0;
   if (value)
     byte_count = strlen(value);
-  if (value)
-    stp_dprintf(STP_DBG_VARS, v, "stp_set_default_file_parameter(%s, %s)\n",
-		parameter, value);
-  else
-    stp_dprintf(STP_DBG_VARS, v, "stp_set_default_file_parameter(%s)\n",
-		parameter);
+  stp_deprintf(STP_DBG_VARS, "stp_set_default_file_parameter(0x%p, %s, %s)\n",
+	       (const void *) v, parameter, value ? value : "NULL");
   set_default_raw_parameter(list, parameter, value, byte_count,
 			    STP_PARAMETER_TYPE_FILE);
   stp_set_verified(v, 0);
@@ -648,12 +625,8 @@ stp_set_default_file_parameter_n(stp_vars_t *v, const char *parameter,
 				 const char *value, size_t byte_count)
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_FILE];
-  if (value)
-    stp_dprintf(STP_DBG_VARS, v, "stp_set_default_file_parameter(%s, %s)\n",
-		parameter, value);
-  else
-    stp_dprintf(STP_DBG_VARS, v, "stp_set_default_file_parameter(%s)\n",
-		parameter);
+  stp_deprintf(STP_DBG_VARS, "stp_set_default_file_parameter(0x%p, %s, %s)\n",
+	       (const void *) v, parameter, value ? value : "NULL");
   set_default_raw_parameter(list, parameter, value, byte_count,
 			    STP_PARAMETER_TYPE_FILE);
   stp_set_verified(v, 0);
@@ -686,7 +659,8 @@ stp_set_curve_parameter(stp_vars_t *v, const char *parameter,
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_CURVE];
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  stp_dprintf(STP_DBG_VARS, v, "stp_set_curve_parameter(%s)\n", parameter);
+  stp_deprintf(STP_DBG_VARS, "stp_set_curve_parameter(0x%p, %s)\n",
+	       (const void *) v, parameter);
   if (curve)
     {
       value_t *val;
@@ -719,8 +693,8 @@ stp_set_default_curve_parameter(stp_vars_t *v, const char *parameter,
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_CURVE];
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  stp_dprintf(STP_DBG_VARS, v, "stp_set_default_curve_parameter(%s)\n",
-	      parameter);
+  stp_deprintf(STP_DBG_VARS, "stp_set_default_curve_parameter(0x%p, %s)\n",
+	       (const void *) v, parameter);
   if (!item)
     {
       if (curve)
@@ -764,6 +738,8 @@ stp_set_array_parameter(stp_vars_t *v, const char *parameter,
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_ARRAY];
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_deprintf(STP_DBG_VARS, "stp_set_array_parameter(0x%p, %s)\n",
+	       (const void *) v, parameter);
   if (array)
     {
       value_t *val;
@@ -795,7 +771,8 @@ stp_set_default_array_parameter(stp_vars_t *v, const char *parameter,
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_ARRAY];
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  stp_dprintf(STP_DBG_VARS, v, "stp_set_array_parameter(%s)\n", parameter);
+  stp_deprintf(STP_DBG_VARS, "stp_set_default_array_parameter(0x%p, %s)\n",
+	       (const void *) v, parameter);
   if (!item)
     {
       if (array)
@@ -824,8 +801,6 @@ stp_get_array_parameter(const stp_vars_t *v, const char *parameter)
   const stp_list_t *list = v->params[STP_PARAMETER_TYPE_ARRAY];
   const value_t *val;
   const stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  stp_dprintf(STP_DBG_VARS, v, "stp_set_default_array_parameter(%s)\n",
-	      parameter);
   if (item)
     {
       val = (const value_t *) stp_list_item_get_data(item);
@@ -841,8 +816,8 @@ stp_set_int_parameter(stp_vars_t *v, const char *parameter, int ival)
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_INT];
   value_t *val;
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  stp_dprintf(STP_DBG_VARS, v, "stp_set_int_parameter(%s, %d)\n",
-	      parameter, ival);
+  stp_deprintf(STP_DBG_VARS, "stp_set_int_parameter(0x%p, %s, %d)\n",
+	       (const void *) v, parameter, ival);
   if (item)
     {
       val = (value_t *) stp_list_item_get_data(item);
@@ -867,8 +842,8 @@ stp_set_default_int_parameter(stp_vars_t *v, const char *parameter, int ival)
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_INT];
   value_t *val;
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  stp_dprintf(STP_DBG_VARS, v, "stp_set_default_int_parameter(%s, %d)\n",
-	      parameter, ival);
+  stp_deprintf(STP_DBG_VARS, "stp_set_default_int_parameter(0x%p, %s, %d)\n",
+	       (const void *) v, parameter, ival);
   if (!item)
     {
       val = stp_malloc(sizeof(value_t));
@@ -886,7 +861,8 @@ stp_clear_int_parameter(stp_vars_t *v, const char *parameter)
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_INT];
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  stp_dprintf(STP_DBG_VARS, v, "stp_clear_int_parameter(%s)\n", parameter);
+  stp_deprintf(STP_DBG_VARS, "stp_clear_int_parameter(0x%p, %s)\n",
+	       (const void *) v, parameter);
   if (item)
     stp_list_item_destroy(list, item);
   stp_set_verified(v, 0);
@@ -929,8 +905,8 @@ stp_set_boolean_parameter(stp_vars_t *v, const char *parameter, int ival)
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_BOOLEAN];
   value_t *val;
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  stp_dprintf(STP_DBG_VARS, v, "stp_set_boolean_parameter(%s, %d)\n",
-	      parameter, ival);
+  stp_deprintf(STP_DBG_VARS, "stp_set_boolean_parameter(0x%p, %s, %d)\n",
+	       (const void *) v, parameter, ival);
   if (item)
     {
       val = (value_t *) stp_list_item_get_data(item);
@@ -959,8 +935,8 @@ stp_set_default_boolean_parameter(stp_vars_t *v, const char *parameter,
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_BOOLEAN];
   value_t *val;
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  stp_dprintf(STP_DBG_VARS, v, "stp_set_default_boolean_parameter(%s, %d)\n",
-	      parameter, ival);
+  stp_deprintf(STP_DBG_VARS, "stp_set_default_boolean_parameter(0x%p, %s, %d)\n",
+	       (const void *) v, parameter, ival);
   if (!item)
     {
       val = stp_malloc(sizeof(value_t));
@@ -981,7 +957,8 @@ stp_clear_boolean_parameter(stp_vars_t *v, const char *parameter)
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_BOOLEAN];
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  stp_dprintf(STP_DBG_VARS, v, "stp_clear_boolean_parameter(%s)\n", parameter);
+  stp_deprintf(STP_DBG_VARS, "stp_clear_boolean_parameter(0x%p, %s)\n",
+	       (const void *) v, parameter);
   if (item)
     stp_list_item_destroy(list, item);
   stp_set_verified(v, 0);
@@ -1024,8 +1001,8 @@ stp_set_dimension_parameter(stp_vars_t *v, const char *parameter, int ival)
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_DIMENSION];
   value_t *val;
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  stp_dprintf(STP_DBG_VARS, v, "stp_set_dimension_parameter(%s, %d)\n",
-	      parameter, ival);
+  stp_deprintf(STP_DBG_VARS, "stp_set_dimension_parameter(0x%p, %s, %d)\n",
+	       (const void *) v, parameter, ival);
   if (item)
     {
       val = (value_t *) stp_list_item_get_data(item);
@@ -1050,8 +1027,8 @@ stp_set_default_dimension_parameter(stp_vars_t *v, const char *parameter, int iv
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_DIMENSION];
   value_t *val;
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  stp_dprintf(STP_DBG_VARS, v, "stp_set_default_dimension_parameter(%s, %d)\n",
-	      parameter, ival);
+  stp_deprintf(STP_DBG_VARS, "stp_set_default_dimension_parameter(0x%p, %s, %d)\n",
+	       (const void *) v, parameter, ival);
   if (!item)
     {
       val = stp_malloc(sizeof(value_t));
@@ -1069,7 +1046,8 @@ stp_clear_dimension_parameter(stp_vars_t *v, const char *parameter)
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_DIMENSION];
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  stp_dprintf(STP_DBG_VARS, v, "stp_clear_dimension_parameter(%s)\n", parameter);
+  stp_deprintf(STP_DBG_VARS, "stp_clear_dimension_parameter(0x%p, %s)\n",
+	       (const void *) v, parameter);
   if (item)
     stp_list_item_destroy(list, item);
   stp_set_verified(v, 0);
@@ -1112,8 +1090,8 @@ stp_set_float_parameter(stp_vars_t *v, const char *parameter, double dval)
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_DOUBLE];
   value_t *val;
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  stp_dprintf(STP_DBG_VARS, v, "stp_set_float_parameter(%s, %f)\n",
-	      parameter, dval);
+  stp_deprintf(STP_DBG_VARS, "stp_set_float_parameter(0x%p, %s, %f)\n",
+	       (const void *) v, parameter, dval);
   if (item)
     {
       val = (value_t *) stp_list_item_get_data(item);
@@ -1139,8 +1117,8 @@ stp_set_default_float_parameter(stp_vars_t *v, const char *parameter,
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_DOUBLE];
   value_t *val;
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  stp_dprintf(STP_DBG_VARS, v, "stp_set_default_float_parameter(%s, %f)\n",
-	      parameter, dval);
+  stp_deprintf(STP_DBG_VARS, "stp_set_default_float_parameter(0x%p, %s, %f)\n",
+	       (const void *) v, parameter, dval);
   if (!item)
     {
       val = stp_malloc(sizeof(value_t));
@@ -1158,7 +1136,8 @@ stp_clear_float_parameter(stp_vars_t *v, const char *parameter)
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_DOUBLE];
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
-  stp_dprintf(STP_DBG_VARS, v, "stp_clear_float_parameter(%s)\n", parameter);
+  stp_deprintf(STP_DBG_VARS, "stp_clear_float_parameter(0x%p, %s)\n",
+	       (const void *) v, parameter);
   if (item)
     stp_list_item_destroy(list, item);
   stp_set_verified(v, 0);
@@ -1214,6 +1193,8 @@ stp_scale_float_parameter(stp_vars_t *v, const char *parameter,
       val = desc.deflt.dbl;
       stp_parameter_description_destroy(&desc);
     }
+  stp_deprintf(STP_DBG_VARS, "stp_scale_float_parameter(%p, %s, %f*%f)\n",
+	       (const void *) v, parameter, val, scale);
   stp_set_float_parameter(v, parameter, val * scale);
 }
 
@@ -1289,12 +1270,15 @@ set_parameter_active_generic(const stp_vars_t *v, stp_parameter_type_t p_type,
     ((value_t *) stp_list_item_get_data(item))->active = active;
 }
 
-#define SET_PARAMETER_ACTIVE_FUNCTION(type, index)			     \
-void									     \
+#define SET_PARAMETER_ACTIVE_FUNCTION(type, index)			      \
+void									      \
 stp_set_##type##_parameter_active(const stp_vars_t *v, const char *parameter, \
-				  stp_parameter_activity_t active)	     \
-{									     \
-  set_parameter_active_generic(v, index, parameter, active);		     \
+				  stp_parameter_activity_t active)	      \
+{									      \
+  stp_deprintf(STP_DBG_VARS,						      \
+	       "stp_set_%s_parameter_active(0x%p, %s, %d)\n",		      \
+	       #type, (const void *) v, parameter, active);			      \
+  set_parameter_active_generic(v, index, parameter, active);		      \
 }
 
 SET_PARAMETER_ACTIVE_FUNCTION(string, STP_PARAMETER_TYPE_STRING_LIST)
@@ -1322,9 +1306,9 @@ stp_fill_parameter_settings(stp_parameter_t *desc,
       desc->verify_this_parameter = param->verify_this_parameter;
       desc->read_only = param->read_only;
       desc->name = param->name;
-      desc->text = param->text;
-      desc->category = param->category;
-      desc->help = param->help;
+      desc->text = _(param->text);
+      desc->category = _(param->category);
+      desc->help = _(param->help);
       return;
     }
 }
@@ -1419,6 +1403,86 @@ stp_parameter_list_add_param(stp_parameter_list_t list,
   stp_list_item_create(ilist, NULL, item);
 }
 
+static void
+debug_print_parameter_description(const stp_parameter_t *desc, const char *who,
+				  const stp_vars_t *v)
+{
+  int i;
+  char *curve;
+  if (! (stp_get_debug_level() & STP_DBG_VARS))
+    return;
+  stp_deprintf(STP_DBG_VARS, "Describe %s: vars 0x%p from %s type %d class %d level %d\n",
+	       desc->name, (const void *) v, who,
+	       desc->p_type, desc->p_class, desc->p_level);
+  stp_deprintf(STP_DBG_VARS, "   driver %s mandatory %d active %d channel %d verify %d ro %d\n",
+	       stp_get_driver(v), desc->is_mandatory, desc->is_active,
+	       desc->channel, desc->verify_this_parameter, desc->read_only);
+  switch (desc->p_type)
+    {
+    case STP_PARAMETER_TYPE_STRING_LIST:
+      stp_deprintf(STP_DBG_VARS,
+		   "   String default: %s\n",
+		   desc->deflt.str ? desc->deflt.str : "(null)");
+      if (desc->bounds.str)
+	for (i = 0; i < stp_string_list_count(desc->bounds.str); i++)
+	  {
+	    if (i == 0)
+	      stp_deprintf(STP_DBG_VARS, "          Choices: %s\n",
+			   stp_string_list_param(desc->bounds.str, i)->name);
+	    else
+	      stp_deprintf(STP_DBG_VARS, "                 : %s\n",
+			   stp_string_list_param(desc->bounds.str, i)->name);
+	  }
+      break;
+    case STP_PARAMETER_TYPE_INT:
+      stp_deprintf(STP_DBG_VARS,
+		   "   Integer default: %d Bounds: %d %d\n",
+		   desc->deflt.integer,
+		   desc->bounds.integer.lower, desc->bounds.integer.upper);
+      break;
+    case STP_PARAMETER_TYPE_DIMENSION:
+      stp_deprintf(STP_DBG_VARS,
+		   "   Dimension default: %d Bounds: %d %d\n",
+		   desc->deflt.dimension,
+		   desc->bounds.dimension.lower, desc->bounds.dimension.upper);
+      break;
+    case STP_PARAMETER_TYPE_BOOLEAN:
+      stp_deprintf(STP_DBG_VARS,
+		   "   Boolean default: %d\n", desc->deflt.boolean);
+      break;
+    case STP_PARAMETER_TYPE_DOUBLE:
+      stp_deprintf(STP_DBG_VARS,
+		   "   Double default: %f Bounds: %f %f\n",
+		   desc->deflt.dbl,
+		   desc->bounds.dbl.lower, desc->bounds.dbl.upper);
+      break;
+    case STP_PARAMETER_TYPE_FILE:
+      stp_deprintf(STP_DBG_VARS, "   File (no default)\n");
+      break;
+    case STP_PARAMETER_TYPE_RAW:
+      stp_deprintf(STP_DBG_VARS, "   Raw (no default)\n");
+      break;
+    case STP_PARAMETER_TYPE_CURVE:
+      curve = stp_curve_write_string(desc->deflt.curve);
+      stp_deprintf(STP_DBG_VARS,
+		   "   Curve default: %s\n", curve);
+      stp_free(curve);
+      curve = stp_curve_write_string(desc->bounds.curve);
+      stp_deprintf(STP_DBG_VARS,
+		   "          bounds: %s\n", curve);
+      stp_free(curve);
+      break;
+    case STP_PARAMETER_TYPE_ARRAY:
+      stp_deprintf(STP_DBG_VARS, "   Array\n");
+      break;
+    case STP_PARAMETER_TYPE_INVALID:
+      stp_deprintf(STP_DBG_VARS, "   *** Invalid ***\n");
+      break;
+    default:
+      stp_deprintf(STP_DBG_VARS, "   Unknown type!\n");
+    }
+}
+
 void
 stp_describe_parameter(const stp_vars_t *v, const char *name,
 		       stp_parameter_t *description)
@@ -1429,14 +1493,27 @@ stp_describe_parameter(const stp_vars_t *v, const char *name,
   description->deflt.str = NULL;
   stp_printer_describe_parameter(v, name, description);
   if (description->p_type != STP_PARAMETER_TYPE_INVALID)
-    return;
+    {
+      debug_print_parameter_description(description, "driver", v);
+      return;
+    }
   stp_color_describe_parameter(v, name, description);
   if (description->p_type != STP_PARAMETER_TYPE_INVALID)
-    return;
+    {
+      debug_print_parameter_description(description, "color", v);
+      return;
+    }
   stp_dither_describe_parameter(v, name, description);
   if (description->p_type != STP_PARAMETER_TYPE_INVALID)
-    return;
+    {
+      debug_print_parameter_description(description, "dither", v);
+      return;
+    }
   stpi_describe_generic_parameter(v, name, description);
+  if (description->p_type != STP_PARAMETER_TYPE_INVALID)
+    debug_print_parameter_description(description, "generic", v);
+  else
+    stp_deprintf(STP_DBG_VARS, "Describing invalid parameter %s\n", name);
 }
 
 void
diff --git a/src/main/print-weave.c b/src/main/print-weave.c
index ba008b0..d440ef1 100644
--- a/src/main/print-weave.c
+++ b/src/main/print-weave.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-weave.c,v 1.65 2006/07/07 22:34:43 rleigh Exp $"
+ * "$Id: print-weave.c,v 1.65.8.1 2007/03/02 12:01:32 rlk Exp $"
  *
  *   Softweave calculator for Gutenprint.
  *
@@ -1151,9 +1151,9 @@ stp_initialize_weave(stp_vars_t *v,
 	      sw->separation, sw->jets, sw->virtual_jets, osample,
 	      v_subpasses, v_subsample);
   stp_dprintf(STP_DBG_WEAVE_PARAMS, v,
-	      "      ncolors %d bpp %d width %d (%d) line_count %d first %d last %d\n",
+	      "      ncolors %d bpp %d width %d (%d) line_count %d first %d last %d max_offset %d\n",
 	      sw->ncolors, sw->bitwidth, linewidth, sw->horizontal_width,
-	      sw->vertical_height, first_line, last_line);
+	      sw->vertical_height, first_line, last_line, maxHeadOffset);
   stp_dprintf(STP_DBG_WEAVE_PARAMS, v,
 	      "      oversample %d line buffer count %d total buffer %d\n",
 	      sw->oversample, sw->vmod,
diff --git a/src/main/printers.c b/src/main/printers.c
index d182637..9d56976 100644
--- a/src/main/printers.c
+++ b/src/main/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c,v 1.78 2006/04/17 23:33:56 rlk Exp $"
+ * "$Id: printers.c,v 1.79.2.1 2007/05/29 01:47:30 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -368,6 +368,9 @@ stp_initialize_printer_defaults(void)
   printer_item = stp_list_get_start(printer_list);
   while (printer_item)
     {
+      stp_deprintf
+	(STP_DBG_PRINTERS, "  ==>init %s\n",
+	 ((stp_printer_t *)(stp_list_item_get_data(printer_item)))->driver);
       set_printer_defaults
 	(((stp_printer_t *)(stp_list_item_get_data(printer_item)))->printvars, 1);
       printer_item = stp_list_item_next(printer_item);
@@ -725,6 +728,9 @@ stp_verify_printer_params(stp_vars_t *v)
   stp_outfunc_t ofunc = stp_get_errfunc(v);
   void *odata = stp_get_errdata(v);
 
+  stp_dprintf(STP_DBG_VARS, v, "** Entering stp_verify_printer_params(0x%p)\n",
+	      v);
+
   stp_parameter_list_t params;
   int nparams;
   int i;
@@ -830,6 +836,8 @@ stp_verify_printer_params(stp_vars_t *v)
       stp_eprintf(v, "%s", errbuf.data);
       stp_free(errbuf.data);
     }
+  stp_dprintf(STP_DBG_VARS, v, "** Exiting stp_verify_printer_params(0x%p) => %d\n",
+	      v, answer);
   return answer;
 }
 
@@ -945,49 +953,79 @@ stp_fill_printvars_from_xmltree(stp_mxml_node_t *prop,
 	      else if (strcmp(p_type, "float") == 0)
 		{
 		  if (child->type == STP_MXML_TEXT)
-		    stp_set_float_parameter
-		      (v, p_name, stp_xmlstrtod(child->value.text.string));
+		    {
+		      stp_set_float_parameter
+			(v, p_name, stp_xmlstrtod(child->value.text.string));
+		      stp_deprintf(STP_DBG_XML, "  Set float '%s' to '%s' (%f)\n",
+				   p_name, child->value.text.string,
+				   stp_get_float_parameter(v, p_name));
+		    }
 		}
 	      else if (strcmp(p_type, "integer") == 0)
 		{
 		  if (child->type == STP_MXML_TEXT)
-		    stp_set_int_parameter
-		      (v, p_name, (int) stp_xmlstrtol(child->value.text.string));
+		    {
+		      stp_set_int_parameter
+			(v, p_name, (int) stp_xmlstrtol(child->value.text.string));
+		      stp_deprintf(STP_DBG_XML, "  Set int '%s' to '%s' (%d)\n",
+				   p_name, child->value.text.string,
+				   stp_get_int_parameter(v, p_name));
+		    }
 		}
 	      else if (strcmp(p_type, "boolean") == 0)
 		{
 		  if (child->type == STP_MXML_TEXT)
-		    stp_set_boolean_parameter
-		      (v, p_name, (int) stp_xmlstrtol(child->value.text.string));
+		    {
+		      stp_set_boolean_parameter
+			(v, p_name, (int) stp_xmlstrtol(child->value.text.string));
+		      stp_deprintf(STP_DBG_XML, "  Set bool '%s' to '%s' (%d)\n",
+				   p_name, child->value.text.string,
+				   stp_get_boolean_parameter(v, p_name));
+		    }
 		}
 	      else if (strcmp(p_type, "string") == 0)
 		{
 		  if (child->type == STP_MXML_TEXT)
-		    stp_set_string_parameter
-		      (v, p_name, child->value.text.string);
+		    {
+		      stp_set_string_parameter
+			(v, p_name, child->value.text.string);
+		      stp_deprintf(STP_DBG_XML, "  Set string '%s' to '%s' (%s)\n",
+				   p_name, child->value.text.string,
+				   stp_get_string_parameter(v, p_name));
+		    }
 		}
 	      else if (strcmp(p_type, "curve") == 0)
 		{
-		  stp_curve_t *curve = stp_curve_create_from_xmltree(child);
+		  stp_curve_t *curve;
+		  while (child->type == STP_MXML_TEXT && child->next)
+		    child = child->next;
+		  curve = stp_curve_create_from_xmltree(child);
 		  if (curve)
 		    {
 		      stp_set_curve_parameter(v, p_name, curve);
+		      stp_deprintf(STP_DBG_XML, "  Set curve '%s' to '%s' (%s)\n",
+				   p_name, child->value.text.string,
+				   stp_curve_write_string(curve));
 		      stp_curve_destroy(curve);
 		    }
 		}
 	      else if (strcmp(p_type, "array") == 0)
 		{
-		  stp_array_t *array = stp_array_create_from_xmltree(child);
+		  stp_array_t *array;
+		  while (child->type == STP_MXML_TEXT && child->next)
+		    child = child->next;
+		  array = stp_array_create_from_xmltree(child);
 		  if (array)
 		    {
 		      stp_set_array_parameter(v, p_name, array);
+		      stp_deprintf(STP_DBG_XML, "  Set array '%s' to '%s'\n",
+				   p_name, child->value.text.string);
 		      stp_array_destroy(array);
 		    }
 		}
 	      else
 		{
 		  stp_erprintf("Bad property %s type %s\n", p_name, p_type);
-		  continue;
 		}
 	    }
 	}
@@ -1025,10 +1063,11 @@ stp_printvars_create_from_xmltree(stp_mxml_node_t *printer,
   strcat(sbuf, stmp);
   outprintvars->name = sbuf;
   prop = printer->child;
+  stp_deprintf(STP_DBG_XML, ">>stp_printvars_create_from_xmltree: %p, %s\n",
+	       outprintvars->printvars, outprintvars->name);
   stp_fill_printvars_from_xmltree(prop, outprintvars->printvars);
-  if (stp_get_debug_level() & STP_DBG_XML)
-    stp_deprintf(STP_DBG_XML, "stp_printvars_create_from_xmltree: %s\n",
-		 outprintvars->name);
+  stp_deprintf(STP_DBG_XML, "<<stp_printvars_create_from_xmltree: %p, %s\n",
+	       outprintvars->printvars, outprintvars->name);
   return outprintvars;
 }
 
diff --git a/src/main/printers.xml b/src/main/printers.xml
index c9e444e..b080e60 100644
--- a/src/main/printers.xml
+++ b/src/main/printers.xml
@@ -4,7 +4,7 @@
    XML description of printers known to libgutenprint
    This file was originally generated.  It should be edited by hand.
 
-   "$Id: printers.xml,v 1.146 2006/07/07 13:11:42 rlk Exp $"
+   "$Id: printers.xml,v 1.157.4.6 2007/06/17 12:37:13 faust3 Exp $"
 -->
 
 <gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
@@ -38,6 +38,16 @@
       <parameters name="gamma_750_params">
         <parameter type="float" name="Gamma">0.75</parameter>
       </parameters>
+      <parameters name="PIXMA_iP4000_params">
+        <parameter type="float" name="Gamma">0.4</parameter>
+      </parameters>
+      <parameters name="PIXMA_iP4300_params">
+        <parameter type="float" name="Brightness">0.7</parameter>
+        <parameter type="float" name="Density">0.6</parameter>
+        <parameter type="float" name="Contrast">1.7</parameter>
+        <parameter type="float" name="Gamma">0.9</parameter>
+        <parameter type="float" name="BlackGamma">0.6</parameter>
+      </parameters>
       <printer name="Canon BJ-30" driver="bjc-30" manufacturer="Canon" model="30" parameters="gamma_2_density_800_params" />
       <printer name="Canon BJC-50" driver="bjc-50" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
       <printer name="Canon BJC-55" driver="bjc-55" manufacturer="Canon" model="4400" parameters="gamma_5_density_800_params" />
@@ -64,7 +74,7 @@
       <printer name="Canon BJC-8200" driver="bjc-8200" manufacturer="Canon" model="8200" parameters="density_800_params" />
       <printer name="Canon S100" driver="bjc-s100" manufacturer="Canon" model="4300" parameters="gamma_750_params" />
       <printer name="Canon S200" driver="bjc-s200" manufacturer="Canon" model="4202" parameters="gamma_8_density_900_params" />
-      <printer name="Canon S300" driver="bjc-s300" manufacturer="Canon" model="4202" parameters="gamma_8_density_900_params" />
+      <printer name="Canon S300" driver="bjc-s300" manufacturer="Canon" model="8201" parameters="density_800_params" />
       <printer name="Canon S400" driver="bjc-s400" manufacturer="Canon" model="3000" parameters="density_800_params" />
       <printer name="Canon S450" driver="bjc-s450" manufacturer="Canon" model="6200" parameters="gamma_750_params" />
       <printer name="Canon S500" driver="bjc-s500" manufacturer="Canon" model="8200" parameters="density_800_params" />
@@ -72,7 +82,32 @@
       <printer name="Canon S630" driver="bjc-s630" manufacturer="Canon" model="8200" parameters="density_800_params" />
       <printer name="Canon S800" driver="bjc-s800" manufacturer="Canon" model="8200" parameters="density_800_params" />
       <printer name="Canon S4500" driver="bjc-s4500" manufacturer="Canon" model="6500" parameters="gamma_750_params" />
-      <printer name="Canon iP4000" driver="bjc-iP4000" manufacturer="Canon" model="4000" />
+      <printer name="Canon PIXMA iP2000" driver="bjc-PIXMA-iP2000" manufacturer="Canon" model="9001" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP3000" driver="bjc-PIXMA-iP3000" manufacturer="Canon" model="3999" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP3100" driver="bjc-PIXMA-iP3100" manufacturer="Canon" model="3999" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP4000" driver="bjc-iP4000" manufacturer="Canon" model="4000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP4100" driver="bjc-PIXMA-iP4100" manufacturer="Canon" model="4000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP4200" driver="bjc-PIXMA-iP4200" manufacturer="Canon" model="4200" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP4300" driver="bjc-PIXMA-iP4300" manufacturer="Canon" model="4200" parameters="PIXMA_iP4300_params" />
+      <printer name="Canon PIXMA iP5000" driver="bjc-PIXMA-iP5000" manufacturer="Canon" model="4000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP5200" driver="bjc-PIXMA-iP5200" manufacturer="Canon" model="4200" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA iP6700" driver="bjc-PIXMA-iP6700" manufacturer="Canon" model="4203" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP150" driver="bjc-MULTIPASS-MP150" manufacturer="Canon" model="4201" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP500" driver="bjc-MULTIPASS-MP500" manufacturer="Canon" model="4200" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP700" driver="bjc-MULTIPASS-MP700" manufacturer="Canon" model="3999" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP730" driver="bjc-MULTIPASS-MP730" manufacturer="Canon" model="3999" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP750" driver="bjc-MULTIPASS-MP750" manufacturer="Canon" model="4000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP760" driver="bjc-MULTIPASS-MP760" manufacturer="Canon" model="4000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP770" driver="bjc-MULTIPASS-MP770" manufacturer="Canon" model="4000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP780" driver="bjc-MULTIPASS-MP780" manufacturer="Canon" model="4000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP790" driver="bjc-MULTIPASS-MP790" manufacturer="Canon" model="4000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXMA MP830" driver="bjc-MULTIPASS-MP830" manufacturer="Canon" model="9000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXUS iP3100" driver="bjc-PIXUS-iP3100" manufacturer="Canon" model="3999" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon PIXUS iP4100" driver="bjc-PIXUS-iP4100" manufacturer="Canon" model="4000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon i560" driver="bjc-i560" manufacturer="Canon" model="3999" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon i850" driver="bjc-i850" manufacturer="Canon" model="3999" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon i860" driver="bjc-i860" manufacturer="Canon" model="4000" parameters="PIXMA_iP4000_params" />
+      <printer name="Canon i865" driver="bjc-i865" manufacturer="Canon" model="4000" parameters="PIXMA_iP4000_params" />
     </family>
     <family name="escp2">
       <parameters name="standard_params">
@@ -93,6 +128,10 @@
         <parameter type="float" name="YellowGamma">1.02</parameter>
         <parameter type="float" name="Gamma">0.500</parameter>
       </parameters>
+      <parameters name="claria_params">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="BlackDensity">0.8</parameter>
+      </parameters>
       <printer name="Epson Stylus C20" driver="escp2-c20" manufacturer="Epson" model="42" parameters="480_params" />
       <printer name="Epson Stylus C20SX" driver="escp2-c20sx" manufacturer="Epson" model="42" parameters="480_params" />
       <printer name="Epson Stylus C20UX" driver="escp2-c20ux" manufacturer="Epson" model="42" parameters="480_params" />
@@ -124,12 +163,14 @@
       <printer name="Epson Stylus C66" driver="escp2-c66" manufacturer="Epson" model="66" parameters="standard_params" />
       <printer name="Epson Stylus C68" driver="escp2-c68" manufacturer="Epson" model="66" parameters="standard_params" />
       <printer name="Epson Stylus C70" driver="escp2-c70" manufacturer="Epson" model="44" parameters="standard_params" />
+      <printer name="Epson Stylus C79" driver="escp2-c79" manufacturer="Epson" model="66" parameters="standard_params" />
       <printer name="Epson Stylus C80" driver="escp2-c80" manufacturer="Epson" model="44" parameters="standard_params" />
       <printer name="Epson Stylus C82" driver="escp2-c82" manufacturer="Epson" model="55" parameters="standard_params" />
       <printer name="Epson Stylus C83" driver="escp2-c83" manufacturer="Epson" model="60" parameters="standard_params" />
       <printer name="Epson Stylus C84" driver="escp2-c84" manufacturer="Epson" model="60" parameters="standard_params" />
       <printer name="Epson Stylus C85" driver="escp2-c85" manufacturer="Epson" model="69" parameters="standard_params" />
       <printer name="Epson Stylus C86" driver="escp2-c86" manufacturer="Epson" model="69" parameters="standard_params" />
+      <printer name="Epson Stylus C87" driver="escp2-c87" manufacturer="Epson" model="69" parameters="standard_params" />
       <printer name="Epson Stylus C88" driver="escp2-c88" manufacturer="Epson" model="69" parameters="standard_params" />
       <printer name="Epson Stylus Color" driver="escp2" manufacturer="Epson" model="0" parameters="standard_params" />
       <printer name="Epson Stylus Color I" driver="escp2-i" manufacturer="Epson" model="0" parameters="standard_params" />
@@ -175,8 +216,8 @@
     -->
       <printer name="Epson Stylus Photo 785" driver="escp2-785" manufacturer="Epson" model="36" parameters="standard_params" />
       <printer name="Epson Stylus Photo 790" driver="escp2-790" manufacturer="Epson" model="35" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 810" driver="escp2-810" manufacturer="Epson" model="35" parameters="standard_params" />
-      <printer name="Epson Stylus Photo 820" driver="escp2-820" manufacturer="Epson" model="35" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 810" driver="escp2-810" manufacturer="Epson" model="78" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 820" driver="escp2-820" manufacturer="Epson" model="78" parameters="standard_params" />
       <printer name="Epson Stylus Photo 825" driver="escp2-825" manufacturer="Epson" model="50" parameters="standard_params" />
       <printer name="Epson Stylus Photo 830" driver="escp2-830" manufacturer="Epson" model="50" parameters="standard_params" />
       <printer name="Epson Stylus Photo 830U" driver="escp2-830u" manufacturer="Epson" model="50" parameters="standard_params" />
@@ -194,25 +235,41 @@
       <printer name="Epson Stylus Photo 1270" driver="escp2-1270" manufacturer="Epson" model="23" parameters="standard_params" />
       <printer name="Epson Stylus Photo 1280" driver="escp2-1280" manufacturer="Epson" model="37" parameters="standard_params" />
       <printer name="Epson Stylus Photo 1290" driver="escp2-1290" manufacturer="Epson" model="37" parameters="standard_params" />
+      <printer name="Epson Stylus Photo 1400" driver="escp2-1400" manufacturer="Epson" model="82" parameters="claria_params" />
+      <printer name="Epson Stylus Photo 1410" driver="escp2-1410" manufacturer="Epson" model="82" parameters="claria_params" />
       <printer name="Epson Stylus Photo 2000P" driver="escp2-2000" manufacturer="Epson" model="26" parameters="standard_params" />
       <printer name="Epson Stylus Photo 2100" driver="escp2-2100" manufacturer="Epson" model="47" parameters="standard_params" />
       <printer name="Epson Stylus Photo 2200" driver="escp2-2200" manufacturer="Epson" model="47" parameters="standard_params" />
       <printer name="Epson Stylus Photo R200" driver="escp2-r200" manufacturer="Epson" model="63" parameters="standard_params" />
       <printer name="Epson Stylus Photo R210" driver="escp2-r210" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R220" driver="escp2-r220" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R220" driver="escp2-r220" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R230" driver="escp2-r230" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R240" driver="escp2-r240" manufacturer="Epson" model="83" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R245" driver="escp2-r245" manufacturer="Epson" model="83" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R260" driver="escp2-r260" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer name="Epson Stylus Photo R265" driver="escp2-r265" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer name="Epson Stylus Photo R270" driver="escp2-r270" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer name="Epson Stylus Photo R300" driver="escp2-r300" manufacturer="Epson" model="63" parameters="standard_params" />
       <printer name="Epson Stylus Photo R310" driver="escp2-r310" manufacturer="Epson" model="63" parameters="standard_params" />
       <printer name="Epson Stylus Photo R320" driver="escp2-r320" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo R340" driver="escp2-r340" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX400" driver="escp2-rx400" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX420" driver="escp2-rx420" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX425" driver="escp2-rx425" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX430" driver="escp2-rx430" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX500" driver="escp2-rx500" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX510" driver="escp2-rx510" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX600" driver="escp2-rx600" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX620" driver="escp2-rx620" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson Stylus Photo RX630" driver="escp2-rx630" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R340" driver="escp2-r340" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R350" driver="escp2-r350" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson Stylus Photo R360" driver="escp2-r360" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer name="Epson Stylus Photo R380" driver="escp2-r380" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer name="Epson Stylus Photo R390" driver="escp2-r390" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer name="Epson Stylus Photo RX400" driver="escp2-rx400" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX420" driver="escp2-rx420" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX425" driver="escp2-rx425" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX430" driver="escp2-rx430" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX500" driver="escp2-rx500" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX510" driver="escp2-rx510" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX560" driver="escp2-rx560" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer name="Epson Stylus Photo RX580" driver="escp2-rx580" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer name="Epson Stylus Photo RX590" driver="escp2-rx590" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer name="Epson Stylus Photo RX600" driver="escp2-rx600" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX620" driver="escp2-rx620" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX630" driver="escp2-rx630" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson Stylus Photo RX640" driver="escp2-rx640" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer name="Epson Stylus Photo RX700" driver="escp2-rx700" manufacturer="Epson" model="70" parameters="standard_params" />
       <printer name="Epson Stylus Photo R800" driver="escp2-r800" manufacturer="Epson" model="64" parameters="standard_params" />
       <printer name="Epson Stylus Photo R1800" driver="escp2-r1800" manufacturer="Epson" model="67" parameters="standard_params" />
@@ -244,20 +301,24 @@
       <printer name="Epson Stylus CX4600" driver="escp2-cx4600" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer name="Epson Stylus CX4700" driver="escp2-cx4700" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer name="Epson Stylus CX4800" driver="escp2-cx4800" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX5000" driver="escp2-cx5000" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX5000F" driver="escp2-cx5000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer name="Epson Stylus CX5100" driver="escp2-cx5100" manufacturer="Epson" model="55" parameters="cx3500_params" />
       <printer name="Epson Stylus CX5200" driver="escp2-cx5200" manufacturer="Epson" model="55" parameters="cx3500_params" />
       <printer name="Epson Stylus CX5300" driver="escp2-cx5300" manufacturer="Epson" model="55" parameters="cx3500_params" />
       <printer name="Epson Stylus CX5400" driver="escp2-cx5400" manufacturer="Epson" model="55" parameters="cx3500_params" />
       <printer name="Epson Stylus CX5700" driver="escp2-cx5700" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer name="Epson Stylus CX5800" driver="escp2-cx5800" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX6000" driver="escp2-cx6000" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer name="Epson Stylus CX6300" driver="escp2-cx6300" manufacturer="Epson" model="60" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX6400" driver="escp2-cx6400" manufacturer="Epson" model="60" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX6500" driver="escp2-cx6500" manufacturer="Epson" model="69" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX6600" driver="escp2-cx6600" manufacturer="Epson" model="69" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX7700" driver="escp2-cx7700" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX6400" driver="escp2-cx6400" manufacturer="Epson" model="79" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX6500" driver="escp2-cx6500" manufacturer="Epson" model="80" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX6600" driver="escp2-cx6600" manufacturer="Epson" model="80" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX7000F" driver="escp2-cx7000f" manufacturer="Epson" model="65" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX7700" driver="escp2-cx7700" manufacturer="Epson" model="80" parameters="cx3500_params" />
       <printer name="Epson Stylus CX7800" driver="escp2-cx7800" manufacturer="Epson" model="65" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX8300" driver="escp2-cx8300" manufacturer="Epson" model="60" parameters="cx3500_params" />
-      <printer name="Epson Stylus CX8400" driver="escp2-cx8400" manufacturer="Epson" model="60" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX8300" driver="escp2-cx8300" manufacturer="Epson" model="79" parameters="cx3500_params" />
+      <printer name="Epson Stylus CX8400" driver="escp2-cx8400" manufacturer="Epson" model="79" parameters="cx3500_params" />
       <printer name="Epson Stylus D68" driver="escp2-d68" manufacturer="Epson" model="66" parameters="standard_params" />
       <printer name="Epson Stylus D88" driver="escp2-d88" manufacturer="Epson" model="69" parameters="standard_params" />
       <printer name="Epson Stylus DX3800" driver="escp2-dx3800" manufacturer="Epson" model="72" parameters="standard_params" />
@@ -267,6 +328,14 @@
       <printer name="Epson Stylus DX4800" driver="escp2-dx4800" manufacturer="Epson" model="65" parameters="standard_params" />
       <printer name="Epson PictureMate" driver="escp2-picmate" manufacturer="Epson" model="73" parameters="standard_params" />
       <printer name="Epson PictureMate Deluxe" driver="escp2-picmated" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer name="Epson PictureMate Flash" driver="escp2-picmateflash" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer name="Epson PictureMate Pal" driver="escp2-picmatepal" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer name="Epson PictureMate Snap" driver="escp2-picmatesnap" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer name="Epson PictureMate 200" driver="escp2-picmate200" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer name="Epson PictureMate 210" driver="escp2-picmate210" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer name="Epson PictureMate 240" driver="escp2-picmate240" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer name="Epson PictureMate 250" driver="escp2-picmate250" manufacturer="Epson" model="73" parameters="standard_params" />
+      <printer name="Epson PictureMate 280" driver="escp2-picmate280" manufacturer="Epson" model="73" parameters="standard_params" />
       <printer name="Epson CL 700" driver="escp2-cl700" manufacturer="Epson" model="38" parameters="480_params" />
       <printer name="Epson CL 750" driver="escp2-cl750" manufacturer="Epson" model="43" parameters="480_params" />
       <printer name="Epson CL 760" driver="escp2-cl760" manufacturer="Epson" model="56" parameters="480_params" />
@@ -314,19 +383,23 @@
       <printer name="Epson PM 10000" driver="escp2-pm10000" manufacturer="Epson" model="41" parameters="standard_params" />
       <printer name="Epson PM A650" driver="escp2-pma650" manufacturer="Epson" model="74" parameters="standard_params" />
       <printer name="Epson PM A750" driver="escp2-pma750" manufacturer="Epson" model="75" parameters="standard_params" />
+      <printer name="Epson PM A820" driver="escp2-pma820" manufacturer="Epson" model="81" parameters="claria_params" />
       <printer name="Epson PM A890" driver="escp2-pma890" manufacturer="Epson" model="76" parameters="standard_params" />
       <printer name="Epson PM A900" driver="escp2-pma900" manufacturer="Epson" model="70" parameters="standard_params" />
       <printer name="Epson PM A950" driver="escp2-pma950" manufacturer="Epson" model="70" parameters="standard_params" />
       <printer name="Epson PM D600" driver="escp2-pmd600" manufacturer="Epson" model="77" parameters="standard_params" />
       <printer name="Epson PM D750" driver="escp2-pmd750" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson PM D770" driver="escp2-pmd770" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson PM D800" driver="escp2-pmd800" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson PM D1000" driver="escp2-pmd1000" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson PM G700" driver="escp2-pmg700" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson PM G720" driver="escp2-pmg720" manufacturer="Epson" model="63" parameters="standard_params" />
-      <printer name="Epson PM G730" driver="escp2-pmg730" manufacturer="Epson" model="63" parameters="standard_params" />
+      <printer name="Epson PM D770" driver="escp2-pmd770" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson PM D800" driver="escp2-pmd800" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson PM D870" driver="escp2-pmd870" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer name="Epson PM D1000" driver="escp2-pmd1000" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson PM G700" driver="escp2-pmg700" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson PM G720" driver="escp2-pmg720" manufacturer="Epson" model="84" parameters="standard_params" />
+      <printer name="Epson PM G730" driver="escp2-pmg730" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer name="Epson PM G800" driver="escp2-pmg800" manufacturer="Epson" model="68" parameters="standard_params" />
       <printer name="Epson PM G820" driver="escp2-pmg820" manufacturer="Epson" model="68" parameters="standard_params" />
+      <printer name="Epson PM G850" driver="escp2-pmg850" manufacturer="Epson" model="81" parameters="claria_params" />
+      <printer name="Epson PM G4500" driver="escp2-pmg4500" manufacturer="Epson" model="82" parameters="standard_params" />
       <printer name="Epson PX A650" driver="escp2-pxa650" manufacturer="Epson" model="65" parameters="cx3500_params" />
       <printer name="Epson PX G900" driver="escp2-pxg900" manufacturer="Epson" model="64" parameters="standard_params" />
       <printer name="Epson PX G920" driver="escp2-pxg920" manufacturer="Epson" model="64" parameters="standard_params" />
@@ -724,6 +797,7 @@
       <printer name="Lexmark 4076" driver="lexmark-4076" manufacturer="Lexmark" model="500" parameters="pcl_inkjet_params" />
       <printer name="Lexmark Optra E" driver="lexmark-optra_e" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
       <printer name="Lexmark Optra E+" driver="lexmark-optra_eplus" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
+      <printer name="Lexmark Optra E220" driver="lexmark-optra_e220" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
       <printer name="Lexmark Valuewriter 300" driver="lexmark-vw_300" manufacturer="Lexmark" model="2" parameters="pcl_laser_params" />
       <printer name="Minolta PagePro 6" driver="minolta-pp_6" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
       <printer name="Minolta PagePro 6e" driver="minolta-pp_6e" manufacturer="Minolta" model="6" parameters="pcl_laser_params" />
@@ -789,6 +863,7 @@
       <printer name="Xerox DocuPrint P1202" driver="xerox-dp_p1202" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
       <printer name="Xerox DocuPrint P8e" driver="xerox-dp_p8e" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
       <printer name="Xerox Document Centre 400" driver="xerox-dc_400" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
+      <printer name="Xerox WorkCentre M118" driver="xerox-wc_m118" manufacturer="Xerox" model="6" parameters="pcl_laser_params" />
     </family>
     <family name="lexmark">
       <parameters name="standard_params">
@@ -796,6 +871,8 @@
         <parameter type="float" name="Gamma">0.5</parameter>
         <parameter type="float" name="Density">2.0</parameter>
       </parameters>
+      <printer name="Compaq IJ1200" driver="compaq-ij1200" manufacturer="Compaq" model="10042" parameters="standard_params" />
+      <printer name="Lexmark X73" driver="lexmark-x73" manufacturer="Lexmark" model="10042" parameters="standard_params" />
       <printer name="Lexmark Z42" driver="lexmark-z42" manufacturer="Lexmark" model="10042" parameters="standard_params" />
       <printer name="Lexmark Z43" driver="lexmark-z43" manufacturer="Lexmark" model="10042" parameters="standard_params" />
       <printer name="Lexmark Z52" driver="lexmark-z52" manufacturer="Lexmark" model="10052" parameters="standard_params" />
@@ -812,6 +889,8 @@
       <printer name="Olympus P-330NE" driver="olympus-p330ne" manufacturer="Olympus" model="0" />
       <printer name="Olympus P-400" driver="olympus-p400" manufacturer="Olympus" model="1" />
       <printer name="Olympus P-440" driver="olympus-p440" manufacturer="Olympus" model="3" />
+      <printer name="Olympus P-S100" driver="olympus-ps100" manufacturer="Olympus" model="20" />
+      <printer name="Canon CP-10" driver="canon-cp10" manufacturer="Canon" model="1002" />
       <printer name="Canon CP-100" driver="canon-cp100" manufacturer="Canon" model="1000" />
       <printer name="Canon CP-200" driver="canon-cp200" manufacturer="Canon" model="1000" />
       <printer name="Canon CP-220" driver="canon-cp220" manufacturer="Canon" model="1001" />
@@ -822,10 +901,15 @@
       <printer name="Canon SELPHY-CP-510" driver="canon-cp510" manufacturer="Canon" model="1001" />
       <printer name="Canon SELPHY-CP-600" driver="canon-cp600" manufacturer="Canon" model="1001" />
       <printer name="Canon SELPHY-CP-710" driver="canon-cp710" manufacturer="Canon" model="1001" />
+      <printer name="Sony DPP-EX5" driver="sony-dppex5" manufacturer="Sony" model="2002" />
+      <printer name="Sony DPP-EX7" driver="sony-dppex5" manufacturer="Sony" model="2002" />
       <printer name="Sony UP-DP10" driver="sony-updp10" manufacturer="Sony" model="2000" />
+      <printer name="Sony UP-DR100" driver="sony-updr100" manufacturer="Sony" model="2003" />
       <printer name="Sony UP-DR150" driver="sony-updr150" manufacturer="Sony" model="2001" />
       <printer name="Fujifilm Printpix-CX-400" driver="fujifilm-cx400" manufacturer="Fujifilm" model="3000" />
       <printer name="Fujifilm Printpix-CX-550" driver="fujifilm-cx550" manufacturer="Fujifilm" model="3001" />
+      <printer name="Fujifilm FinePix-NX-500" driver="fujifilm-nx500" manufacturer="Fujifilm" model="3002" />
+      <printer name="Kodak Easyshare-Printer-Dock" driver="kodak-dock" manufacturer="Kodak" model="4000"/>
     </family>
     <family name="raw">
       <printer name="RAW DATA 16 bit" driver="raw-data-16" manufacturer="" model="0" />
diff --git a/src/main/sequence.c b/src/main/sequence.c
index ef69990..83f2b69 100644
--- a/src/main/sequence.c
+++ b/src/main/sequence.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: sequence.c,v 1.22 2006/07/07 21:31:02 rleigh Exp $"
+ * "$Id: sequence.c,v 1.23 2006/09/12 19:03:33 easysw Exp $"
  *
  *   Sequence data type.  This type is designed to be derived from by
  *   the curve and dither matrix types.
@@ -277,7 +277,7 @@ stp_sequence_set_point(stp_sequence_t *sequence, size_t where,
 {
   check_sequence(sequence);
 
-  if (where >= sequence->size || ! finite(data) ||
+  if (where >= sequence->size || ! isfinite(data) ||
       data < sequence->blo || data > sequence->bhi)
     return 0;
 
@@ -378,7 +378,7 @@ stp_sequence_create_from_xmltree(stp_mxml_node_t *da)
 		     child->value.text.string);
 		  goto error;
 		}
-	      if (! finite(tmpval)
+	      if (! isfinite(tmpval)
 		  || ( tmpval == 0 && errno == ERANGE )
 		  || tmpval < low
 		  || tmpval > high)
@@ -484,7 +484,7 @@ stp_sequence_set_##name##_data(stp_sequence_t *sequence,                     \
 									     \
   /* Validate the data before we commit to it. */			     \
   for (i = 0; i < count; i++)						     \
-    if (! finite(data[i]) ||                                                 \
+    if (! isfinite(data[i]) ||                                                 \
         data[i] < sequence->blo ||                                           \
         data[i] > sequence->bhi)                                             \
       return 0;								     \
diff --git a/src/main/util.h b/src/main/util.h
index 701a8eb..7a3fe61 100644
--- a/src/main/util.h
+++ b/src/main/util.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.h,v 1.33 2006/01/13 16:09:14 rleigh Exp $"
+ * "$Id: util.h,v 1.33.10.1 2007/03/02 12:01:33 rlk Exp $"
  *
  *   Gutenprint header.
  *
@@ -58,6 +58,9 @@ extern "C" {
 extern void stpi_init_paper(void);
 extern void stpi_init_dither(void);
 extern void stpi_init_printer(void);
+#define BUFFER_FLAG_FLIP_X	0x1
+#define BUFFER_FLAG_FLIP_Y	0x2
+extern stp_image_t* stpi_buffer_image(stp_image_t* image, unsigned int flags);
 
 /** @} */
 
@@ -67,5 +70,5 @@ extern void stpi_init_printer(void);
 
 #endif /* GUTENPRINT_INTERNAL_UTIL_H */
 /*
- * End of "$Id: util.h,v 1.33 2006/01/13 16:09:14 rleigh Exp $".
+ * End of "$Id: util.h,v 1.33.10.1 2007/03/02 12:01:33 rlk Exp $".
  */
diff --git a/src/main/xml.c b/src/main/xml.c
index ac64537..c43b13b 100644
--- a/src/main/xml.c
+++ b/src/main/xml.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: xml.c,v 1.33 2004/09/17 18:38:27 rleigh Exp $"
+ * "$Id: xml.c,v 1.33.18.1 2007/05/29 01:47:30 rlk Exp $"
  *
  *   XML parser - process Gutenprint XML data with mxml.
  *
@@ -126,9 +126,7 @@ stp_unregister_xml_preload(const char *name)
 
 static void stpi_xml_process_gutenprint(stp_mxml_node_t *gutenprint, const char *file);
 
-static char *saved_lc_collate;                 /* Saved LC_COLLATE */
-static char *saved_lc_ctype;                   /* Saved LC_CTYPE */
-static char *saved_lc_numeric;                 /* Saved LC_NUMERIC */
+static char *saved_locale;                 /* Saved LC_ALL */
 static int xml_is_initialised;                 /* Flag for init */
 
 void
@@ -154,6 +152,8 @@ stp_xml_preinit(void)
 void
 stp_xml_init(void)
 {
+  stp_deprintf(STP_DBG_XML, "stp_xml_init: entering at level %d\n",
+	       xml_is_initialised);
   if (xml_is_initialised >= 1)
     {
       xml_is_initialised++;
@@ -161,9 +161,11 @@ stp_xml_init(void)
     }
 
   /* Set some locale facets to "C" */
-  saved_lc_collate = setlocale(LC_COLLATE, "C");
-  saved_lc_ctype = setlocale(LC_CTYPE, "C");
-  saved_lc_numeric = setlocale(LC_NUMERIC, "C");
+#ifdef HAVE_LOCALE_H
+  saved_locale = stp_strdup(setlocale(LC_ALL, NULL));
+  stp_deprintf(STP_DBG_XML, "stp_xml_init: saving locale %s\n", saved_locale);
+  setlocale(LC_ALL, "C");
+#endif
 
   xml_is_initialised = 1;
 }
@@ -175,6 +177,8 @@ stp_xml_init(void)
 void
 stp_xml_exit(void)
 {
+  stp_deprintf(STP_DBG_XML, "stp_xml_exit: entering at level %d\n",
+	       xml_is_initialised);
   if (xml_is_initialised > 1) /* don't restore original state */
     {
       xml_is_initialised--;
@@ -184,9 +188,12 @@ stp_xml_exit(void)
     return;
 
   /* Restore locale */
-  setlocale(LC_COLLATE, saved_lc_collate);
-  setlocale(LC_CTYPE, saved_lc_ctype);
-  setlocale(LC_NUMERIC, saved_lc_numeric);
+#ifdef HAVE_LOCALE_H
+  stp_deprintf(STP_DBG_XML, "stp_xml_init: restoring locale %s\n", saved_locale);
+  setlocale(LC_ALL, saved_locale);
+  stp_free(saved_locale);
+  saved_locale = NULL;
+#endif
   xml_is_initialised = 0;
 }
 
diff --git a/src/testpattern/Makefile.in b/src/testpattern/Makefile.in
index c5833f9..a58e6a2 100644
--- a/src/testpattern/Makefile.in
+++ b/src/testpattern/Makefile.in
@@ -52,11 +52,12 @@ subdir = src/testpattern
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
@@ -78,8 +79,8 @@ testpattern_OBJECTS = $(am_testpattern_OBJECTS)
 testpattern_DEPENDENCIES = $(am__DEPENDENCIES_1)
 SCRIPTS = $(noinst_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp =
-am__depfiles_maybe =
+depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
+am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -109,13 +110,18 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 pkgdatadir = $(datadir)/$(PACKAGE)/samples
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -141,6 +147,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -148,6 +156,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -160,12 +169,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -200,6 +211,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -295,14 +307,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -319,6 +334,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -336,17 +354,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -376,9 +398,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/testpattern/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/testpattern/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps src/testpattern/Makefile
+	  $(AUTOMAKE) --gnu  src/testpattern/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -454,14 +476,32 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printer_options.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printers.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testpattern.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testpatternl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testpatterny.Po@am__quote@
+
 .c.o:
-	$(COMPILE) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 .l.c:
 	$(LEXCOMPILE) $<
@@ -707,6 +747,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-libtool \
 	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -732,6 +773,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/testpattern/printer_options.c b/src/testpattern/printer_options.c
index 388e920..444e4b5 100644
--- a/src/testpattern/printer_options.c
+++ b/src/testpattern/printer_options.c
@@ -1,7 +1,7 @@
 /*
- * "$Id: printer_options.c,v 1.2 2006/05/28 16:59:05 rlk Exp $"
+ * "$Id: printer_options.c,v 1.2.8.2 2007/03/04 23:57:48 tillkamppeter Exp $"
  *
- *   Dump the per-printer options for Grant Taylor's *-omatic database
+ *   Dump the per-printer options for the OpenPrinting database
  *
  *   Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)
  *
@@ -32,11 +32,23 @@ int
 main(int argc, char **argv)
 {
   int i, j, k;
+  int first_arg = 1;
+  stp_string_list_t *printer_list = NULL;
   stp_parameter_level_t max_level = STP_PARAMETER_LEVEL_ADVANCED4;
   if (argc > 1 && !strcmp(argv[1], "-s"))
-    max_level = STP_PARAMETER_LEVEL_BASIC;
+    {
+      max_level = STP_PARAMETER_LEVEL_BASIC;
+      first_arg++;
+    }
 
   stp_init();
+  
+  if (argc > first_arg)
+    {
+      printer_list = stp_string_list_create();
+      for (i = 1; i < argc; i++)
+	stp_string_list_add_string(printer_list, argv[i], argv[i]);
+    }
   for (i = 0; i < stp_printer_model_count(); i++)
     {
       stp_parameter_list_t params;
@@ -51,6 +63,8 @@ main(int argc, char **argv)
       int printer_is_color = 0;
       if (strcmp(family, "ps") == 0 || strcmp(family, "raw") == 0)
 	continue;
+      if (printer_list && !stp_string_list_is_present(printer_list, driver))
+	continue;
 
       /* Set Job Mode to "Job" as this enables the Duplex option */
       stp_set_string_parameter(pv, "JobMode", "Job");
diff --git a/src/testpattern/printers.c b/src/testpattern/printers.c
index d9c5286..21ffd1e 100644
--- a/src/testpattern/printers.c
+++ b/src/testpattern/printers.c
@@ -1,7 +1,7 @@
 /*
- * "$Id: printers.c,v 1.6 2004/09/17 18:38:27 rleigh Exp $"
+ * "$Id: printers.c,v 1.6.18.1 2007/03/04 23:57:49 tillkamppeter Exp $"
  *
- *   Dump the per-printer options for Grant Taylor's *-omatic database
+ *   Dump the per-printer options for the OpenPrinting database
  *
  *   Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)
  *
diff --git a/src/testpattern/run-testpattern-2.in b/src/testpattern/run-testpattern-2.in
index daba8db..9f0fd5c 100644
--- a/src/testpattern/run-testpattern-2.in
+++ b/src/testpattern/run-testpattern-2.in
@@ -8,9 +8,14 @@ use strict;
 my $valgrind = 0;
 my $cachegrind = 0;
 my $gdb_attach = 0;
+my $calc_md5 = 0;
 my $dontrun = 0;
 my $retval = 0;
+my $testpattern_command;
 my @printer_list = ();
+my @special_options = ();
+my @standard_options = qw(InkType);
+my $global_status = 1;
 
 my @extras = ();
 my @messages = ();
@@ -24,7 +29,13 @@ GetOptions("v+"  => \$valgrind,
 	   "c"   => \$cachegrind,
 	   "g"   => \$gdb_attach,
 	   "n"   => \$dontrun,
-	   "s!"  => \$skip_duplicate_printers);
+	   "s!"  => \$skip_duplicate_printers,
+	   "o=s" => \@special_options,
+	   "m"   => \$calc_md5);
+
+if (! @special_options) {
+    @special_options = @standard_options;
+}
 
 my $pwd = `pwd`;
 chomp $pwd;
@@ -110,15 +121,10 @@ EOF
     return $stuff;
 }
 
-open PIPE, "./printer_options|" or die "Cannot run printer_options: $!\n";
-while(<PIPE>) {
-    next if m!^#!;
-    eval $_;
-}
-close PIPE or die "Cannot run printer_options: $!\n";
-
+my $extra_arg = "";
 if ($#ARGV >= 0) {
     @printer_list = @ARGV;
+    $extra_arg = join " ", @printer_list;
 } else {
     open PIPE, "./printers|" or die "Cannot run printers: $!\n";
     while(<PIPE>) {
@@ -129,24 +135,55 @@ if ($#ARGV >= 0) {
     close PIPE;
 }
 
-sub do_printer($$) {
+open PIPE, "./printer_options $extra_arg|" or die "Cannot run printer_options: $!\n";
+while(<PIPE>) {
+    next if m!^#!;
+    eval $_;
+}
+close PIPE or die "Cannot run printer_options: $!\n";
+
+sub do_print {
+    my ($output, $fh) = @_;
+    if ($dontrun) {
+	print $output;
+    } elsif ($calc_md5) {
+	open TESTPATTERN, "|$testpattern_command" or
+		die "Can't run $testpattern_command: $!\n";
+	print TESTPATTERN $output;
+	my $status = close TESTPATTERN;
+	if (! $status) {
+	    $global_status = 0;
+	}
+    } else {
+	print $fh $output;
+    }
+}
+
+
+sub do_printer {
     my ($printer, $fh) = @_;
-    my $tmp = $stpdata{$printer}{'Resolution'};
+    my $tmp;
     my $min_res_name;
     my $min_res_value = 0;
     my $first_time = 1;
     my $model_id = $models{$printer};
     my $family_id = $families{$printer};
+    my $key;
+    my %opt_vals = {};
     if ($skip_duplicate_printers && $models_found{$family_id}{$model_id}) {
 	return;
     } else {
 	$models_found{$family_id}{$model_id} = 1;
     }
+    $tmp = $stpdata{$printer}{'Resolution'};
     my (@resolutions) = grep {$_ ne 'None' } keys %$tmp;
     $tmp = $stpdata{$printer}{'PrintingMode'};
     my (@printing_modes) = grep {$_ ne 'None' } keys %$tmp;
-    $tmp = $stpdata{$printer}{'InkType'};
-    my (@ink_types) = grep {$_ ne 'None' } keys %$tmp;
+    foreach $key (@special_options) {
+	$tmp = $stpdata{$printer}{$key};
+	my (@tmp) = grep {$_ ne 'None' } keys %$tmp;
+	$opt_vals{$key} = \@tmp;
+    }
     foreach $tmp (sort @resolutions) {
 	my $res_value = ($stpdata{$printer}{'x_resolution'}{$tmp} *
 			 $stpdata{$printer}{'y_resolution'}{$tmp});
@@ -159,7 +196,7 @@ sub do_printer($$) {
     # We don't need to do both resolutions and ink types.
     my $pmode;
     foreach $pmode (@printing_modes) {
-	my ($resolution, $ink_type);
+	my ($resolution);
 	foreach $resolution (@resolutions) {
 	    @extras = ();
 	    @messages = ();
@@ -173,24 +210,29 @@ sub do_printer($$) {
 	    set_opt("ColorCorrection", "Raw");
 	    set_message("    ${pmode}+${resolution}");
 	    my $output = print_one_testpattern($printer);
-	    print $fh $output;
+	    do_print( $output, $fh );
 	}
-	if ($#ink_types >= 1) {
-	    foreach $ink_type (@ink_types) {
-		@extras = ();
-		@messages = ();
-		if ($first_time) {
-		    set_message("$printer\n");
-		    $first_time = 0;
+	foreach $key (@special_options) {
+	    $tmp = $opt_vals{$key};
+	    my (@opts) = @$tmp;
+	    if ($#opts >= 1) {
+		my $opt;
+		foreach $opt (@opts) {
+		    @extras = ();
+		    @messages = ();
+		    if ($first_time) {
+			set_message("$printer\n");
+			$first_time = 0;
+		    }
+		    set_opt("PrintingMode", $pmode);
+		    set_opt("Resolution", $min_res_name);
+		    set_opt($key, $opt);
+		    set_opt("DitherAlgorithm", "Fast");
+		    set_opt("ColorCorrection", "Raw");
+		    set_message("    ${key}=${opt}+${pmode}+${min_res_name}");
+		    my $output = print_one_testpattern($printer);
+		    do_print( $output, $fh );
 		}
-		set_opt("PrintingMode", $pmode);
-		set_opt("Resolution", $min_res_name);
-		set_opt("InkType", $ink_type);
-		set_opt("DitherAlgorithm", "Fast");
-		set_opt("ColorCorrection", "Raw");
-		set_message("    ${ink_type}+${pmode}+${min_res_name}");
-		my $output = print_one_testpattern($printer);
-		print $fh $output;
 	    }
 	}
     }
@@ -200,7 +242,6 @@ if ($dontrun) {
     map { do_printer($_, \*STDOUT) } @printer_list;
     exit 0;
 } else {
-    my $testpattern_command;
     my $valgrind_command;
     my $valopts;
     if ($cachegrind) {
@@ -215,19 +256,26 @@ if ($dontrun) {
     if ($valgrind == 1) {
 	$valgrind_command = "valgrind $valopts -q --num-callers=100 --error-limit=no --leak-check=yes";
     } elsif ($valgrind == 2) {
-	$valgrind_command = "valgrind $valopts --num-callers=100 --error-limit=no --show-reachable=yes --leak-resolution=high --leak-check=yes";
+	$valgrind_command = "valgrind $valopts --num-callers=100 --error-limit=no --leak-resolution=high --leak-check=yes";
     } elsif ($valgrind == 3) {
 	$valgrind_command = "valgrind $valopts --error-limit=no --num-callers=100 --show-reachable=yes --leak-resolution=high --leak-check=yes";
     } elsif ($valgrind == 4) {
 	$valgrind_command = "valgrind $valopts";
     }
 
-    $testpattern_command = "$valgrind_command ./testpattern -n";
-	
-    open TESTPATTERN, "|$testpattern_command" or
-	die "Can't run $testpattern_command: $!\n";
-    map { do_printer($_, \*TESTPATTERN) } @printer_list;
-    my $status = close TESTPATTERN;
+    my $status = 1;
+    if ($calc_md5) {
+	$testpattern_command = "./testpattern > out.prn; a=\$? ; md5sum out.prn; exit \$a";
+	map { do_printer($_) } @printer_list;
+	$status = $global_status;
+    } else {
+	$testpattern_command = "$valgrind_command ./testpattern -n";
+	open TESTPATTERN, "|$testpattern_command" or
+	    die "Can't run $testpattern_command: $!\n";
+	$testpattern_command = "$valgrind_command ./testpattern -n";
+	map { do_printer($_, \*TESTPATTERN) } @printer_list;
+	$status = close TESTPATTERN;
+    }
     if ($status) {
 	exit 0;
     } else {
diff --git a/src/testpattern/testpatterny.c b/src/testpattern/testpatterny.c
index ede6285..25a082c 100644
--- a/src/testpattern/testpatterny.c
+++ b/src/testpattern/testpatterny.c
@@ -1,7 +1,9 @@
-/* A Bison parser, made by GNU Bison 1.875.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,16 +17,24 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
 
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
 
-/* Written by Richard Stallman by simplifying the original so called
-   ``semantic'' parser.  */
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
 
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
@@ -36,6 +46,9 @@
 /* Identify Bison output.  */
 #define YYBISON 1
 
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
@@ -99,6 +112,7 @@
      END = 301
    };
 #endif
+/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tSTRING 260
@@ -228,7 +242,12 @@ find_color(const char *name)
 # define YYERROR_VERBOSE 0
 #endif
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -240,49 +259,171 @@ typedef int YYSTYPE;
 /* Copy the second part of user declarations.  */
 
 
-/* Line 214 of yacc.c.  */
-#line 244 "testpatterny.c"
+/* Line 216 of yacc.c.  */
+#line 264 "testpatterny.c"
 
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
+#ifdef short
+# undef short
+#endif
 
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
 
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
 # else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
+{
+  return i;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
 #   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
 #    endif
 #   endif
 #  endif
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
 # else
-#  if defined (__STDC__) || defined (__cplusplus)
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
 #  endif
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
 # endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
 
 
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (YYSTYPE_IS_TRIVIAL)))
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short yyss;
+  yytype_int16 yyss;
   YYSTYPE yyvs;
   };
 
@@ -292,24 +433,24 @@ union yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if 1 < __GNUC__
+#  if defined __GNUC__ && 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
 #   define YYCOPY(To, From, Count)		\
       do					\
 	{					\
-	  register YYSIZE_T yyi;		\
+	  YYSIZE_T yyi;				\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
-      while (0)
+      while (YYID (0))
 #  endif
 # endif
 
@@ -327,39 +468,33 @@ union yyalloc
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
-    while (0)
+    while (YYID (0))
 
 #endif
 
-#if defined (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short yysigned_char;
-#endif
-
-/* YYFINAL -- State number of the termination state. */
-#define YYFINAL  52
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  54
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   131
+#define YYLAST   134
 
-/* YYNTOKENS -- Number of terminals. */
+/* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  47
-/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  65
-/* YYNRULES -- Number of rules. */
-#define YYNRULES  115
-/* YYNRULES -- Number of states. */
-#define YYNSTATES  170
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  66
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  117
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  174
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   301
 
-#define YYTRANSLATE(YYX) 						\
+#define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const unsigned char yytranslate[] =
+static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -397,26 +532,26 @@ static const unsigned char yytranslate[] =
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const unsigned short yyprhs[] =
+static const yytype_uint16 yyprhs[] =
 {
        0,     0,     3,     5,     7,     9,    11,    13,    15,    17,
       19,    22,    25,    28,    31,    34,    37,    41,    43,    45,
       47,    49,    51,    53,    55,    58,    62,    66,    70,    74,
       77,    80,    83,    86,    89,    93,    95,    97,   101,   105,
-     109,   111,   113,   115,   118,   121,   124,   127,   130,   133,
-     137,   139,   142,   143,   145,   148,   153,   159,   161,   163,
-     165,   168,   169,   171,   173,   175,   181,   185,   188,   191,
-     195,   198,   202,   207,   213,   220,   222,   224,   226,   228,
-     230,   232,   234,   236,   238,   240,   242,   244,   246,   248,
-     250,   252,   254,   256,   258,   260,   262,   264,   266,   268,
-     271,   273,   275,   277,   279,   282,   283,   286,   288,   289,
-     292,   294,   296,   297,   300,   301
+     109,   113,   115,   117,   119,   121,   124,   127,   130,   133,
+     136,   139,   143,   145,   148,   149,   151,   154,   159,   165,
+     167,   169,   171,   174,   175,   177,   179,   181,   187,   191,
+     194,   197,   201,   204,   208,   213,   219,   226,   228,   230,
+     232,   234,   236,   238,   240,   242,   244,   246,   248,   250,
+     252,   254,   256,   258,   260,   262,   264,   266,   268,   270,
+     272,   274,   277,   279,   281,   283,   285,   288,   289,   292,
+     294,   295,   298,   300,   302,   303,   306,   307
 };
 
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yysigned_char yyrhs[] =
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
 {
-     110,     0,    -1,     6,    -1,     7,    -1,     8,    -1,     9,
+     111,     0,    -1,     6,    -1,     7,    -1,     8,    -1,     9,
       -1,    10,    -1,    11,    -1,    12,    -1,    13,    -1,    36,
        3,    -1,    37,     3,    -1,    38,     3,    -1,    39,     3,
       -1,    40,     3,    -1,    41,     3,    -1,    31,     3,     3,
@@ -426,71 +561,72 @@ static const yysigned_char yyrhs[] =
       14,     3,     4,    -1,    14,     4,    -1,    16,     3,    -1,
       17,     4,    -1,    18,     5,    -1,    44,     5,    -1,    44,
        3,     3,    -1,    66,    -1,    67,    -1,    19,     5,     5,
-      -1,    20,     5,     3,    -1,    21,     5,     4,    -1,    69,
-      -1,    70,    -1,    71,    -1,    23,     4,    -1,    24,     4,
-      -1,    25,     4,    -1,    26,     4,    -1,    27,     4,    -1,
-      28,     3,    -1,     4,     4,     4,    -1,    79,    -1,    80,
-      79,    -1,    -1,    80,    -1,    79,    81,    -1,    48,     4,
-       4,     4,    -1,    35,     3,     4,     4,     4,    -1,    83,
-      -1,    84,    -1,    85,    -1,    86,    85,    -1,    -1,    86,
-      -1,    82,    -1,    87,    -1,     4,     4,     4,     4,     4,
-      -1,    29,    89,    88,    -1,    30,    88,    -1,    33,     3,
-      -1,    32,     3,     3,    -1,    45,     5,    -1,    45,     5,
-       5,    -1,    45,     5,     5,     5,    -1,    45,     5,     5,
-       5,     5,    -1,    45,     5,     5,     5,     5,     5,    -1,
-      94,    -1,    95,    -1,    96,    -1,    97,    -1,    98,    -1,
-      99,    -1,    60,    -1,    61,    -1,    58,    -1,    59,    -1,
-      62,    -1,    63,    -1,    64,    -1,    65,    -1,    72,    -1,
-      73,    -1,    74,    -1,    75,    -1,    76,    -1,    77,    -1,
-      78,    -1,    57,    -1,    68,    -1,   100,    -1,   101,    34,
-      -1,    90,    -1,    91,    -1,    92,    -1,   100,    -1,   103,
-      34,    -1,    -1,   105,   104,    -1,    93,    -1,    -1,   107,
-     102,    -1,   105,    -1,   106,    -1,    -1,    46,    34,    -1,
-      -1,   107,   111,   108,   109,    -1
+      -1,    20,     5,     3,    -1,    21,     5,     4,    -1,    22,
+       5,     5,    -1,    69,    -1,    70,    -1,    71,    -1,    72,
+      -1,    23,     4,    -1,    24,     4,    -1,    25,     4,    -1,
+      26,     4,    -1,    27,     4,    -1,    28,     3,    -1,     4,
+       4,     4,    -1,    80,    -1,    81,    80,    -1,    -1,    81,
+      -1,    80,    82,    -1,    48,     4,     4,     4,    -1,    35,
+       3,     4,     4,     4,    -1,    84,    -1,    85,    -1,    86,
+      -1,    87,    86,    -1,    -1,    87,    -1,    83,    -1,    88,
+      -1,     4,     4,     4,     4,     4,    -1,    29,    90,    89,
+      -1,    30,    89,    -1,    33,     3,    -1,    32,     3,     3,
+      -1,    45,     5,    -1,    45,     5,     5,    -1,    45,     5,
+       5,     5,    -1,    45,     5,     5,     5,     5,    -1,    45,
+       5,     5,     5,     5,     5,    -1,    95,    -1,    96,    -1,
+      97,    -1,    98,    -1,    99,    -1,   100,    -1,    60,    -1,
+      61,    -1,    58,    -1,    59,    -1,    62,    -1,    63,    -1,
+      64,    -1,    65,    -1,    73,    -1,    74,    -1,    75,    -1,
+      76,    -1,    77,    -1,    78,    -1,    79,    -1,    57,    -1,
+      68,    -1,   101,    -1,   102,    34,    -1,    91,    -1,    92,
+      -1,    93,    -1,   101,    -1,   104,    34,    -1,    -1,   106,
+     105,    -1,    94,    -1,    -1,   108,   103,    -1,   106,    -1,
+     107,    -1,    -1,    46,    34,    -1,    -1,   108,   112,   109,
+     110,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short yyrline[] =
+static const yytype_uint16 yyrline[] =
 {
        0,   139,   139,   139,   139,   139,   140,   140,   140,   140,
      143,   155,   167,   179,   191,   203,   215,   227,   227,   227,
      227,   227,   227,   227,   230,   233,   243,   252,   262,   271,
      278,   285,   292,   301,   310,   319,   319,   322,   332,   341,
-     364,   364,   364,   366,   373,   380,   387,   394,   401,   409,
-     424,   424,   427,   427,   430,   433,   447,   460,   460,   463,
-     463,   466,   466,   469,   469,   472,   487,   490,   505,   516,
-     533,   539,   546,   554,   563,   574,   574,   574,   574,   574,
-     577,   580,   580,   580,   580,   580,   580,   581,   581,   581,
-     581,   581,   581,   581,   582,   582,   582,   582,   582,   585,
-     589,   589,   589,   589,   592,   596,   596,   599,   603,   603,
-     606,   606,   609,   609,   614,   613
+     350,   364,   364,   364,   364,   366,   373,   380,   387,   394,
+     401,   409,   424,   424,   427,   427,   430,   433,   447,   460,
+     460,   463,   463,   466,   466,   469,   469,   472,   487,   490,
+     505,   516,   533,   539,   546,   554,   563,   574,   574,   574,
+     574,   574,   577,   580,   580,   580,   580,   580,   580,   581,
+     581,   581,   581,   581,   581,   581,   582,   582,   582,   582,
+     582,   585,   589,   589,   589,   589,   592,   596,   596,   599,
+     603,   603,   606,   606,   609,   609,   614,   613
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tSTRING", "CYAN", 
-  "L_CYAN", "MAGENTA", "L_MAGENTA", "YELLOW", "D_YELLOW", "BLACK", 
-  "L_BLACK", "GAMMA", "LEVEL", "STEPS", "INK_LIMIT", "PRINTER", 
-  "PARAMETER", "PARAMETER_INT", "PARAMETER_FLOAT", "PARAMETER_CURVE", 
-  "DENSITY", "TOP", "LEFT", "HSIZE", "VSIZE", "BLACKLINE", "PATTERN", 
-  "XPATTERN", "EXTENDED", "IMAGE", "GRID", "SEMI", "CHANNEL", "CMYK", 
-  "KCMY", "RGB", "CMY", "GRAY", "WHITE", "RAW", "MODE", "PAGESIZE", 
-  "MESSAGE", "END", "$accept", "COLOR", "cmykspec", "kcmyspec", "rgbspec", 
-  "cmyspec", "grayspec", "whitespec", "extendedspec", "modespec", 
-  "inputspec", "level", "channel_level", "gamma", "channel_gamma", 
-  "global_gamma", "steps", "ink_limit", "printer", "page_size_name", 
-  "page_size_custom", "page_size", "parameter_string", "parameter_int", 
-  "parameter_float", "parameter", "density", "top", "left", "hsize", 
-  "vsize", "blackline", "color_block1", "color_blocks1a", 
-  "color_blocks1b", "color_blocks1", "color_block2a", "color_block2b", 
-  "color_block2", "color_blocks2a", "color_blocks2", "color_blocks", 
-  "patvars", "pattern", "xpattern", "grid", "image", "Message0", 
-  "Message1", "Message2", "Message3", "Message4", "A_Message", "message", 
-  "A_Rule", "Rule", "A_Pattern", "Pattern", "Patterns", "Image", "Rules", 
+  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tSTRING", "CYAN",
+  "L_CYAN", "MAGENTA", "L_MAGENTA", "YELLOW", "D_YELLOW", "BLACK",
+  "L_BLACK", "GAMMA", "LEVEL", "STEPS", "INK_LIMIT", "PRINTER",
+  "PARAMETER", "PARAMETER_INT", "PARAMETER_FLOAT", "PARAMETER_CURVE",
+  "DENSITY", "TOP", "LEFT", "HSIZE", "VSIZE", "BLACKLINE", "PATTERN",
+  "XPATTERN", "EXTENDED", "IMAGE", "GRID", "SEMI", "CHANNEL", "CMYK",
+  "KCMY", "RGB", "CMY", "GRAY", "WHITE", "RAW", "MODE", "PAGESIZE",
+  "MESSAGE", "END", "$accept", "COLOR", "cmykspec", "kcmyspec", "rgbspec",
+  "cmyspec", "grayspec", "whitespec", "extendedspec", "modespec",
+  "inputspec", "level", "channel_level", "gamma", "channel_gamma",
+  "global_gamma", "steps", "ink_limit", "printer", "page_size_name",
+  "page_size_custom", "page_size", "parameter_string", "parameter_int",
+  "parameter_float", "parameter_curve", "parameter", "density", "top",
+  "left", "hsize", "vsize", "blackline", "color_block1", "color_blocks1a",
+  "color_blocks1b", "color_blocks1", "color_block2a", "color_block2b",
+  "color_block2", "color_blocks2a", "color_blocks2", "color_blocks",
+  "patvars", "pattern", "xpattern", "grid", "image", "Message0",
+  "Message1", "Message2", "Message3", "Message4", "A_Message", "message",
+  "A_Rule", "Rule", "A_Pattern", "Pattern", "Patterns", "Image", "Rules",
   "Output", "EOF", "Thing", "@1", 0
 };
 #endif
@@ -498,7 +634,7 @@ static const char *const yytname[] =
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short yytoknum[] =
+static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -509,109 +645,111 @@ static const unsigned short yytoknum[] =
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const unsigned char yyr1[] =
+static const yytype_uint8 yyr1[] =
 {
        0,    47,    48,    48,    48,    48,    48,    48,    48,    48,
       49,    50,    51,    52,    53,    54,    55,    56,    56,    56,
       56,    56,    56,    56,    57,    58,    59,    60,    61,    62,
       63,    64,    65,    66,    67,    68,    68,    69,    70,    71,
-      72,    72,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    80,    81,    81,    82,    83,    84,    85,    85,    86,
-      86,    87,    87,    88,    88,    89,    90,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,    99,    99,    99,    99,
-     100,   101,   101,   101,   101,   101,   101,   101,   101,   101,
-     101,   101,   101,   101,   101,   101,   101,   101,   101,   102,
-     103,   103,   103,   103,   104,   105,   105,   106,   107,   107,
-     108,   108,   109,   109,   111,   110
+      72,    73,    73,    73,    73,    74,    75,    76,    77,    78,
+      79,    80,    81,    81,    82,    82,    83,    84,    85,    86,
+      86,    87,    87,    88,    88,    89,    89,    90,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   100,   100,
+     100,   100,   101,   102,   102,   102,   102,   102,   102,   102,
+     102,   102,   102,   102,   102,   102,   102,   102,   102,   102,
+     102,   103,   104,   104,   104,   104,   105,   106,   106,   107,
+     108,   108,   109,   109,   110,   110,   112,   111
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const unsigned char yyr2[] =
+static const yytype_uint8 yyr2[] =
 {
        0,     2,     1,     1,     1,     1,     1,     1,     1,     1,
        2,     2,     2,     2,     2,     2,     3,     1,     1,     1,
        1,     1,     1,     1,     2,     3,     3,     3,     3,     2,
        2,     2,     2,     2,     3,     1,     1,     3,     3,     3,
-       1,     1,     1,     2,     2,     2,     2,     2,     2,     3,
-       1,     2,     0,     1,     2,     4,     5,     1,     1,     1,
-       2,     0,     1,     1,     1,     5,     3,     2,     2,     3,
-       2,     3,     4,     5,     6,     1,     1,     1,     1,     1,
+       3,     1,     1,     1,     1,     2,     2,     2,     2,     2,
+       2,     3,     1,     2,     0,     1,     2,     4,     5,     1,
+       1,     1,     2,     0,     1,     1,     1,     5,     3,     2,
+       2,     3,     2,     3,     4,     5,     6,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
-       1,     1,     1,     1,     2,     0,     2,     1,     0,     2,
-       1,     1,     0,     2,     0,     4
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     2,     1,     1,     1,     1,     2,     0,     2,     1,
+       0,     2,     1,     1,     0,     2,     0,     4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
    STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
-static const unsigned char yydefact[] =
+static const yytype_uint8 yydefact[] =
 {
-     108,   114,     0,     0,     0,     0,     0,     0,     0,     0,
+     110,   116,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      96,    83,    84,    81,    82,    85,    86,    87,    88,    35,
-      36,    97,    40,    41,    42,    89,    90,    91,    92,    93,
-      94,    95,    75,    76,    77,    78,    79,    80,    98,     0,
-     109,   105,     1,     0,    29,     2,     3,     4,     5,     6,
-       7,     8,     9,     0,     0,     0,    30,    31,    32,     0,
-       0,     0,    43,    44,    45,    46,    47,    48,     0,     0,
-       0,     0,     0,     0,     0,    17,    18,    19,    20,    21,
-      22,    23,    24,     0,    33,    70,    99,     0,   107,   110,
-     111,   112,    28,    27,    26,    25,    37,    38,    39,     0,
-      10,    11,    12,    13,    14,    15,    34,    71,     0,     0,
-      61,     0,   100,   101,   102,   103,     0,   106,     0,   115,
-      16,    72,    69,     0,    61,     0,     0,     0,    52,    63,
-      57,    58,    59,    62,    64,    67,    68,   104,   113,    73,
-       0,    66,     0,     0,     0,    50,    53,    54,    60,    74,
-       0,    49,     0,     0,    51,     0,     0,    55,    65,    56
+       0,    98,    85,    86,    83,    84,    87,    88,    89,    90,
+      35,    36,    99,    41,    42,    43,    44,    91,    92,    93,
+      94,    95,    96,    97,    77,    78,    79,    80,    81,    82,
+     100,     0,   111,   107,     1,     0,    29,     2,     3,     4,
+       5,     6,     7,     8,     9,     0,     0,     0,    30,    31,
+      32,     0,     0,     0,     0,    45,    46,    47,    48,    49,
+      50,     0,     0,     0,     0,     0,     0,     0,    17,    18,
+      19,    20,    21,    22,    23,    24,     0,    33,    72,   101,
+       0,   109,   112,   113,   114,    28,    27,    26,    25,    37,
+      38,    39,    40,     0,    10,    11,    12,    13,    14,    15,
+      34,    73,     0,     0,    63,     0,   102,   103,   104,   105,
+       0,   108,     0,   117,    16,    74,    71,     0,    63,     0,
+       0,     0,    54,    65,    59,    60,    61,    64,    66,    69,
+      70,   106,   115,    75,     0,    68,     0,     0,     0,    52,
+      55,    56,    62,    76,     0,    51,     0,     0,    53,     0,
+       0,    57,    67,    58
 };
 
-/* YYDEFGOTO[NTERM-NUM]. */
-static const short yydefgoto[] =
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
 {
-      -1,   137,    85,    86,    87,    88,    89,    90,    91,    92,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,    41,   138,   156,   157,   139,   140,   141,   142,   143,
-     144,   145,   134,   122,   123,   124,    98,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,   126,   127,    99,   100,
-       1,   101,   129,     2,    51
+      -1,   141,    88,    89,    90,    91,    92,    93,    94,    95,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
+      41,    42,    43,   142,   160,   161,   143,   144,   145,   146,
+     147,   148,   149,   138,   126,   127,   128,   101,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,   130,   131,   102,
+     103,     1,   104,   133,     2,    53
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -131
-static const short yypact[] =
+#define YYPACT_NINF -118
+static const yytype_int16 yypact[] =
 {
-    -131,   -14,    16,    56,    41,    25,    36,    38,    53,    66,
-      67,    69,    70,    77,    78,    79,    81,    39,    22,    80,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,    54,
-    -131,    55,  -131,    82,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,    85,    86,    87,  -131,  -131,  -131,    88,
-      89,    90,  -131,  -131,  -131,  -131,  -131,  -131,    92,    93,
-      94,    95,    96,    97,    98,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,    99,  -131,   100,  -131,   101,  -131,    12,
-    -131,    57,  -131,  -131,  -131,  -131,  -131,  -131,  -131,   103,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,   102,   105,   106,
-      11,   108,  -131,  -131,  -131,  -131,    75,  -131,    83,  -131,
-    -131,   107,  -131,   109,    11,   110,   112,   114,   115,  -131,
-    -131,  -131,  -131,    26,  -131,  -131,  -131,  -131,  -131,   111,
-     116,  -131,   117,   118,   119,  -131,   115,  -131,  -131,  -131,
-     120,  -131,   121,   122,  -131,   123,   124,  -131,  -131,  -131
+    -118,   -14,    16,    56,    41,    24,    36,    53,    66,    67,
+      68,    69,    77,    78,    79,    80,    81,    83,    39,    23,
+      82,  -118,  -118,  -118,  -118,  -118,  -118,  -118,  -118,  -118,
+    -118,  -118,  -118,  -118,  -118,  -118,  -118,  -118,  -118,  -118,
+    -118,  -118,  -118,  -118,  -118,  -118,  -118,  -118,  -118,  -118,
+    -118,    54,  -118,    57,  -118,    86,  -118,  -118,  -118,  -118,
+    -118,  -118,  -118,  -118,  -118,    87,    88,    89,  -118,  -118,
+    -118,    90,    91,    92,    93,  -118,  -118,  -118,  -118,  -118,
+    -118,    94,    96,    97,    98,    99,   100,   101,  -118,  -118,
+    -118,  -118,  -118,  -118,  -118,  -118,   102,  -118,   103,  -118,
+     104,  -118,    12,  -118,    60,  -118,  -118,  -118,  -118,  -118,
+    -118,  -118,  -118,   106,  -118,  -118,  -118,  -118,  -118,  -118,
+    -118,   105,   108,   109,    11,   111,  -118,  -118,  -118,  -118,
+      84,  -118,    85,  -118,  -118,   107,  -118,   112,    11,   113,
+     117,   118,   119,  -118,  -118,  -118,  -118,    26,  -118,  -118,
+    -118,  -118,  -118,   110,   120,  -118,   121,   122,   123,  -118,
+     119,  -118,  -118,  -118,   124,  -118,   125,   126,  -118,   127,
+     128,  -118,  -118,  -118
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const short yypgoto[] =
+static const yytype_int8 yypgoto[] =
 {
-    -131,    52,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -130,  -131,  -131,  -131,  -131,  -131,   -13,  -131,
-    -131,    -5,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,    32,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131
+    -118,    52,  -118,  -118,  -118,  -118,  -118,  -118,  -118,  -118,
+    -118,  -118,  -118,  -118,  -118,  -118,  -118,  -118,  -118,  -118,
+    -118,  -118,  -118,  -118,  -118,  -118,  -118,  -118,  -118,  -118,
+    -118,  -118,  -118,  -117,  -118,  -118,  -118,  -118,  -118,   -26,
+    -118,  -118,    -5,  -118,  -118,  -118,  -118,  -118,  -118,  -118,
+    -118,  -118,  -118,  -118,    32,  -118,  -118,  -118,  -118,  -118,
+    -118,  -118,  -118,  -118,  -118,  -118
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -619,81 +757,66 @@ static const short yypgoto[] =
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -1
-static const unsigned char yytable[] =
+static const yytype_uint8 yytable[] =
 {
-       3,     4,     5,     6,     7,     8,     9,    10,   155,    11,
-      12,    13,    14,    15,    16,   135,    52,    55,    56,    57,
-      58,    59,    60,    61,    62,    93,   164,    94,    66,    17,
-      18,    19,    55,    56,    57,    58,    59,    60,    61,    62,
-      67,   119,   120,    68,    64,   121,   136,    55,    56,    57,
-      58,    59,    60,    61,    62,    63,    65,    19,    69,    53,
-      54,   136,    55,    56,    57,    58,    59,    60,    61,    62,
-      78,    70,    71,    72,    73,    79,    80,    81,    82,    83,
-      84,    74,    75,    76,    77,    95,   102,    97,    96,   103,
-     104,   105,   107,   106,   108,   109,   110,   111,   112,   113,
-     114,   115,   116,   128,   118,   117,   130,   131,   132,   147,
-     133,   146,   149,   150,   152,   153,   159,   148,   154,   135,
-     160,   161,   162,   163,   165,   166,   167,   168,   169,   151,
-     158,   125
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,   139,    54,    57,    58,    59,
+      60,    61,    62,    63,    64,   159,    96,    68,    97,    18,
+      19,    20,    57,    58,    59,    60,    61,    62,    63,    64,
+      69,   123,   124,   168,    66,   125,   140,    57,    58,    59,
+      60,    61,    62,    63,    64,    65,    67,    20,    70,    55,
+      56,   140,    57,    58,    59,    60,    61,    62,    63,    64,
+      81,    71,    72,    73,    74,    82,    83,    84,    85,    86,
+      87,    75,    76,    77,    78,    79,    80,    98,    99,   100,
+     105,   106,   107,   108,   110,   109,   111,   113,   112,   114,
+     115,   116,   117,   118,   119,   120,   132,   122,   121,   134,
+     135,   136,   153,   137,   150,   163,   154,   156,   151,   152,
+     157,   162,   158,   139,   164,   165,   166,   167,   169,   170,
+     171,   172,   173,   155,   129
 };
 
-static const unsigned char yycheck[] =
+static const yytype_uint8 yycheck[] =
 {
-      14,    15,    16,    17,    18,    19,    20,    21,   138,    23,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,     4,     0,     6,     7,     8,
-       9,    10,    11,    12,    13,     3,   156,     5,     3,    43,
+       9,    10,    11,    12,    13,   142,     3,     3,     5,    43,
       44,    45,     6,     7,     8,     9,    10,    11,    12,    13,
-       4,    29,    30,     5,     3,    33,    35,     6,     7,     8,
+       4,    29,    30,   160,     3,    33,    35,     6,     7,     8,
        9,    10,    11,    12,    13,     3,     4,    45,     5,     3,
        4,    35,     6,     7,     8,     9,    10,    11,    12,    13,
-      31,     5,     5,     4,     4,    36,    37,    38,    39,    40,
-      41,     4,     4,     4,     3,     5,     4,    32,    34,     4,
-       4,     4,     3,     5,     4,     3,     3,     3,     3,     3,
-       3,     3,     3,    46,     3,     5,     3,     5,     3,    34,
-       4,     3,     5,     4,     4,     3,     5,    34,     4,     4,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,   134,
-     143,    99
+      31,     5,     5,     5,     5,    36,    37,    38,    39,    40,
+      41,     4,     4,     4,     4,     4,     3,     5,    34,    32,
+       4,     4,     4,     4,     3,     5,     4,     3,     5,     3,
+       3,     3,     3,     3,     3,     3,    46,     3,     5,     3,
+       5,     3,     5,     4,     3,     5,     4,     4,    34,    34,
+       3,   147,     4,     4,     4,     4,     4,     4,     4,     4,
+       4,     4,     4,   138,   102
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
+static const yytype_uint8 yystos[] =
 {
-       0,   107,   110,    14,    15,    16,    17,    18,    19,    20,
-      21,    23,    24,    25,    26,    27,    28,    43,    44,    45,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    94,    95,    96,    97,    98,    99,   100,   101,
-     102,   111,     0,     3,     4,     6,     7,     8,     9,    10,
-      11,    12,    13,    48,     3,    48,     3,     4,     5,     5,
-       5,     5,     4,     4,     4,     4,     4,     3,    31,    36,
-      37,    38,    39,    40,    41,    49,    50,    51,    52,    53,
-      54,    55,    56,     3,     5,     5,    34,    32,    93,   105,
-     106,   108,     4,     4,     4,     4,     5,     3,     4,     3,
-       3,     3,     3,     3,     3,     3,     3,     5,     3,    29,
-      30,    33,    90,    91,    92,   100,   103,   104,    46,   109,
-       3,     5,     3,     4,    89,     4,    35,    48,    79,    82,
-      83,    84,    85,    86,    87,    88,     3,    34,    34,     5,
-       4,    88,     4,     3,     4,    79,    80,    81,    85,     5,
-       4,     4,     4,     4,    79,     4,     4,     4,     4,     4
+       0,   108,   111,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    43,    44,
+      45,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    95,    96,    97,    98,    99,   100,
+     101,   102,   103,   112,     0,     3,     4,     6,     7,     8,
+       9,    10,    11,    12,    13,    48,     3,    48,     3,     4,
+       5,     5,     5,     5,     5,     4,     4,     4,     4,     4,
+       3,    31,    36,    37,    38,    39,    40,    41,    49,    50,
+      51,    52,    53,    54,    55,    56,     3,     5,     5,    34,
+      32,    94,   106,   107,   109,     4,     4,     4,     4,     5,
+       3,     4,     5,     3,     3,     3,     3,     3,     3,     3,
+       3,     5,     3,    29,    30,    33,    91,    92,    93,   101,
+     104,   105,    46,   110,     3,     5,     3,     4,    90,     4,
+      35,    48,    80,    83,    84,    85,    86,    87,    88,    89,
+       3,    34,    34,     5,     4,    89,     4,     3,     4,    80,
+      81,    82,    86,     5,     4,     4,     4,     4,    80,     4,
+       4,     4,     4,     4
 };
 
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
 #define YYEMPTY		(-2)
@@ -701,7 +824,8 @@ static const unsigned char yystos[] =
 
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrlab1
+#define YYERROR		goto yyerrorlab
+
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
@@ -718,30 +842,63 @@ do								\
       yychar = (Token);						\
       yylval = (Value);						\
       yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
+      YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
   else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
-while (0)
+while (YYID (0))
+
 
 #define YYTERROR	1
 #define YYERRCODE	256
 
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).  */
 
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)         \
-  Current.first_line   = Rhs[1].first_line;      \
-  Current.first_column = Rhs[1].first_column;    \
-  Current.last_line    = Rhs[N].last_line;       \
-  Current.last_column  = Rhs[N].last_column;
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
 #endif
 
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 #ifdef YYLEX_PARAM
@@ -762,42 +919,96 @@ while (0)
 do {						\
   if (yydebug)					\
     YYFPRINTF Args;				\
-} while (0)
+} while (YYID (0))
 
-# define YYDSYMPRINT(Args)			\
-do {						\
-  if (yydebug)					\
-    yysymprint Args;				\
-} while (0)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
 
-# define YYDSYMPRINTF(Title, Token, Value, Location)		\
-do {								\
-  if (yydebug)							\
-    {								\
-      YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr, 					\
-                  Token, Value);	\
-      YYFPRINTF (stderr, "\n");					\
-    }								\
-} while (0)
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (cinluded).                                                   |
+| TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (short *bottom, short *top)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
 #else
 static void
 yy_stack_print (bottom, top)
-    short *bottom;
-    short *top;
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (/* Nothing. */; bottom <= top; ++bottom)
+  for (; bottom <= top; ++bottom)
     YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
 }
@@ -806,45 +1017,52 @@ yy_stack_print (bottom, top)
 do {								\
   if (yydebug)							\
     yy_stack_print ((Bottom), (Top));				\
-} while (0)
+} while (YYID (0))
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (int yyrule)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
 #else
 static void
-yy_reduce_print (yyrule)
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
     int yyrule;
 #endif
 {
+  int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned int yylineno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-             yyrule - 1, yylineno);
-  /* Print the symbols being reduced, and their result.  */
-  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      fprintf (stderr, "\n");
+    }
 }
 
 # define YY_REDUCE_PRINT(Rule)		\
 do {					\
   if (yydebug)				\
-    yy_reduce_print (Rule);		\
-} while (0)
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
-# define YYDSYMPRINT(Args)
-# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -859,13 +1077,9 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
@@ -875,45 +1089,47 @@ int yydebug;
 #if YYERROR_VERBOSE
 
 # ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
+#  if defined __GLIBC__ && defined _STRING_H
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
 yystrlen (const char *yystr)
-#   else
+#else
+static YYSIZE_T
 yystrlen (yystr)
-     const char *yystr;
-#   endif
+    const char *yystr;
+#endif
 {
-  register const char *yys = yystr;
-
-  while (*yys++ != '\0')
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
     continue;
-
-  return yys - yystr - 1;
+  return yylen;
 }
 #  endif
 # endif
 
 # ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
 #   define yystpcpy stpcpy
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static char *
-#   if defined (__STDC__) || defined (__cplusplus)
 yystpcpy (char *yydest, const char *yysrc)
-#   else
+#else
+static char *
 yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
+    char *yydest;
+    const char *yysrc;
+#endif
 {
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;
@@ -923,70 +1139,192 @@ yystpcpy (yydest, yysrc)
 #  endif
 # endif
 
-#endif /* !YYERROR_VERBOSE */
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
 
-
+  if (! yyres)
+    return yystrlen (yystr);
 
-#if YYDEBUG
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
 
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yysymprint (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  int yyn = yypact[yystate];
 
-  if (yytype < YYNTOKENS)
-    {
-      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
-      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-    }
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
   else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-
-  switch (yytype)
     {
-      default:
-        break;
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
     }
-  YYFPRINTF (yyoutput, ")");
 }
+#endif /* YYERROR_VERBOSE */
+
 
-#endif /* ! YYDEBUG */
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
 #else
 static void
-yydestruct (yytype, yyvaluep)
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
     int yytype;
     YYSTYPE *yyvaluep;
 #endif
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
   switch (yytype)
     {
 
       default:
-        break;
+	break;
     }
 }
 
@@ -994,13 +1332,13 @@ yydestruct (yytype, yyvaluep)
 /* Prevent warnings from -Wmissing-prototypes.  */
 
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
+#if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
-# else
+#else
 int yyparse ();
-# endif
+#endif
 #else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#if defined __STDC__ || defined __cplusplus
 int yyparse (void);
 #else
 int yyparse ();
@@ -1009,10 +1347,10 @@ int yyparse ();
 
 
 
-/* The lookahead symbol.  */
+/* The look-ahead symbol.  */
 int yychar;
 
-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
@@ -1025,14 +1363,18 @@ int yynerrs;
 `----------*/
 
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM)
-# else
-int yyparse (YYPARSE_PARAM)
-  void *YYPARSE_PARAM;
-# endif
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
 #else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 int
 yyparse (void)
 #else
@@ -1043,13 +1385,19 @@ yyparse ()
 #endif
 {
   
-  register int yystate;
-  register int yyn;
+  int yystate;
+  int yyn;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
+  /* Look-ahead token as an internal (translated) token number.  */
   int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
 
   /* Three stacks and their tools:
      `yyss': related to states,
@@ -1060,18 +1408,18 @@ yyparse ()
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short	yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
+  YYSTYPE *yyvsp;
 
 
 
-#define YYPOPSTACK   (yyvsp--, yyssp--)
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
   YYSIZE_T yystacksize = YYINITDEPTH;
 
@@ -1080,9 +1428,9 @@ yyparse ()
   YYSTYPE yyval;
 
 
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule.  */
-  int yylen;
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
 
@@ -1106,8 +1454,7 @@ yyparse ()
 `------------------------------------------------------------*/
  yynewstate:
   /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
+     have just been pushed.  So pushing a state here evens the stacks.  */
   yyssp++;
 
  yysetstate:
@@ -1120,18 +1467,18 @@ yyparse ()
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack. Use copies of
+	/* Give user a chance to reallocate the stack.  Use copies of
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 
 
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
 	   be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
+	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
 
@@ -1142,21 +1489,21 @@ yyparse ()
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
+      goto yyexhaustedlab;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyoverflowlab;
+	goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
 
       {
-	short *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyoverflowlab;
+	  goto yyexhaustedlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
 
@@ -1187,19 +1534,17 @@ yyparse ()
 `-----------*/
 yybackup:
 
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
 
+  /* First try to decide what to do without reference to look-ahead token.  */
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1214,7 +1559,7 @@ yybackup:
   else
     {
       yytoken = YYTRANSLATE (yychar);
-      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1234,22 +1579,21 @@ yybackup:
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-
-
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
   yystate = yyn;
+  *++yyvsp = yylval;
+
   goto yynewstate;
 
 
@@ -1288,12 +1632,12 @@ yyreduce:
 #line 144 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>cmykspec %d\n", yyvsp[0].ival);
+	    fprintf(stderr, ">>>cmykspec %d\n", (yyvsp[(2) - (2)].ival));
 	  global_image_type = "CMYK";
 	  global_channel_depth = 4;
 	  global_invert_data = 0;
-	  if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16)
-	    global_bit_depth = yyvsp[0].ival;
+	  if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16)
+	    global_bit_depth = (yyvsp[(2) - (2)].ival);
 	}
     break;
 
@@ -1301,12 +1645,12 @@ yyreduce:
 #line 156 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>kcmyspec %d\n", yyvsp[0].ival);
+	    fprintf(stderr, ">>>kcmyspec %d\n", (yyvsp[(2) - (2)].ival));
 	  global_image_type = "KCMY";
 	  global_channel_depth = 4;
 	  global_invert_data = 0;
-	  if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16)
-	    global_bit_depth = yyvsp[0].ival;
+	  if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16)
+	    global_bit_depth = (yyvsp[(2) - (2)].ival);
 	}
     break;
 
@@ -1314,12 +1658,12 @@ yyreduce:
 #line 168 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>rgbspec %d\n", yyvsp[0].ival);
+	    fprintf(stderr, ">>>rgbspec %d\n", (yyvsp[(2) - (2)].ival));
 	  global_image_type = "RGB";
 	  global_channel_depth = 3;
 	  global_invert_data = 1;
-	  if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16)
-	    global_bit_depth = yyvsp[0].ival;
+	  if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16)
+	    global_bit_depth = (yyvsp[(2) - (2)].ival);
 	}
     break;
 
@@ -1327,12 +1671,12 @@ yyreduce:
 #line 180 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>cmyspec %d\n", yyvsp[0].ival);
+	    fprintf(stderr, ">>>cmyspec %d\n", (yyvsp[(2) - (2)].ival));
 	  global_image_type = "CMY";
 	  global_channel_depth = 3;
 	  global_invert_data = 0;
-	  if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16)
-	    global_bit_depth = yyvsp[0].ival;
+	  if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16)
+	    global_bit_depth = (yyvsp[(2) - (2)].ival);
 	}
     break;
 
@@ -1340,12 +1684,12 @@ yyreduce:
 #line 192 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>grayspec %d\n", yyvsp[0].ival);
+	    fprintf(stderr, ">>>grayspec %d\n", (yyvsp[(2) - (2)].ival));
 	  global_image_type = "Grayscale";
 	  global_channel_depth = 1;
 	  global_invert_data = 0;
-	  if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16)
-	    global_bit_depth = yyvsp[0].ival;
+	  if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16)
+	    global_bit_depth = (yyvsp[(2) - (2)].ival);
 	}
     break;
 
@@ -1353,12 +1697,12 @@ yyreduce:
 #line 204 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>whitespec %d\n", yyvsp[0].ival);
+	    fprintf(stderr, ">>>whitespec %d\n", (yyvsp[(2) - (2)].ival));
 	  global_image_type = "Whitescale";
 	  global_channel_depth = 1;
 	  global_invert_data = 1;
-	  if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16)
-	    global_bit_depth = yyvsp[0].ival;
+	  if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16)
+	    global_bit_depth = (yyvsp[(2) - (2)].ival);
 	}
     break;
 
@@ -1366,23 +1710,23 @@ yyreduce:
 #line 216 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>extendedspec %d\n", yyvsp[-1].ival);
+	    fprintf(stderr, ">>>extendedspec %d\n", (yyvsp[(2) - (3)].ival));
 	  global_image_type = "Raw";
 	  global_invert_data = 0;
-	  global_channel_depth = yyvsp[-1].ival;
-	  if (yyvsp[-1].ival == 8 || yyvsp[-1].ival == 16)
-	    global_bit_depth = yyvsp[0].ival;
+	  global_channel_depth = (yyvsp[(2) - (3)].ival);
+	  if ((yyvsp[(2) - (3)].ival) == 8 || (yyvsp[(2) - (3)].ival) == 16)
+	    global_bit_depth = (yyvsp[(3) - (3)].ival);
 	}
     break;
 
   case 25:
 #line 234 "testpatterny.y"
     {
-	  int channel = find_color(yyvsp[-1].sval);
+	  int channel = find_color((yyvsp[(2) - (3)]).sval);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>level %s %f\n", yyvsp[-1].sval, yyvsp[0].dval);
+	    fprintf(stderr, ">>>level %s %f\n", (yyvsp[(2) - (3)]).sval, (yyvsp[(3) - (3)].dval));
 	  if (channel >= 0)
-	    global_levels[channel] = yyvsp[0].dval;
+	    global_levels[channel] = (yyvsp[(3) - (3)].dval);
 	}
     break;
 
@@ -1390,20 +1734,20 @@ yyreduce:
 #line 244 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>channel_level %d %f\n", yyvsp[-1].ival, yyvsp[0].dval);
-	  if (yyvsp[-1].ival >= 0 && yyvsp[-1].ival <= STP_CHANNEL_LIMIT)
-	    global_levels[yyvsp[-1].ival] = yyvsp[0].dval;
+	    fprintf(stderr, ">>>channel_level %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].dval));
+	  if ((yyvsp[(2) - (3)].ival) >= 0 && (yyvsp[(2) - (3)].ival) <= STP_CHANNEL_LIMIT)
+	    global_levels[(yyvsp[(2) - (3)].ival)] = (yyvsp[(3) - (3)].dval);
 	}
     break;
 
   case 27:
 #line 253 "testpatterny.y"
     {
-	  int channel = find_color(yyvsp[-1].sval);
+	  int channel = find_color((yyvsp[(2) - (3)]).sval);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>gamma %s %f\n", yyvsp[-1].sval, yyvsp[0].dval);
+	    fprintf(stderr, ">>>gamma %s %f\n", (yyvsp[(2) - (3)]).sval, (yyvsp[(3) - (3)].dval));
 	  if (channel >= 0)
-	    global_gammas[channel] = yyvsp[0].dval;
+	    global_gammas[channel] = (yyvsp[(3) - (3)].dval);
 	}
     break;
 
@@ -1411,9 +1755,9 @@ yyreduce:
 #line 263 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>channel_gamma %d %f\n", yyvsp[-1].ival, yyvsp[0].dval);
-	  if (yyvsp[-1].ival >= 0 && yyvsp[-1].ival <= STP_CHANNEL_LIMIT)
-	    global_gammas[yyvsp[-1].ival] = yyvsp[0].dval;
+	    fprintf(stderr, ">>>channel_gamma %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].dval));
+	  if ((yyvsp[(2) - (3)].ival) >= 0 && (yyvsp[(2) - (3)].ival) <= STP_CHANNEL_LIMIT)
+	    global_gammas[(yyvsp[(2) - (3)].ival)] = (yyvsp[(3) - (3)].dval);
 	}
     break;
 
@@ -1421,8 +1765,8 @@ yyreduce:
 #line 272 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>global_gamma %f\n", yyvsp[0].dval);
-	  global_gamma = yyvsp[0].dval;
+	    fprintf(stderr, ">>>global_gamma %f\n", (yyvsp[(2) - (2)].dval));
+	  global_gamma = (yyvsp[(2) - (2)].dval);
 	}
     break;
 
@@ -1430,8 +1774,8 @@ yyreduce:
 #line 279 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>steps %d\n", yyvsp[0].ival);
-	  global_steps = yyvsp[0].ival;
+	    fprintf(stderr, ">>>steps %d\n", (yyvsp[(2) - (2)].ival));
+	  global_steps = (yyvsp[(2) - (2)].ival);
 	}
     break;
 
@@ -1439,8 +1783,8 @@ yyreduce:
 #line 286 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>ink_limit %f\n", yyvsp[0].dval);
-	  global_ink_limit = yyvsp[0].dval;
+	    fprintf(stderr, ">>>ink_limit %f\n", (yyvsp[(2) - (2)].dval));
+	  global_ink_limit = (yyvsp[(2) - (2)].dval);
 	}
     break;
 
@@ -1448,9 +1792,9 @@ yyreduce:
 #line 293 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>printer %s\n", yyvsp[0].sval);
-	  global_printer = strdup(yyvsp[0].sval);
-	  free(yyvsp[0].sval);
+	    fprintf(stderr, ">>>printer %s\n", (yyvsp[(2) - (2)].sval));
+	  global_printer = strdup((yyvsp[(2) - (2)].sval));
+	  free((yyvsp[(2) - (2)].sval));
 	}
     break;
 
@@ -1458,9 +1802,9 @@ yyreduce:
 #line 302 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>page_size_name %s\n", yyvsp[0].sval);
-	  stp_set_string_parameter(global_vars, "PageSize", yyvsp[0].sval);
-	  free(yyvsp[0].sval);
+	    fprintf(stderr, ">>>page_size_name %s\n", (yyvsp[(2) - (2)].sval));
+	  stp_set_string_parameter(global_vars, "PageSize", (yyvsp[(2) - (2)].sval));
+	  free((yyvsp[(2) - (2)].sval));
 	}
     break;
 
@@ -1468,9 +1812,9 @@ yyreduce:
 #line 311 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>page_size_custom %d %d\n", yyvsp[-1].ival, yyvsp[0].ival);
-	  stp_set_page_width(global_vars, yyvsp[-1].ival);
-	  stp_set_page_height(global_vars, yyvsp[0].ival);
+	    fprintf(stderr, ">>>page_size_custom %d %d\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival));
+	  stp_set_page_width(global_vars, (yyvsp[(2) - (3)].ival));
+	  stp_set_page_height(global_vars, (yyvsp[(3) - (3)].ival));
 	}
     break;
 
@@ -1478,10 +1822,10 @@ yyreduce:
 #line 323 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>parameter_string %s %s\n", yyvsp[-1].sval, yyvsp[0].sval);
-	  stp_set_string_parameter(global_vars, yyvsp[-1].sval, yyvsp[0].sval);
-	  free(yyvsp[-1].sval);
-	  free(yyvsp[0].sval);
+	    fprintf(stderr, ">>>parameter_string %s %s\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval));
+	  stp_set_string_parameter(global_vars, (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval));
+	  free((yyvsp[(2) - (3)].sval));
+	  free((yyvsp[(3) - (3)].sval));
 	}
     break;
 
@@ -1489,9 +1833,9 @@ yyreduce:
 #line 333 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>parameter_int %s %d\n", yyvsp[-1].sval, yyvsp[0].ival);
-	  stp_set_int_parameter(global_vars, yyvsp[-1].sval, yyvsp[0].ival);
-	  free(yyvsp[-1].sval);
+	    fprintf(stderr, ">>>parameter_int %s %d\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].ival));
+	  stp_set_int_parameter(global_vars, (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].ival));
+	  free((yyvsp[(2) - (3)].sval));
 	}
     break;
 
@@ -1499,128 +1843,143 @@ yyreduce:
 #line 342 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>parameter_float %s %f\n", yyvsp[-1].sval, yyvsp[0].dval);
-	  stp_set_float_parameter(global_vars, yyvsp[-1].sval, yyvsp[0].dval);
-	  free(yyvsp[-1].sval);
+	    fprintf(stderr, ">>>parameter_float %s %f\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].dval));
+	  stp_set_float_parameter(global_vars, (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].dval));
+	  free((yyvsp[(2) - (3)].sval));
+	}
+    break;
+
+  case 40:
+#line 351 "testpatterny.y"
+    {
+	  stp_curve_t *curve = stp_curve_create_from_string((yyvsp[(3) - (3)].sval));
+	  if (getenv("STP_TESTPATTERN_DEBUG"))
+	    fprintf(stderr, ">>>parameter_curve %s %s\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval));
+	  if (curve)
+	    {
+	      stp_set_curve_parameter(global_vars, (yyvsp[(2) - (3)].sval), curve);
+	      stp_curve_destroy(curve);
+	    }
+	  free((yyvsp[(2) - (3)].sval));
 	}
     break;
 
-  case 43:
+  case 45:
 #line 367 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>density %f\n", yyvsp[0].dval);
-	  global_density = yyvsp[0].dval;
+	    fprintf(stderr, ">>>density %f\n", (yyvsp[(2) - (2)].dval));
+	  global_density = (yyvsp[(2) - (2)].dval);
 	}
     break;
 
-  case 44:
+  case 46:
 #line 374 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>top %f\n", yyvsp[0].dval);
-	  global_xtop = yyvsp[0].dval;
+	    fprintf(stderr, ">>>top %f\n", (yyvsp[(2) - (2)].dval));
+	  global_xtop = (yyvsp[(2) - (2)].dval);
 	}
     break;
 
-  case 45:
+  case 47:
 #line 381 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>left %f\n", yyvsp[0].dval);
-	  global_xleft = yyvsp[0].dval;
+	    fprintf(stderr, ">>>left %f\n", (yyvsp[(2) - (2)].dval));
+	  global_xleft = (yyvsp[(2) - (2)].dval);
 	}
     break;
 
-  case 46:
+  case 48:
 #line 388 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>hsize %f\n", yyvsp[0].dval);
-	  global_hsize = yyvsp[0].dval;
+	    fprintf(stderr, ">>>hsize %f\n", (yyvsp[(2) - (2)].dval));
+	  global_hsize = (yyvsp[(2) - (2)].dval);
 	}
     break;
 
-  case 47:
+  case 49:
 #line 395 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>vsize %f\n", yyvsp[0].dval);
-	  global_vsize = yyvsp[0].dval;
+	    fprintf(stderr, ">>>vsize %f\n", (yyvsp[(2) - (2)].dval));
+	  global_vsize = (yyvsp[(2) - (2)].dval);
 	}
     break;
 
-  case 48:
+  case 50:
 #line 402 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>blackline %d\n", yyvsp[0].ival);
-	  global_noblackline = !(yyvsp[0].ival);
+	    fprintf(stderr, ">>>blackline %d\n", (yyvsp[(2) - (2)].ival));
+	  global_noblackline = !((yyvsp[(2) - (2)].ival));
 	}
     break;
 
-  case 49:
+  case 51:
 #line 410 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", yyvsp[-2].dval, yyvsp[-1].dval, yyvsp[0].dval,
+	    fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", (yyvsp[(1) - (3)].dval), (yyvsp[(2) - (3)].dval), (yyvsp[(3) - (3)].dval),
 		    current_index);
 	  if (current_index < STP_CHANNEL_LIMIT)
 	    {
-	      current_testpattern->d.p.mins[current_index] = yyvsp[-2].dval;
-	      current_testpattern->d.p.vals[current_index] = yyvsp[-1].dval;
-	      current_testpattern->d.p.gammas[current_index] = yyvsp[0].dval;
+	      current_testpattern->d.p.mins[current_index] = (yyvsp[(1) - (3)].dval);
+	      current_testpattern->d.p.vals[current_index] = (yyvsp[(2) - (3)].dval);
+	      current_testpattern->d.p.gammas[current_index] = (yyvsp[(3) - (3)].dval);
 	      current_index++;
 	    }
 	}
     break;
 
-  case 55:
+  case 57:
 #line 434 "testpatterny.y"
     {
-	  int channel = find_color(yyvsp[-3].sval);
+	  int channel = find_color((yyvsp[(1) - (4)]).sval);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>color_block2a %s %f %f %f\n", yyvsp[-3].sval, yyvsp[-2].dval, yyvsp[-1].dval, yyvsp[0].dval);
+	    fprintf(stderr, ">>>color_block2a %s %f %f %f\n", (yyvsp[(1) - (4)]).sval, (yyvsp[(2) - (4)].dval), (yyvsp[(3) - (4)].dval), (yyvsp[(4) - (4)].dval));
 	  if (channel >= 0 && channel < STP_CHANNEL_LIMIT)
 	    {
-	      current_testpattern->d.p.mins[channel] = yyvsp[-2].dval;
-	      current_testpattern->d.p.vals[channel] = yyvsp[-1].dval;
-	      current_testpattern->d.p.gammas[channel] = yyvsp[0].dval;
+	      current_testpattern->d.p.mins[channel] = (yyvsp[(2) - (4)].dval);
+	      current_testpattern->d.p.vals[channel] = (yyvsp[(3) - (4)].dval);
+	      current_testpattern->d.p.gammas[channel] = (yyvsp[(4) - (4)].dval);
 	    }
 	}
     break;
 
-  case 56:
+  case 58:
 #line 448 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>color_block2b %d %f %f %f\n", yyvsp[-3].ival, yyvsp[-2].dval, yyvsp[-1].dval, yyvsp[0].dval);
-	  if (yyvsp[-3].ival >= 0 && yyvsp[-3].ival < STP_CHANNEL_LIMIT)
+	    fprintf(stderr, ">>>color_block2b %d %f %f %f\n", (yyvsp[(2) - (5)].ival), (yyvsp[(3) - (5)].dval), (yyvsp[(4) - (5)].dval), (yyvsp[(5) - (5)].dval));
+	  if ((yyvsp[(2) - (5)].ival) >= 0 && (yyvsp[(2) - (5)].ival) < STP_CHANNEL_LIMIT)
 	    {
-	      current_testpattern->d.p.mins[yyvsp[-3].ival] = yyvsp[-2].dval;
-	      current_testpattern->d.p.vals[yyvsp[-3].ival] = yyvsp[-1].dval;
-	      current_testpattern->d.p.gammas[yyvsp[-3].ival] = yyvsp[0].dval;
+	      current_testpattern->d.p.mins[(yyvsp[(2) - (5)].ival)] = (yyvsp[(3) - (5)].dval);
+	      current_testpattern->d.p.vals[(yyvsp[(2) - (5)].ival)] = (yyvsp[(4) - (5)].dval);
+	      current_testpattern->d.p.gammas[(yyvsp[(2) - (5)].ival)] = (yyvsp[(5) - (5)].dval);
 	    }
 	}
     break;
 
-  case 65:
+  case 67:
 #line 473 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>patvars %f %f %f %f %f\n", yyvsp[-4].dval, yyvsp[-3].dval, yyvsp[-2].dval, yyvsp[-1].dval, yyvsp[0].dval);
+	    fprintf(stderr, ">>>patvars %f %f %f %f %f\n", (yyvsp[(1) - (5)].dval), (yyvsp[(2) - (5)].dval), (yyvsp[(3) - (5)].dval), (yyvsp[(4) - (5)].dval), (yyvsp[(5) - (5)].dval));
 	  current_testpattern->t = E_PATTERN;
-	  current_testpattern->d.p.lower = yyvsp[-4].dval;
-	  current_testpattern->d.p.upper = yyvsp[-3].dval;
-	  current_testpattern->d.p.levels[1] = yyvsp[-2].dval;
-	  current_testpattern->d.p.levels[2] = yyvsp[-1].dval;
-	  current_testpattern->d.p.levels[3] = yyvsp[0].dval;
+	  current_testpattern->d.p.lower = (yyvsp[(1) - (5)].dval);
+	  current_testpattern->d.p.upper = (yyvsp[(2) - (5)].dval);
+	  current_testpattern->d.p.levels[1] = (yyvsp[(3) - (5)].dval);
+	  current_testpattern->d.p.levels[2] = (yyvsp[(4) - (5)].dval);
+	  current_testpattern->d.p.levels[3] = (yyvsp[(5) - (5)].dval);
 	  current_testpattern = get_next_testpattern();
 	  current_index = 0;
 	}
     break;
 
-  case 67:
+  case 69:
 #line 491 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
@@ -1636,26 +1995,26 @@ yyreduce:
 	}
     break;
 
-  case 68:
+  case 70:
 #line 506 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>grid %d\n", yyvsp[0].ival);
+	    fprintf(stderr, ">>>grid %d\n", (yyvsp[(2) - (2)].ival));
 	  current_testpattern->t = E_GRID;
-	  current_testpattern->d.g.ticks = yyvsp[0].ival;
+	  current_testpattern->d.g.ticks = (yyvsp[(2) - (2)].ival);
 	  current_testpattern = get_next_testpattern();
 	  current_index = 0;
 	}
     break;
 
-  case 69:
+  case 71:
 #line 517 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>image %d %d\n", yyvsp[-1].ival, yyvsp[0].ival);
+	    fprintf(stderr, ">>>image %d %d\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival));
 	  current_testpattern->t = E_IMAGE;
-	  current_testpattern->d.i.x = yyvsp[-1].ival;
-	  current_testpattern->d.i.y = yyvsp[0].ival;
+	  current_testpattern->d.i.x = (yyvsp[(2) - (3)].ival);
+	  current_testpattern->d.i.y = (yyvsp[(3) - (3)].ival);
 	  if (current_testpattern->d.i.x <= 0 ||
 	      current_testpattern->d.i.y <= 0)
 	    {
@@ -1666,77 +2025,77 @@ yyreduce:
 	}
     break;
 
-  case 70:
+  case 72:
 #line 534 "testpatterny.y"
     {
-	  fprintf(stderr, yyvsp[0].sval);
-	  free(yyvsp[0].sval);
+	  fprintf(stderr,"%s",(yyvsp[(2) - (2)].sval));
+	  free((yyvsp[(2) - (2)].sval));
 	}
     break;
 
-  case 71:
+  case 73:
 #line 540 "testpatterny.y"
     {
-	  fprintf(stderr, yyvsp[-1].sval, yyvsp[0].sval);
-	  free(yyvsp[-1].sval);
-	  free(yyvsp[0].sval);
+	  fprintf(stderr,"%s%s", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval));
+	  free((yyvsp[(2) - (3)].sval));
+	  free((yyvsp[(3) - (3)].sval));
 	}
     break;
 
-  case 72:
+  case 74:
 #line 547 "testpatterny.y"
     {
-	  fprintf(stderr, yyvsp[-2].sval, yyvsp[-1].sval, yyvsp[0].sval);
-	  free(yyvsp[-2].sval);
-	  free(yyvsp[-1].sval);
-	  free(yyvsp[0].sval);
+	  fprintf(stderr,"%s%s%s", (yyvsp[(2) - (4)].sval), (yyvsp[(3) - (4)].sval), (yyvsp[(4) - (4)].sval));
+	  free((yyvsp[(2) - (4)].sval));
+	  free((yyvsp[(3) - (4)].sval));
+	  free((yyvsp[(4) - (4)].sval));
 	}
     break;
 
-  case 73:
+  case 75:
 #line 555 "testpatterny.y"
     {
-	  fprintf(stderr, yyvsp[-3].sval, yyvsp[-2].sval, yyvsp[-1].sval, yyvsp[0].sval);
-	  free(yyvsp[-3].sval);
-	  free(yyvsp[-2].sval);
-	  free(yyvsp[-1].sval);
-	  free(yyvsp[0].sval);
+	  fprintf(stderr, "%s%s%s%s", (yyvsp[(2) - (5)].sval), (yyvsp[(3) - (5)].sval), (yyvsp[(4) - (5)].sval), (yyvsp[(5) - (5)].sval));
+	  free((yyvsp[(2) - (5)].sval));
+	  free((yyvsp[(3) - (5)].sval));
+	  free((yyvsp[(4) - (5)].sval));
+	  free((yyvsp[(5) - (5)].sval));
 	}
     break;
 
-  case 74:
+  case 76:
 #line 564 "testpatterny.y"
     {
-	  fprintf(stderr, yyvsp[-4].sval, yyvsp[-3].sval, yyvsp[-2].sval, yyvsp[-1].sval, yyvsp[0].sval);
-	  free(yyvsp[-4].sval);
-	  free(yyvsp[-3].sval);
-	  free(yyvsp[-2].sval);
-	  free(yyvsp[-1].sval);
-	  free(yyvsp[0].sval);
+	  fprintf(stderr, "%s%s%s%s%s", (yyvsp[(2) - (6)].sval), (yyvsp[(3) - (6)].sval), (yyvsp[(4) - (6)].sval), (yyvsp[(5) - (6)].sval), (yyvsp[(6) - (6)].sval));
+	  free((yyvsp[(2) - (6)].sval));
+	  free((yyvsp[(3) - (6)].sval));
+	  free((yyvsp[(4) - (6)].sval));
+	  free((yyvsp[(5) - (6)].sval));
+	  free((yyvsp[(6) - (6)].sval));
 	}
     break;
 
-  case 99:
+  case 101:
 #line 586 "testpatterny.y"
     { global_did_something = 1; }
     break;
 
-  case 104:
+  case 106:
 #line 593 "testpatterny.y"
     { global_did_something = 1; }
     break;
 
-  case 107:
+  case 109:
 #line 600 "testpatterny.y"
     { global_did_something = 1; }
     break;
 
-  case 113:
+  case 115:
 #line 610 "testpatterny.y"
     { return 0; }
     break;
 
-  case 114:
+  case 116:
 #line 614 "testpatterny.y"
     {
 	  current_testpattern = get_next_testpattern();
@@ -1744,15 +2103,14 @@ yyreduce:
     break;
 
 
+/* Line 1267 of yacc.c.  */
+#line 2108 "testpatterny.c"
+      default: break;
     }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
-/* Line 991 of yacc.c.  */
-#line 1750 "testpatterny.c"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-
-
+  YYPOPSTACK (yylen);
+  yylen = 0;
   YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
@@ -1781,109 +2139,93 @@ yyerrlab:
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
-	{
-	  YYSIZE_T yysize = 0;
-	  int yytype = YYTRANSLATE (yychar);
-	  char *yymsg;
-	  int yyx, yycount;
-
-	  yycount = 0;
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  for (yyx = yyn < 0 ? -yyn : 0;
-	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-	  yysize += yystrlen ("syntax error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[yytype]);
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
-	    {
-	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[yytype]);
-
-	      if (yycount < 5)
-		{
-		  yycount = 0;
-		  for (yyx = yyn < 0 ? -yyn : 0;
-		       yyx < (int) (sizeof (yytname) / sizeof (char *));
-		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-		      {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
-			yyp = yystpcpy (yyp, yyq);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
-		      }
-		}
-	      yyerror (yymsg);
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
 	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    yyerror ("syntax error; also virtual memory exhausted");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror ("syntax error");
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
     }
 
 
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it.  */
 
-      /* Return failure if at end of input.  */
-      if (yychar == YYEOF)
-        {
-	  /* Pop the error token.  */
-          YYPOPSTACK;
-	  /* Pop the rest of the stack.  */
-	  while (yyss < yyssp)
-	    {
-	      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-	      yydestruct (yystos[*yyssp], yyvsp);
-	      YYPOPSTACK;
-	    }
-	  YYABORT;
-        }
-
-      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-      yydestruct (yytoken, &yylval);
-      yychar = YYEMPTY;
-
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
-  goto yyerrlab2;
+  goto yyerrlab1;
 
 
-/*----------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action.  |
-`----------------------------------------------------*/
-yyerrlab1:
-
-  /* Suppress GCC warning that yyerrlab1 is unused when no action
-     invokes YYERROR.  */
-#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) \
-    && !defined __cplusplus
-  __attribute__ ((__unused__))
-#endif
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
 
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
 
-  goto yyerrlab2;
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
 
 
-/*---------------------------------------------------------------.
-| yyerrlab2 -- pop states until the error token can be shifted.  |
-`---------------------------------------------------------------*/
-yyerrlab2:
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
   yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
   for (;;)
@@ -1904,22 +2246,23 @@ yyerrlab2:
       if (yyssp == yyss)
 	YYABORT;
 
-      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-      yydestruct (yystos[yystate], yyvsp);
-      yyvsp--;
-      yystate = *--yyssp;
 
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
   *++yyvsp = yylval;
 
 
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
   yystate = yyn;
   goto yynewstate;
 
@@ -1939,21 +2282,39 @@ yyabortlab:
   goto yyreturn;
 
 #ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here.  |
-`----------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
-  return yyresult;
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
 
 
diff --git a/src/testpattern/testpatterny.h b/src/testpattern/testpatterny.h
index 2567b82..69e3127 100644
--- a/src/testpattern/testpatterny.h
+++ b/src/testpattern/testpatterny.h
@@ -1,7 +1,9 @@
-/* A Bison parser, made by GNU Bison 1.875.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,13 +17,21 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
 
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -75,6 +85,7 @@
      END = 301
    };
 #endif
+/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tSTRING 260
@@ -123,7 +134,7 @@
 
 
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -132,5 +143,3 @@ typedef int YYSTYPE;
 
 extern YYSTYPE yylval;
 
-
-
diff --git a/src/testpattern/testpatterny.y b/src/testpattern/testpatterny.y
index 6d92bad..bb2073f 100644
--- a/src/testpattern/testpatterny.y
+++ b/src/testpattern/testpatterny.y
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpatterny.y,v 1.26 2004/08/21 22:35:18 rlk Exp $"
+ * "$Id: testpatterny.y,v 1.26.18.2 2007/05/29 01:47:30 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -361,7 +361,7 @@ parameter_curve: PARAMETER_CURVE tSTRING tSTRING
 	}
 ;
 
-parameter: parameter_string | parameter_int | parameter_float
+parameter: parameter_string | parameter_int | parameter_float | parameter_curve
 ;
 density: DENSITY tDOUBLE
 	{
@@ -532,20 +532,20 @@ image: IMAGE tINT tINT
 
 Message0: MESSAGE tSTRING
 	{
-	  fprintf(stderr, $2);
+	  fprintf(stderr,"%s",$2);
 	  free($2);
 	}
 ;
 Message1: MESSAGE tSTRING tSTRING
 	{
-	  fprintf(stderr, $2, $3);
+	  fprintf(stderr,"%s%s", $2, $3);
 	  free($2);
 	  free($3);
 	}
 ;
 Message2: MESSAGE tSTRING tSTRING tSTRING
 	{
-	  fprintf(stderr, $2, $3, $4);
+	  fprintf(stderr,"%s%s%s", $2, $3, $4);
 	  free($2);
 	  free($3);
 	  free($4);
@@ -553,7 +553,7 @@ Message2: MESSAGE tSTRING tSTRING tSTRING
 ;
 Message3: MESSAGE tSTRING tSTRING tSTRING tSTRING
 	{
-	  fprintf(stderr, $2, $3, $4, $5);
+	  fprintf(stderr, "%s%s%s%s", $2, $3, $4, $5);
 	  free($2);
 	  free($3);
 	  free($4);
@@ -562,7 +562,7 @@ Message3: MESSAGE tSTRING tSTRING tSTRING tSTRING
 ;
 Message4: MESSAGE tSTRING tSTRING tSTRING tSTRING tSTRING
 	{
-	  fprintf(stderr, $2, $3, $4, $5, $6);
+	  fprintf(stderr, "%s%s%s%s%s", $2, $3, $4, $5, $6);
 	  free($2);
 	  free($3);
 	  free($4);
diff --git a/test/Makefile.am b/test/Makefile.am
index 150e2c6..5789ca3 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.46 2006/05/12 01:10:19 rlk Exp $
+## $Id: Makefile.am,v 1.46.8.1 2007/03/02 12:01:35 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,7 @@ TESTS = curve run-testdither run-weavetest
 ## Programs
 
 if BUILD_TEST
-noinst_PROGRAMS = testdither escp2-weavetest unprint pcl-unprint bjc-unprint curve xml-curve
+noinst_PROGRAMS = testdither escp2-weavetest unprint pcl-unprint bjc-unprint curve xml-curve pixma_parse
 endif
 
 escp2_weavetest_SOURCES = escp2-weavetest.c
@@ -55,6 +55,8 @@ testdither_LDADD = $(GUTENPRINT_LIBS)
 xml_curve_SOURCES = xml-curve.c
 xml_curve_LDADD = $(GUTENPRINT_LIBS)
 
+pixma_parse_SOURCES = pixma_parse.c pixma_parse.h
+
 ## Rules
 
 #run-weavetest: escp2-weavetest
diff --git a/test/Makefile.in b/test/Makefile.in
index 32fa54e..899bdac 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -46,16 +46,18 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 @BUILD_TEST_TRUE@noinst_PROGRAMS = testdither$(EXEEXT) \
 @BUILD_TEST_TRUE@	escp2-weavetest$(EXEEXT) unprint$(EXEEXT) \
 @BUILD_TEST_TRUE@	pcl-unprint$(EXEEXT) bjc-unprint$(EXEEXT) \
-@BUILD_TEST_TRUE@	curve$(EXEEXT) xml-curve$(EXEEXT)
+@BUILD_TEST_TRUE@	curve$(EXEEXT) xml-curve$(EXEEXT) \
+@BUILD_TEST_TRUE@	pixma_parse$(EXEEXT)
 subdir = test
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
@@ -75,6 +77,9 @@ escp2_weavetest_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_pcl_unprint_OBJECTS = pcl-unprint.$(OBJEXT)
 pcl_unprint_OBJECTS = $(am_pcl_unprint_OBJECTS)
 pcl_unprint_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_pixma_parse_OBJECTS = pixma_parse.$(OBJEXT)
+pixma_parse_OBJECTS = $(am_pixma_parse_OBJECTS)
+pixma_parse_LDADD = $(LDADD)
 am_testdither_OBJECTS = testdither.$(OBJEXT)
 testdither_OBJECTS = $(am_testdither_OBJECTS)
 testdither_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -85,8 +90,8 @@ am_xml_curve_OBJECTS = xml-curve.$(OBJEXT)
 xml_curve_OBJECTS = $(am_xml_curve_OBJECTS)
 xml_curve_DEPENDENCIES = $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp =
-am__depfiles_maybe =
+depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
+am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -97,22 +102,29 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(bjc_unprint_SOURCES) $(curve_SOURCES) \
 	$(escp2_weavetest_SOURCES) $(pcl_unprint_SOURCES) \
-	$(testdither_SOURCES) $(unprint_SOURCES) $(xml_curve_SOURCES)
+	$(pixma_parse_SOURCES) $(testdither_SOURCES) \
+	$(unprint_SOURCES) $(xml_curve_SOURCES)
 DIST_SOURCES = $(bjc_unprint_SOURCES) $(curve_SOURCES) \
 	$(escp2_weavetest_SOURCES) $(pcl_unprint_SOURCES) \
-	$(testdither_SOURCES) $(unprint_SOURCES) $(xml_curve_SOURCES)
+	$(pixma_parse_SOURCES) $(testdither_SOURCES) \
+	$(unprint_SOURCES) $(xml_curve_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@
+BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@
 BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
+BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
 BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
 BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
@@ -138,6 +150,8 @@ BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
 BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
 BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
 BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@
 BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
 BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
 BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
@@ -145,6 +159,7 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -157,12 +172,14 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
+DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -197,6 +214,7 @@ GLIB_LIBS = @GLIB_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GMSGFMT = @GMSGFMT@
 GNUCFLAGS = @GNUCFLAGS@
+GREP = @GREP@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -292,14 +310,17 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = @YFLAGS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
 am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -316,6 +337,9 @@ cups_exec_prefix = @cups_exec_prefix@
 cups_prefix = @cups_prefix@
 cups_sbindir = @cups_sbindir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 gimp2_plug_indir = @gimp2_plug_indir@
 gimp_plug_indir = @gimp_plug_indir@
@@ -333,17 +357,21 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -365,6 +393,7 @@ testdither_SOURCES = testdither.c
 testdither_LDADD = $(GUTENPRINT_LIBS)
 xml_curve_SOURCES = xml-curve.c
 xml_curve_LDADD = $(GUTENPRINT_LIBS)
+pixma_parse_SOURCES = pixma_parse.c pixma_parse.h
 
 #run-weavetest: escp2-weavetest
 CLEANFILES = mixed-color-1bit.ppm
@@ -383,9 +412,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps test/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  --ignore-deps test/Makefile
+	  $(AUTOMAKE) --gnu  test/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -422,6 +451,9 @@ escp2-weavetest$(EXEEXT): $(escp2_weavetest_OBJECTS) $(escp2_weavetest_DEPENDENC
 pcl-unprint$(EXEEXT): $(pcl_unprint_OBJECTS) $(pcl_unprint_DEPENDENCIES) 
 	@rm -f pcl-unprint$(EXEEXT)
 	$(LINK) $(pcl_unprint_LDFLAGS) $(pcl_unprint_OBJECTS) $(pcl_unprint_LDADD) $(LIBS)
+pixma_parse$(EXEEXT): $(pixma_parse_OBJECTS) $(pixma_parse_DEPENDENCIES) 
+	@rm -f pixma_parse$(EXEEXT)
+	$(LINK) $(pixma_parse_LDFLAGS) $(pixma_parse_OBJECTS) $(pixma_parse_LDADD) $(LIBS)
 testdither$(EXEEXT): $(testdither_OBJECTS) $(testdither_DEPENDENCIES) 
 	@rm -f testdither$(EXEEXT)
 	$(LINK) $(testdither_LDFLAGS) $(testdither_OBJECTS) $(testdither_LDADD) $(LIBS)
@@ -438,14 +470,35 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bjc-unprint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-weavetest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcl-unprint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixma_parse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdither.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unprint.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml-curve.Po@am__quote@
+
 .c.o:
-	$(COMPILE) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -643,6 +696,7 @@ clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
 	mostlyclean-am
 
 distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -668,6 +722,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/test/parse-escp2 b/test/parse-escp2
index 0a0d45c..ae95a5f 100755
--- a/test/parse-escp2
+++ b/test/parse-escp2
@@ -1,16 +1,43 @@
 #!/usr/bin/perl
 
+# Copyright 2000-2007 Robert Krawitz <rlk@alum.mit.edu>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the Free
+#   Software Foundation; either version 2 of the License, or (at your option)
+#   any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#   for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
 use Getopt::Std;
 use strict;
 
-getopts('v');
+getopts('VvO:');
 
 use vars qw($atend
 	    $stuff
 	    $opt_v
+	    $opt_V
+	    $opt_O
 	    $curpos
 	    $esc
-	    %seqtable);
+	    $page_mgmt_unit
+	    $horizontal_position
+	    $horizontal_unit
+	    $vertical_unit
+	    $vertical_position
+	    $raster_x
+	    $raster_y
+	    $print_offsets
+	    %seqtable
+	    @offsets);
 
 $atend = 0;
 
@@ -21,6 +48,7 @@ $atend = 0;
 	      "\\", 2,
 	      "\$", 2,
 	      "r", 1,
+	      "\031", 1,
 	      ".", "SPECIAL",
 	      "i", "SPECIAL1",
 	      "\000", 2,
@@ -31,6 +59,14 @@ $esc = "\033";
 
 $curpos = 0;
 
+$page_mgmt_unit = 360;
+$horizontal_unit = 180;
+$vertical_unit = 360;
+
+$vertical_position = 0;
+$horizontal_position = 0;
+$print_offsets = 0;
+
 sub get_stuff($) {
     my ($where) = @_;
     my ($end) = length $stuff;
@@ -141,23 +177,32 @@ sub print_prefix_bytes($) {
     }
 }
 
-sub print_output_data($$$$$) {
-    my ($comptype, $bitsperpixel, $dots, $rows, $dot_scale) = @_;
+sub print_output_data($$$$$$) {
+    my ($comptype, $bitsperpixel, $dots, $rows, $dot_scale, $color) = @_;
     my $counter;
     my $fchar;
-    print " ($dots, $rows, $bitsperpixel) ";
+    my $last_row = 0;
+    my $first_row = -1;
+    my $i;
+    my $vstuff;
     $dots *= 8;
     $dots /= $dot_scale;
+    my $real_dots = $dots / $bitsperpixel;
+    if ($opt_v) {
+	print " ($real_dots dots, $rows rows, $bitsperpixel bits";
+    }
     my $savedots = $dots;
     if ($comptype == 0) {
-	if ($opt_v) {
+	if ($opt_V) {
 	    get_stuff($dots);
 	    printf "%*v02x ", " ", substr($stuff, 0, $dots);
 	}
 	increment_curpos($dots);
     } elsif ($comptype == 1) {
-	while ($rows-- > 0) {
+	foreach $i (0..$rows-1) {
+	    my ($found_something) = 0;
 	    $dots = $savedots;
+	    my ($tstuff) = "\n    $i    ";;
 	    while ($dots > 0) {
 		get_stuff(1);
 		$counter = ord(substr($stuff, 0, 1));
@@ -165,25 +210,69 @@ sub print_output_data($$$$$) {
 		if ($counter <= 127) {
 		    $counter++;
 		    get_stuff($counter);
-		    if ($opt_v) {
-			printf "%*v02x ", " ", substr($stuff, 0, $counter);
+		    if ($opt_v || $opt_V) {
+			my $tmp = sprintf "%*v02x ", " ", substr($stuff, 0, $counter);
+			if (!($tmp =~ /^[0 ]+$/)) {
+			    $found_something = 1;
+			    $last_row = $i;
+			    if ($first_row == -1) {
+				$first_row = $i;
+			    }
+			}
+			if ($opt_V) {
+			    $tstuff .= $tmp;
+			}
 		    }
 		    increment_curpos($counter);
 		} else {
 		    $counter = 257 - $counter;
 		    get_stuff(1);
-		    if ($opt_v) {
+		    if ($opt_v || $opt_V) {
 			$fchar = sprintf "%v02x ", substr($stuff, 0, 1);
-			map { print $fchar } (0..$counter - 1);
+			if ($fchar ne "00 ") {
+			    $found_something = 1;
+			    $last_row = $i;
+			    if ($first_row == -1) {
+				$first_row = $i;
+			    }
+			}
+		    }
+		    if ($opt_V) {
+			map { $tstuff .= $fchar } (0..$counter - 1);
 		    }
 		    increment_curpos(1);
 		}
 		$dots -= $counter * 8;
 	    }
-	    if ($rows > 0 && $opt_v) {
-		print "\n        ";
+	    if ($opt_V && $found_something) {
+		$vstuff .= $tstuff;
+	    }
+	}
+	if ($opt_v) {
+	    my ($offset) = $offsets[$color];
+	    my ($first_position) = ($vertical_position / $vertical_unit)
+		+ ($first_row + $offset) * $raster_y;
+	    my ($last_position) = ($vertical_position / $vertical_unit)
+		+ ($last_row + $offset) * $raster_y;
+	    my ($final_position) = ($vertical_position / $vertical_unit)
+		+ ($rows + $offset) * $raster_y;
+	    my ($final_horizontal) = $horizontal_position +
+		($real_dots * $page_mgmt_unit * $raster_x);
+	    if ($print_offsets) {
+		printf (" %d,%d+%d %.4f  %d,%d+%d %.4f  %.4f) ",
+			$horizontal_position, $first_row, $offset, $first_position,
+			$final_horizontal, $last_row, $offset, $last_position,
+			$final_position);
+	    } else {
+		printf (" %d,%d %.4f  %d,%d %.4f  %.4f) ",
+			$horizontal_position, $first_row, $first_position,
+			$final_horizontal, $last_row, $last_position,
+			$final_position);
 	    }
 	}
+	if ($opt_V) {
+	    print " $vstuff";
+	}
     } else {
 	print "\nUnknown compression type $comptype!\n";
     }
@@ -192,22 +281,68 @@ sub print_output_data($$$$$) {
 sub do_special_command() {
     get_stuff(8);
     my $comptype = unpack("C", substr($stuff, 2, 1));
+    my $color = 0;
     my $dots = unpack("v", substr($stuff, 6, 2));
     my $rows = unpack("C", substr($stuff, 5, 1));
     print_prefix_bytes(8);
     increment_curpos(8);
-    print_output_data($comptype, 1, $dots, $rows, 8);
+    print_output_data($comptype, 1, $dots, $rows, 8, $color);
+    get_stuff(1);
+    while (substr($stuff, 0, 1) eq "\r") {
+	increment_curpos(1);
+    }
 }
 
 sub do_special1_command() {
     get_stuff(9);
+    my $color = unpack("C", substr($stuff, 2, 1));
     my $comptype = unpack("C", substr($stuff, 3, 1));
     my $bitsperpixel = unpack("C", substr($stuff, 4, 1));
     my $dots = unpack("v", substr($stuff, 5, 2));
     my $rows = unpack("v", substr($stuff, 7, 2));
     print_prefix_bytes(9);
     increment_curpos(9);
-    print_output_data($comptype, $bitsperpixel, $dots, $rows, 1);
+    print_output_data($comptype, $bitsperpixel, $dots, $rows, 1, $color);
+    get_stuff(1);
+    while (substr($stuff, 0, 1) eq "\r") {
+	increment_curpos(1);
+    }
+}
+
+sub get_long($) {
+    my ($string) = @_;
+    my ($tmp) = unpack("V", $string);
+    if ($tmp >= (1 << 31)) {
+	return -(0xffffffff ^ $tmp) - 1;
+    } else {
+	return $tmp;
+    }
+}
+
+sub get_short($) {
+    my ($string) = @_;
+    my ($tmp) = unpack("v", $string);
+    if ($tmp >= (1 << 15)) {
+	return -(0xffff ^ $tmp) - 1;
+    } else {
+	return $tmp;
+    }
+}
+
+sub get_byte($) {
+    my ($string) = @_;
+    return unpack("C", $string);
+}
+
+if ($opt_O) {
+    my (@stuff) = split /,/, $opt_O;
+    map {
+	my ($key, $val) = split /=/;
+	if ($val) {
+	    $print_offsets = 1;
+	}
+	@offsets[$key] = $val;
+    } @stuff;
 }
 
 while (! $atend) {
@@ -233,19 +368,20 @@ while (! $atend) {
 	    if (substr($stuff, 1, length $key) eq $key) {
 		$skipchars = $seqtable{$key};
 		if ($skipchars eq "SPECIAL") {
-		    do_special_command;
+		    do_special_command();
 		    $found = 2;
 		} elsif ($skipchars eq "SPECIAL1") {
-		    do_special1_command;
+		    do_special1_command();
 		    $found = 2;
 		} elsif ($skipchars eq "REMOTE") {
-		    do_remote_command;
+		    do_remote_command();
 		    $found = 2;
 		} else {
 		    print "\n";
 		    printf "%08x  ", $curpos;
 		    print "1b ";
 		    $startoff = 0;
+		    my $print_stuff = 0;
 		    if ($skipchars eq "VARIABLE") {
 			get_stuff((length $key) + 3);
 			$kchar = substr($stuff, (length $key) + 1, 1);
@@ -256,6 +392,7 @@ while (! $atend) {
 			$nhchar = unpack("C", $hchar);
 			$skipchars = ($nhchar * 256) + $nlchar;
 			$startoff = 3;
+			$print_stuff = 1;
 		    }
 		    get_stuff($skipchars + (length $key) + $startoff + 1);
 		    for ($i = 0;
@@ -269,6 +406,111 @@ while (! $atend) {
 			    printf "%02x ", unpack("C", $char);
 			}
 		    }
+		    if ($print_stuff) {
+			my $xchar = substr($stuff, 2, 1);
+			if ($xchar eq "c") {
+			    my ($top, $bottom);
+			    if ($skipchars == 8) {
+				$top = get_long(substr($stuff, 5, 4));
+				$bottom = get_long(substr($stuff, 9, 4));
+			    } else {
+				$top = get_short(substr($stuff, 5, 2));
+				$bottom = get_short(substr($stuff, 7, 2));
+			    }
+			    if ($opt_v) {
+				printf (" (page format %d %d %.2f %.2f)",
+					$top, $bottom, $top / $page_mgmt_unit,
+					$bottom / $page_mgmt_unit);
+			    }
+			    $vertical_position =
+				$top * $vertical_unit / $page_mgmt_unit;
+			} elsif ($xchar eq "S") {
+			    my ($width, $height);
+			    if ($skipchars == 8) {
+				$width = get_long(substr($stuff, 5, 4));
+				$height = get_long(substr($stuff, 9, 4));
+			    } else {
+				$width = get_short(substr($stuff, 5, 2));
+				$height = get_short(substr($stuff, 7, 2));
+			    }
+			    if ($opt_v) {
+				printf (" (paper size %d %d %.2f %.2f)",
+					$width, $height, $width / $page_mgmt_unit,
+					$height / $page_mgmt_unit);
+			    }
+			} elsif ($xchar eq "C") {
+			    my ($length);
+			    if ($skipchars == 4) {
+				$length = get_long(substr($stuff, 5, 4));
+			    } else {
+				$length = get_short(substr($stuff, 5, 2));
+			    }
+			    if ($opt_v) {
+				printf (" (page length %d %.2f)",
+					$length, $length / $page_mgmt_unit);
+			    }
+			} elsif ($xchar eq "D") {
+			    my $base = get_short(substr($stuff, 5, 2));
+			    my $y = get_byte(substr($stuff, 7, 1));
+			    my $x = get_byte(substr($stuff, 8, 1));
+			    $raster_x = $x / $base;
+			    $raster_y = $y / $base;
+			    if ($opt_v) {
+				printf (" (raster base %d, %d x %d)",
+					$base, $base / $x, $base / $y);
+			    }
+			} elsif ($xchar eq "U") {
+			    if ($skipchars == 5) {
+				my $page_mgmt = get_byte(substr($stuff, 5, 1));
+				my $vertical = get_byte(substr($stuff, 6, 1));
+				my $horiz = get_byte(substr($stuff, 7, 1));
+				my $scale = get_short(substr($stuff, 8, 2));
+				$page_mgmt_unit = $scale / $page_mgmt;
+				$horizontal_unit = $scale / $horiz;
+				$vertical_unit = $scale / $vertical;
+				if ($opt_v) {
+				    printf (" (units base %d  mgmt %d  vert %d  horiz %d)",
+					    $scale, $page_mgmt_unit,
+					    $vertical_unit, $horizontal_unit);
+				}
+			    } else {
+				my $page_mgmt = get_byte(substr($stuff, 5, 1));
+				if ($opt_v) {
+				    printf " (units base = %d/720)", $page_mgmt;
+				}
+				$page_mgmt_unit = $page_mgmt;
+				$horizontal_unit = $page_mgmt;
+				$vertical_unit = $page_mgmt;
+			    }
+			} elsif ($xchar eq "v") {
+			    my ($length);
+			    if ($skipchars == 4) {
+				$length = get_long(substr($stuff, 5, 4));
+			    } else {
+				$length = get_short(substr($stuff, 5, 2));
+			    }
+			    $vertical_position += $length;
+			    if ($opt_v) {
+				printf (" (skip vertical %d at %d %.4f)",
+					$length, $vertical_position,
+					$vertical_position / $vertical_unit);
+			    }
+			} elsif ($xchar eq "\$") {
+			    my ($length);
+			    if ($skipchars == 4) {
+				$horizontal_position =
+				    get_long(substr($stuff, 5, 4));
+			    } else {
+				$horizontal_position =
+				    get_short(substr($stuff, 5, 2));
+			    }
+			    if ($opt_v) {
+				printf (" (horizontal position %d %.4f)",
+					$horizontal_position,
+					$horizontal_position / $horizontal_unit);
+			    }
+			}
+		    }
 		    $found = 1;
 		}
 		$bytes = length($key) + 1 + $skipchars + $startoff;
@@ -282,8 +524,18 @@ while (! $atend) {
 	    increment_curpos(1);
 	} elsif ($found == 1) {
 	    increment_curpos($bytes);
+	}
+    } elsif (substr($stuff, 0, 1) eq "\0" ||
+	     substr($stuff, 0, 1) eq "\f") {
+	get_stuff(1);
+	$char = substr($stuff, 0, 1);
+	$nchar = unpack("C", $char);
+	if ($nchar >= 32 && $nchar < 127) {
+	    print " $char ";
 	} else {
+	    printf "%02x ", unpack("C", $char);
 	}
+	increment_curpos(1);
     } else {
 	get_stuff(1);
 	$char = substr($stuff, 0, 1);
@@ -296,3 +548,6 @@ while (! $atend) {
 	increment_curpos(1);
     }
 }
+
+print "\n";
+
diff --git a/test/pixma_parse.c b/test/pixma_parse.c
new file mode 100644
index 0000000..b32cec0
--- /dev/null
+++ b/test/pixma_parse.c
@@ -0,0 +1,674 @@
+/******************************************************************************
+ * pixma_parse.c parser for Canon BJL printjobs 
+ * Copyright (c) 2005 - 2007 Sascha Sommer <saschasommer@freenet.de>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ *****************************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <inttypes.h>
+
+
+#define MAX_COLORS 8  /* maximum number of Colors: CMYKcmyk */
+
+#include "pixma_parse.h"
+
+
+
+
+/* nextcmd(): find a command in a printjob
+ * commands in the printjob start with either ESC[ or ESC(
+ * ESC@ (go to neutral mode) and 0xc (form feed) are handled directly 
+ * params:
+ *  infile: handle to the printjob
+ *  cmd: the command type
+ *  buf: the buffer to hold the arguments, has to be at least 0xFFFF bytes
+ *  cnt: len of the arguments
+ *
+ * return values:
+ *   0 when a command has been succesfully read
+ *   1 when EOF has been reached
+ *  -1 when an error occureed
+ */
+static int nextcmd( FILE *infile,unsigned char* cmd,unsigned char *buf, unsigned int *cnt)
+{
+	unsigned char c1,c2;
+	if (feof(infile))
+		return -1;
+	while (!feof(infile)){
+		c1 = fgetc(infile);
+		if(feof(infile)) /* NORMAL EOF */
+			return 1;
+		if (c1 == 27 ){  /* A new ESC command */
+			c2 = fgetc(infile);
+			if(feof(infile))
+				return 1;
+			if (c2=='[' || c2=='(' ){   /* ESC[ or ESC( command */
+				*cmd = fgetc(infile);    /* read command type  (1 byte) */
+				if(feof(infile))
+					return 1;
+				c1 = fgetc(infile); /* read size 16 bit little endian */
+				c2 = fgetc(infile);
+				*cnt = c1 + (c2<<8);
+				if (*cnt){  /* read arguments */
+					unsigned int read;
+					if((read=fread(buf,1,*cnt,infile)) != *cnt){
+						printf("nextcmd: read error - not enough data %d %d\n", read, *cnt);
+						return -1;
+					}
+				}
+				return 0;
+			}else if(c2 == '@'){ /* ESC@ */
+				printf("ESC @ Return to neutral mode\n");
+			} else {
+				printf("unknown byte following ESC %x \n",c2);
+			}
+		}else if(c1==0x0c){ /* Form Feed */
+			printf("-->Form Feed\n");
+		}else{
+			printf("UNKNOWN BYTE 0x%x @ %lu\n",c1,ftell(infile));
+		}
+	}
+	return -1;
+}
+
+
+/* return pointer to color info structure matching name */
+static color_t* get_color(image_t* img,char name){
+	int i;
+	for(i=0;i<MAX_COLORS;i++)
+		if(img->color[i].name==name)
+			return &(img->color[i]);
+	return NULL;
+}
+
+static int valid_color(unsigned char color){
+	int i;
+	for(i=0;i<sizeof(valid_colors) / sizeof(valid_colors[0]);i++)
+		if(valid_colors[i] == color)
+			return 1;
+	printf("unknown color %c 0x%x\n",color,color);
+	return 0;
+}
+
+
+/* eight2ten() 
+ * decompression routine for canons 10to8 compression that stores 5 3-valued pixels in 8-bit
+ */
+static int eight2ten(unsigned char* inbuffer,unsigned char* outbuffer,int num_bytes,int outbuffer_size){
+	PutBitContext s;
+	int read_pos=0;
+	init_put_bits(&s, outbuffer,outbuffer_size);
+	while(read_pos < num_bytes){
+		unsigned short value=Table8[inbuffer[read_pos]];
+		++read_pos;
+		put_bits(&s,10,value);
+	}
+	return s.buf_ptr-s.buf;
+}
+
+
+/* reads a run length encoded block of raster data, decodes and uncompresses it */
+static int Raster(image_t* img,unsigned char* buffer,unsigned int len,unsigned char color_name){
+	color_t* color=get_color(img,color_name);
+        char* buf = (char*)buffer;
+	int size=0; /* size of unpacked buffer */
+	int cur_line=0; /* line relative to block begin */
+
+	unsigned char* dst=malloc(len*256); /* the destination buffer */
+	unsigned char* dstr=dst;
+	if(!color){
+		printf("no matching color for %c (0x%x) in the database => ignoring %i bytes\n",color_name,color_name,len);
+	}
+
+	/* decode pack bits */
+	while( len > 0){
+		int c = *buf;
+		++buf;
+		--len;
+		if(c >= 128)
+			c -=256;
+		if(c== -128){ /* end of line => decode and copy things here */
+			/* create new list entry */
+			if(color && size){
+				if(!color->tail)
+					color->head = color->tail = color->pos = calloc(1,sizeof(rasterline_t));
+				else {
+					color->head->next = calloc(1,sizeof(rasterline_t));
+					color->head=color->head->next;
+				}
+				color->head->line = img->height + cur_line;
+				if(!color->compression){
+					color->head->buf=calloc(1,size+8); /* allocat slightly bigger buffer for get_bits */
+					memcpy(color->head->buf,dstr,size);
+					color->head->len=size;
+				}else{ /* handle 5pixel in 8 bits compression */
+					color->head->buf=calloc(1,size*2+8);
+					size=color->head->len=eight2ten(dstr,color->head->buf,size,size*2);
+				}
+			}
+			/* adjust the maximum image width */
+			if(color && img->width < size*8/color->bpp)
+				img->width = size *8/color->bpp;
+			/* reset output buffer */
+			size=0;
+			dst=dstr;
+			++cur_line;
+		}else {
+			int i;
+			if(c < 0){ /* repeat char */
+				i= - c + 1;
+				c=*buf;
+				++buf;
+				--len;
+				memset(dst,c,i);
+				dst +=i;
+				size+=i;
+			}else{ /* normal code */
+				i=c+1;
+				len-=i;
+				memcpy( dst, buf, i);
+				buf +=i;
+				dst +=i;
+				size+=i;
+			}
+		}
+	}
+	free(dstr);
+	return 0;
+}
+
+
+/* checks if the buffer contains a pixel definition at the given x and y position */
+static inline int inside_range(color_t* c,int x,int y){
+	if(c->bpp && c->pos &&  c->pos->line==y && c->pos->len && (c->pos->len *8 >= c->bpp*x))
+		return 1;
+	return 0;
+}
+
+
+/* moves all iterators in the rasterline list */
+static void advance(image_t* img,unsigned int to){
+	int i;
+	for(i=0;i<MAX_COLORS;i++){
+		while(img->color[i].pos && img->color[i].pos->line < to && img->color[i].pos->next && img->color[i].pos->next->line <= to){
+			img->color[i].pos = img->color[i].pos->next;
+			if(!img->color[i].pos->next)
+				break;
+		}
+	}
+}
+
+/* write 1 line of decoded raster data */
+static void write_line(image_t*img,FILE* fp,int pos_y){
+	int i;
+	unsigned int x;
+	unsigned int written;
+	unsigned char* line=malloc(img->width*3);
+	color_t* Y=get_color(img,'Y');
+	color_t* C=get_color(img,'C');
+	color_t* M=get_color(img,'M');
+	color_t* K=get_color(img,'K');
+	color_t* k=get_color(img,'k');
+	color_t* c=get_color(img,'c');
+	color_t* m=get_color(img,'m');
+	color_t* y=get_color(img,'y');
+	GetBitContext gb[MAX_COLORS];
+	/* move iterator */
+	advance(img,pos_y);
+	/* init get bits */
+	for(i=0;i<MAX_COLORS;i++){
+		if(inside_range(&(img->color[i]),0,pos_y)){
+			init_get_bits(&(gb[i]),img->color[i].pos->buf,img->color[i].pos->len);
+		}
+	}
+	for(x=0;x<img->width;x++){
+		int lK=0,lM=0,lY=0,lC=0;
+		/* get pixel values */
+		for(i=0;i<MAX_COLORS;i++){
+			if(inside_range(&img->color[i],x,pos_y))
+				img->color[i].value = get_bits(&gb[i],img->color[i].bpp);
+			else
+				img->color[i].value = 0;
+			/* update statistics */
+			(img->color[i].dots)[img->color[i].value] += 1;
+		}
+		/* calculate CMYK values */
+		lK=K->density * K->value/(K->level-1) + k->density * k->value/(k->level-1);
+		lM=M->density * M->value/(M->level-1) + m->density * m->value/(m->level-1);
+		lY=Y->density * Y->value/(Y->level-1) + y->density * y->value/(y->level-1);
+		lC=C->density * C->value/(C->level-1) + c->density * c->value/(c->level-1);
+
+		/* detect image edges */
+		if(lK || lM || lY || lC){
+			if(!img->image_top)
+				img->image_top = pos_y;
+			img->image_bottom = pos_y;
+			if(x < img->image_left)
+				img->image_left = x;
+			if(x > img->image_right)
+				img->image_right = x;
+		}
+			
+                /* clip values */
+                if(lK > 255)
+                   lK = 255;
+                if(lM > 255)
+                   lM = 255;
+                if(lC > 255)
+                   lC = 255;
+                if(lY > 255)
+                   lY = 255;
+		/* convert to RGB */
+		/* 0 == black, 255 == white */
+		line[x*3]=255 - lC - lK;        
+		line[x*3+1]=255 - lM -lK;      
+		line[x*3+2]=255 - lY -lK;     
+		++img->dots;
+	}
+
+	/* output line */
+	if((written = fwrite(line,img->width,3,fp)) != 3)
+		printf("fwrite failed %u vs %u\n",written,img->width*3);
+	free(line);
+}
+
+
+/* create a ppm image from the decoded raster data */
+static void write_ppm(image_t* img,FILE* fp){
+	int i;
+	/* allocate buffers for dot statistics */
+        for(i=0;i<MAX_COLORS;i++){
+		img->color[i].dots=calloc(1,sizeof(int)*(img->color[i].level+1));
+	}	
+
+	/* write header */
+	fputs("P6\n", fp);
+	fprintf(fp, "%d\n%d\n255\n", img->width, img->height);
+
+	/* set top most left value */
+	img->image_left = img->width;
+
+	/* write data line by line */
+	for(i=0;i<img->height;i++){
+		write_line(img,fp,i);
+	}
+	
+	/* output some statistics */
+	printf("statistics:\n");
+	for(i=0;i<MAX_COLORS;i++){
+		int level;
+		for(level=0;level < img->color[i].level;level++)
+			printf("color %c level %i dots %i\n",img->color[i].name,level,img->color[i].dots[level]);
+	}
+	/* translate area coordinates to 1/72 in (the gutenprint unit)*/
+	img->image_top = img->image_top * 72.0 / img->yres ;
+	img->image_bottom = img->image_bottom * 72.0 / img->yres ;
+	img->image_left = img->image_left * 72.0 / img->xres ;
+	img->image_right = img->image_right * 72.0 / img->xres ;
+	printf("top %u bottom %u left %u right %u\n",img->image_top,img->image_bottom,img->image_left,img->image_right);
+	printf("width %u height %u\n",img->image_right - img->image_left,img->image_bottom - img->image_top);	
+
+	/* clean up */
+        for(i=0;i<MAX_COLORS;i++){
+		if(img->color[i].dots)
+			free(img->color[i].dots);
+	}	
+
+}
+
+static unsigned int read_uint32(unsigned char* a){
+        unsigned int value = ( a[0] << 24) | (a[1] << 16) | (a[2] << 8) | a[3];
+        return value;
+}
+
+
+/* process a printjob command by command */
+static int process(FILE* in, FILE* out,int verbose,unsigned int maxh){
+	image_t* img=calloc(1,sizeof(image_t));
+	unsigned char* buf=malloc(0xFFFF);
+	int returnv=0;
+	int i;
+	printf("------- parsing the printjob -------\n");
+	while(!returnv && !feof(in)){
+		unsigned char cmd;
+		unsigned int cnt = 0;
+		if((returnv = nextcmd(in,&cmd,buf,&cnt)))
+			break;
+		switch(cmd){
+			case 'c':
+				printf("ESC (c set media (len=%i):\n",cnt);
+				printf(" model id %x bw %x",buf[0]>> 4,buf[0]&0xf);
+				printf(" media %x",buf[1]);
+				printf(" direction %x quality %x\n",(buf[2]>>4)&3 ,buf[2]&0xf);
+				break;
+			case 'K':
+				if(buf[1]==0x1f){
+					printf("ESC [K go to command mode\n");
+					do{
+						fgets((char*)buf,0xFFFF,in);
+						printf(" %s",buf);
+					}while(strcmp((char*)buf,"BJLEND\n"));
+				}else if(cnt == 2 && buf[1]==0x0f){
+					printf("ESC [K reset printer\n");
+					img->width=0;
+					img->height=0;
+				}else
+					printf("ESC [K unsupported param (len=%i): %x\n",cnt,buf[1]);
+				break;
+			case 'b':
+				printf("ESC (b set data compression (len=%i): %x\n",cnt,buf[0]);
+				break;
+			case 'I':
+				printf("ESC (I select data transmission (len=%i): ",cnt);
+				if(buf[0]==0)printf("default");
+				else if(buf[0]==1)printf("multi raster");
+				else printf("unknown 0x%x",buf[0]);
+				printf("\n");
+				break;
+			case 'l':
+				printf("ESC (l select paper loading (len=%i):\n",cnt);
+				printf(" model id 0x%x ",buf[0]>>4);
+				printf(" source 0x%x",buf[0]&15);
+				printf(" media: %x",buf[1]);
+				printf(" paper gap: %x\n",buf[2]);
+				break;
+			case 'd':
+				img->xres = (buf[0]<<8)|buf[1];
+				img->yres = (buf[2]<<8)|buf[3];
+				printf("ESC (d set raster resolution (len=%i): %i x %i\n",cnt,img->xres,img->yres);
+				break;
+			case 't':
+				printf("ESC (t set image cnt %i\n",cnt);
+				if(buf[0]>>7){
+				        char order[]="CMYKcmyk";
+					int black_found = 0;
+					int num_colors = (cnt - 3)/3;
+					printf(" bit_info: using detailed color settings for max %i colors\n",num_colors);
+					if(buf[1]==0x80)
+						printf(" format: BJ indexed color image format\n");
+					else{
+						printf(" format: settings not supported 0x%x\n",buf[1]);
+						returnv = -2;
+					}
+					if(buf[2] != 0x1){
+						printf(" ink: settings not supported 0x%x\n",buf[2]);
+						returnv = -2;
+					}
+
+					for(i=0;i<num_colors;i++){
+					        if(i<MAX_COLORS){	
+						    img->color[i].name=order[i];
+						    img->color[i].compression=buf[3+i*3] >> 5;
+						    img->color[i].bpp=buf[3+i*3] & 31;
+						    img->color[i].level=(buf[3+i*3+1] << 8) + buf[3+i*3+2];
+                                                    /* this is not supposed to give accurate images */
+                                                    if(i<4)
+                                                         img->color[i].density = 255;
+                                                    else
+                                                         img->color[i].density = 128;
+						    if((order[i] == 'K' || order[i] =='k') && img->color[i].bpp)
+						         black_found = 1;
+                                                    if(order[i] == 'y' && !black_found && img->color[i].level){
+                                                        printf("iP6700 hack: treating colordefinition at the y position as k\n");
+                                                        img->color[i].name = 'k';
+                                                        order[i] = 'k';
+                                                        order[i+1] = 'y';
+							black_found = 1;
+                                                        img->color[i].density = 255;
+                                                    }
+						    printf(" Color %c Compression: %i bpp %i level %i\n",img->color[i].name,
+							img->color[i].compression,img->color[i].bpp,img->color[i].level);
+                                                }else{
+						    printf(" Color ignoring setting %x %x %x\n",buf[3+i*3],buf[3+i*3+1],buf[3+i*3+2]);
+						}
+
+					}
+
+
+				}else if(buf[0]==0x1 && buf[1]==0x0 && buf[2]==0x1){
+					printf(" 1bit-per pixel\n");
+					for(i=0;i<MAX_COLORS;i++){
+						const char order[]="CMYKcmyk";
+						img->color[i].name=order[i];
+						img->color[i].compression=0;
+						img->color[i].bpp=1;
+						img->color[i].level=2;
+						img->color[i].density = 255;
+					}
+				}else{
+					printf(" bit_info: unknown settings 0x%x 0x%x 0x%x\n",buf[0],buf[1],buf[2]);
+					returnv=-2;
+				}
+				break;
+			case 'L':
+				printf("ESC (L set component order for F raster command (len=%i): ",cnt);
+				img->color_order=calloc(1,cnt+1);
+				/* check if the colors are sane => the iP4000 driver appends invalid bytes in the highest resolution mode */
+				for(i=0;i<cnt;i++){
+					if(!valid_color(buf[i]))
+						break;
+				}
+				cnt = i;
+				memcpy(img->color_order,buf,cnt);
+				printf("%s\n",img->color_order);
+				img->num_colors = cnt;
+				img->cur_color=0;
+				break;
+			case 'p':
+				printf("ESC (p set extended margin (len=%i):\n",cnt);
+                                printf(" printed length %i left %i\n",((buf[0]<<8 )+buf[1]) *6 / 5,(buf[2]<<8) + buf[3]);
+                                printf(" printed width %i top %i\n",((buf[4]<<8 )+buf[5]) * 6 / 5,(buf[6]<<8) + buf[7]);
+
+                                if(cnt > 8){
+					int unit = (buf[12] << 8)| buf[13];
+					int area_right = read_uint32(buf+14);
+					int area_top = read_uint32(buf+18);
+					unsigned int area_width = read_uint32(buf+22);
+					unsigned int area_length = read_uint32(buf+26);
+					int paper_right = read_uint32(buf+30);
+					int paper_top = read_uint32(buf+34);
+					unsigned int paper_width = read_uint32(buf+38);
+					unsigned int paper_length = read_uint32(buf+42);
+                                        printf(" unknown %i\n",read_uint32(buf+8));
+                                        printf(" unit %i [1/in]\n",unit);
+                                        printf(" area_right %i %.1f mm\n",area_right,area_right * 25.4 / unit);
+                                        printf(" area_top %i %.1f mm\n",area_top,area_top * 25.4 / unit);
+                                        printf(" area_width %u %.1f mm\n",area_width, area_width * 25.4 / unit);
+                                        printf(" area_length %u %.1f mm\n",area_length,area_length * 25.4 / unit);
+                                        printf(" paper_right %i %.1f mm\n",paper_right,paper_right * 25.4 / unit);
+                                        printf(" paper_top %i %.1f mm\n",paper_top,paper_top * 25.4 / unit);
+                                        printf(" paper_width %u %.1f mm\n",paper_width,paper_width * 25.4 / unit);
+                                        printf(" paper_length %u %.1f mm\n",paper_length,paper_length * 25.4 / unit);
+					img->top = (float)area_top / unit;
+					img->left = (float)area_top / unit;
+                                }
+				break;
+			case '$':
+				printf("ESC ($ set duplex (len=%i)\n",cnt);
+				break;
+			case 'J':
+				printf("ESC (J select number of raster lines per block (len=%i): %i\n",cnt,buf[0]);
+				img->lines_per_block=buf[0];
+				break;
+			case 'F':
+				if(verbose)
+					printf("ESC (F raster block (len=%i):\n",cnt);
+				if((returnv = Raster(img,buf,cnt,img->color_order[img->cur_color])))
+					break;
+				++img->cur_color;
+				if(img->cur_color >= img->num_colors){
+					img->cur_color=0;
+					img->height+=img->lines_per_block;
+				}
+				break;
+			case 'q':
+				printf("ESC (q set page id (len=%i):%i\n",cnt,buf[0]);
+				break;
+			case 'r':
+				printf("ESC (r printer specific command (len=%i): ",cnt);
+				for(i=0;i<cnt;i++)
+					printf("0x%x ",buf[i]);
+				printf("\n");
+				break;
+			case 'A':
+				if(verbose)
+					printf("ESC (A raster line (len=%i): color %c\n",cnt,buf[0]);
+				/* the single line rasters are not terminated by 0x80 => do it here
+				 * instead of 0x80 every raster A command is followed by a 0x0d byte
+				 * the selected color is stored in the first byte
+				 */
+				buf[cnt]=0x80;
+				returnv = Raster(img,buf+1,cnt,buf[0]);
+				if (fgetc(in)!=0x0d){
+					printf("Raster A not terminated by 0x0d\n");
+					returnv=-4;
+				}
+				break;
+			case 'e': /* Raster skip */
+				if(verbose)
+					printf("ESC (e advance (len=%i): %i\n",cnt,buf[0]*256+buf[1]);
+				if(img->lines_per_block){
+					img->height += (buf[0]*256+buf[1])*img->lines_per_block;
+					img->cur_color=0;
+				}else	
+					img->height += (buf[0]*256+buf[1]);
+				break;
+			default: /* Last but not least completely unknown commands */
+				printf("ESC (%c UNKNOWN (len=%i)\n",cmd,cnt);
+				for(i=0;i<cnt;i++)
+					printf(" 0x%x",buf[i]);
+				printf("\n");
+
+		}
+	}
+
+	printf("-------- finished parsing   --------\n");
+	if(returnv < 0){
+		printf("error: parsing the printjob failed error %i\n",returnv);
+	} else {
+	
+		printf("created bit image with width %i height %i\n",img->width,img->height);
+		if(maxh > 0){
+			printf("limiting height to %u\n",maxh);
+			img->height=maxh;
+		}
+
+		/* now that we have a complete nice raster image
+	 	* lets build a bitmap from it
+         	*/
+		if(out)
+			write_ppm(img,out);
+		printf("dots: %u\n",img->dots);
+
+	}
+	/* deallocate resources */
+	free(buf);
+	for(i=0;i<MAX_COLORS;i++){
+		rasterline_t** r=&img->color[i].tail;
+		while(*r){
+			rasterline_t* tmp=(*r)->next;
+			free((*r)->buf);
+			free(*r);
+			*r=tmp;
+		}
+	}
+	if(img->color_order)
+		free(img->color_order);
+	free(img);
+	return returnv;
+}
+
+
+
+static void display_usage(void){
+	printf("usage: pixma_parse [options] infile [outfile]\n");
+	printf("infile: the printjob to parse\n");
+	printf("outfile: if specified a ppm file will be generated from the raster data\n");
+	printf("options:\n");
+	printf(" -v: verbose print ESC e),F) and A) commands\n");
+	printf(" -y height: cut the output ppm to the given height\n");
+	printf(" -h: display this help\n");
+}
+
+
+
+int main(int argc,char* argv[]){
+	int verbose = 0;
+	unsigned int maxh=0;
+	char* filename_in=NULL,*filename_out=NULL;
+	FILE *in,*out=NULL;
+	int i;
+	printf("pixma_parse - parser for Canon BJL printjobs (c) 2005-2007 Sascha Sommer <saschasommer@freenet.de>\n");
+
+	/* parse args */
+	for(i=1;i<argc;i++){
+		if(strlen(argv[i]) >= 2 && argv[i][0] == '-'){
+			if(argv[i][1] == 'v'){
+				verbose = 1;
+			}else if(argv[i][1] == 'h'){
+				display_usage();
+				return 0;	
+			}else if(argv[i][1] == 'y'){
+				if(argc > i+1){
+					++i;
+					maxh = atoi(argv[i]);
+				}else{
+					display_usage();
+					return 1;
+				}
+			}else {
+				printf("unknown parameter %s\n",argv[i]);
+				return 1;
+			}
+		}else if(!filename_in){
+			filename_in = argv[i];
+		}else if(!filename_out){
+			filename_out = argv[i];
+		}else{
+			display_usage();
+			return 1;
+		}
+	}
+	if(!filename_in){
+		display_usage();
+		return 1;
+	}
+
+	/* open input file */
+	if(!(in=fopen(filename_in,"rb"))){
+		printf("unable to open input file %s\n",filename_in);
+		return 1;
+	}
+
+	/* open output file */
+	if(filename_out && !(out=fopen(filename_out,"wb"))){
+		printf("can't create the output file %s\n",filename_out);
+		fclose(in);
+		return 1;
+	}
+	
+	/* process the printjob */
+	process(in,out,verbose,maxh);
+
+	/* cleanup */
+	fclose(in);
+	if(out)
+		fclose(out);
+	return 0;
+} 
diff --git a/test/pixma_parse.h b/test/pixma_parse.h
new file mode 100644
index 0000000..1be8549
--- /dev/null
+++ b/test/pixma_parse.h
@@ -0,0 +1,264 @@
+/******************************************************************************
+ * pixma_parse.h parser for Canon BJL printjobs
+ * Copyright (c) 2005 - 2007 Sascha Sommer <saschasommer@freenet.de>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ *****************************************************************************/
+
+
+#ifndef PIXMA_PARSE_H
+#define PIXMA_PARSE_H 1
+
+
+#define bswap_32(x) \
+     ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
+      (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define be2me_32(x) bswap_32(x)
+#else
+#define be2me_32
+#endif
+
+
+
+/* Bitstream reader from FFmpeg (http://www.ffmpeg.org)
+ * libavcodec/bitstream.h
+ * 
+ */
+
+typedef struct PutBitContext {
+    uint32_t bit_buf;
+    int bit_left;
+    uint8_t *buf, *buf_ptr, *buf_end;
+} PutBitContext;
+
+static inline void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_size)
+{
+    s->buf = buffer;
+    s->buf_end = s->buf + buffer_size;
+    s->buf_ptr = s->buf;
+    s->bit_left=32;
+    s->bit_buf=0;
+}
+
+static inline void put_bits(PutBitContext *s, int n, unsigned int value)
+{
+    unsigned int bit_buf;
+    int bit_left;
+
+    /*    printf("put_bits=%d %x\n", n, value); */
+
+    
+    bit_buf = s->bit_buf;
+    bit_left = s->bit_left;
+
+    /*    printf("n=%d value=%x cnt=%d buf=%x\n", n, value, bit_cnt, bit_buf); */
+    /* XXX: optimize */
+    if (n < bit_left) {
+        bit_buf = (bit_buf<<n) | value;
+        bit_left-=n;
+    } else {
+	bit_buf<<=bit_left;
+        bit_buf |= value >> (n - bit_left);
+        *(uint32_t *)s->buf_ptr = be2me_32(bit_buf);
+        /* printf("bitbuf = %08x\n", bit_buf); */
+        s->buf_ptr+=4;
+	bit_left+=32 - n;
+        bit_buf = value;
+    }
+
+    s->bit_buf = bit_buf;
+    s->bit_left = bit_left;
+}
+
+/* bit input */
+/* buffer, buffer_end and size_in_bits must be present and used by every reader */
+typedef struct GetBitContext {
+    const uint8_t *buffer, *buffer_end;
+    uint32_t *buffer_ptr;
+    uint32_t cache0;
+    uint32_t cache1;
+    int bit_count;
+    int size_in_bits;
+} GetBitContext;
+
+
+#    define NEG_SSR32(a,s) ((( int32_t)(a))>>(32-(s)))
+#    define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s)))
+
+
+#   define MIN_CACHE_BITS 32
+
+#   define OPEN_READER(name, gb)\
+        int name##_bit_count=(gb)->bit_count;\
+        uint32_t name##_cache0= (gb)->cache0;\
+        uint32_t name##_cache1= (gb)->cache1;\
+        uint32_t * name##_buffer_ptr=(gb)->buffer_ptr;\
+
+#   define CLOSE_READER(name, gb)\
+        (gb)->bit_count= name##_bit_count;\
+        (gb)->cache0= name##_cache0;\
+        (gb)->cache1= name##_cache1;\
+        (gb)->buffer_ptr= name##_buffer_ptr;\
+
+#   define UPDATE_CACHE(name, gb)\
+    if(name##_bit_count > 0){\
+        const uint32_t next= be2me_32( *name##_buffer_ptr );\
+        name##_cache0 |= NEG_USR32(next,name##_bit_count);\
+        name##_cache1 |= next<<name##_bit_count;\
+        name##_buffer_ptr++;\
+        name##_bit_count-= 32;\
+    }\
+
+#   define SKIP_CACHE(name, gb, num)\
+        name##_cache0 <<= (num);\
+        name##_cache0 |= NEG_USR32(name##_cache1,num);\
+        name##_cache1 <<= (num);
+
+#   define SKIP_COUNTER(name, gb, num)\
+        name##_bit_count += (num);\
+
+#   define SKIP_BITS(name, gb, num)\
+        {\
+            SKIP_CACHE(name, gb, num)\
+            SKIP_COUNTER(name, gb, num)\
+        }\
+
+#   define LAST_SKIP_BITS(name, gb, num) SKIP_BITS(name, gb, num)
+#   define LAST_SKIP_CACHE(name, gb, num) SKIP_CACHE(name, gb, num)
+
+#   define SHOW_UBITS(name, gb, num)\
+        NEG_USR32(name##_cache0, num)
+
+#   define SHOW_SBITS(name, gb, num)\
+        NEG_SSR32(name##_cache0, num)
+
+#   define GET_CACHE(name, gb)\
+        (name##_cache0)
+
+
+/**
+ * reads 0-17 bits.
+ * Note, the alt bitstream reader can read up to 25 bits, but the libmpeg2 reader can't
+ */
+static inline unsigned int get_bits(GetBitContext *s, int n){
+    register int tmp;
+    OPEN_READER(re, s)
+    UPDATE_CACHE(re, s)
+    tmp= SHOW_UBITS(re, s, n);
+    LAST_SKIP_BITS(re, s, n)
+    CLOSE_READER(re, s)
+    return tmp;
+}
+
+/**
+ * init GetBitContext.
+ * @param buffer bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE bytes larger then the actual read bits
+ * because some optimized bitstream readers read 32 or 64 bit at once and could read over the end
+ * @param bit_size the size of the buffer in bits
+ */
+static inline void init_get_bits(GetBitContext *s,
+                   uint8_t *buffer, int bit_size)
+{
+    const int buffer_size= (bit_size+7)>>3;
+
+    s->buffer= buffer;
+    s->size_in_bits= bit_size;
+    s->buffer_end= buffer + buffer_size;
+    s->buffer_ptr = (uint32_t*)buffer;
+    s->bit_count = 32;
+    s->cache0 = 0;
+    s->cache1 = 0;
+
+    {
+        OPEN_READER(re, s)
+        UPDATE_CACHE(re, s)
+        UPDATE_CACHE(re, s)
+        CLOSE_READER(re, s)
+    }
+    s->cache1 = 0;
+
+}
+
+/* 10to8 decompression table */
+static const unsigned short Table8[] = {
+    0x0,0x1,0x2,0x4,0x5,0x6,0x8,0x9,0xa,0x10,0x11,0x12,0x14,0x15,0x16,
+    0x18,0x19,0x1a,0x20,0x21,0x22,0x24,0x25,0x26,0x28,0x29,0x2a,0x40,0x41,0x42,
+    0x44,0x45,0x46,0x48,0x49,0x4a,0x50,0x51,0x52,0x54,0x55,0x56,0x58,0x59,0x5a,
+    0x60,0x61,0x62,0x64,0x65,0x66,0x68,0x69,0x6a,0x80,0x81,0x82,0x84,0x85,0x86,
+    0x88,0x89,0x8a,0x90,0x91,0x92,0x94,0x95,0x96,0x98,0x99,0x9a,0xa0,0xa1,0xa2,
+    0xa4,0xa5,0xa6,0xa8,0xa9,0xaa,0x100,0x101,0x102,0x104,0x105,0x106,0x108,0x109,0x10a,
+    0x110,0x111,0x112,0x114,0x115,0x116,0x118,0x119,0x11a,0x120,0x121,0x122,0x124,0x125,0x126,
+    0x128,0x129,0x12a,0x140,0x141,0x142,0x144,0x145,0x146,0x148,0x149,0x14a,0x150,0x151,0x152,
+    0x154,0x155,0x156,0x158,0x159,0x15a,0x160,0x161,0x162,0x164,0x165,0x166,0x168,0x169,0x16a,
+    0x180,0x181,0x182,0x184,0x185,0x186,0x188,0x189,0x18a,0x190,0x191,0x192,0x194,0x195,0x196,
+    0x198,0x199,0x19a,0x1a0,0x1a1,0x1a2,0x1a4,0x1a5,0x1a6,0x1a8,0x1a9,0x1aa,0x200,0x201,0x202,
+    0x204,0x205,0x206,0x208,0x209,0x20a,0x210,0x211,0x212,0x214,0x215,0x216,0x218,0x219,0x21a,
+    0x220,0x221,0x222,0x224,0x225,0x226,0x228,0x229,0x22a,0x240,0x241,0x242,0x244,0x245,0x246,
+    0x248,0x249,0x24a,0x250,0x251,0x252,0x254,0x255,0x256,0x258,0x259,0x25a,0x260,0x261,0x262,
+    0x264,0x265,0x266,0x268,0x269,0x26a,0x280,0x281,0x282,0x284,0x285,0x286,0x288,0x289,0x28a,
+    0x290,0x291,0x292,0x294,0x295,0x296,0x298,0x299,0x29a,0x2a0,0x2a1,0x2a2,0x2a4,0x2a5,0x2a6,
+    0x2a8,0x2a9,0x2aa,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0
+};
+
+
+typedef struct rasterline_s {
+	unsigned char* buf;
+	unsigned int len;
+	unsigned int line;
+	struct rasterline_s* next;
+} rasterline_t;
+
+
+typedef struct color_s {
+	char name;          /* name (one of CMYKcmyk) */
+	int bpp;            /* number of bits */
+	int level;          /* number of levels */
+        int density;     /* relative density to the other colors*/
+	unsigned int  value;/* last used dot value */
+	unsigned int* dots;  /* number of dots for every level */
+	int compression;    /* bits are compressed */
+	rasterline_t* head; /* end of linked list */
+	rasterline_t* tail; /* start of linked list */
+	rasterline_t* pos;  /* iterator position */
+} color_t;
+
+
+typedef struct image_s {
+        unsigned int width;
+        unsigned int height;
+        unsigned int dots;
+	unsigned int image_top;
+	unsigned int image_bottom;
+	unsigned int image_left;
+	unsigned int image_right;
+	float top;
+	float left;
+	int xres,yres;
+        int y;
+        color_t color[MAX_COLORS];
+        char* color_order;
+        int num_colors;
+        int cur_color;
+        int lines_per_block;
+} image_t;
+
+/* FIXME what are the 0xa3 and 0xad for? they are used in the PIXMA iP4200 CD mode */
+static const unsigned char valid_colors[] = {'C','M','Y','K','c','m','y','k',0xa3,0xad}; 
+#endif
+
+
diff --git a/test/unprint.c b/test/unprint.c
index bdc0003..2ff448a 100644
--- a/test/unprint.c
+++ b/test/unprint.c
@@ -1,4 +1,4 @@
-/* $Id: unprint.c,v 1.37 2006/04/13 12:09:15 rlk Exp $ */
+/* $Id: unprint.c,v 1.37.8.1 2007/03/02 12:01:36 rlk Exp $ */
 /*
  * Generate PPM files from printer output
  *
@@ -432,8 +432,10 @@ write_output(FILE *fp_w, int dontwrite, int allblack)
   right = pstate.right_edge;
   height = oversample * (last - first + 1);
 
-  fprintf(stderr, "Image from (%d,%d) to (%d,%d) (%dx%d).\n",
-	  left, first, right, last, right - left, last - first);
+  fprintf(stderr, "Image from (%d,%d) to (%d,%d) (%dx%d) (%.3fx%.3f)\n",
+	  left, first, right, last, right - left + 1, last - first + 1,
+	  (right - left + 1) / (double) pstate.page_management_units,
+	  (last - first + 1) / (double) pstate.page_management_units);
 
   width = right - left + 1;
   if (width < 0)